Browse Source

优化0折订单数据问题

ccc 3 months ago
parent
commit
6bd578f912

+ 3 - 0
BaseLibrary/src/main/java/com/hboxs/base_library/http/NoPayOrderStringApi.java

@@ -245,4 +245,7 @@ public interface NoPayOrderStringApi {
     @GET("tPromoCode/updateCode")
     Observable<String> updateCode(@QueryMap Map<String, String> params);
 
+    //上传diy花型和糖的显示隐藏状态
+    @GET("api/app_equipment/index/updateDIYFlowerShow")
+    Observable<String> updateDIYFlowerShow(@QueryMap Map<String, String> params);
 }

+ 63 - 4
app/src/main/java/com/bgy/autosale/RemoteSupportService.java

@@ -19,9 +19,11 @@ import android.os.IBinder;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.bgy.autosale.entitys.ProductShowBean;
 import com.bgy.autosale.helpers.CommunicationHelper;
 import com.bgy.autosale.interfaces.SendCallback;
 import com.bgy.autosale.payutil.AddAlarmRecordBean;
+import com.bgy.autosale.payutil.BaseBean;
 import com.bgy.autosale.payutil.HeartbeatBean;
 import com.bgy.autosale.payutil.MQService;
 import com.bgy.autosale.payutil.PaymentMessage;
@@ -29,6 +31,8 @@ import com.bgy.autosale.payutil.gkash.GkashApi;
 import com.bgy.autosale.payutil.gkash.OrderGkashInquiryBean;
 import com.bgy.autosale.ui.MainActivity;
 import com.bgy.autosale.ui.operator.LockActivity;
+import com.bgy.autosale.ui.operator.fragments.PriceFragment;
+import com.bgy.autosale.utils.SPUtils;
 import com.bgy.autosale.utils.ShellUtils;
 import com.example.offpay.event.OfflineMessageEvent;
 import com.example.offpay.ictrs232.SerialPortUtil;
@@ -36,6 +40,7 @@ import com.example.offpay.wmdb.WeaverUtil;
 import com.example.spunsugar.db.UpCoinOrderBeanDao;
 import com.example.spunsugar.system.model.bean.AlarmClockBean;
 import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import com.hboxs.base_library.base.BaseApplication;
 import com.hboxs.base_library.base.IView;
 import com.hboxs.base_library.beans.PaperInvoiceBean;
@@ -205,17 +210,18 @@ public class RemoteSupportService extends Service implements SendCallback {
                 break;
         }
     }
