Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

app/src/main/AndroidManifest.xml

@@ -88,6 +88,10 @@
             android:name=".ui.marketing.ms.MsActivity"
             android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name=".ui.manage.manageMenu.ManageMenuActivity"
+            android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -13,14 +13,31 @@ public class C {
         public static final int MENU_MS = 103;
         public static final int MENU_TICKET = 104;
         public static final int MENU_STATISTICS = 105;
+
         public static final int MENU_MANAGER = 106;
+        public static final int MENU_MANAGER_OPER = 1251;
+        public static final int MENU_MANAGER_GOODS = 1252;
+        public static final int MENU_MANAGER_BALE = 1253;
+        public static final int MENU_MANAGER_REPLENISHMENT= 1254;
+        public static final int MENU_MANAGER_OTHER= 1255;
+        public static final int MENU_MANAGER_INVENTORY= 1256;
+
+
         public static final int MENU_ANNOUNCEMENT = 107;
         public static final int MENU_FEED = 108;
         public static final int MENU_UPDATE = 109;
         public static final int MENU_HELP = 110;
         public static final int MENU_EXIT = 111;
+
         public static final int MENU_STATISTICS_ORDER = 1051;
         public static final int MENU_STATISTICS_MS = 1052;
+
+        public static final int MENU_MS_VIP_LEVEL = 1151;
+        public static final int MENU_MS_INTEGRAL = 1152;
+        public static final int MENU_MS_TICKET = 1153;
+        public static final int MENU_MS_RECHARGE = 1154;
+        public static final int MENU_MS_MS = 1155;
+        public static final int MENU_MS_SMS = 1156;
     }
 
 

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java

@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
+import com.xingdata.zzdpos.ui.manage.manageMenu.ManageMenuActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
@@ -70,7 +71,8 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
                         ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);
                         break;
                     case C.MENU.MENU_MANAGER://管理
-
+                        ActivityUtils.startActivity(new Intent(getActivity(),
+                                ManageMenuActivity.class));
                         break;
 
                 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/manageMenu/ManageMenuActivity.java

+package com.xingdata.zzdpos.ui.manage.manageMenu;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+
+import com.blankj.utilcode.util.ActivityUtils;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
+import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
+import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
+import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
+import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
+import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ManageMenuActivity extends AppCompatActivity {
+    MarketingMenuAdapter marketingMenuAdapter;
+    List<Integer> list = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_marketing_menu);
+
+        ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
+                this, R.layout.activity_marketing_menu);
+        mViewBinding.icTitle.tvTitle.setText("管理");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                ActivityUtils.finishActivity(ManageMenuActivity.class);
+            }
+        });
+        list.add(C.MENU.MENU_MANAGER_OPER);
+        list.add(C.MENU.MENU_MANAGER_GOODS);
+        list.add(C.MENU.MENU_MANAGER_BALE);
+        list.add(C.MENU.MENU_MANAGER_REPLENISHMENT);
+        list.add(C.MENU.MENU_MANAGER_OTHER);
+        list.add(C.MENU.MENU_MANAGER_INVENTORY);
+
+
+        marketingMenuAdapter = new MarketingMenuAdapter(list);
+        mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
+        marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (marketingMenuAdapter.getData().get(position)) {
+                    case C.MENU.MENU_MANAGER_OPER: {
+                        //会员等级
+                    }
+                    break;
+                    case C.MENU.MENU_MANAGER_GOODS: {
+                        //积分规则
+                        ActivityUtils.startActivity(IntegralActivity.class);
+                    }
+                    break;
+                    case C.MENU.MENU_MANAGER_BALE: {
+                        //优惠券设置
+                        ActivityUtils.startActivity(ReturnTicketActivity.class);
+                    }
+                    break;
+                    case C.MENU.MENU_MANAGER_REPLENISHMENT: {
+                        //充值优惠
+                    }
+                    break;
+                    case C.MENU.MENU_MANAGER_OTHER: {
+                        //营销计划
+                        ActivityUtils.startActivity(MsActivity.class);
+                    }
+                    break;
+                    case C.MENU.MENU_MANAGER_INVENTORY: {
+                        //群发短信
+                    }
+                    break;
+                    default: {
+
+                    }
+                    break;
+                }
+            }
+        });
+    }
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -8,6 +8,7 @@ import android.view.View;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
 import com.xingdata.zzdpos.model.MarketingMenuModel;
@@ -22,7 +23,7 @@ import java.util.List;
 
 public class MarketingMenuActivity extends AppCompatActivity {
     MarketingMenuAdapter marketingMenuAdapter;
-    List<MarketingMenuModel> list = new ArrayList<>();
+    List<Integer> list = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -38,30 +39,13 @@ public class MarketingMenuActivity extends AppCompatActivity {
                 ActivityUtils.finishActivity(MarketingMenuActivity.class);
             }
         });
