积分规则修改

app/src/main/java/com/xingdata/zzdpos/model/Category.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.model;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.bigkoo.pickerview.model.IPickerViewData;
 import com.xingdata.zzdpos.base.BaseBean;
+import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralGetFragment;
 
 /**
  * Created by Administrator on 2017/11/27.
@@ -132,15 +133,15 @@ public class Category implements BaseBean, IPickerViewData {
     @Override
     public String getPickerViewText() {
         switch (nowCategory) {
-//            case IntegralGetDialog.ONE_CATEGORY: {
-//                return getSpuClaName() + "";
-//            }
-//            case IntegralGetDialog.TWO_CATEGORY: {
-//                return getSpuGrpName() + "";
-//            }
-//            case IntegralGetDialog.THREE_CATEGORY: {
-//                return getSpuCateName() + "";
-//            }
+            case IntegralGetFragment.ONE_CATEGORY: {
+                return getSpuClaName() + "";
+            }
+            case IntegralGetFragment.TWO_CATEGORY: {
+                return getSpuGrpName() + "";
+            }
+            case IntegralGetFragment.THREE_CATEGORY: {
+                return getSpuCateName() + "";
+            }
         }
         return "";
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

@@ -23,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
+import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.splash.SplashActivity;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
@@ -138,7 +139,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         promptDialog.dismiss();
         //如果sn已经绑定款台，则直接跳转主页
         if (loginReturnBean.getBindSN()) {
-            startActivity(new Intent(LoginActivity.this, IntegralActivity.class));
+            startActivity(new Intent(LoginActivity.this, ReturnTicketActivity.class));
             LoginActivity.this.finish();
             return;
         }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralActivity.java

@@ -66,6 +66,7 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
 
     @Override
     public void addSucc(LoadingDialog loadingDialog) {
+        pop();
         mPresenter.query(1, mPresenter.integralIndexFragment.NORMAL_TYPE, loadingDialog);
     }
 
@@ -82,6 +83,7 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
 
     @Override
     public void exchangeUpdateSucc(Ubound ubound, LoadingDialog loadingDialog) {
+        pop();
         mPresenter.exchangeQuery(loadingDialog);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralPresenter.java

@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.model.Category;
 import com.xingdata.zzdpos.model.Gbound;
 import com.xingdata.zzdpos.model.Ubound;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralExchangeFragment;
 import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralGetFragment;
 import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
 
@@ -23,6 +24,7 @@ public class IntegralPresenter extends IntegralContract.Presenter {
     private int number = 1;
     public  IntegralIndexFragment integralIndexFragment = new IntegralIndexFragment();
     public IntegralGetFragment integralGetFragment = new IntegralGetFragment();
+    public IntegralExchangeFragment integralExchangeFragment = new IntegralExchangeFragment();
     @Override
     public void onAttached() {
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java

+package com.xingdata.zzdpos.ui.marketing.integral.fragment;
+
+import android.text.TextUtils;
+import android.view.View;
+
+import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseActivity;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.DialogIntegralExchangeSettingBinding;
+import com.xingdata.zzdpos.model.Ubound;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
+import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.OnClickListener;
+
+/**
+ * 绑定款台界面
+ * <p>
+ * 设备没有绑定款台的进行绑定操作
+ */
+public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
+        DialogIntegralExchangeSettingBinding> {
+    Ubound ubound;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.dialog_integral_exchange_setting;
+    }
+
+    @Override
+    public void initView() {
+        mViewBinding.icTitle.tvTitle.setText("积分规则");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                pop();
+            }
+        });
+        mViewBinding.setOnClickListener(view -> {
+
+//            hintKbTwo();
+            switch (view.getId()) {
+                case R.id.rd_suspendeds: {
+                    //暂停
+                    ubound.setBoundUseStatus((byte) 1);
+                }
+                break;
+                case R.id.rd_starts: {
+                    //启用
+                    ubound.setBoundUseStatus((byte) 0);
+                }
+                break;
+                case R.id.btn_ok: {
+                    if (isNullAndSet()) {
+                        LoadingDialog loadingDialog = new LoadingDialog();
+                        loadingDialog.show((BaseActivity) getActivity());
+                        ubound.setUpdateTime(null);
+                        ubound.setCreateTime(null);
+                        mPresenter.exchangeUpdate(ubound, loadingDialog);
+                    } else {
+                        ToastUtils.showLong("输入数据不能null");
+                    }
+                }
+                break;
+            }
+        });
+        initUiData();
+    }
+
+    private void initUiData() {
+        if (ubound != null) {
+            if (ubound.getBoundUseStatus() != null && ubound.getBoundUseStatus() == 0) {
+                mViewBinding.rdStarts.setChecked(true);
+            } else if (ubound.getBoundUseStatus() != null && ubound.getBoundUseStatus() == 1) {
+                mViewBinding.rdSuspendeds.setChecked(true);
+            }
+            if (ubound.getBoundValAmt() != null) {
+                mViewBinding.etIntegralExchangeRuleCountMoney.setText(ubound.getBoundValAmt() + "");
+            }
+            if (ubound.getBoundOrderAmt() != null) {
+                mViewBinding.etIntegralExchangeMoney.setText(ConvertUtil.fenToYuanNoPoint(ubound
+                        .getBoundOrderAmt()));
+            }
+            if (ubound.getBoundUseNum() != null) {
+                mViewBinding.etIntegralExchangeCount.setText(ubound.getBoundUseNum() + "");
+            }
+        }
+    }
+
+    public void setData(Ubound ubound) {
+        this.ubound = ubound;
+    }
+
+
+    /**
+     * 判断用户输入数据是否为null
+     *
+     * @return 输入为null返回false 反之返回true
+     */
+    private boolean isNullAndSet() {
+        if (ubound == null || ubound.getBoundUseStatus() == null) {
+            return false;
+        }
+        if (TextUtils.isEmpty(mViewBinding.etIntegralExchangeRuleCountMoney.getText().toString())
+                || TextUtils.isEmpty(mViewBinding.etIntegralExchangeMoney.getText().toString())
+                || TextUtils.isEmpty(mViewBinding.etIntegralExchangeCount.getText().toString
+                ())) {
+            return false;
+        }
+        ubound.setBoundValAmt(Long.parseLong(mViewBinding.etIntegralExchangeRuleCountMoney
+                .getText().toString()));
+        ubound.setBoundOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etIntegralExchangeMoney
+                .getText().toString()));
+        ubound.setBoundUseNum(Long.parseLong(mViewBinding.etIntegralExchangeCount.getText()
+                .toString()));
+        return true;
+    }
+
+
+//    /**
+//     * 显示软键盘，Dialog使用
+//     */
+//    public void hintKbTwo() {
+//        View view = getDialog().getCurrentFocus();
+//        if (view == null) {
+//            return;
+//        }
+//        if (view instanceof TextView) {
+//            InputMethodManager mInputMethodManager = (InputMethodManager) getContext()
+//                    .getSystemService(Context.INPUT_METHOD_SERVICE);
+//            mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager
+//                    .RESULT_UNCHANGED_SHOWN);
+//        }
+//    }
+
+//    @Override
+//    public void dismiss() {
+//        hintKbTwo();
+//        super.dismiss();
+//    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java

