Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/base/BaseDialog.java

@@ -295,24 +295,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         mBaseBinding.tvTitle.setText(res);
     }
 
-    /**
-     * 设置取消键的点击事件
-     *
-     * @param onCancelClick 取消键的点击事件
-     */
-    protected void setOnCancelClick(View.OnClickListener onCancelClick) {
-        mBaseBinding.btnCancel.setOnClickListener(onCancelClick);
-    }
-
-    /**
-     * 设置确定键点击事件
-     *
-     * @param onConfirmClick 确定键的点击事件
-     */
-    protected void setOnConfirmClick(View.OnClickListener onConfirmClick) {
-        mBaseBinding.btnConfirm.setOnClickListener(onConfirmClick);
-    }
-
     public String getTitleValue() {
         return null;
     }

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/DeleteInventoryDialog.java

@@ -11,13 +11,17 @@ import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.manage.inventory.InventoryPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.OnClickListener;
+
 
 
-/**
- * 交班页面
- */
 public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, DialogDeleteInventoryBinding> {
 
+    private BackCall mBackCall;
+
+    private void setBackCall(BackCall backCall) {
+        this.mBackCall = backCall;
+    }
 
     @Override
     public int getLayoutId() {
@@ -33,17 +37,42 @@ public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, Dialog
     @Override
     public void initView() {
         setBtnName("不删除", "删除");
-//        mViewBinding.tvDis.set
+        mViewBinding.tvDis.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                dismiss();
+            }
+        });
     }
-
 
     @Override
