禁用和删除

app/src/main/java/com/miekir/eden/base/ApiService.java

@@ -49,8 +49,8 @@ public interface ApiService {
 
     /*----------------------------------------京东商品开始----------------------------------------*/
     /**新增京东商品*/
-    @POST("/eden/api/addGoods")
-    Observable<BaseResponse<String>> addGoods(@Body GoodsBean body);
+    @POST("/eden/api/revertGoodsEnable")
+    Observable<BaseResponse<String>> revertGoodsEnable(@Query("goodsId") long goodsId);
 
     /**删除京东商品*/
     @GET("/eden/api/deleteGoodsById")

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsAdapter.java

@@ -1,6 +1,7 @@
 package com.miekir.eden.ui.home.goods;
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
@@ -9,6 +10,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
@@ -21,7 +23,7 @@ import com.makeramen.roundedimageview.RoundedImageView;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.eden.BuildConfig;
 import com.miekir.eden.R;
-import com.miekir.eden.base.ItemLongClickListener;
+import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.constant.ConstantString;
 import com.miekir.eden.manager.UserInfoManager;
 import com.miekir.eden.tool.StringTool;
@@ -35,6 +37,36 @@ import rx_activity_result2.RxActivityResult;
 
 import static android.app.Activity.RESULT_OK;
 
+//View fl_video_play = holder.getView(R.id.fl_video_play);
+//View iv_video_play = holder.getView(R.id.iv_video_play);
+//if (!TextUtils.isEmpty(goodsBean.videoUrl)) {
+//    iv_video_play.setVisibility(View.VISIBLE);
+//    fl_video_play.setOnClickListener(new View.OnClickListener() {
+//        @Override
+//        public void onClick(View v) {
+//            if (!UserInfoManager.getInstance().getBeiUser().vip) {
+//                ToastTool.showShort("请先激活会员");
+//                if (mContext instanceof TabActivity) {
+//                    ((TabActivity) mContext).setCurrentPage(2);
+//                }
+//                return;
+//            }
+//
+//            if (!goodsBean.enable) {
+//                ToastTool.showShort("敬请期待");
+//                return;
+//            }
+//
+//            // 全屏播放视频
+//            Intent playIntent = new Intent(mContext, VideoPlayActivity.class);
+//            playIntent.putExtra(VideoPlayActivity.KEY_URL, goodsBean.videoUrl);
+//            playIntent.putExtra(VideoPlayActivity.KEY_TITLE, goodsBean.title);
+//            mContext.startActivity(playIntent);
+//        }
+//    });
+//} else {
+//    iv_video_play.setVisibility(View.GONE);
+//}
 /**
  *
  *
@@ -45,6 +77,7 @@ import static android.app.Activity.RESULT_OK;
 public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
     private Activity mContext;
     private int mRadius;
+    private GoodsPresenter mGoodsPresenter;
 
     public GoodsAdapter(Activity context, @Nullable List<GoodsBean> data) {
         super(R.layout.item_goods, data);
@@ -54,8 +87,17 @@ 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_good_comment, StringTool.getPercent(goodsBean.dingNum, goodsBean.dingNum+goodsBean.caiNum));
+        if (goodsBean.enable) {
+            holder.setText(R.id.tv_title, goodsBean.title);
+        } else {
+            if (TextUtils.equals(ConstantString.NAME_ADMIN, UserInfoManager.getInstance().getBeiUser().email)) {
+                holder.setText(R.id.tv_title, goodsBean.title + "（已禁用）");
+            } else {
+                holder.setText(R.id.tv_title, "已被禁用");
+            }
+        }
+
+        //holder.setText(R.id.tv_good_comment, StringTool.getPercent(goodsBean.dingNum, goodsBean.dingNum+goodsBean.caiNum));
         if (goodsBean.favNum < 0) {
             goodsBean.favNum = 0;
         }
@@ -106,72 +148,43 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
 
         setDefaultView(aciv_goods);
         aciv_goods.setTag(R.id.aciv_goods, goodsBean.coverImageUrl);
-        Glide.with(mContext).load(goodsBean.coverImageUrl)
-                .apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
-                //.apply(new RequestOptions()
-                //        .skipMemoryCache(true)
-                //        .diskCacheStrategy(DiskCacheStrategy.NONE))
-                //先加载原图大小的十分之一
-                .thumbnail(0.1f)
-                .into(new SimpleTarget<Drawable>() {
-                    @Override
-                    public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
-                        if (resource == null) {
-                            return;
-                        }
+        if (goodsBean.enable) {
+            Glide.with(mContext).load(goodsBean.coverImageUrl)
+                    .apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
+                    //.apply(new RequestOptions()
+                    //        .skipMemoryCache(true)
+                    //        .diskCacheStrategy(DiskCacheStrategy.NONE))
+                    //先加载原图大小的十分之一
+                    .thumbnail(0.1f)
+                    .into(new SimpleTarget<Drawable>() {
+                        @Override
+                        public void onResourceReady(Drawable resource, Transition<? super Drawable> transition) {
+                            if (resource == null) {
+                                return;
+                            }
 
-                        String coverUrl = null;
-                        try {
-                            coverUrl = (String) aciv_goods.getTag(R.id.aciv_goods);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        if (!TextUtils.isEmpty(coverUrl) && TextUtils.equals(coverUrl, goodsBean.coverImageUrl)) {
-                            aciv_goods.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                            aciv_goods.setImageDrawable(resource);
-                        }
-                    }
-                });
-
-        /*View fl_video_play = holder.getView(R.id.fl_video_play);
-        View iv_video_play = holder.getView(R.id.iv_video_play);
-        if (!TextUtils.isEmpty(goodsBean.videoUrl)) {
-            iv_video_play.setVisibility(View.VISIBLE);
-            fl_video_play.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (!UserInfoManager.getInstance().getBeiUser().vip) {
-                        ToastTool.showShort("请先激活会员");
-                        if (mContext instanceof TabActivity) {
-                            ((TabActivity) mContext).setCurrentPage(2);
+                            String coverUrl = null;
+                            try {
+                                coverUrl = (String) aciv_goods.getTag(R.id.aciv_goods);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            if (!TextUtils.isEmpty(coverUrl) && TextUtils.equals(coverUrl, goodsBean.coverImageUrl)) {
+                                aciv_goods.setScaleType(ImageView.ScaleType.CENTER_CROP);
+                                aciv_goods.setImageDrawable(resource);
+                            }
                         }
-                        return;
-                    }
-
-                    if (!goodsBean.enable) {
-                        ToastTool.showShort("敬请期待");
-                        return;
-                    }
+                    });
+        }
 
-                    // 全屏播放视频
-                    Intent playIntent = new Intent(mContext, VideoPlayActivity.class);
-                    playIntent.putExtra(VideoPlayActivity.KEY_URL, goodsBean.videoUrl);
-                    playIntent.putExtra(VideoPlayActivity.KEY_TITLE, goodsBean.title);
-                    mContext.startActivity(playIntent);
-                }
-            });
-        } else {
-            iv_video_play.setVisibility(View.GONE);
-        }*/
 
-        // 暂时不需要长按弹出操作
+        // 长按弹出操作
         if (UserInfoManager.getInstance().isLogin() &&
                 TextUtils.equals(ConstantString.NAME_ADMIN, UserInfoManager.getInstance().getBeiUser().email)) {
             View view = holder.getView(R.id.cv_goods);
             view.setOnLongClickListener(v -> {
-                if (goodsLongClickListener != null) {
-                    goodsLongClickListener.onItemLongClick(holder.getLayoutPosition());
-                }
+                // 长按
+                showAdminDialog(goodsBean, holder.getLayoutPosition());
                 return false;
             });
         }
@@ -182,12 +195,50 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         aciv_goods.setImageResource(R.mipmap.logo_gray);
     }
 
