Parcourir la source

本地数据不能删除

詹子聪 il y a 5 ans
Parent
commit
5dcc7ea9fa

+ 43 - 0
app/src/main/java/com/itant/shibei/bean/CouponBean.java

@@ -0,0 +1,43 @@
+package com.itant.shibei.bean;
+
+import com.itant.shibei.common.ConstantUrl;
+
+/**
+ *
+ *
+ * @author Miekir
+ * @date 2020/7/7 19:37
+ * Description: 优惠券实体
+ */
+public class CouponBean {
+    /**
+     * 模板Id
+     */
+    public long couponId;
+    /**
+     * 模板类型
+     */
+    public int couponType;
+
+    /**
+     * 模板名称
+     */
+    public String couponName;
+    /**
+     * 点击之后跳转的链接
+     */
+    public String jumpUrl;
+    /**
+     * 封面图片URL
+     */
+    public String coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+
+
+    /**
+     * 是否可以响应点击
+     */
+    public boolean actionEnable;
+
+    /**是否是本地写死的数据*/
+    public boolean isLocal;
+}

+ 3 - 0
app/src/main/java/com/itant/shibei/bean/GoodsBean.java

@@ -102,4 +102,7 @@ public class GoodsBean implements Serializable {
     public long updateTimeMillis;
 
     public boolean enable;
+
+    /**是否是本地写死的数据*/
+    public boolean isLocal;
 }

+ 0 - 88
app/src/main/java/com/itant/shibei/bean/TemplateBean.java

@@ -1,88 +0,0 @@
-package com.itant.shibei.bean;
-
-import com.itant.shibei.common.ConstantUrl;
-
-/**
- *
- *
- * @author Miekir
- * @date 2020/7/7 19:37
- * Description: 模板实体
- */
-public class TemplateBean {
-    /**
-     * 模板Id
-     */
-    private int templateId;
-    /**
-     * 模板类型
-     */
-    private int templateType;
-
-    /**
-     * 模板名称
-     */
-    private String templateName;
-    /**
-     * 点击之后跳转的链接
-     */
-    private String jumpUrl;
-    /**
-     * 封面图片URL
-     */
-    private String coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
-
-
-    /**
-     * 是否可以响应点击
-     */
-    private boolean actionEnable;
-
-    public int getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(int templateId) {
-        this.templateId = templateId;
-    }
-
-    public String getTemplateName() {
-        return templateName;
-    }
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    public String getJumpUrl() {
-        return jumpUrl;
-    }
-
-    public void setJumpUrl(String jumpUrl) {
-        this.jumpUrl = jumpUrl;
-    }
-
-    public String getCoverUrl() {
-        return coverUrl;
-    }
-
-    public void setCoverUrl(String coverUrl) {
-        this.coverUrl = coverUrl;
-    }
-
-    public boolean isActionEnable() {
-        return actionEnable;
-    }
-
-    public void setActionEnable(boolean actionEnable) {
-        this.actionEnable = actionEnable;
-    }
-
-    public int getTemplateType() {
-        return templateType;
-    }
-
-    public void setTemplateType(int templateType) {
-        this.templateType = templateType;
-    }
-}

+ 29 - 26
app/src/main/java/com/itant/shibei/tool/DataTool.java

@@ -1,7 +1,7 @@
 package com.itant.shibei.tool;
 
+import com.itant.shibei.bean.CouponBean;
 import com.itant.shibei.bean.GoodsBean;
-import com.itant.shibei.bean.TemplateBean;
 import com.itant.shibei.common.ConstantUrl;
 import com.itant.shibei.ui.function.FunctionFragment;
 
