Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.xingdata.api.print.ZX_PrintPOS;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -209,4 +210,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     }
 
 
+    @Override
+    protected void onDestroy() {
+        ZX_PrintPOS.getInstance(this).Destory();
+        super.onDestroy();
+    }
 }

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

@@ -277,7 +277,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 @Override
                 protected void myOnClickListener(View v) {
                     try {
-                        ZX_PrintPOS.getInstance(StatisticsDetailActivity.this).print(1, mSaleorder);
+                        ZX_PrintPOS.getInstance(MainActivity.mainActivity).print(1, mSaleorder);
                     } catch (Exception e) {
                         ToastUtils.showShort("打印异常");
                     }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
+import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.vip.fragment.VipAddSucceedFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipExpenseListFragment;
 import com.xingdata.zzdpos.ui.vip.fragment.VipInfoEditFragment;
@@ -39,7 +40,7 @@ public class VipPresenter extends VipContract.Presenter {
     public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
     public VipSearchFragment vipSearchFragment = new VipSearchFragment();
     public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
-    public  VipAddSucceedFragment vipAddSucceedFragment =new VipAddSucceedFragment();
+    public VipAddSucceedFragment vipAddSucceedFragment = new VipAddSucceedFragment();
     public ArrayList<Level> levels = new ArrayList<>();
 
     @Override
@@ -78,10 +79,9 @@ public class VipPresenter extends VipContract.Presenter {
     }
 
 
-
     @Override
     public void addVip(Vip vip) {
-        int vipDis= vip.getVipDefDiscount();
+        int vipDis = vip.getVipDefDiscount();
         if (vip.getVipId() == null) {
             ApiFactory.User.addVip(vip).subscribe(mVip -> {
                 mVip.setVipLevelName(vip.getVipLevelName());
@@ -210,7 +210,7 @@ public class VipPresenter extends VipContract.Presenter {
             mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
             mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
             try {
-                ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
+                ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, mVipRechangeOrdervip);
             } catch (Exception e) {
                 ToastUtils.showShort("打印异常");
             }