-    private ItemLongClickListener goodsLongClickListener;
-    public ItemLongClickListener getGoodsLongClickListener() {
-        return goodsLongClickListener;
+    /**
+     * 修改商品或者删除商品
+     */
+    private void showAdminDialog(GoodsBean goodsBean, int position) {
+        AlertDialog alertDialog = new AlertDialog.Builder(mContext)
+                .setMessage("选择操作")
+                .setNeutralButton("取消", (dialog, which) -> {
+                    dialog.dismiss();
+                })
+                .setNegativeButton("禁用", (DialogInterface dialog, int which) -> {
+                    dialog.dismiss();
+                    if (mContext instanceof BaseBeiActivity) {
+                        ((BaseBeiActivity) mContext).showLoading();
+                    }
+                    mGoodsPresenter.revertGoodsEnable(position, goodsBean.id);
+                })
+                .setPositiveButton("删除", (DialogInterface dialog, int which) -> {
+                    dialog.dismiss();
+                    showDeleteDialog(goodsBean, position);
+                }).create();
+        alertDialog.setCanceledOnTouchOutside(false);
+        alertDialog.setCancelable(false);
+        alertDialog.show();
+    }
+
+    /**
+     * 是否删除商品
+     */
+    private void showDeleteDialog(GoodsBean goodsBean, int position) {
+        AlertDialog alertDialog = new AlertDialog.Builder(mContext)
+                .setMessage("确定删除商品：" + goodsBean.title)
+                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
+                .setPositiveButton("确定", (DialogInterface dialog, int which) -> {
+                    dialog.dismiss();
+                    if (mContext instanceof BaseBeiActivity) {
+                        ((BaseBeiActivity) mContext).showLoading();
+                    }
+                    // 删除商品
+                    mGoodsPresenter.deleteGoodsById(position, goodsBean.id);
+                }).create();
+        alertDialog.show();
     }
 
-    public void setGoodsLongClickListener(ItemLongClickListener goodsLongClickListener) {
-        this.goodsLongClickListener = goodsLongClickListener;
+    public void setGoodsPresenter(GoodsPresenter goodsPresenter) {
+        this.mGoodsPresenter = goodsPresenter;
     }
 }

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsFragment.java

@@ -1,9 +1,7 @@
 package com.miekir.eden.ui.home.goods;
 
-import android.content.DialogInterface;
 import android.util.TypedValue;
 
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -11,6 +9,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.bumptech.glide.Glide;
 import com.miekir.common.utils.ToastTool;
 import com.miekir.eden.R;
+import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.base.ITopActionListener;
 import com.miekir.eden.widget.bottomlistener.OnRcvScrollListener;
 import com.miekir.eden.widget.decoration.SpacesItemDecoration;
@@ -65,7 +64,6 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
         // 假数据
         //mGoodsList.addAll(DataTool.getGoodsList());
         mAdapter = new GoodsAdapter(getActivity(), mGoodsList);
-        mAdapter.setGoodsLongClickListener(this::showAdminDialog);
         rv_goods.setAdapter(mAdapter);
         // 必须先绑定RecyclerView
         mAdapter.setEmptyView(R.layout.view_empty, rv_goods);
@@ -127,46 +125,10 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
     protected void onLazyLoad() {
         // 获取数据
         srl_goods.setRefreshing(true);
+        mAdapter.setGoodsPresenter(goodsPresenter);
         goodsPresenter.getGoodsData(mCurrentPage, PAGE_SIZE);
     }
 
-    /**
-     * 修改商品或者删除商品
-     */
-    private void showAdminDialog(int position) {
-        AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
-                .setMessage("选择操作")
-                .setNegativeButton("取消", (dialog, which) -> {
-                    dialog.dismiss();
-                })
-//                .setPositiveButton("禁用", (DialogInterface dialog, int which) -> {
-//                    dialog.dismiss();
-//                })
-                .setPositiveButton("删除", (DialogInterface dialog, int which) -> {
-                    dialog.dismiss();
-                    showDeleteDialog(position);
-                }).create();
-        alertDialog.setCanceledOnTouchOutside(false);
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
-    /**
-     * 是否删除商品
-     */
-    private void showDeleteDialog(int position) {
-        GoodsBean goodsBean = mGoodsList.get(position);
-        AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
-                .setMessage("确定删除商品：" + goodsBean.title)
-                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
-                .setPositiveButton("确定", (DialogInterface dialog, int which) -> {
-                    dialog.dismiss();
-                    // 删除商品
-                    goodsPresenter.deleteGoodsById(position, goodsBean.id);
-                }).create();
-        alertDialog.show();
-    }
-
     /**
      * 获取商品结果
      * @param success
@@ -183,8 +145,7 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
 
         if (mCurrentPage == PAGE_START) {
             mGoodsList.clear();
-            // 如果是下拉刷新获取的第0页数据，item不要自动滚动一段距离
-            // 或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
+            // 如果是下拉刷新获取的第0页数据，item不要自动滚动一段距离，或者用这个mLayoutManager.scrollToPositionWithOffset(0, 0);
             if (mIsRefresh) {
                 ToastTool.showShort("刷新成功");
                 rv_goods.smoothScrollToPosition(0);
@@ -219,6 +180,7 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
      */
     @Override
     public void onDeleteGoodsResult(boolean success, String message, int position) {
+        dismissLoading();
         if (success) {
             mAdapter.notifyItemRemoved(position);
             ToastTool.showShort("删除成功");
@@ -227,6 +189,18 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
         }
     }
 
+    @Override
+    public void onRevertGoodsEnable(boolean success, String message, int position) {
+        if (getActivity() instanceof BaseBeiActivity) {
+            ((BaseBeiActivity)getActivity()).dismissLoading();
+        }
+        if (success) {
+            mGoodsList.get(position).enable = !mGoodsList.get(position).enable;
+            mAdapter.notifyItemChanged(position);
+        }
+        ToastTool.showShort(message);
+    }
+
     @Override
     public void onTopAction() {
         rv_goods.smoothScrollToPosition(0);

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsPresenter.java

@@ -65,4 +65,27 @@ public class GoodsPresenter extends BasePresenter<IGoodsView> {
                     }
                 });
     }
