Merge remote-tracking branch 'origin/master'

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

@@ -581,4 +581,9 @@ public class C {
         public static final int ADD_SKU = 7;
         public static final int SKU_EDITOR = 8;
     }
+
+    public final class PAY_STATE {
+        public static final String PAYING = "0098";
+        public static final String SUCC = "0000";
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java

@@ -45,13 +45,13 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
         super.show(activity, 20);
     }
 
+    public void show(BaseActivity activity, int s) {
+        super.show(activity, s);
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-//        if (null != disp && (!disp.isDisposed())) {
-//            disp.dispose();
-//        }
-
     }
 
 }

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

@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
+import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
 import com.xingdata.zzdpos.ui.manage.manageMenu.ManageMenuActivity;
@@ -28,12 +29,17 @@ import com.xingdata.zzdpos.util.SystemUtil;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
 
 public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBinding> {
     private MenuRecyclerAdapter mMenuRecyclerAdapter;
-    private List<Integer> integers;
     private Bundle bundle;
-    private   Intent intent;
+    private Intent intent;
+    private int[] ints = {101, 102, 103, 104, 105, 106};
+    private int[] intsB = {101, 102, 104, 105, 106};
 
     @Override
     public int getLayoutId() {
@@ -42,27 +48,63 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
 
     @Override
     public void initView() {
-        if (SystemUtil.checkDeviceHasNavigationBar(getActivity())){
-            LinearLayout.LayoutParams cp = new LinearLayout.LayoutParams( mViewBinding.fragmentCasherRecycler.getLayoutParams());
+
+        switch ((int) LoginPresenter.loginReturnBean.getOperLevel()) {
+            case 1:
+                ints = intsB;
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+        }
+
+        if (SystemUtil.checkDeviceHasNavigationBar(getActivity())) {
+            LinearLayout.LayoutParams cp = new LinearLayout.LayoutParams(mViewBinding.fragmentCasherRecycler.getLayoutParams());
             cp.setMargins(0, 0, 0, 0);
             mViewBinding.fragmentCasherRecycler.setLayoutParams(cp);
 
         }
 
 
-        mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(),
-                2));
-        integers = new ArrayList<>();
-        integers.add(101);
-        integers.add(102);
-        integers.add(103);
-        integers.add(104);
-        integers.add(105);
-        integers.add(106);
-        mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
-        mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
-        mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
-                (getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
+        io.reactivex.Observable.create((ObservableOnSubscribe<Integer>) e -> {
+            for (int i : ints) {
+                e.onNext(i);
+            }
+            e.onComplete();
+        }).doFinally(() -> {
+            mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(),
+                    2));
+        }).subscribe(new Observer<Integer>() {
+            private List<Integer> integers;
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                integers = new ArrayList<>();
+            }
+
+            @Override
+            public void onNext(Integer integer) {
+                integers.add(integer);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onComplete() {
+                mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
+                mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
+                mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
+                        (getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
+            }
+        });
+
+
         mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

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

@@ -3,6 +3,7 @@ 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.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
@@ -11,6 +12,8 @@ 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.login.LoginPresenter;
+import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
 import com.xingdata.zzdpos.ui.manage.bale.BaleActivity;
 import com.xingdata.zzdpos.ui.manage.inventory.InventoryActivity;
 import com.xingdata.zzdpos.ui.manage.otherselect.OtherSelectActivity;
@@ -18,20 +21,38 @@ import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
 import com.xingdata.zzdpos.ui.manage.user.UserActivity;
 import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
+import com.xingdata.zzdpos.util.MyMenuItemDecoration;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
 public class ManageMenuActivity extends AppCompatActivity {
     MarketingMenuAdapter marketingMenuAdapter;
-    List<Integer> list = new ArrayList<>();
+    private int[] ints = {C.MENU.MENU_MANAGER_OPER, C.MENU.MENU_MANAGER_GOODS, C.MENU.MENU_MANAGER_BALE, C.MENU.MENU_MANAGER_REPLENISHMENT, C.MENU.MENU_MANAGER_OTHER, C.MENU.MENU_MANAGER_INVENTORY};
+    private int[] intsB = {C.MENU.MENU_MANAGER_OTHER, C.MENU.MENU_MANAGER_INVENTORY};
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_marketing_menu);
 
+        switch ((int) LoginPresenter.loginReturnBean.getOperLevel()) {
+            case 1:
+                ints = intsB;
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+        }
+
         ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
                 this, R.layout.activity_marketing_menu);
         mViewBinding.icTitle.tvTitle.setText("管理");
@@ -41,19 +62,42 @@ public class ManageMenuActivity extends AppCompatActivity {
                 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);
+
+        io.reactivex.Observable.create((ObservableOnSubscribe<Integer>) e -> {
+            for (int i : ints) {
+                e.onNext(i);
+            }
+            e.onComplete();
+        }).doFinally(() -> {
+            LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
+            linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+            mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
+        }).subscribe(new Observer<Integer>() {
+            private List<Integer> integers;
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                integers = new ArrayList<>();
+            }
+
+            @Override
+            public void onNext(Integer integer) {
+                integers.add(integer);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+
+            }
+
+            @Override
+            public void onComplete() {
+                marketingMenuAdapter = new MarketingMenuAdapter(integers);
+                mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
+            }
+        });
+
+
         marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -173,7 +173,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void showLoadingDialog() {
-        mLoadingDialog.show(this);
+        mLoadingDialog.show(this, 60);
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleContract.java

@@ -257,8 +257,10 @@ interface SettleContract {
 
         /**
          * 支付中页面 - 查看支付状态
+         *
+         * @param payType 支付类型
          */
-        public abstract void checkPayState();
+        public abstract void checkPayState(int payType);
 
         /**
          * 支付结果页面 - 完成订单

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java

@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.settle;
 
 
 import com.alibaba.fastjson.JSON;
-import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.C;
@@ -259,10 +258,10 @@ public class SettlePresenter extends SettleContract.Presenter {
                         response -> {
                             com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
                             switch (r1.getResponseCode()) {
-                                case "0000":
+                                case C.PAY_STATE.SUCC:
                                     subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.WECHAT)).doFinally(() -> mView.dismissLoadingDialog())));
                                     break;
-                                case "0098":
+                                case C.PAY_STATE.PAYING:
                                     mView.showPayingDialog(C.PAY_CHANNEL.WECHAT, r1);
                                     break;
                                 default:
@@ -302,17 +301,17 @@ public class SettlePresenter extends SettleContract.Presenter {
     }
 
     @Override
-    public void checkPayState() {
+    public void checkPayState(int payType) {
         mView.showLoadingDialog();
         JniFactory.Settle.query()
                 .doFinally(() -> mView.dismissLoadingDialog())
                 .subscribe(s -> {
                             com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(s.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
                             switch (r1.getResponseCode()) {
-                                case "0000":
-                                    subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.ALI)).doFinally(() -> mView.dismissLoadingDialog())));
+                                case C.PAY_STATE.SUCC:
+                                    subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, payType)).doFinally(() -> mView.dismissLoadingDialog())));
                                     break;
-                                case "0098":
+                                case C.PAY_STATE.PAYING:
                                     mView.showMsg("交易处理中");
                                     break;
                                 default:
@@ -356,15 +355,11 @@ public class SettlePresenter extends SettleContract.Presenter {
      * 提交订单
      */
     private Observable<String> commitOrder() {
-        if (StringUtils.isEmpty(mSaleorder.getOrderNo())) {
-            return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
-                    .doAfterNext(s -> {
-                        mSaleorder.setOrderNo(s);
-                        mView.changeLockState(true);
-                    });
-        } else {
-            return Observable.just(mSaleorder.getOrderNo());
-        }
+        return ApiFactory.Saleorder.addOrderMis(createSaleorderParam())
+                .doAfterNext(s -> {
+                    mSaleorder.setOrderNo(s);
+                    mView.changeLockState(true);
+                });
     }
 
     /**

app/src/main/java/com/xingdata/zzdpos/ui/settle/dialog/PayingDialog.java

@@ -26,8 +26,7 @@ public class PayingDialog extends BaseDialog<SettlePresenter, DialogSettlePaying
 
     @Override
     public void initView() {
-
-        mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState());
+        mViewBinding.tvCheck.setOnClickListener(view -> mPresenter.checkPayState(mType));
         switch (mType) {
             case C.PAY_CHANNEL.ALI:
                 mViewBinding.ivLogo.setImageResource(R.mipmap.pay_alipay);

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsRechargeGroupAdapter.java

@@ -28,17 +28,17 @@ public class StatisticsRechargeGroupAdapter extends BaseSectionQuickAdapter<VipR
 
     @Override
     protected void convertHead(com.chad.library.adapter.base.BaseViewHolder helper, VipRechargeOrder item) {
-               helper.setText(R.id.item_tv,item.header);
+        helper.setText(R.id.item_tv, item.header);
 
 
     }
 
     @Override
     protected void convert(BaseViewHolder helper, VipRechargeOrder item) {
-        helper.setText(R.id.tv_left_top,item.getUserName());
-        helper.setText(R.id.tv_left_bottom,com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
-        helper.setText(R.id.tv_right_top,"+"+ ConvertUtil.fenToYuan(item.getCardAmtPay(),false));
-        ((ImageView)helper.getView(R.id.img_left)).setImageResource(R.mipmap.ic_filling);
+        helper.setText(R.id.tv_left_top, item.getUserName());
+        helper.setText(R.id.tv_left_bottom, com.blankj.utilcode.util.TimeUtils.millis2String(item.getCreateTime(), new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
+        helper.setText(R.id.tv_right_top, "+" + ConvertUtil.fenToYuan(item.getCardAmtPay(), false));
+        ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.ic_filling);
 
 
     }

app/src/main/java/com/xingdata/zzdpos/util/MyMenuItemDecoration.java

@@ -128,7 +128,7 @@ public class MyMenuItemDecoration extends RecyclerView.ItemDecoration {
 //                top = child.getBottom() + params.bottomMargin;
 //                bottom = top + mDividerHight;
 //            } else {
-                if (i/size!=(parent.getAdapter().getItemCount()/size-1)){
+                if (i/size!=(parent.getAdapter().getItemCount()+(int)(size*0.5+0.5))/size-1){
                     top = child.getBottom() + params.bottomMargin;
                     bottom = top + mDividerHight;
                 }

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

@@ -50,6 +50,8 @@
             android:paddingEnd="@dimen/all_padding"
             android:text="1231231244124124"
             android:textColor="@color/black_baozheng"
+            android:singleLine="true"
+            android:ellipsize = "end"
             android:textSize="@dimen/all_text_size"
             app:layout_constraintEnd_toStartOf="@id/tv_right_top"
             app:layout_constraintStart_toEndOf="@id/img_left"