修复订单完成后，不跳进度

app/src/main/java/com/bgy/autosale/ui/consumer/IceCreamFragment.java

@@ -178,7 +178,7 @@ import top.keepempty.sph.library.SphResultCallback;
  * Created by cjx on 2020-08-21
  * 说明：
  */
-public class IceCreamFragment extends BaseAutoExitFragment implements View.OnClickListener, Animation.AnimationListener {
+public class IceCreamFragment extends BaseAutoExitFragment implements View.OnClickListener, Animation.AnimationListener{
 
     // 去除末尾的0
 //    private DecimalFormat decimalFormat = new DecimalFormat("###################.###########");
@@ -823,6 +823,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                     return; // 直接返回，不继续执行
                 } else {
                     if (PreventSpeedClickUtil.isFastClick()) {
+                        showLoading();
                         getDiscountCodeOverseas(arrayCode[shoppingNumber], id);
                     } else {
                     }
@@ -1543,6 +1544,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
         Log.d(TAG, "setPaperDriverListener event: " + messageEvent);
         switch (messageEvent.getName()) {
             case "clearMenu":
+                resetFinishDelay();
                 orderHelper.clearOrder();
                 updateShopCart(-1, -1);
                 showShopCartView(false);
@@ -2629,6 +2631,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                 new HttpResultObserver<String>(mView, getContext()) {
                     public void onNext(String type) {
                         Log.d(TAG, "type onNext: " + type);
+                        dismissLoading();
                         switch (type) {
                             case "0":
                                 if (R.id.btn_discounts_code == id) {
@@ -2636,6 +2639,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
                                 }
                                 //成功
                                 getConfirmCodeOverseas(code, id);
+                                Log.d(TAG, "onNext: 0折优惠码");
                                 break;
                             case "1":
                                 //不存在

app/src/main/java/com/bgy/autosale/ui/consumer/PaySuccessFragment.java

@@ -187,18 +187,17 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
                         exitTime = 120000; // 子订单取走了， 2分钟超时退出
                         break;
                     case BasePlcAgreement.RESULT_CODE_ORDER_COMPLETE: // 3
-//                        updateFinishInfo();
+                        updateFinishInfo();
 //                        exitTime = 5000; // 完成订单， 5秒超时退出
                         new Handler().postDelayed(new Runnable() {
                             @Override
                             public void run() {
-                                resetFinishDelay();
                                 if (getFragmentManager()!=null){
-                                    EventBus.getDefault().post(new ApiMessageEvent("clearMenu", 1));
                                     getFragmentManager().popBackStack();
                                 }
+                                EventBus.getDefault().post(new ApiMessageEvent("clearMenu", 1));
                             }
-                        }, 5000); // 10000 毫秒 = 10 秒
+                        }, 5000);
                         break;
                     default:
                         exitTime = 120000; // 不知道什么指令 2分钟超时退出
@@ -267,16 +266,16 @@ public class PaySuccessFragment extends BaseAutoExitFragment implements Callback
     // 订单完成界面数据
     private void updateFinishInfo() {
         UISoundHelper.getInstance().playOrderFinish();
-        homeView.setVisibility(View.VISIBLE);
-        homeView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                resetFinishDelay();
-                if (getFragmentManager()!=null){
-                    getFragmentManager().popBackStack();
-                }
-            }
-        });
+//        homeView.setVisibility(View.VISIBLE);
+//        homeView.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                resetFinishDelay();
+//                if (getFragmentManager()!=null){
+//                    getFragmentManager().popBackStack();
+//                }
+//            }
+//        });
 
         if (mix) {
             outTipView.setText("订单完成，欢迎下次光临~\nOrder Completed. Hope to see you again!");

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

@@ -444,7 +444,7 @@
             android:id="@+id/rl_select_language"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="visible"
+            android:visibility="gone"
             android:layout_gravity="bottom">
 
             <LinearLayout

config.gradle

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