-    public void setOnCancelClick(View.OnClickListener onCancelClick) {
-        super.setOnCancelClick(onCancelClick);
+    public void onConfirmClick(View view) {
+        if (mBackCall != null) {
+            mBackCall.Ok();
+        }
+        super.onConfirmClick(view);
     }
 
     @Override
-    public void setOnConfirmClick(View.OnClickListener onConfirmClick) {
-        super.setOnConfirmClick(onConfirmClick);
+    public void onCancelClick(View view) {
+        if (mBackCall != null) {
+            mBackCall.No();
+        }
+        super.onCancelClick(view);
     }
+
+    public static DeleteInventoryDialog getDeleteInventoryDialog(BackCall backCall) {
+        DeleteInventoryDialog deleteInventoryDialog = new DeleteInventoryDialog();
+        deleteInventoryDialog.setBackCall(backCall);
+        return deleteInventoryDialog;
+    }
+
+    public abstract static class BackCall {
+
+        public abstract void Ok();
+
+        public abstract void No();
+
+    }
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -42,7 +42,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     private List<Sssku> topCsList = new ArrayList<>();
     private InventoryGoodsAdapter mInventoryGoodsAdapter;
     private CsCartDialog mCartDialog = new CsCartDialog();
-    DeleteInventoryDialog deleteInventoryDialog = new DeleteInventoryDialog();
+    DeleteInventoryDialog deleteInventoryDialog;
 
 
     /**
@@ -91,22 +91,24 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     }
 
     private void initDialog() {
-        deleteInventoryDialog.setOnConfirmClick(new OnClickListener() {
+        if (deleteInventoryDialog == null) {
+            deleteInventoryDialog = DeleteInventoryDialog.getDeleteInventoryDialog(new DeleteInventoryDialog.BackCall() {
                 @Override
-            protected void myOnClickListener(View v) {
+                public void Ok() {
                     mPresenter.cancelInventoryAdd(mCs);
                     deleteInventoryDialog.dismiss();
                 }
-        });
-        deleteInventoryDialog.setOnCancelClick(new OnClickListener() {
+
                 @Override
-            protected void myOnClickListener(View v) {
+                public void No() {
                     deleteInventoryDialog.dismiss();
-                pop();
+                    mPresenter.exitInventoryAdd();
                 }
             });
         }
 
+    }
+
     private void initRecycler() {
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserInfoEditFragment.java

@@ -68,35 +68,34 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                     break;
 
                 case R.id.onSure:
-                    if (oper == null) {
-                        oper = new Oper();
-                    }
+                    Oper mOper = new Oper();
 
                     if (mViewBinding.userName.getText().length() == 0) {
-                        ToastUtils.showShort("会员名称不能为空");
+                        ToastUtils.showShort("店员名称不能为空");
                         return;
                     }
                     if (mViewBinding.userPhone.getText().length() == 0) {
-                        ToastUtils.showShort("会员帐号不能为空");
+                        ToastUtils.showShort("店员帐号不能为空");
                         return;
                     }
                     if (mViewBinding.userPhone.getText().length() !=11) {
-                        ToastUtils.showShort("会员帐号长度必须11位");
+                        ToastUtils.showShort("店员帐号长度必须11位");
                         return;
                     }
 
                     if (mViewBinding.userLevel.getText().length() == 0) {
-                        ToastUtils.showShort("会员等级不能为空");
+                        ToastUtils.showShort("店员等级不能为空");
                         return;
                     }
 
-                    oper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
-                    oper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
-                    oper.setOperName(mViewBinding.userName.getText().toString());
+                    mOper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
+                    mOper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
+                    mOper.setOperName(mViewBinding.userName.getText().toString());
                     if (oper.getOperId() == null) {
-                        mPresenter.addUser(oper);
+                        mPresenter.addUser(mOper);
                     } else {
-                        mPresenter.updateUser(oper);
+                        mOper.setOperId(oper.getOperId());
+                        mPresenter.updateUser(mOper);
                     }
                     break;
             }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java

@@ -5,31 +5,39 @@ package com.xingdata.zzdpos.ui.marketing.recharge.fragment;
  */
 
 import android.app.DatePickerDialog;
+import android.graphics.Color;
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentRechargeRuleEditBinding;
 import com.xingdata.zzdpos.databinding.FragmentVipLevelEditBinding;
 import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRulePresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 会员等级编辑界面
  */
 public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter, FragmentRechargeRuleEditBinding> {
     private Mscard mMscard;
+    private List<Mscard> mscards;
+    private ArrayList<String> mScards;
+
 
     @Override
     public int getLayoutId() {
@@ -39,7 +47,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
     @Override
     public void initView() {
         mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
-
+        iniMscard();
         if (mMscard != null) {
             mViewBinding.infoTitle.tvTitle.setText("修改充值优惠");
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
@@ -48,6 +56,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
             mViewBinding.sendAmt.setText(ConvertUtil.fenToYuanNoZero(mMscard.getCruleSendAmt()));
             mViewBinding.ruleBeginTime.setText(StringUtil.format(new Date(mMscard.getDateBegin())));
             mViewBinding.ruleEndTime.setText(StringUtil.format(new Date(mMscard.getDateEnd())));
+            mViewBinding.rechargNo.setText(mMscard.getCruleGradeNo().toString());
             RadioButton radioButton = mViewBinding.ruleState.findViewWithTag(mMscard.getCruleStatus().toString());
             if (radioButton != null) {
                 radioButton.setChecked(true);
@@ -55,7 +64,8 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         } else {
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
             mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
-            ((RadioButton)mViewBinding.ruleState.getChildAt(0)).setChecked(true);
+            ((RadioButton) mViewBinding.ruleState.getChildAt(1)).setChecked(true);
+            mViewBinding.rechargNo.setText(mScards.get(0));
         }
 
         mViewBinding.setOnClickListener(view -> {
@@ -66,13 +76,15 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                         mscard.setId(mMscard.getId());
                         mscard.setCruleGradeNo(mMscard.getCruleGradeNo());
                         mscard.setIssuerMapId(mMscard.getIssuerMapId());
+                    } else {
+                        mscard.setCruleGradeNo(Byte.parseByte(mViewBinding.rechargNo.getText().toString()));
                     }
 
                     if (mViewBinding.rechargAmt.getText().length() == 0) {
                         ToastUtils.showShort("充值金额不能为空");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.rechargAmt.getText().toString())<=0) {
+                    if (Long.parseLong(mViewBinding.rechargAmt.getText().toString()) <= 0) {
                         ToastUtils.showShort("充值金额必须大于0");
                         return;
                     }
@@ -80,20 +92,20 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                         ToastUtils.showShort("赠送金额不能为空");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString())<=0) {
+                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) <= 0) {
                         ToastUtils.showShort("赠送金额必须大于0");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString())>Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
+                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) > Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
                         ToastUtils.showShort("充值金额必须大于或者等于赠送金额");
                         return;
                     }
-                    if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >=StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
+                    if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >= StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
                         ToastUtils.showShort("开始时间不能大于或者等于结束日期");
                         return;
                     }
-                    mscard.setCruleChargeAmt(ConvertUtil.yuanToFen( mViewBinding.rechargAmt.getText().toString()));
-                    mscard.setCruleSendAmt(ConvertUtil.yuanToFen( mViewBinding.sendAmt.getText().toString()));
+                    mscard.setCruleChargeAmt(ConvertUtil.yuanToFen(mViewBinding.rechargAmt.getText().toString()));
+                    mscard.setCruleSendAmt(ConvertUtil.yuanToFen(mViewBinding.sendAmt.getText().toString()));
                     mscard.setCruleStatus(Byte.parseByte(mViewBinding.ruleState.findViewById(mViewBinding.ruleState.getCheckedRadioButtonId()).getTag().toString()));
                     mscard.setDateBegin(StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()));
                     mscard.setDateEnd(StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString()));