+
+    public void revertGoodsEnable(int position, long goodsId) {
+        RetrofitHelper.getInstance()
+                .getRequestApi(ApiService.class)
+                .revertGoodsEnable(goodsId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new BaseObserver<String>() {
+                    @Override
+                    public void onSuccess(String result) {
+                        if (getView() != null) {
+                            getView().onRevertGoodsEnable(true, result, position);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Throwable e, String errMsg) {
+                        if (getView() != null) {
+                            getView().onRevertGoodsEnable(false, TextUtils.isEmpty(errMsg) ? "设置失败："+e.getMessage() : errMsg, position);
+                        }
+                    }
+                });
+    }
 }

app/src/main/java/com/miekir/eden/ui/home/goods/IGoodsView.java

@@ -14,4 +14,5 @@ import java.util.List;
 public interface IGoodsView extends IView {
     void onGoodsDataCome(boolean success, String message, List<GoodsBean> goodsList);
     void onDeleteGoodsResult(boolean success, String message, int position);
+    void onRevertGoodsEnable(boolean success, String message, int position);
 }

app/src/main/java/com/miekir/eden/ui/home/search/SearchActivity.java

@@ -1,13 +1,12 @@
 package com.miekir.eden.ui.home.search;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import androidx.appcompat.app.AlertDialog;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -81,7 +80,6 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
         CardViewDividerItemDecoration decoration = new CardViewDividerItemDecoration(dividerWidth);
         rv_search_result.addItemDecoration(decoration);
         mAdapter = new GoodsAdapter(this, mGoodsList);
