UI

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

-package com.xingdata.zzdpos.ui.marketing.fragment;
-
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.Gravity;
-import android.widget.RadioButton;
-
-import com.blankj.utilcode.util.ToastUtils;
-import com.xingdata.api.print.ZX_PrintPOS;
-import com.xingdata.zzdpos.App;
-import com.xingdata.zzdpos.R;
-import com.xingdata.zzdpos.api.ApiFactory;
-import com.xingdata.zzdpos.db.DBFactory;
-import com.xingdata.zzdpos.model.Mscard;
-import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.model.VipRechargeOrder;
-import com.xingdata.zzdpos.ui.vip.VipContract;
-import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipInfoFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipListFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipRechargeListFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipSearchFragment;
-import com.xingdata.zzdpos.ui.vip.fragment.VipTruleListFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class VipPresenter extends VipContract.Presenter {
-    public VipListFragment vipListFragment = new VipListFragment();
-    public VipInfoEditFragment vipInfoEditFragment = new VipInfoEditFragment();
-    public VipInfoFragment vipInfoFragment = new VipInfoFragment();
-    public VipExpenseListFragment vipExpenseListFragment = new VipExpenseListFragment();
-    public VipRechargeListFragment vipRechargeListFragment = new VipRechargeListFragment();
-    public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
-    public VipSearchFragment vipSearchFragment = new VipSearchFragment();
-    public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
-    public int inVipState = 0; //1 充值
-
-    @Override
-    public void onAttached() {
-        this.initRealm();
-    }
-
-
-    @Override
-    public void getVipList(int pageNumber, String vipLevel) {
-        ApiFactory.User.getVipList(pageNumber, vipLevel).subscribe(vipPager -> {
-            mView.getVipListSus(vipPager, pageNumber);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-
-    @Override
-    public void getVipLevel(int pageNum, int
-            pageSize) {
-        ApiFactory.Level.getVipLevelList(pageNum, pageSize).subscribe(vipPager -> {
-            mView.getVipLevelSus(vipPager);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-    @Override
-    public void getVipNumber() {
-        ApiFactory.Sta.querySta().subscribe(sta -> {
-            mView.getVipNumberSus(sta);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-
-    @Override
-    public void addVip(Vip vip) {
-        if (vip.getVipId() == null) {
-            ApiFactory.User.addVip(vip).subscribe(mVip -> {
-                mView.addVipSus(mVip);
-            }, throwable -> {
-                ToastUtils.showShort(throwable.getMessage());
-            });
-        } else {
-            ApiFactory.User.updateVip(vip).subscribe(mVip -> {
-                mView.addVipSus(mVip);
-            }, throwable -> {
-                ToastUtils.showShort(throwable.getMessage());
-            });
-        }
-
-
-    }
-
-    @Override
-    public void ticketQuery(Long vipID) {
-        ApiFactory.Ticket.query(vipID).subscribe(ticketList -> {
-            mView.ticketQuerySus(ticketList);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-    @Override
-    public void saleorderQuery(Long vipID, int pageNumber) {
-        ApiFactory.Saleorder.querySaleorderByVipId(vipID, pageNumber, 5).subscribe(saleorder -> {
-            mView.getSaleorderSus(saleorder);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-    @Override
-    public void rechargeorderQuery(Long vipID, int number) {
-        ApiFactory.Rctrace.queryRecharge(vipID, number, 10).subscribe(rechargeOrderPager -> {
-            mView.getRechargeOrderSus(rechargeOrderPager);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-
-    }
-
-    @Override
-    public void truleQuery(Long vipID) {
-        ApiFactory.TRULE.truleQueryByVipId(vipID).subscribe(trulePager -> {
-            mView.getTruleSus(trulePager);
-        }, throwable -> {
-            ToastUtils.showShort(throwable.getMessage());
-        });
-    }
-
-    @Override
-    public void searchVip(String keyword) {
-        ApiFactory.User.queryUserDetailByWD(keyword).subscribe(
-                vipPager -> {
-                    mView.searchVipSus(vipPager);
-                },
-                throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
-                });
-    }
-
-    @Override
-    public void getMscardList(long vipID) {
-        ApiFactory.MsCard.mscardQuery(vipID).subscribe(
-                mscardPager -> {
-                    mView.getMscardSus(mscardPager);
-                },
-                throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
-                });
-
-    }
-
-
-    @SuppressLint("ResourceType")
-    public RadioButton addRadioButton(Context mContext, Mscard mscard) {
-        RadioButton radioButton = new RadioButton(mContext);
-//        ArrayList<RadioButton> radioButtons = new ArrayList<>();
-        radioButton.setTextSize(18);
-        radioButton.setTag(mscard.getCruleGradeNo());
-        radioButton.setText("充：" + mscard.getCruleChargeAmt() / 100);
-        radioButton.setButtonDrawable(null);
-        radioButton.setGravity(Gravity.CENTER);
-        radioButton.getPaint().setFakeBoldText(true);
-        radioButton.setBackgroundResource(R.drawable.selector_paymoney_radiobutton_bg);
-        radioButton.setTextColor(mContext.getResources().getColorStateList(R.drawable.selector_paymoney_textcolor_bg));
-        return radioButton;
-    }
-
-    public Mscard getMaxRechange(List<Mscard> realm, Long rechangeMoney) {
-        Mscard mMscard = null;
-        ArrayList<String> strings = new ArrayList<>();
-        long rechangeM = 0;
-        for (Mscard mscard : realm) {
-            if (rechangeMoney >= mscard.getCruleChargeAmt()) {
-                rechangeM = mscard.getCruleChargeAmt();
-                mMscard = mscard;
-            }
-        }
-        return mMscard;
-
-    }
-
-    @Override
-    public void initSettle() {
-//        Realm.getInstance(App.instance.mRealmConfig).
-        DBFactory.Vip.queryPays().subscribe(
-                pays -> mView.loadPays(pays),
-                throwable -> {
-                }
-        );
-//        mView.setSettleFragmentBySettleMode(mSettleMode);
-    }
-
-    @Override
-    public void fullVip(Vip vipOld, Long amtPay, Long amtSend) {
-        ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> {
-            VipRechargeOrder mVipRechangeOrdervip = vip.getRctrace();
-            mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime());
-            mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
-            mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
-            try {
-                ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
-            } catch (Exception e) {
-                ToastUtils.showShort("打印异常");
-            }
-            mView.rechangeSus(vip);
-        }, throwable -> {
-            mView.rechangeErr(vipOld, amtPay, amtSend, throwable.getMessage());
-
-        });
-    }
-}

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -162,6 +162,20 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 false));
         viewVipRechargeBinding.setSendAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtSend()
                 , false));
+
+
+//        mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
+//        mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
+        mViewBinding.btnPrint.setOnClickListener(new OnClickListener() {
+            @Override
+            protected void myOnClickListener(View v) {
+                ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, vipRechargeOrder);
+                mViewBinding.btnPrint.setEnabled(false);
+                mViewBinding.btnPrint.setText("已打印");
+
+
+            }
+        });
     }
 
     @Override
@@ -251,11 +265,11 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                     new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货")
                             .setNegativeButton("取消", null).setPositiveButton("确认", new
                             DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialogInterface, int i) {
-                            mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
-                        }
-                    }).create().show();
+                                @Override
+                                public void onClick(DialogInterface dialogInterface, int i) {
+                                    mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
+                                }
+                            }).create().show();
 
 
                 }

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

@@ -2,6 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:color="@color/white" android:state_pressed="true" />
+    <item android:color="@color/white" android:state_enabled="false" />
     <item android:color="@color/red_guanyu" />
 
 </selector>
\ No newline at end of file

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

@@ -6,6 +6,6 @@
         android:width="@dimen/edit_border"
         android:color="@color/gary"/>
 
-    <solid android:color="@color/lyt_main_bg"/>
+    <solid android:color="@color/gray_huanggai"/>
 
 </shape>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout 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"
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/gray_zhouyu"
-        tools:context="com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity">
+       >
 
         <include
             android:id="@+id/ic_title"
@@ -78,7 +77,7 @@
                 android:id="@+id/btn_return"
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
-                android:layout_height="@dimen/button1_height"
+                android:layout_height="37dp"
                 android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"