+
     @SuppressLint("checkResult")
     public void QueryGkashpaymentorder(Object sn, int gkashIndex) {
         HashMap<String, String> map = (HashMap<String, String>) sn;
         HashMap<String, String> params = new HashMap<>();
         params.put("version", "1.3.0");
         params.put("CID", Hawk.get(Name.GkashCID, Global.GkashCID));
-        params.put("cartid",map.get("cartid"));
+        params.put("cartid", map.get("cartid"));
         params.put("currency", "MYR");
         params.put("amount", map.get("price"));
         params.put("signature", map.get("signature"));
-        Log.d(TAG, "QueryGkashpaymentorder: "+params);
+        Log.d(TAG, "QueryGkashpaymentorder: " + params);
         GkashApi.api.orderInquiry(params).subscribeOn(Schedulers.io())
                 .repeatWhen(new Function<Observable<Object>, ObservableSource<?>>() {
                     @Override
@@ -242,7 +248,7 @@ public class RemoteSupportService extends Service implements SendCallback {
                     public void accept(String payIsSuccessBean) throws Exception {
                         Gson gson = new Gson();
                         OrderGkashInquiryBean americaNihaoPayMerchantBean = gson.fromJson(payIsSuccessBean, OrderGkashInquiryBean.class);
-                        Log.d(TAG, "americaNihaoPayMerchantBean10: "+americaNihaoPayMerchantBean);
+                        Log.d(TAG, "americaNihaoPayMerchantBean10: " + americaNihaoPayMerchantBean);
                         if (!"88 - Transferred".equals(americaNihaoPayMerchantBean.getStatus())) {
                             Log.d(TAG, "payIsSucaccept2: payIsSuccessBean");
                             return;
@@ -702,12 +708,65 @@ public class RemoteSupportService extends Service implements SendCallback {
                 Log.d(TAG, "event: is_freshness");
                 CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_KEEP_FRESH, this);
                 break;
+            case "updateDIYProductShow":
+                updateProductsShow((String) messageEvent.getData());
+                break;
             default:
                 break;
-
         }
     }
 
+    private void updateProductsShow(String data) {
+        Gson gson = new Gson();
+        ArrayList<ProductShowBean> list = gson.fromJson(data, new TypeToken<List<ProductShowBean>>() {
+        }.getType());
+        HashMap<String, String> params1 = new HashMap<>();
+        params1.put("clientId", Heartbeat.deviceId);
+        params1.put("updateProductsShow", data);
+        Log.d(TAG, "updateProductsShow12: "+data);
+        addSubscriptionNew(NoPayOrderStringApi.api.updateDIYFlowerShow(params1), String.class,
+                new HttpResultObserver<String>(view, getApplicationContext()) {
+                    @Override
+                    public void onNext(String result) {
+                        for (int i = 0; i < list.size(); i++) {
+                            ProductShowBean productShowBean = list.get(i);
+                            Log.d(TAG, "updateProductsShow1: " + productShowBean.getNo());
+                            Log.d(TAG, "updateProductsShow1: " + productShowBean.getShowType());
+                            String no = productShowBean.getNo();
+                            boolean b = true;
+                            if (productShowBean.getShowType().equals("0")) {
+                                b = true;
+                            } else if (productShowBean.getShowType().equals("1")) {
+                                b = false;
+                            }
+                            String s = getString(no);
+                            SPUtils.getInstance(App.app).putBoolean(s, b);
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                        super.onError(t);
+                        Log.d(TAG, "getProductPrice onError: " + t.getMessage());
+                        BaseException exception = ExceptionFactory.create(t);
+                    }
+                });
+    }
+    private static String getString(String no) {
+        String s = "";
+        if (no.equals("J01")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
+        } else if (no.equals("J02")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
+        } else if (no.equals("J03")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_3;
+        } else if (no.equals("C01")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
+        } else if (no.equals("C02")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
+        }
+        return s;
+    }
     private void sleep(String baseBean) {
         if (baseBean.equals("1")) {
             //睡眠

+ 51 - 33
app/src/main/java/com/bgy/autosale/payutil/MQService.java

@@ -103,7 +103,7 @@ import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
 
 @Route(path = "/module_app/mqservice")
-public class MQService extends Service implements SendCallback,Callback<Result> {
+public class MQService extends Service implements SendCallback, Callback<Result> {
 
     private static final String TAG = "MQService";
     ConnectionFactory factory;
@@ -150,7 +150,8 @@ public class MQService extends Service implements SendCallback,Callback<Result>
         switch (kind) {
             //显示花型
             case "updateProductsShow":
-                updateProductsShow(gson, baseBean, kind);
+//                updateProductsShow(gson, baseBean, kind);
+                EventBus.getDefault().post(new ApiMessageEvent("updateDIYProductShow", baseBean.getKind_data()));
                 break;
             case "products":
                 //保存价格到本地
@@ -370,7 +371,7 @@ public class MQService extends Service implements SendCallback,Callback<Result>
                         public void run() {
                             CommunicationHelper.getInstance().sendControl(IceCreamDeviceConstants.ORDER_THAW, MQService.this);
                         }
-                    },500);
+                    }, 500);
                 }
                 break;
             case "smokeJam":
@@ -378,17 +379,17 @@ public class MQService extends Service implements SendCallback,Callback<Result>
                 String name = smokeJam[0];
                 int param1 = Integer.parseInt(smokeJam[1]);
                 int id = 0;
-                if (name.equals("J01")){
-                    id=IceCreamDeviceConstants.ORDER_SAUCE_1;
+                if (name.equals("J01")) {
+                    id = IceCreamDeviceConstants.ORDER_SAUCE_1;
                 } else if (name.equals("J02")) {
-                    id=IceCreamDeviceConstants.ORDER_SAUCE_2;
+                    id = IceCreamDeviceConstants.ORDER_SAUCE_2;
                 } else if (name.equals("J03")) {
-                    id=IceCreamDeviceConstants.ORDER_SAUCE_3;
+                    id = IceCreamDeviceConstants.ORDER_SAUCE_3;
                 }
-                if (param1==0){
-                    param1=3;
+                if (param1 == 0) {
+                    param1 = 3;
                 }
-                Log.d(TAG, "smokeJam: "+id+":"+param1);
+                Log.d(TAG, "smokeJam: " + id + ":" + param1);
                 CommunicationHelper.getInstance().sendControl(id, param1, 0, 0, this);
                 break;
             default:
@@ -404,30 +405,47 @@ public class MQService extends Service implements SendCallback,Callback<Result>
             ProductShowBean productShowBean = list.get(i);
             Log.d(TAG, "updateProductsShow1: " + productShowBean.getNo());
             Log.d(TAG, "updateProductsShow1: " + productShowBean.getShowType());
-            String no=productShowBean.getNo();
-            boolean b=true;
-            if (productShowBean.getShowType().equals("0")){
-                b=true;
-            }else if (productShowBean.getShowType().equals("1")){
-                b=false;
+            String no = productShowBean.getNo();
+            boolean b = true;
+            if (productShowBean.getShowType().equals("0")) {
+                b = true;
+            } else if (productShowBean.getShowType().equals("1")) {
+                b = false;
             }
             String s = getString(no);
-            SPUtils.getInstance(App.app).putBoolean(s,b);
+            SPUtils.getInstance(App.app).putBoolean(s, b);
         }
+        HashMap<String, String> params1 = new HashMap<>();
+        params1.put("clientId", Heartbeat.deviceId);
+        params1.put("DIYFlowerStatus", kind_data);
+        addSubscriptionNew(NoPayOrderStringApi.api.updateDIYFlowerShow(params1), String.class,
+                new HttpResultObserver<String>(view, getApplicationContext()) {
+                    @Override
+                    public void onNext(String result) {
+
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                        super.onError(t);
+                        Log.d(TAG, "getProductPrice onError: " + t.getMessage());
+                        BaseException exception = ExceptionFactory.create(t);
+                    }
+                });
     }
 
     private static String getString(String no) {
-        String s="";
-        if (no.equals("J01")){
-            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
+        String s = "";
+        if (no.equals("J01")) {
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_1;
         } else if (no.equals("J02")) {
-            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
         } else if (no.equals("J03")) {
-            s=PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_SAUCE_2;
         } else if (no.equals("C01")) {
-            s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_1;
         } else if (no.equals("C02")) {
-            s=PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
+            s = PriceFragment.SHARED_PREFERENCE_SWITCH_KERNEL_2;
         }
         return s;
     }
@@ -953,15 +971,15 @@ public class MQService extends Service implements SendCallback,Callback<Result>
         AndroidSchedulers.mainThread().scheduleDirect(new Runnable() {
             @Override
             public void run() {
-                Log.d(TAG, "AndroidSchedulers run1: "+result);
-                Log.d(TAG, "AndroidSchedulers run2: "+result.code);
-                Log.d(TAG, "AndroidSchedulers run3: "+result.message);
-                Log.d(TAG, "AndroidSchedulers run4: "+result.data);
+                Log.d(TAG, "AndroidSchedulers run1: " + result);
+                Log.d(TAG, "AndroidSchedulers run2: " + result.code);
+                Log.d(TAG, "AndroidSchedulers run3: " + result.message);
+                Log.d(TAG, "AndroidSchedulers run4: " + result.data);
                 switch (result.code) {
                 }
             }
-    });
-}
+        });
+    }
 
     //接收网络状态改变的广播
     public class NetWorkBroadCastReciver extends BroadcastReceiver {
@@ -1320,15 +1338,15 @@ public class MQService extends Service implements SendCallback,Callback<Result>
 //        if ("1".equals(s) || "2".equals(s) || "3".equals(s) || "4".equals(s) ||
 //                "5".equals(s) || "6".equals(s) || "7".equals(s) || "8".equals(s)||
 //                "9".equals(s)|| "10".equals(s)|| "11".equals(s)|| "12".equals(s)|| "14".equals(s)) {
-        if ("1".equals(s) ||"SUNZ".equals(s) || "7770".equals(s) || "8647".equals(s) || "7264".equals(s) || "1932".equals(s) ||
+        if ("1".equals(s) || "SUNZ".equals(s) || "7770".equals(s) || "8647".equals(s) || "7264".equals(s) || "1932".equals(s) ||
                 "2381".equals(s) || "0291".equals(s) || "1313".equals(s) || "3103".equals(s) ||
                 "4873".equals(s) || "5291".equals(s) || "9284".equals(s) || "2222".equals(s)
                 || "3212".equals(s) || "3535".equals(s) || "1921".equals(s) || "3624".equals(s)
                 || "2019".equals(s) || "7391".equals(s) || "0924".equals(s) || "9427".equals(s) || "0735".equals(s)
                 || "5769".equals(s) || "6894".equals(s) || "8123".equals(s) || "5217".equals(s) || "6431".equals(s)
                 || "7777".equals(s) || "8080".equals(s) || "6702".equals(s) || "7772".equals(s) || "7761".equals(s)
-                || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s)|| "7754".equals(s)
-                ||"0000".equals(s)|| "7764".equals(s)|| "5784".equals(s)|| "7749".equals(s)|| "7756".equals(s)) {
+                || "7773".equals(s) || "7774".equals(s) || "7786".equals(s) || "7775".equals(s) || "7754".equals(s)
+                || "0000".equals(s) || "7764".equals(s) || "5784".equals(s) || "7749".equals(s) || "7756".equals(s)) {
             Hawk.put("logo", s);
             Hawk.get("logo", "7777");
         }

+ 3 - 0
app/src/main/java/com/bgy/autosale/payutil/MdbCreditCardDialog.java

@@ -82,6 +82,9 @@ public class MdbCreditCardDialog extends FrameLayout implements View.OnClickList
         if (parent == null) {
             return;
         }
+        if (this.getParent() != null) {
+            ((ViewGroup) this.getParent()).removeView(this);
+        }
         parent.addView(this, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.scale_in);
         view.startAnimation(animation);

+ 3 - 0
app/src/main/java/com/bgy/autosale/payutil/dialog/ShoppingTrolleyDialogChoosePay.java

@@ -128,6 +128,9 @@ public class ShoppingTrolleyDialogChoosePay extends FrameLayout implements View.
         if (parent == null) {
             return;
         }
+        if (this.getParent() != null) {
+            ((ViewGroup) this.getParent()).removeView(this);
+        }
         parent.addView(this, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.scale_in);
         view.startAnimation(animation);

+ 11 - 5
app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -350,7 +350,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         sauceDownViews = new ArrayList<>(2);
         tvMoney = findViewById(R.id.tv_money);
         Log.d(TAG, "onViewCreated: 4");
-        tvMoney.setText(haveMoney/* + (Global.hasmoney.doubleValue() + Global.hasmoney.doubleValue())*/);
+        tvMoney.setText(haveMoney + Global.hasmoney.setScale(2, RoundingMode.HALF_UP));
         tvDeviceId1 = findViewById(R.id.tv_device_id1);
         if (Heartbeat.deviceId != null && Heartbeat.deviceId.length() > 6) {
             tvDeviceId1.setText(Heartbeat.deviceId.substring(Heartbeat.deviceId.length() - 6));
@@ -1674,11 +1674,14 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             case Name.MDBRS232://mdb威佛上电了
                 break;
             case Name.CURRENCYCHANGES://入钞了
-                tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue()) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+//                tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue()) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+                tvMoney.setText(haveMoney + Global.hasmoney.add(Global.hascoin).setScale(2,RoundingMode.HALF_UP) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+
                 Log.d(TAG, "event: " + Global.hascoin.doubleValue());
                 if (payMixDialog != null && payMixDialog.isShowing()) {
                     if (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() >= pri) {
-                        tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+//                        tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+                        tvMoney.setText(haveMoney + (Global.hasmoney.add(Global.hascoin).subtract(new BigDecimal(pri+"").setScale(2, RoundingMode.HALF_UP))) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
                         remainMoney = Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri;
                         payPaperSuccess(); // 收钞完成
                         EventBus.getDefault().post(new ApiMessageEvent("cashsale",
@@ -1780,7 +1783,8 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         payMixDialog.show();
         dismissLoading();
         if (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() >= pri) {
-            tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+//            tvMoney.setText(haveMoney + (Global.hasmoney.doubleValue() + Global.hascoin.doubleValue() - pri) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
+            tvMoney.setText(haveMoney + (Global.hasmoney.add(Global.hascoin).subtract(new BigDecimal(pri+"").setScale(2, RoundingMode.HALF_UP))) + Hawk.get(Name.UNIT_OF_CURRENCY_TIME, ""));
             payPaperSuccess(); // 收钞完成
             EventBus.getDefault().post(new ApiMessageEvent("cashsale", ByteUtils.decimal2fitHex((long) (coin * 100), 4) + ";" + ByteUtils.decimal2fitHex((long) 1, 4)));
         } else {
@@ -1798,6 +1802,8 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         DialogUtil.dismiss1(payMixDialog);
 //        DialogUtil.dismiss1(payPaperDialog);
 //        DialogUtil.dismiss1(autoDismissDialog);
+        Global.hasmoney = Global.hasmoney.subtract(new BigDecimal(pri + "")).add(Global.hascoin).setScale(2, RoundingMode.HALF_UP);
+        Global.hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
         //显示投币成功弹窗
         showDialogPaySuccess(R.string.coin_success, R.drawable.img_toubi_pay);  //如果使用NAYAX_CASHCALE功能,那么就发送上去
     }
@@ -1983,7 +1989,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 for (Double price : getPriceList) {
                     sum += price; // 单个商品价格的总和
                 }
-                Log.d(TAG, "manualMake: sum" + sum + ":" + orderHelper.getOrderList().get(i).buyCount);
+                Log.d(TAG, "manualMake: sum" + sum + ":" + orderHelper.getOrderList().get(i).buyCount);if (sum<0) sum=0;
                 saveCoinOrder(shoppingCart.getShoppingName(), sum, payType, localOrderSn, orderHelper.getOrderList().get(i).buyCount);
             }
         }

+ 25 - 4
app/src/main/java/com/bgy/autosale/ui/consumer/PaySuccessFragment.java

@@ -2,6 +2,7 @@ package com.bgy.autosale.ui.consumer;
 
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
@@ -136,6 +137,15 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
 
         makingTitleView.setSelected(true);
 
+//        homeView.setVisibility(View.VISIBLE);
+//        homeView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                removeFinish();
+//                getFragmentManager().popBackStack();
+//            }
+//        });
+
     }
 
     @Override
@@ -174,8 +184,17 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
                         exitTime = 120000; // 子订单取走了, 2分钟超时退出
                         break;
                     case BasePlcAgreement.RESULT_CODE_ORDER_COMPLETE: // 3
-                        updateFinishInfo();
-                        exitTime = 5000; // 完成订单, 5秒超时退出
+//                        updateFinishInfo();
+//                        exitTime = 5000; // 完成订单, 5秒超时退出
+                        new Handler().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                resetFinishDelay();
+                                if (getFragmentManager()!=null){
+                                    getFragmentManager().popBackStack();
+                                }
+                            }
+                        }, 5000); // 10000 毫秒 = 10 秒
                         break;
                     default:
                         exitTime = 120000; // 不知道什么指令 2分钟超时退出
@@ -248,8 +267,10 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
         homeView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                removeFinish();
-                finish("main");
+                resetFinishDelay();
+                if (getFragmentManager()!=null){
+                    getFragmentManager().popBackStack();
+                }
             }
         });
 

+ 3 - 0
app/src/main/java/com/bgy/autosale/ui/widget/InfoView.java

@@ -110,6 +110,9 @@ public class InfoView extends FrameLayout implements View.OnClickListener {
         if (parent == null) {
             return;
         }
+        if (this.getParent() != null) {
+            ((ViewGroup) this.getParent()).removeView(this);
+        }
         parent.addView(this, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
         Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.scale_in);
         view.startAnimation(animation);

+ 1 - 1
config.gradle

@@ -5,7 +5,7 @@ ext {
             "minSdkVersion"                : 21,
             "targetSdkVersion"             : 28,
             "versionCode"                  : 110,
-            "versionName"                  : "1.0.72",//版本号修改
+            "versionName"                  : "1.0.75",//版本号修改
 
             "androidSupport"               : "28.0.0",
             "constraint-layout"            : "1.1.3",