-        mAdapter.setGoodsLongClickListener(this::showAdminDialog);
         rv_search_result.setAdapter(mAdapter);
         mAdapter.setEmptyView(R.layout.view_empty, rv_search_result);
         // 加载更多
@@ -124,6 +122,12 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
         ViewTool.setOnClickListener(this, this, new int[]{R.id.ll_search, R.id.btn_search, R.id.fl_clear});
     }
 
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAdapter.setGoodsPresenter(goodsPresenter);
+    }
+
     @Override
     public void onClick(View v) {
 
@@ -155,42 +159,6 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
         }
     }
 
-    /**
-     * 修改商品或者删除商品
-     */
-    private void showAdminDialog(int position) {
-        GoodsBean goodsBean = mGoodsList.get(position);
-
-        AlertDialog alertDialog = new AlertDialog.Builder(this)
-                .setMessage("选择操作")
-                .setNegativeButton("取消", (dialog, which) -> {
-                    dialog.dismiss();
-                })
-                .setPositiveButton("删除", (DialogInterface dialog, int which) -> {
-                    dialog.dismiss();
-                    showDeleteDialog(position);
-                }).create();
-        alertDialog.setCanceledOnTouchOutside(false);
-        alertDialog.setCancelable(false);
-        alertDialog.show();
-    }
-
-    /**
-     * 是否删除商品
-     */
-    private void showDeleteDialog(int position) {
-        GoodsBean goodsBean = mGoodsList.get(position);
-        AlertDialog alertDialog = new AlertDialog.Builder(this)
-                .setMessage("确定删除商品：" + goodsBean.title)
-                .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
-                .setPositiveButton("确定", (DialogInterface dialog, int which) -> {
-                    dialog.dismiss();
-                    // 删除商品
-                    goodsPresenter.deleteGoodsById(position, goodsBean.id);
-                }).create();
-        alertDialog.show();
-    }
-
     @Override
     public void onSearchKeywordResult(boolean success, String message, List<GoodsBean> goodsList) {
         dismissLoading();
@@ -246,6 +214,7 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
      */
     @Override
     public void onDeleteGoodsResult(boolean success, String message, int position) {
+        dismissLoading();
         if (success) {
             mAdapter.notifyItemRemoved(position);
             ToastTool.showShort("删除成功");
@@ -254,6 +223,16 @@ public class SearchActivity extends BaseBeiActivity implements View.OnClickListe
         }
     }
 
+    @Override
+    public void onRevertGoodsEnable(boolean success, String message, int position) {
+        dismissLoading();
+        if (success) {
+            mGoodsList.get(position).enable = !mGoodsList.get(position).enable;
+            mAdapter.notifyItemChanged(position);
+        }
+        ToastTool.showShort(message);
+    }
+
     @Override
     public void onFocusChange(View v, boolean hasFocus) {
         if (v.getId() == R.id.et_search) {

app/src/main/java/com/miekir/eden/ui/mine/fav/MyFavActivity.java

@@ -12,6 +12,8 @@ import com.miekir.eden.R;
 import com.miekir.eden.base.BaseBeiActivity;
 import com.miekir.eden.ui.home.goods.GoodsAdapter;
 import com.miekir.eden.ui.home.goods.GoodsBean;
+import com.miekir.eden.ui.home.goods.GoodsPresenter;
+import com.miekir.eden.ui.home.goods.IGoodsView;
 import com.miekir.eden.widget.bottomlistener.OnRcvScrollListener;
 import com.miekir.eden.widget.decoration.CardViewDividerItemDecoration;
 import com.miekir.mvp.presenter.InjectPresenter;
@@ -26,7 +28,7 @@ import java.util.List;
  * @date 2020/8/12 19:40
  * Description: 输入文字搜索
  */
-public class MyFavActivity extends BaseBeiActivity implements IMyFavView {
+public class MyFavActivity extends BaseBeiActivity implements IMyFavView, IGoodsView {
     private static final int PAGE_START = 0;
     private static final int PAGE_SIZE = 20;
     private int mCurrentPage = PAGE_START;
@@ -39,6 +41,9 @@ public class MyFavActivity extends BaseBeiActivity implements IMyFavView {
     @InjectPresenter
     MyFavPresenter myFavPresenter;
 
+    @InjectPresenter
+    GoodsPresenter goodsPresenter;
+
     @Override
     public int getLayoutID() {
         return R.layout.activity_my_fav;
@@ -96,6 +101,7 @@ public class MyFavActivity extends BaseBeiActivity implements IMyFavView {
         super.onCreate(savedInstanceState);
         showLoading();
         mIsLoading = true;
+        mAdapter.setGoodsPresenter(goodsPresenter);
         myFavPresenter.getMyFavGoods(mCurrentPage, PAGE_SIZE);
     }
 
@@ -140,4 +146,25 @@ public class MyFavActivity extends BaseBeiActivity implements IMyFavView {
             ToastTool.showShort("没有更多数据了");
         }
     }
+
+    @Override
+    public void onDeleteGoodsResult(boolean success, String message, int position) {
+        dismissLoading();
+        if (success) {
+            mAdapter.notifyItemRemoved(position);
+            ToastTool.showShort("删除成功");
+        } else {
+            ToastTool.showShort(message);
+        }
+    }
+
+    @Override
+    public void onRevertGoodsEnable(boolean success, String message, int position) {
+        dismissLoading();
+        if (success) {
+            mGoodsList.get(position).enable = !mGoodsList.get(position).enable;
+            mAdapter.notifyItemChanged(position);
+        }
+        ToastTool.showShort(message);
+    }
 }