@@ -106,12 +118,30 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                 case R.id.rule_end_time:
                     showDialogPick(mViewBinding.ruleEndTime);
                     break;
+
+                case R.id.recharg_No:
+
+                    ShowRechargeNo();
+                    break;
             }
         });
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
 
+
+    }
+
+    private void iniMscard() {
+        mScards = new ArrayList<>();
+        for (int i = 1; i < 10; i++) {
+            mScards.add(String.valueOf(i));
+        }
+        for (Mscard mscard : mscards) {
+            if (mScards.contains(mscard.getCruleGradeNo().toString())) {
+                mScards.remove(mscard.getCruleGradeNo().toString());
+            }
+        }
     }
 
     @Override
@@ -119,7 +149,9 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         return false;
 
     }
+
     //将两个选择时间的dialog放在该函数中
+
     private void showDialogPick(final View btn) {
         //获取Calendar对象，用于获取当前时间
         final Calendar calendar = Calendar.getInstance();
@@ -141,7 +173,33 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         datePickerDialog.show();
     }
 
+
+    /**
+     * 弹出选择会员P
+     *
+     * @param mScards
+     */
+    private void ShowRechargeNo() {// 弹出选择器
+        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
+                OptionsPickerView.OnOptionsSelectListener() {
+                    @Override
+                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                        mViewBinding.rechargNo.setText(mScards.get(options1));
+                    }
+                }).setTitleText("请选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+        pvOptions.setPicker(mScards);
+        pvOptions.show();
+    }
+
     public void setmMscard(Mscard mMscard) {
         this.mMscard = mMscard;
     }
+
+    public void setMscards(List<Mscard> mscards) {
+        this.mscards = mscards;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java

@@ -50,6 +50,7 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
         mViewBinding.titleLayout.tvTitle.setText("充值优惠");
         adapter.setOnItemClickListener((mAdapter, view, position) -> {
             mPresenter.rechargeRuleEditFragment.setmMscard(adapter.getData().get(position));
+            mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
             start( mPresenter.rechargeRuleEditFragment);
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
@@ -60,6 +61,7 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
             switch (view.getId()) {
                 case R.id.addRule:
                     mPresenter.rechargeRuleEditFragment.setmMscard(null);
+                    mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
                     start( mPresenter.rechargeRuleEditFragment);
                     break;
             }

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools">
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
                                                  xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -11,7 +12,9 @@
         <include
             android:id="@+id/ic_title"
             layout="@layout/title"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
         <FrameLayout

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

@@ -19,14 +19,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:paddingTop="@dimen/all_padding"
-        android:orientation="vertical">
+        android:orientation="vertical"
+       >
 
         <View
             android:id="@+id/ll_title"
             android:layout_width="0dp"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="@dimen/all_margin"
+            android:layout_marginTop="@dimen/all_margin_big"
             android:background="@color/white_caocao"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

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

@@ -22,7 +22,6 @@
             android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
             android:inputType="number"
-            android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low"
 
             />

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

@@ -49,7 +49,6 @@
                 android:hint="@string/other_select_edit_hint"
                 android:imeOptions="actionSearch"
                 android:inputType="text"
-                android:textColor="@color/black_likui"
                 android:textSize="@dimen/all_text_size_low"
                 />
 

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

@@ -70,6 +70,30 @@
                         android:enabled="false" />
                 </LinearLayout>
 
+                <include layout="@layout/line_layout_margin"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/default_blacktext_margin_smallstyle"
+                        android:layout_width="90dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/all_margin_left"
+                        android:text="充值档位" />
+
+                    <TextView
+                        android:id="@+id/recharg_No"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="@dimen/all_margin_left"
+                        android:background="@mipmap/ic_expand_left"
+                        android:gravity="center"
+                        android:onClick="@{onClickListener}" />
+                </LinearLayout>
+
                 <include layout="@layout/line_layout_margin"/>
 
                 <LinearLayout

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

@@ -25,7 +25,6 @@
             android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
             android:imeOptions="actionSearch"
-            android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low"
 
             />

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

@@ -103,23 +103,6 @@
         </LinearLayout>
 
         <include layout="@layout/line_layout" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/all_margin_left"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/onSure"
-                style="@style/button_positive_noradius"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:onClick="@{onClickListener}"
-                android:text="确认" />
-
-        </RelativeLayout>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -120,6 +120,14 @@
 
         <include layout="@layout/line_layout" />
 
+        <TextView
+            android:layout_marginTop="@dimen/all_margin_left"
+            style="@style/textView_title"
+            android:textSize="@dimen/small_text_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="注：店员初始密码为000000" />
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -10,6 +10,7 @@
 
         <ImageButton
             android:id="@+id/iv_back"
+            android:layout_marginLeft="@dimen/all_margin_left"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"