营销计划页面;

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java

 package com.xingdata.zzdpos.ui.marketing.ms;
 
 
+import com.blankj.utilcode.util.LogUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityMsBinding;
@@ -39,8 +40,13 @@ public class MsActivity extends BaseActivity<MsPresenter, ActivityMsBinding> imp
     }
 
     @Override
-    public void showEditorFragment() {
+    public void showEditorFragment(Ms ms) {
+        LogUtils.e("编辑 " + ms.getMsName());
+    }
 
+    @Override
+    public void showEditorFragment(int msType) {
+        LogUtils.e("添加 " + msType);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsContract.java

@@ -20,8 +20,20 @@ interface MsContract {
          */
         void showAddFragment();
 
+        /**
+         * 显示编辑页面
+         *
+         * @param ms 要编辑的营销计划
+         */
+        void showEditorFragment(Ms ms);
 
-        void showEditorFragment();
+
+        /**
+         * 显示编辑页面
+         *
+         * @param msType 计划类型
+         */
+        void showEditorFragment(int msType);
 
         /**
          * 显示读取对话框
@@ -56,6 +68,11 @@ interface MsContract {
          */
         public abstract void clickMsItem(Ms ms);
 
+        /**
+         * 添加页面 - 点击类型的item
+         */
+        public abstract void clickTypeItem(int msType);
+
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsPresenter.java

@@ -34,6 +34,12 @@ public class MsPresenter extends MsContract.Presenter {
 
     @Override
     public void clickMsItem(Ms ms) {
+        mView.showEditorFragment(ms);
+    }
+
+    @Override
+    public void clickTypeItem(int msType) {
+        mView.showEditorFragment(msType);
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/MsAdapter.java

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.marketing.ms.adapter;
 
 import android.annotation.SuppressLint;
 
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.databinding.ItemMsBinding;
@@ -20,6 +21,25 @@ public class MsAdapter extends BaseAdapter<Ms, ItemMsBinding> {
     protected void convert(ItemMsBinding mViewBinding, Ms item) {
         mViewBinding.tvName.setText(item.getMsName());
 
+        switch (item.getMsTools()) {
+            case C.MS_TYPE.DIS:
+                mViewBinding.ivType.setImageResource(R.mipmap.icon_discount01);
+                break;
+            case C.MS_TYPE.GIFT:
+                mViewBinding.ivType.setImageResource(R.mipmap.icon_buy01);
+                break;
+            case C.MS_TYPE.MONEY_OFF:
+                mViewBinding.ivType.setImageResource(R.mipmap.icon_full01);
+                break;
+            case C.MS_TYPE.PROMOTION:
+                mViewBinding.ivType.setImageResource(R.mipmap.icon_sales01);
+                break;
+            case C.MS_TYPE.SECOND:
+                mViewBinding.ivType.setImageResource(R.mipmap.icon_discount01);
+                break;
+        }
+
+
         StringBuilder sbDateBegin = new StringBuilder(item.getMsDateBegin().toString());
         StringBuilder sbDateEnd = new StringBuilder(item.getMsDateEnd().toString());
         sbDateBegin.insert(6, "-");

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/adapter/TypeAdapter.java

+package com.xingdata.zzdpos.ui.marketing.ms.adapter;
+
+
+import android.support.annotation.Nullable;
+
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseAdapter;
+import com.xingdata.zzdpos.databinding.ItemMsTypeBinding;
+
+import java.util.List;
+
+public class TypeAdapter extends BaseAdapter<Integer, ItemMsTypeBinding> {
+
+    public TypeAdapter(@Nullable List<Integer> data) {
+        super(R.layout.item_ms_type, data);
+    }
+
+    @Override
+    protected void convert(ItemMsTypeBinding mViewBinding, Integer item) {
+        int resPic = -1, resStr = -1;
+        switch (item) {
+            case C.MS_TYPE.DIS:
+                resPic = R.mipmap.icon_discount02;
+                resStr = R.string.ms_type_dis;
+                break;
+            case C.MS_TYPE.PROMOTION:
+                resPic = R.mipmap.icon_sales02;
+                resStr = R.string.ms_type_promotion;
+                break;
+            case C.MS_TYPE.MONEY_OFF:
+                resPic = R.mipmap.icon_full02;
+                resStr = R.string.ms_type_money_off;
+                break;
+            case C.MS_TYPE.GIFT:
+                resPic = R.mipmap.icon_buy02;
+                resStr = R.string.ms_type_gift;
+                break;
+            case C.MS_TYPE.SECOND:
+                resPic = R.mipmap.icon_discount02;
+                resStr = R.string.ms_type_dis;
+                break;
+        }
+        if (resPic < 0) return;
+        mViewBinding.tvName.setText(resStr);
+        mViewBinding.ivType.setImageResource(resPic);
+
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/AddFragment.java

 package com.xingdata.zzdpos.ui.marketing.ms.fragment;
 
+import android.support.v7.widget.GridLayoutManager;
+
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentMsAddBinding;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
+import com.xingdata.zzdpos.ui.marketing.ms.adapter.TypeAdapter;
+import com.xingdata.zzdpos.util.MyMenuItemDecoration;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class AddFragment extends BaseFragment<MsPresenter, FragmentMsAddBinding> {
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_ms_add;
@@ -13,5 +22,25 @@ public class AddFragment extends BaseFragment<MsPresenter, FragmentMsAddBinding>
 
     @Override
     public void initView() {
+        // init type
+        TypeAdapter mTypeAdapter = new TypeAdapter(getTypeList());
+        mViewBinding.rlType.setAdapter(mTypeAdapter);
+        mViewBinding.rlType.setLayoutManager(new GridLayoutManager(mContext, 2));
+        mViewBinding.rlType.addItemDecoration(new MyMenuItemDecoration(mContext, 2, getResources().getColor(R.color.gray_kongming)));
+
+        // set t listener
+        mTypeAdapter.setOnItemClickListener((adapter, view, position) -> mPresenter.clickTypeItem(mTypeAdapter.getData().get(position)));
+    }
+
+    /**
+     *
+     */
+    private List<Integer> getTypeList() {
+        List<Integer> msList = new ArrayList<>();
+        msList.add(C.MS_TYPE.DIS);
+        msList.add(C.MS_TYPE.PROMOTION);
+        msList.add(C.MS_TYPE.MONEY_OFF);
+        msList.add(C.MS_TYPE.GIFT);
+        return msList;
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/fragment/ManagerFragment.java

@@ -10,6 +10,7 @@ import com.xingdata.zzdpos.databinding.FragmentMsManagerBinding;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.adapter.MsAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.List;
 
@@ -28,6 +29,7 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
         mMsAdapter = new MsAdapter();
         mViewBinding.rlMs.setAdapter(mMsAdapter);
         mViewBinding.rlMs.setLayoutManager(new LinearLayoutManager(mContext));
+        mViewBinding.rlMs.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(1, mContext.getResources().getDimensionPixelOffset(R.dimen.all_margin), true));
 
         // set ms listener
         mViewBinding.srlMs.setOnRefreshListener(this::refreshMs);
@@ -36,6 +38,9 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
 
         // set other
         mViewBinding.llAdd.setOnClickListener(view -> mPresenter.clickAdd());
+
+        // init data
+        refreshMs();
     }
 
     /**

app/src/main/res/drawable/shape_orange_b1.xml

@@ -7,4 +7,6 @@
         android:width="@dimen/view_line_L1"
         android:color="@color/orange_shixiu" />
 
+    <solid android:color="@color/white_caocao" />
+
 </shape>
\ No newline at end of file

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

@@ -7,5 +7,22 @@
         android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:layout_marginTop="@dimen/all_spacing"
+            android:background="@color/gray_huanggai" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rl_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white_caocao" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_huanggai" />
+
     </LinearLayout>
 </layout>
\ No newline at end of file

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

@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_line_width"
             android:layout_gravity="bottom"
-            android:layout_marginTop="@dimen/all_spacing"
+            android:layout_marginTop="@dimen/all_margin"
             android:background="@color/gray_huanggai" />
 
         <LinearLayout

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

@@ -4,12 +4,12 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:layout_margin="@dimen/all_margin"
+        android:layout_height="130dp"
         android:background="@drawable/shape_orange_b1"
         android:foreground="?android:attr/selectableItemBackground">
 
         <ImageView
+            android:id="@+id/iv_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_spacing"

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

+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:foreground="?android:attr/selectableItemBackground"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="@dimen/all_margin_big">
+
+        <ImageView
+            android:id="@+id/iv_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/icon_buy02"
+            android:contentDescription="@null" />
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/all_spacing"
+            android:text="满减送" />
+
+    </LinearLayout>
+</layout>
+
+