@@ -17,45 +17,48 @@ public class DataTool {
     private DataTool() {
     }
 
-    public static List<TemplateBean> getTemplateList(int functionTye) {
+    public static List<CouponBean> getTemplateList(int functionTye) {
 
-        List<TemplateBean> templateBeanList = new ArrayList<>();
+        List<CouponBean> couponBeanList = new ArrayList<>();
         switch (functionTye) {
             case FunctionFragment.TEMPLATE_TYPE_BONUS:
-                TemplateBean meituan1 = new TemplateBean();
-                meituan1.setCoverUrl(ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER);
-                meituan1.setTemplateName("美团优惠券最多可领48元大礼包");
-                meituan1.setJumpUrl(ConstantUrl.URL_MEITUAN_BONUS_1);
-                meituan1.setActionEnable(true);
-                templateBeanList.add(meituan1);
+                CouponBean meituan1 = new CouponBean();
+                meituan1.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                meituan1.couponName = "美团优惠券最多可领48元大礼包";
+                meituan1.jumpUrl = ConstantUrl.URL_MEITUAN_BONUS_1;
+                meituan1.actionEnable = true;
+                meituan1.isLocal = true;
+                couponBeanList.add(meituan1);
 
-                TemplateBean meituan2 = new TemplateBean();
-                meituan2.setCoverUrl(ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER);
-                meituan2.setTemplateName("美团优惠券至少2元起(新老用户都可领)");
-                meituan2.setJumpUrl(ConstantUrl.URL_MEITUAN_BONUS_2);
-                meituan2.setActionEnable(true);
-                templateBeanList.add(meituan2);
+                CouponBean meituan2 = new CouponBean();
+                meituan2.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_WALLPAPER;
+                meituan2.couponName = "美团优惠券至少2元起(新老用户都可领)";
+                meituan2.jumpUrl = ConstantUrl.URL_MEITUAN_BONUS_2;
+                meituan2.actionEnable = true;
+                meituan2.isLocal = true;
+                couponBeanList.add(meituan2);
                 break;
             case FunctionFragment.TEMPLATE_TYPE_TEMPLATE:
-                TemplateBean template = new TemplateBean();
-                template.setCoverUrl(ConstantUrl.URL_RANDOM_PHOTO_ECY);
-                template.setTemplateName("DIY装机");
-                template.setJumpUrl(ConstantUrl.URL_JD_TEMPLATE_COMPUTER);
-                template.setActionEnable(true);
-                templateBeanList.add(template);
+                CouponBean template = new CouponBean();
+                template.coverUrl = ConstantUrl.URL_RANDOM_PHOTO_ECY;
+                template.couponName = "DIY装机";
+                template.jumpUrl = ConstantUrl.URL_JD_TEMPLATE_COMPUTER;
+                template.actionEnable = true;
+                template.isLocal = true;
+                couponBeanList.add(template);
                 break;
 
             case FunctionFragment.TEMPLATE_TYPE_GAME:
-                TemplateBean game = new TemplateBean();
-                game.setCoverUrl(ConstantUrl.URL_RANDOM_PHOTO_ECY);
-                game.setTemplateName("欢乐猜猜");
-                game.setActionEnable(false);
+//                CouponBean game = new CouponBean();
+//                game.setCoverUrl(ConstantUrl.URL_RANDOM_PHOTO_ECY);
+//                game.setTemplateName("欢乐猜猜");
+//                game.setActionEnable(false);
                 break;
             default:
                 break;
         }
 
-        return templateBeanList;
+        return couponBeanList;
     }
 
     public static List<GoodsBean> getGoodsList() {

+ 2 - 2
app/src/main/java/com/itant/shibei/ui/function/template/ITemplateView.java

@@ -1,6 +1,6 @@
 package com.itant.shibei.ui.function.template;
 
-import com.itant.shibei.bean.TemplateBean;
+import com.itant.shibei.bean.CouponBean;
 import com.miekir.mvp.view.IView;
 
 import java.util.List;
@@ -13,5 +13,5 @@ import java.util.List;
  * Description: Template的View
  */
 public interface ITemplateView extends IView {
-    void onTemplateDataCome(List<TemplateBean> templateBeanList);
+    void onTemplateDataCome(List<CouponBean> couponBeanList);
 }

+ 11 - 11
app/src/main/java/com/itant/shibei/ui/function/template/TemplateAdapter.java

@@ -14,7 +14,7 @@ import com.bumptech.glide.request.transition.Transition;
 import com.itant.library.recyclerview.CommonAdapter;
 import com.itant.library.recyclerview.base.ViewHolder;
 import com.itant.shibei.R;
-import com.itant.shibei.bean.TemplateBean;
+import com.itant.shibei.bean.CouponBean;
 import com.miekir.common.utils.ActivityTool;
 import com.miekir.common.utils.ToastTool;
 
@@ -27,22 +27,22 @@ import java.util.List;
  * @date 2020/7/6 20:08
  * Description: 首页商品适配器
  */
-public class TemplateAdapter extends CommonAdapter<TemplateBean> {
-    private List<TemplateBean> mTemplateList;
+public class TemplateAdapter extends CommonAdapter<CouponBean> {
+    private List<CouponBean> mTemplateList;
     //private int mRadius = 8;
 
-    public TemplateAdapter(Context context, List<TemplateBean> templateBeanList) {
-        super(context, R.layout.item_template, templateBeanList);
-        mTemplateList = templateBeanList;
+    public TemplateAdapter(Context context, List<CouponBean> couponBeanList) {
+        super(context, R.layout.item_template, couponBeanList);
+        mTemplateList = couponBeanList;
         //mRadius = (int) context.getResources().getDimension(R.dimen.margin_s);
     }
 
 
     @Override
-    protected void convert(ViewHolder holder, TemplateBean templateBean, int position) {
+    protected void convert(ViewHolder holder, CouponBean couponBean, int position) {
         ImageView iv_template = holder.getView(R.id.iv_template);
         // 圆角
-        Glide.with(mContext).load(templateBean.getCoverUrl())
+        Glide.with(mContext).load(couponBean.coverUrl)
                 //.apply(RequestOptions.bitmapTransform(new RoundedCorners(48)))
                 //.apply(RequestOptions.bitmapTransform(new RoundedCorners(mRadius)))
                 .apply(new RequestOptions()
@@ -58,12 +58,12 @@ public class TemplateAdapter extends CommonAdapter<TemplateBean> {
                     }
                 });
 
-        holder.setText(R.id.tv_template, templateBean.getTemplateName());
+        holder.setText(R.id.tv_template, couponBean.couponName);
         holder.setOnClickListener(R.id.rl_template, new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (templateBean.isActionEnable()) {
-                    ActivityTool.openUrl((Activity) mContext, templateBean.getJumpUrl());
+                if (couponBean.actionEnable) {
+                    ActivityTool.openUrl((Activity) mContext, couponBean.jumpUrl);
                 } else {
                     ToastTool.showShort("敬请期待");
                 }

+ 6 - 6
app/src/main/java/com/itant/shibei/ui/function/template/TemplateFragment.java

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.itant.library.recyclerview.CommonAdapter;
 import com.itant.shibei.R;
 import com.itant.shibei.base.ITopActionListener;
-import com.itant.shibei.bean.TemplateBean;
+import com.itant.shibei.bean.CouponBean;
 import com.itant.shibei.ui.function.FunctionFragment;
 import com.itant.shibei.widget.DividerItemDecoration;
 import com.miekir.mvp.presenter.InjectPresenter;
@@ -23,8 +23,8 @@ import java.util.List;
  */
 public class TemplateFragment extends BaseMVPFragment implements ITemplateView, ITopActionListener {
     private int mTemplateType = FunctionFragment.TEMPLATE_TYPE_BONUS;
-    private List<TemplateBean> mTemplateBeanList = new ArrayList<>();
-    private CommonAdapter<TemplateBean> mAdapter;
+    private List<CouponBean> mCouponBeanList = new ArrayList<>();
+    private CommonAdapter<CouponBean> mAdapter;
     private RecyclerView rv_template;
 
     @InjectPresenter
@@ -50,7 +50,7 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView,
         int dividerWidth = (int) getResources().getDimension(R.dimen.margin_s);
         DividerItemDecoration decoration = new DividerItemDecoration(dividerWidth);
         rv_template.addItemDecoration(decoration);
-        mAdapter = new TemplateAdapter(getActivity(), mTemplateBeanList);
+        mAdapter = new TemplateAdapter(getActivity(), mCouponBeanList);
         rv_template.setAdapter(mAdapter);
 
         // 从服务器获取数据
@@ -58,9 +58,9 @@ public class TemplateFragment extends BaseMVPFragment implements ITemplateView,
     }
 
     @Override
-    public void onTemplateDataCome(List<TemplateBean> templateBeanList) {
+    public void onTemplateDataCome(List<CouponBean> couponBeanList) {
         // todo 分页,判断是否第0页(下拉刷新)
-        mTemplateBeanList.addAll(templateBeanList);
+        mCouponBeanList.addAll(couponBeanList);
         mAdapter.notifyDataSetChanged();
     }
 

+ 3 - 3
app/src/main/java/com/itant/shibei/ui/function/template/TemplatePresenter.java

@@ -1,6 +1,6 @@
 package com.itant.shibei.ui.function.template;
 
-import com.itant.shibei.bean.TemplateBean;
+import com.itant.shibei.bean.CouponBean;
 import com.itant.shibei.tool.DataTool;
 import com.miekir.mvp.presenter.BasePresenter;
 
@@ -21,8 +21,8 @@ public class TemplatePresenter extends BasePresenter<ITemplateView> {
      */
     public void getTemplateData(int functionType) {
         if (getView() != null) {
-            List<TemplateBean> templateBeanList = DataTool.getTemplateList(functionType);
-            getView().onTemplateDataCome(templateBeanList);
+            List<CouponBean> couponBeanList = DataTool.getTemplateList(functionType);
+            getView().onTemplateDataCome(couponBeanList);
         }
     }
 }

+ 8 - 3
app/src/main/java/com/itant/shibei/ui/home/GoodsFragment.java

@@ -79,12 +79,17 @@ 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, mGoodsList.get(position));
+                    modifyIntent.putExtra(AddGoodsActivity.KEY_MODIFY_GOODS, goodsBean);
                     RxActivityResult.on(getActivity()).startIntent(modifyIntent)
                             .filter(result -> result.resultCode() == RESULT_OK)
                             .subscribe(result -> {
@@ -110,11 +115,11 @@ public class GoodsFragment extends BaseMVPFragment implements IGoodsView, ITopAc
     private void showDeleteDialog(int position) {
         GoodsBean goodsBean = mGoodsList.get(position);
         AlertDialog alertDialog = new AlertDialog.Builder(getActivity())
-                .setMessage("确定删除当前商品?")
+                .setMessage("确定删除商品:" + goodsBean.title)
                 .setNegativeButton("取消", (dialog, which) -> dialog.dismiss())
                 .setPositiveButton("确定", (DialogInterface dialog, int which) -> {
                     dialog.dismiss();
-                    // todo 删除商品
+                    // 删除商品
                     mPresenter.deleteGoodsById(position, goodsBean.id);
                 }).create();
         alertDialog.show();