去除没用的数据

app/src/main/AndroidManifest.xml

@@ -56,11 +56,6 @@
             android:screenOrientation="portrait"
             android:theme="@style/TextInputStyle" />
 
-        <activity
-            android:name=".ui.mine.goods.AddGoodsActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/TextInputStyle" />
-
         <activity
             android:name=".ui.mine.coupon.AddCouponActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/itant/shibei/tool/DataTool.java

@@ -73,21 +73,7 @@ public class DataTool {
         goodsBean.coverImageUrl = "https://img14.360buyimg.com/n12/jfs/t1/97822/29/10664/255856/5e1ebf26Eea1a28ec/ac2c298127bae9a4.jpg";
         goodsBean.title = "华硕(ASUS) PN60 商用办公家用教育 台式机电脑主机 (i3-8130U 128G SSD 4G 正版Win10 三年上门)迷你主机";
         goodsBean.description = "远程教育，在家办公，顺畅不卡顿！";
-        goodsBean.reason = "小巧稳定的个人服务器";
-        goodsBean.oldPrice = 229900;
-        goodsBean.nowPrice = 229900;
-        goodsBean.rebate = 0;
-        goodsBean.shopName = "华硕京东自营旗舰店";
-        goodsBean.province = "广东";
-        goodsBean.isSelfBusiness = true;
-        goodsBean.hasCoupon = true;
-        goodsBean.couponInfo = "30";
-        goodsBean.goodsType = GoodsBean.TYPE_TECHNOLOGY;
-        goodsBean.goodsUrl = "https://union-click.jd.com/jdc?e=&p=AyIGZRtcEgAXA1QfWhIyEgZUGloRAxYEXRpfJUZNXwtEa0xHV0YXEEULWldTCQQHCllHGAdFBwtEQkQBBRxNVlQYBUkeTVxNCRNLGEF6RwtVGloUAxYGURhTFAYichZtC3VcTl8wREFHCkp9MRwcSkBbZ1kXaxQyEgZUGFMcBREAUitrFQUiVDtADnsGQQBWH1JHCxMCUksOJQMiB1ETXR0CEANQG10cASIAVRJrU1dTWhNNBEtnbFMSRQYlMiIEZStrFTIRNxd1CxNSEwUFHggXBRFQUB0JFlFAUFcaXhUBGwVXT14UBEU3VxpaEQs%3D";
-        goodsBean.salesPerMonth = 1022;
-        goodsBean.commentNum = 1022;
-        goodsBean.goodCommentPercent = 0.97d;
-        goodsBean.isLocal = true;
+
         goodsBean.enable = true;
         goodsList.add(goodsBean);
         return goodsList;

app/src/main/java/com/itant/shibei/ui/home/goods/GoodsAdapter.java

@@ -1,14 +1,11 @@
 package com.itant.shibei.ui.home.goods;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -22,12 +19,9 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.itant.shibei.R;
 import com.itant.shibei.base.ItemLongClickListener;
-import com.itant.shibei.constant.ConstantString;
 import com.itant.shibei.manager.UserInfoManager;
-import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.ui.home.goods.play.VideoPlayActivity;
 import com.makeramen.roundedimageview.RoundedImageView;
-import com.miekir.common.utils.ActivityTool;
 import com.miekir.common.utils.ToastTool;
 
 import java.util.List;
@@ -52,54 +46,16 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
     @Override
     protected void convert(@NonNull BaseViewHolder holder, GoodsBean goodsBean) {
         holder.setText(R.id.tv_title, goodsBean.title);
-        holder.setText(R.id.tv_shop_name, goodsBean.shopName);
-
-        // 好评
-        holder.setText(R.id.tv_good_comment,
-                String.format(ConstantString.GOOD_COMMENT, Math.round(goodsBean.goodCommentPercent*100)));
-
-        // 评论条数
-        holder.setText(R.id.tv_comment_num,
-                String.format(ConstantString.COMMENT_NUM, StringTool.getNumberString(goodsBean.commentNum)));
-
-        // 返现
-        TextView tv_rebate = holder.getView(R.id.tv_rebate);
-        tv_rebate.setText(String.format(ConstantString.MONEY_GAME,
-                StringTool.longCent2Yuan(goodsBean.oldPrice-goodsBean.nowPrice)));
-        // 走马灯
-        tv_rebate.setSelected(true);
-
-        // 自营
-        TextView tv_self = holder.getView(R.id.tv_self);
-        if (goodsBean.isSelfBusiness) {
-            tv_self.setVisibility(View.VISIBLE);
-        } else {
-            tv_self.setVisibility(View.GONE);
-        }
-
-        // 原价
-        TextView tv_old_price = holder.getView(R.id.tv_old_price);
-        tv_old_price.setText(String.format(ConstantString.MONEY_RMB, StringTool.longCent2Yuan(goodsBean.oldPrice)));
-        // 增加删除线
-        tv_old_price.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
 
-        // 现价
-        holder.setText(R.id.tv_now_price, String.format(ConstantString.MONEY_RMB, StringTool.longCent2Yuan(goodsBean.nowPrice)));
 
-        // 一句话推荐
-        TextView tv_reason = holder.getView(R.id.tv_reason);
-        if (TextUtils.isEmpty(goodsBean.reason)) {
-            tv_reason.setText("拾贝推荐");
-        } else {
-            tv_reason.setText(goodsBean.reason);
-        }
 
         holder.setOnClickListener(R.id.cv_goods, v -> {
             if (!goodsBean.enable) {
                 ToastTool.showShort("敬请期待");
                 return;
             }
-            ActivityTool.openUrl((Activity) mContext, goodsBean.goodsUrl);
+            // todo 跳到详情界面
+            //ActivityTool.openUrl((Activity) mContext, goodsBean.goodsUrl);
         });
 
         // 解决图片错乱

app/src/main/java/com/itant/shibei/ui/home/goods/GoodsBean.java

@@ -1,6 +1,7 @@
 package com.itant.shibei.ui.home.goods;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  *
@@ -10,90 +11,69 @@ import java.io.Serializable;
  * Description: 商品实体
  */
 public class GoodsBean implements Serializable {
-    public static final int TYPE_RECOMMEND = 0;
-    public static final int TYPE_TECHNOLOGY = 1;
-    public static final int TYPE_LIFE = 2;
-    public static final int TYPE_NETWORK = 3;
-
 
     /**
      * 商品id
      */
     public long id;
     /**
-     * 封面图片地址
+     * 封面图片地址，如果内容图片链接不为空，取第一条
      */
     public String coverImageUrl;
     /**
-     * 体验视频地址
+     * 视频地址，如果磁力不为空，取磁力第一条
      */
     public String videoUrl;
+
     /**
      * 标题
      */
     public String title;
     /**
-     * 商品描述
+     * 描述
      */
     public String description;
+
+    /**主演*/
+    public String actors;
+
+    /**时长（分钟），-1表示未知*/
+    public int timeLong = -1;
+
     /**
-     * 商品推荐理由（一句话推荐、推荐者心声）
-     */
-    public String reason;
-    /**
-     * 原价
-     */
-    public long oldPrice;
-    /**
-     * 现价
-     */
-    public long nowPrice;
-    /**
-     * 返利
-     */
-    public long rebate;
-    /**
-     * 店名
-     */
-    public String shopName;
-    /**
-     * 商店所属省份
-     */
-    public String province;
-    /**
-     * 是否自营
-     */
-    public boolean isSelfBusiness;
-    /**
-     * 是否有券
+     * 赞的数量
      */
-    public boolean hasCoupon;
+    public int dingNum;
+
     /**
-     * 优惠券信息
+     * 踩的数量
      */
-    public String couponInfo;
+    public int caiNum;
+
     /**
-     * 所属类型
+     * 好评率 = 赞/(赞+踩)
      */
-    public int goodsType;
+    public double goodComment;
+
     /**
-     * 商品链接
+     * 烦号信息
      */
-    public String goodsUrl;
+    public List<String> fanList;
+
     /**
-     * 月销量
+     * 磁力链接合集
      */
-    public long salesPerMonth;
+    public List<MagnetBean> magnetBeanList;
 
     /**
-     * 评论条数
+     * 是否已收藏
      */
-    public long commentNum;
+    public boolean isFavorite;
 
     /**
-     * 好评率
+     * 内容的图片链接列表
      */
-    public double goodCommentPercent;
+    public List<String> contentImageUrlList;
 
     /**
      * 创建时间
@@ -106,31 +86,4 @@ public class GoodsBean implements Serializable {
     public long updateTimeMillis;
 
     public boolean enable;
-
-    /**是否是本地写死的数据*/
-    public boolean isLocal;
-
-    public void updateData(GoodsBean goodsBean) {
-        this.coverImageUrl = goodsBean.coverImageUrl;
-        this.videoUrl = goodsBean.videoUrl;
-        this.title = goodsBean.title;
-        this.description = goodsBean.description;
-        this.reason = goodsBean.reason;
-        this.oldPrice = goodsBean.oldPrice;
-        this.nowPrice = goodsBean.nowPrice;
-        this.rebate = goodsBean.rebate;
-        this.shopName = goodsBean.shopName;
-        this.province = goodsBean.province;
-        this.isSelfBusiness = goodsBean.isSelfBusiness;
-        this.hasCoupon = goodsBean.hasCoupon;
-        this.couponInfo = goodsBean.couponInfo;
-        this.goodsType = goodsBean.goodsType;
-        this.goodsUrl = goodsBean.goodsUrl;
-        this.salesPerMonth = goodsBean.salesPerMonth;
-        this.goodCommentPercent = goodsBean.goodCommentPercent;
-        this.createTimeMillis = goodsBean.createTimeMillis;
-        this.updateTimeMillis = goodsBean.updateTimeMillis;
-        this.enable = goodsBean.enable;
-        this.isLocal = goodsBean.isLocal;
-    }
 }

app/src/main/java/com/itant/shibei/ui/home/goods/GoodsFragment.java

@@ -1,7 +1,6 @@
 package com.itant.shibei.ui.home.goods;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.util.TypedValue;
 
 import androidx.appcompat.app.AlertDialog;
@@ -11,7 +10,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.itant.shibei.R;
 import com.itant.shibei.base.ITopActionListener;
-import com.itant.shibei.ui.mine.goods.AddGoodsActivity;
+import com.itant.shibei.tool.DataTool;
 import com.itant.shibei.widget.bottomlistener.OnRcvScrollListener;
 import com.itant.shibei.widget.decoration.SpacesItemDecoration;
 import com.miekir.common.utils.ToastTool;
@@ -21,10 +20,6 @@ import com.miekir.mvp.view.BaseMVPFragment;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx_activity_result2.RxActivityResult;
-
-import static android.app.Activity.RESULT_OK;
-
 /**
  *
  *
@@ -67,6 +62,7 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
         int dividerWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 4, getResources().getDisplayMetrics());
         SpacesItemDecoration decoration = new SpacesItemDecoration(dividerWidth);
         rv_goods.addItemDecoration(decoration);
+        mGoodsList.addAll(DataTool.getGoodsList());
         mAdapter = new GoodsAdapter(getActivity(), mGoodsList);
         mAdapter.setGoodsLongClickListener(this::showAdminDialog);
         rv_goods.setAdapter(mAdapter);
@@ -117,30 +113,8 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
      * 修改商品或者删除商品
      */
     private void showAdminDialog(int position) {
-        GoodsBean goodsBean = mGoodsList.get(position);
-        if (goodsBean.isLocal) {
-            // 本地写死的不能删除
-            return;
-        }
         AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
                 .setMessage("选择操作")
-                .setPositiveButton("修改", (dialog, which) -> {
-                    dialog.dismiss();
-                    Intent modifyIntent = new Intent(getActivity(), AddGoodsActivity.class);
-                    modifyIntent.putExtra(AddGoodsActivity.KEY_MODIFY_GOODS, goodsBean);
-                    RxActivityResult.on(getActivity()).startIntent(modifyIntent)
-                            .filter(result -> result.resultCode() == RESULT_OK)
-                            .doOnNext(result -> {
-                                // 修改商品成功之后刷新item
-                                GoodsBean modifiedBean = (GoodsBean) result.data().getSerializableExtra(AddGoodsActivity.KEY_MODIFY_GOODS);
-                                if (modifiedBean == null) {
-                                    return;
-                                }
-                                goodsBean.updateData(modifiedBean);
-                                mAdapter.notifyItemChanged(position);
-                            })
-                            .subscribe();
-                })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();
                 })

app/src/main/java/com/itant/shibei/ui/home/goods/MagnetBean.java

@@ -0,0 +1,13 @@
+package com.itant.shibei.ui.home.goods;
+
+/**
+ * Copyright (C), 2019-2020, Miekir
+ *
+ * @author Miekir
+ * @date 2020/8/28 16:25
+ * Description: 磁力链接
+ */
+public class MagnetBean {
+    public String text;
+    public String url;
+}

app/src/main/java/com/itant/shibei/ui/home/search/SearchActivity.java

@@ -1,7 +1,6 @@
 package com.itant.shibei.ui.home.search;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -18,7 +17,6 @@ import com.itant.shibei.ui.home.goods.GoodsAdapter;
 import com.itant.shibei.ui.home.goods.GoodsBean;
 import com.itant.shibei.ui.home.goods.GoodsPresenter;
 import com.itant.shibei.ui.home.goods.IGoodsView;
-import com.itant.shibei.ui.mine.goods.AddGoodsActivity;
 import com.itant.shibei.widget.bottomlistener.OnRcvScrollListener;
 import com.itant.shibei.widget.decoration.CardViewDividerItemDecoration;
 import com.miekir.common.utils.ToastTool;
@@ -28,8 +26,6 @@ import com.miekir.mvp.presenter.InjectPresenter;
 import java.util.ArrayList;
 import java.util.List;
 
-import rx_activity_result2.RxActivityResult;
-
 /**
  * Copyright (C), 2019-2020, Miekir
  *
@@ -136,29 +132,9 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
      */
     private void showAdminDialog(int position) {
         GoodsBean goodsBean = mGoodsList.get(position);
-        if (goodsBean.isLocal) {
-            // 本地写死的不能删除
-            return;
-        }
+
         AlertDialog alertDialog = new AlertDialog.Builder(this)
                 .setMessage("选择操作")
-                .setPositiveButton("修改", (dialog, which) -> {
-                    dialog.dismiss();
-                    Intent modifyIntent = new Intent(this, AddGoodsActivity.class);
-                    modifyIntent.putExtra(AddGoodsActivity.KEY_MODIFY_GOODS, goodsBean);
-                    RxActivityResult.on(this).startIntent(modifyIntent)
-                            .filter(result -> result.resultCode() == RESULT_OK)
-                            .doOnNext(result -> {
-                                // 修改商品成功之后刷新item
-                                GoodsBean modifiedBean = (GoodsBean) result.data().getSerializableExtra(AddGoodsActivity.KEY_MODIFY_GOODS);
-                                if (modifiedBean == null) {
-                                    return;
-                                }
-                                goodsBean.updateData(modifiedBean);
-                                mAdapter.notifyItemChanged(position);
-                            })
-                            .subscribe();
-                })
                 .setNeutralButton("取消", (dialog, which) -> {
                     dialog.dismiss();
                 })

app/src/main/java/com/itant/shibei/ui/mine/MineActivity.java

@@ -2,7 +2,6 @@ package com.itant.shibei.ui.mine;
 
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
@@ -23,8 +22,6 @@ import com.itant.shibei.tool.StringTool;
 import com.itant.shibei.tool.TimeTool;
 import com.itant.shibei.ui.home.tool.ISystemView;
 import com.itant.shibei.ui.home.tool.SystemPresenter;
-import com.itant.shibei.ui.mine.coupon.AddCouponActivity;
-import com.itant.shibei.ui.mine.goods.AddGoodsActivity;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.common.utils.ViewTool;
 import com.miekir.mvp.presenter.InjectPresenter;
@@ -52,8 +49,7 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
         mUser = UserInfoManager.getInstance().getBeiUser();
         setTitle(String.format(ConstantString.WELCOME_HELLO, TimeTool.getCurrentTimePeriod(), mUser.nickName));
         ViewTool.setOnClickListener(this, this,
-                new int[]{R.id.ll_user, R.id.tv_add_goods, R.id.btn_exit_login, R.id.tv_add_coupon,
-                R.id.tv_add_goods_from_url, R.id.tv_deal_cash});
+                new int[]{R.id.ll_favorite, R.id.btn_exit_login, R.id.tv_deal_cash});
 
         // 只有我才能管理后台
         View ll_admin = findViewById(R.id.ll_admin);
@@ -86,26 +82,12 @@ public class MineActivity extends BaseBeiActivity implements View.OnClickListene
     public void onClick(View v) {
         switch (v.getId()) {
 
-            case R.id.ll_user:
-                // todo 查看账户明细
+            case R.id.ll_favorite:
+                // todo 我的收藏条数
                 break;
 
             case R.id.tv_deal_cash:
-                // todo 处理提现工单
-                break;
-
-            case R.id.tv_add_goods_from_url:
-                // todo 解析链接添加商品
-                break;
-
-            case R.id.tv_add_goods:
-                // 上架新商品
-                startActivity(new Intent(this, AddGoodsActivity.class));
-                break;
-
-            case R.id.tv_add_coupon:
-                // 上架优惠券
-                startActivity(new Intent(this, AddCouponActivity.class));
+                // todo 设置会员VIP
                 break;
 
             case R.id.btn_exit_login:

app/src/main/java/com/itant/shibei/ui/mine/MineFragment.java

@@ -20,7 +20,7 @@ public class MineFragment extends Fragment implements View.OnClickListener {
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.activity_mine, container, false);
-        root.findViewById(R.id.ll_user).setOnClickListener(this);
+        root.findViewById(R.id.ll_favorite).setOnClickListener(this);
         //root.findViewById(R.id.ll_feedback).setOnClickListener(this);
         return root;
 
@@ -29,7 +29,7 @@ public class MineFragment extends Fragment implements View.OnClickListener {
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.ll_user:
+            case R.id.ll_favorite:
                 if (!UserInfoManager.getInstance().isLogin()) {
                     // 未登录，跳转登录
                     startActivity(new Intent(getActivity(), LoginActivity.class));

app/src/main/java/com/itant/shibei/ui/mine/goods/AddGoodsActivity.java

@@ -1,193 +0,0 @@
-package com.itant.shibei.ui.mine.goods;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-
-import androidx.annotation.NonNull;
-
-import com.google.android.material.textfield.TextInputEditText;
-import com.itant.shibei.R;
-import com.itant.shibei.base.BaseBeiActivity;
-import com.itant.shibei.constant.ConstantUrl;
-import com.itant.shibei.ui.home.goods.GoodsBean;
-import com.miekir.common.utils.ActivityTool;
-import com.miekir.common.utils.ToastTool;
-import com.miekir.common.utils.ViewTool;
-import com.miekir.mvp.presenter.InjectPresenter;
-
-/**
- * @author Miekir
- * @date 2020/6/18 16:48
- * Description: 添加京东商品界面
- */
-public class AddGoodsActivity extends BaseBeiActivity implements View.OnClickListener, IAddGoodsView {
-    public static final String KEY_MODIFY_GOODS = "key_modify_goods";
-
-    private TextInputEditText et_goods_title;
-    private TextInputEditText et_cover_url;
-    private TextInputEditText et_video_url;
-    private TextInputEditText et_desc;
-    private TextInputEditText et_reason;
-    private TextInputEditText et_old_price;
-    private TextInputEditText et_rebate_all;
-    private TextInputEditText et_province;
-    private TextInputEditText et_coupon;
-    private TextInputEditText et_goods_url;
-    private TextInputEditText et_sales_per_month;
-    private TextInputEditText et_good_comment_percent;
-    private TextInputEditText et_shop_name;
-    private TextInputEditText et_comment_num;
-    private CheckBox cb_self;
-    private CheckBox cb_enable;
-
-    private GoodsBean mGoodsBean;
-
-    @InjectPresenter
-    AddGoodsPresenter presenter;
-
-    @Override
-    public int getLayoutID() {
-        return R.layout.activity_goods_add;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_done, menu);
-        MenuItem item = menu.findItem(R.id.action_done);
-        item.setTitle("  返利链接  ");
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_done:
-                // 注册
-                ActivityTool.openUrl(this, ConstantUrl.URL_JD_UNION);
-                break;
-            default:
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void initViews(Bundle savedInstanceState) {
-        et_goods_title = findViewById(R.id.et_goods_title);
-        et_cover_url = findViewById(R.id.et_cover_url);
-        et_video_url = findViewById(R.id.et_video_url);
-        et_desc = findViewById(R.id.et_desc);
-        et_reason = findViewById(R.id.et_reason);
-        et_old_price = findViewById(R.id.et_old_price);
-        et_rebate_all = findViewById(R.id.et_rebate_all);
-        et_province = findViewById(R.id.et_province);
-        et_coupon = findViewById(R.id.et_coupon);
-        et_goods_url = findViewById(R.id.et_goods_url);
-        et_sales_per_month = findViewById(R.id.et_sales_per_month);
-        et_good_comment_percent = findViewById(R.id.et_good_comment_percent);
-        et_shop_name = findViewById(R.id.et_shop_name);
-        et_comment_num = findViewById(R.id.et_comment_num);
-        cb_self = findViewById(R.id.cb_self);
-        cb_enable = findViewById(R.id.cb_enable);
-        ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_add_goods});
-        Button btn_add_goods = findViewById(R.id.btn_add_goods);
-
-        mGoodsBean = (GoodsBean) getIntent().getSerializableExtra(KEY_MODIFY_GOODS);
-        if (mGoodsBean != null) {
-            initGoods();
-            setTitle("更新商品");
-            btn_add_goods.setText("立即更新");
-        } else {
-            setTitle("上架新的商品");
-        }
-    }
-
-    private void initGoods() {
-        et_goods_title.setText(mGoodsBean.title);
-        et_cover_url.setText(mGoodsBean.coverImageUrl);
-        et_video_url.setText(mGoodsBean.videoUrl);
-        et_desc.setText(mGoodsBean.description);
-        et_reason.setText(mGoodsBean.reason);
-        et_old_price.setText(String.valueOf(mGoodsBean.oldPrice));
-        et_rebate_all.setText(String.valueOf(mGoodsBean.rebate));
-        et_province.setText(mGoodsBean.province);
-        et_coupon.setText(mGoodsBean.couponInfo);
-        et_goods_url.setText(mGoodsBean.goodsUrl);
-        et_sales_per_month.setText(String.valueOf(mGoodsBean.salesPerMonth));
-        et_good_comment_percent.setText(String.valueOf(mGoodsBean.goodCommentPercent));
-        et_shop_name.setText(mGoodsBean.shopName);
-        et_comment_num.setText(String.valueOf(mGoodsBean.commentNum));
-        cb_self.setChecked(mGoodsBean.isSelfBusiness);
-        cb_enable.setChecked(mGoodsBean.enable);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.btn_add_goods:
-                String title = et_goods_title.getEditableText().toString();
-                String coverUrl = et_cover_url.getEditableText().toString();
-                String videoUrl = et_video_url.getEditableText().toString();
-                String description = et_desc.getEditableText().toString();
-                String reason = et_reason.getEditableText().toString();
-                long oldPrice = Long.parseLong(et_old_price.getEditableText().toString());
-                long rebate = Long.parseLong(et_rebate_all.getEditableText().toString());
-                long nowPrice = oldPrice - rebate/2;
-                String province = et_province.getEditableText().toString();
-                String shopName = et_shop_name.getEditableText().toString();
-                String coupon = et_coupon.getEditableText().toString();
-                String goodsUrl = et_goods_url.getEditableText().toString();
-                String salesPerMonth = et_sales_per_month.getEditableText().toString();
-                String goodCommentPercent = et_good_comment_percent.getEditableText().toString();
-                String commentNum = et_comment_num.getEditableText().toString();
-                boolean isSelf = cb_self.isChecked();
-                boolean isEnable = cb_enable.isChecked();
-
-                if (mGoodsBean == null) {
-                    mGoodsBean = new GoodsBean();
-                }
-                mGoodsBean.title = title;
-                mGoodsBean.coverImageUrl = coverUrl;
-                mGoodsBean.videoUrl = videoUrl;
-                mGoodsBean.description = description;
-                mGoodsBean.reason = reason;
-                mGoodsBean.oldPrice = oldPrice;
-                mGoodsBean.nowPrice = nowPrice;
-                mGoodsBean.rebate = rebate;
-                mGoodsBean.province = province;
-                mGoodsBean.shopName = shopName;
-                mGoodsBean.couponInfo = coupon;
-                mGoodsBean.goodsUrl = goodsUrl;
-                mGoodsBean.salesPerMonth = Long.parseLong(salesPerMonth);
-                mGoodsBean.goodCommentPercent = Double.parseDouble(goodCommentPercent);
-                mGoodsBean.commentNum = Long.parseLong(commentNum);
-                mGoodsBean.isSelfBusiness = isSelf;
-                mGoodsBean.enable = isEnable;
-                mGoodsBean.hasCoupon = !TextUtils.isEmpty(coupon);
-
-                showLoading();
-                presenter.addGoods(mGoodsBean);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onAddGoodsResult(boolean success, String message) {
-        dismissLoading();
-        ToastTool.showShort(message);
-        if (success) {
-            Intent intent = getIntent();
-            intent.putExtra(KEY_MODIFY_GOODS, mGoodsBean);
-            setResult(RESULT_OK, intent);
-            finish();
-        }
-    }
-}

app/src/main/java/com/itant/shibei/ui/mine/goods/AddGoodsPresenter.java

@@ -1,43 +0,0 @@
-package com.itant.shibei.ui.mine.goods;
-
-import android.text.TextUtils;
-
-import com.itant.shibei.base.ApiService;
-import com.itant.shibei.net.RetrofitHelper;
-import com.itant.shibei.ui.home.goods.GoodsBean;
-import com.miekir.mvp.presenter.BasePresenter;
-import com.miekir.network.core.base.BaseObserver;
-
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-
-/**
- * @author Miekir
- * @date 2020/7/9 20:54
- * Description: 商品的相关数据接口处理
- */
-public class AddGoodsPresenter extends BasePresenter<IAddGoodsView> {
-
-    public void addGoods(GoodsBean goodsBean) {
-        RetrofitHelper.getInstance()
-                .getRequestApi(ApiService.class)
-                .addGoods(goodsBean)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new BaseObserver<String>() {
-                    @Override
-                    public void onSuccess(String result) {
-                        if (getView() != null) {
-                            getView().onAddGoodsResult(true, result);
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Throwable e, String errMsg) {
-                        if (getView() != null) {
-                            getView().onAddGoodsResult(false, TextUtils.isEmpty(errMsg) ? "操作失败"+e.getMessage() : errMsg);
-                        }
-                    }
-                });
-    }
-}

app/src/main/java/com/itant/shibei/ui/mine/goods/IAddGoodsView.java

@@ -1,15 +0,0 @@
-package com.itant.shibei.ui.mine.goods;
-
-import com.miekir.mvp.view.IView;
-
-/**
- * Copyright (C), 2019-2020, Miekir
- *
- * @author Miekir
- * @date 2020/8/2 10:29
- * Description: 获取验证码的回调
- */
-public interface IAddGoodsView extends IView {
-
-    void onAddGoodsResult(boolean success, String message);
-}

app/src/main/res/layout/activity_mine.xml

@@ -10,7 +10,7 @@
     <include layout="@layout/view_toolbar"/>
 
     <LinearLayout
-        android:id="@+id/ll_user"
+        android:id="@+id/ll_favorite"
         android:layout_width="match_parent"
         android:layout_height="@dimen/size_image_big"
         android:gravity="center_vertical"
@@ -82,44 +82,6 @@
 
         <include layout="@layout/view_divider_common"/>
 
-        <TextView
-            android:id="@+id/tv_add_goods"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_tab_bar"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="手动上架商品"
-            android:textColor="@color/black_text" />
-
-        <include layout="@layout/view_divider_common" />
-
-        <TextView
-            android:id="@+id/tv_add_goods_from_url"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_tab_bar"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="解析商品链接"
-            android:textColor="@color/black_text" />
-
-        <include layout="@layout/view_divider_common" />
-
-        <TextView
-            android:id="@+id/tv_add_coupon"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/height_tab_bar"
-            android:background="?attr/selectableItemBackground"
-            android:gravity="center_vertical"
-            android:paddingStart="@dimen/activity_horizontal_margin"
-            android:paddingEnd="@dimen/activity_horizontal_margin"
-            android:text="上架新优惠券"
-            android:textColor="@color/black_text" />
-
-        <include layout="@layout/view_divider_common" />
 
         <Switch
             android:id="@+id/switch_api"
@@ -128,9 +90,10 @@
             android:gravity="center_vertical"
             android:layout_marginStart="@dimen/margin_default"
             android:layout_marginEnd="@dimen/margin_default"
-            android:text="接口是否收费"/>
+            android:text="接口是否收费"
+            android:visibility="gone"/>
 
-        <include layout="@layout/view_divider_common" />
+        <!--<include layout="@layout/view_divider_common" />-->
     </LinearLayout>
 
     <View

app/src/main/res/layout/activity_search.xml

@@ -30,7 +30,7 @@
             android:paddingTop="@dimen/margin_ss"
             android:paddingBottom="@dimen/margin_ss"
             android:textSize="@dimen/text_normal_p"
-            android:hint="请输入关键字或链接"
+            android:hint="请输入关键字"
             android:textColor="@color/black_text_comfortable"
             android:textColorHint="@color/gray_text_hint"
             android:maxLength="512" />