-        MarketingMenuModel marketingMenuModel1 = new MarketingMenuModel();
-        MarketingMenuModel marketingMenuModel2 = new MarketingMenuModel();
-        MarketingMenuModel marketingMenuModel3 = new MarketingMenuModel();
-        MarketingMenuModel marketingMenuModel4 = new MarketingMenuModel();
-        MarketingMenuModel marketingMenuModel5 = new MarketingMenuModel();
-        MarketingMenuModel marketingMenuModel6 = new MarketingMenuModel();
-        marketingMenuModel1.setMarketingMenuImg(R.mipmap.vip_level);
-        marketingMenuModel1.setMarketingMenuName("会员等级");
-        marketingMenuModel2.setMarketingMenuImg(R.mipmap.integral_rules);
-        marketingMenuModel2.setMarketingMenuName("积分规则");
-        marketingMenuModel3.setMarketingMenuImg(R.mipmap.ticker_setting);
-        marketingMenuModel3.setMarketingMenuName("优惠券设置");
-        marketingMenuModel4.setMarketingMenuImg(R.mipmap.top_up_preferential);
-        marketingMenuModel4.setMarketingMenuName("充值优惠");
-        marketingMenuModel5.setMarketingMenuImg(R.mipmap.marketing_plan);
-        marketingMenuModel5.setMarketingMenuName("营销计划");
-        marketingMenuModel6.setMarketingMenuImg(R.mipmap.sms_all);
-        marketingMenuModel6.setMarketingMenuName("群发短信");
-        list.add(marketingMenuModel1);
-        list.add(marketingMenuModel2);
-        list.add(marketingMenuModel3);
-        list.add(marketingMenuModel4);
-        list.add(marketingMenuModel5);
-        list.add(marketingMenuModel6);
+        list.add(C.MENU.MENU_MS_VIP_LEVEL);
+        list.add(C.MENU.MENU_MS_INTEGRAL);
+        list.add(C.MENU.MENU_MS_TICKET);
+        list.add(C.MENU.MENU_MS_RECHARGE);
+        list.add(C.MENU.MENU_MS_MS);
+        list.add(C.MENU.MENU_MS_SMS);
+
         marketingMenuAdapter = new MarketingMenuAdapter(list);
         mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