@@ -55,7 +55,7 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
     //进度对话框
     LoadingDialog loadingDialog;
     //当前点击商品类型空间id，防止直接点击商品第二三种类型
-    private int nowShopTypeId = 1;
+    private int nowShopTypeId = 0;
 
     @Override
     public int getLayoutId() {
@@ -64,6 +64,13 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
 
     @Override
     public void initView() {
+        mViewBinding.icTitle.tvTitle.setText("积分规则");
+        mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                pop();
+            }
+        });
         mViewBinding.setOnClickListener(
                 new OnClickListener() {
                     @Override
@@ -118,7 +125,6 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                                 if (nowShopTypeId >= 1) {
                                     mPresenter.initData(getCategory(v.getId()), TWO_CATEGORY);
                                     mViewBinding.tvCategorySelectThree.setText("");
-                                    nowShopTypeId = 2;
                                 } else {
                                     ToastUtils.showLong("请先选择第一类品类");
                                 }
@@ -127,7 +133,6 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                             case R.id.tv_category_select_three: {
                                 if (nowShopTypeId >= 2) {
                                     mPresenter.initData(getCategory(v.getId()), THREE_CATEGORY);
-                                    nowShopTypeId = 3;
                                 } else {
                                     ToastUtils.showLong("请先选择第一二类品类");
                                 }
@@ -349,18 +354,21 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                 //返回的分别是三个级别的选中位置
                 switch (nowList) {
                     case ONE_CATEGORY: {
+                        nowShopTypeId=1;
                         mViewBinding.tvCategorySelectOne.setText(listCategory.get(options1)
                                 .getSpuClaName());
                         spuCateIdTwo = listCategory.get(options1).getSpuCateId();
                     }
                     break;
                     case TWO_CATEGORY: {
+                        nowShopTypeId=2;
                         mViewBinding.tvCategorySelectTwo.setText(listCategory.get(options1)
                                 .getSpuGrpName());
                         spuCateIdThree = listCategory.get(options1).getSpuCateId();
                     }
                     break;
                     case THREE_CATEGORY: {
+                        nowShopTypeId=3;
                         mViewBinding.tvCategorySelectThree.setText(listCategory.get(options1)
                                 .getSpuCateName());
 

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -20,7 +20,6 @@ import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
 import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
 import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter;
-import com.xingdata.zzdpos.ui.marketing.integral.dialog.IntegralExchangeDialog;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 import java.util.ArrayList;
@@ -80,6 +79,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
         mViewBinding.setOnClickListener(v -> {
             switch (v.getId()) {
                 case R.id.btn_add: {
+                    mPresenter.integralGetFragment = new IntegralGetFragment();
                     mPresenter.integralGetFragment.setNowType(1);
                     start(mPresenter.integralGetFragment);
 //                    integralGetDialog = new IntegralGetDialog();
@@ -197,6 +197,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
         if ((System.currentTimeMillis() - mExitTime) > 1000) {
 //            integralGetDialog = new IntegralGetDialog();
             loadingDialog.show((BaseActivity) getActivity());
+            mPresenter.integralGetFragment = new IntegralGetFragment();
             mPresenter.integralGetFragment.setData(gbound, loadingDialog);
             start(mPresenter.integralGetFragment);
 //            integralGetDialog.show((BaseActivity) getActivity());
@@ -213,9 +214,12 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
      */
     private void exchangeClickProduct(Ubound gbound) {
         if ((System.currentTimeMillis() - mExitTime) > 1000) {
-            IntegralExchangeDialog integralExchangeDialog = new IntegralExchangeDialog();
-            integralExchangeDialog.setData(gbound);
-            integralExchangeDialog.show((BaseActivity) getActivity());
+            mPresenter.integralExchangeFragment = new IntegralExchangeFragment();
+            mPresenter.integralExchangeFragment.setData(gbound);
+            start(mPresenter.integralExchangeFragment);
+//            IntegralExchangeDialog integralExchangeDialog = new IntegralExchangeDialog();
+//            integralExchangeDialog.setData(gbound);
+//            integralExchangeDialog.show((BaseActivity) getActivity());
             mExitTime = System.currentTimeMillis();
         } else {
             ToastUtils.showLong("您操作太快了");