@@ -70,31 +54,31 @@ public class MarketingMenuActivity extends AppCompatActivity {
         marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                switch (position) {
-                    case 0: {
+                switch (marketingMenuAdapter.getData().get(position)) {
+                    case C.MENU.MENU_MS_VIP_LEVEL: {
                         //会员等级
                     }
                     break;
-                    case 1: {
+                    case C.MENU.MENU_MS_INTEGRAL: {
                         //积分规则
                         ActivityUtils.startActivity(IntegralActivity.class);
                     }
                     break;
-                    case 2: {
+                    case C.MENU.MENU_MS_TICKET: {
                         //优惠券设置
                         ActivityUtils.startActivity(ReturnTicketActivity.class);
                     }
                     break;
-                    case 3: {
+                    case C.MENU.MENU_MS_RECHARGE: {
                         //充值优惠
                     }
                     break;
-                    case 4: {
+                    case C.MENU.MENU_MS_MS: {
                         //营销计划
                         ActivityUtils.startActivity(MsActivity.class);
                     }
                     break;
-                    case 5: {
+                    case C.MENU.MENU_MS_SMS: {
                         //群发短信
                     }
                     break;

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/adapter/MarketingMenuAdapter.java

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.marketing.marketingMenu.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.ItemMarketingMenuBinding;
@@ -13,14 +14,78 @@ import java.util.List;
  * Created by Administrator on 2017/11/24.
  */
 
-public class MarketingMenuAdapter extends BaseAdapter<MarketingMenuModel, ItemMarketingMenuBinding> {
-    public MarketingMenuAdapter(@Nullable List<MarketingMenuModel> data) {
+public class MarketingMenuAdapter extends BaseAdapter<Integer, ItemMarketingMenuBinding> {
+    private Integer titleId;
+    private Integer imgId;
+
+    public MarketingMenuAdapter(@Nullable List<Integer> data) {
         super(R.layout.item_marketing_menu, data);
     }
 
     @Override
-    protected void convert(ItemMarketingMenuBinding mViewBinding, MarketingMenuModel item) {
-        mViewBinding.ivLogo.setImageResource(item.getMarketingMenuImg());
-        mViewBinding.tvMenuName.setText(item.getMarketingMenuName());
+    protected void convert(ItemMarketingMenuBinding mViewBinding, Integer item) {
+        switch (item) {
+            case C.MENU.MENU_MS_VIP_LEVEL:
+                titleId = R.string.menu_ms_vip_level;
+                imgId = R.mipmap.vip_level;
+                break;
+            case C.MENU.MENU_MS_INTEGRAL:
+                titleId = R.string.menu_ms_integral;
+                imgId = R.mipmap.integral_rules;
+                break;
+            case C.MENU.MENU_MS_TICKET:
+                titleId = R.string.menu_ms_ticket;
+                imgId = R.mipmap.ticker_setting;
+                break;
+            case C.MENU.MENU_MS_RECHARGE:
+                titleId = R.string.menu_ms_recharge;
+                imgId = R.mipmap.top_up_preferential;
+                break;
+            case C.MENU.MENU_MS_MS:
+                titleId = R.string.menu_ms_ms;
+                imgId = R.mipmap.marketing_plan;
+                break;
+            case C.MENU.MENU_MS_SMS:
+                titleId = R.string.menu_ms_sms;
+                imgId = R.mipmap.sms_all;
+                break;
+            case C.MENU.MENU_MANAGER_OPER: {
+                titleId = R.string.menu_manager_oper;
+                imgId = R.mipmap.ic_oper_setting;
+            }
+            break;
+            case C.MENU.MENU_MANAGER_GOODS: {
+                titleId = R.string.menu_manager_goods;
+                imgId = R.mipmap.ic_goods_setting;
+            }
+            break;
+            case C.MENU.MENU_MANAGER_BALE: {
+                titleId = R.string.menu_manager_bale;
+                imgId = R.mipmap.ic_bale;
+            }
+            break;
+            case C.MENU.MENU_MANAGER_REPLENISHMENT: {
+                titleId = R.string.menu_manager_replenishment;
+                imgId = R.mipmap.ic_replenishment;
+            }
+            break;
+            case C.MENU.MENU_MANAGER_OTHER: {
+                titleId = R.string.menu_manager_other;
+                imgId = R.mipmap.ic_other_select;
+
+            }
+            break;
+            case C.MENU.MENU_MANAGER_INVENTORY: {
+                titleId = R.string.menu_manager_inventory;
+                imgId = R.mipmap.ic_inventory;
+            }
+            break;
+            default: {
+
+            }
+            break;
+        }
+        mViewBinding.tvMenuName.setText(titleId);
+        mViewBinding.ivLogo.setImageResource(imgId);
     }
 }

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

@@ -9,6 +9,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+
         android:layout_marginTop="@dimen/all_margin"
         android:background="@color/white"
         android:orientation="horizontal">
@@ -20,20 +21,23 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/all_margin"
-            android:src="@mipmap/right"/>
+            android:layout_marginRight="@dimen/all_padding_left_right"
+            android:src="@mipmap/right" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toLeftOf="@+id/iv"
-            android:padding="@dimen/all_padding">
+            android:paddingTop="@dimen/all_padding"
+            android:paddingBottom="@dimen/all_padding"
+            android:paddingStart="@dimen/all_padding_left_right"
+            >
 
             <ImageView
                 android:id="@+id/iv_logo"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@mipmap/vip_level"/>
+                android:src="@mipmap/vip_level" />
 
             <TextView
                 android:id="@+id/tv_menu_name"
@@ -43,7 +47,20 @@
                 android:padding="@dimen/all_padding"
                 android:text="会员等级"
                 android:textColor="@color/black_baozheng"
-                android:textSize="@dimen/et_textsize"/>
+                android:textSize="@dimen/et_textsize" />
         </LinearLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_alignParentTop="true"
+            android:background="@color/gray_kongming" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_alignParentBottom="true"
+            android:background="@color/gray_kongming" />
+
+
     </RelativeLayout>
 </layout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -462,15 +462,36 @@
     <string name="menu_receivables">收款</string>
     <string name="menu_vip">会员</string>
     <string name="menu_recharge">充值</string>
+
     <string name="menu_ms">营销</string>
+    <string name="menu_ms_vip_level">会员等级</string>
+    <string name="menu_ms_integral">积分规则</string>
+    <string name="menu_ms_ticket">优惠券设置</string>
+    <string name="menu_ms_recharge">充值优惠</string>
+    <string name="menu_ms_ms">营销计划</string>
+    <string name="menu_ms_sms">群发短信</string>
+
     <string name="menu_ticket">发券</string>
+
     <string name="menu_statistics">统计</string>
+    <string name="menu_statistics_order">订单统计</string>
+    <string name="menu_statistics_ms">营销记录</string>
+
     <string name="menu_manager">管理</string>
+    <string name="menu_manager_oper">店员管理</string>
+    <string name="menu_manager_goods">商品维护</string>
+    <string name="menu_manager_bale">商品组合</string>
+    <string name="menu_manager_replenishment">补货订货</string>
+    <string name="menu_manager_other">临库查询</string>
+    <string name="menu_manager_inventory">库存盘点</string>
+
     <string name="menu_announcement">公告通知</string>
     <string name="menu_feed">反馈</string>
     <string name="menu_update">升级</string>
     <string name="menu_help">帮助</string>
     <string name="menu_exit">退出</string>
+
+
     <!--输入器-->
     <string name="inputer_1">1</string>
     <string name="inputer_2">2</string>