优化了一下自动返回广告页面的逻辑

BaseLibrary/src/main/java/com/hboxs/base_library/constant/Global.java

@@ -20,7 +20,7 @@ public abstract class Global {
      * 1：
      * 2：国外线上
      */
-    public static final int isVersions = 1;
+    public static final int isVersions = 2;
 
     /**
      * 用来初始化这个Global的类，不然会很卡。

app/src/main/java/com/bgy/autosale/ui/MainActivity.java

@@ -271,10 +271,24 @@ public class MainActivity extends BaseScanGunActivity  implements SendCallback,
         isVisible = false;
     }
 
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void event(ApiMessageEvent messageEvent) {
         // 进行刷新操作
         switch (messageEvent.getName()) {
+            case "timeOut":
+                if (mainFragment.isAdded() && mainFragment.getActivity() != null) {
+                    // 直接替换 Fragment
+                    FragmentManager fragmentManager = mainFragment.getActivity().getSupportFragmentManager();
+                    fragmentManager.beginTransaction()
+                            .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+                            .commit();
+                }else {
+                    getSupportFragmentManager().beginTransaction()
+                            .replace(R.id.main_fragment, new MainFragment())
+                            .commit();
+                }
+                break;
             case "makeicecream":
                 LinkedList<MakeIceCreamBean> iceCreamOrders = new LinkedList<>();
                 MakeIceCreamBean detail = new MakeIceCreamBean();

app/src/main/java/com/bgy/autosale/ui/base/BaseAutoExitFragment.java

@@ -14,8 +14,11 @@ import com.bgy.autosale.R;
 import com.bgy.autosale.ui.consumer.MainFragment;
 import com.bgy.autosale.utils.PlcLog;
 import com.hboxs.base_library.constant.Global;
+import com.hboxs.base_library.event.ApiMessageEvent;
 import com.hboxs.base_library.util.LogUtils;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
@@ -91,10 +94,11 @@ public abstract class BaseAutoExitFragment extends BaseFragment {
     protected void onTimeOutFinish() {
         LogUtils.logWrite("超时返回广告页面");
 //        finish("main");
-        FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
-        fragmentManager.beginTransaction()
-                .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
-                .commit();
+//        FragmentManager fragmentManager = getActivity().getSupportFragmentManager();
+//        fragmentManager.beginTransaction()
+//                .replace(R.id.main_fragment, new MainFragment()) // 替换为一个新的 Fragment
+//                .commit();
+        EventBus.getDefault().post(new ApiMessageEvent("timeOut",1));
         PlcLog.getInstance().e_s("BaseFragment", "是我发生了超时退出回到了主界面 ---" + this);
         Global.hasmoney = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);
         Global.hascoin = new BigDecimal("0").setScale(2, RoundingMode.HALF_UP);

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

@@ -492,7 +492,7 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        LogUtils.logWrite("进入了选购页面");
+        LogUtils.logWrite("进入了选购页面。"+"当前的支付方式为："+App.app.payChannel);
         Heartbeat.deviceId = FileUtil.getDeviceId().trim();
         EventBus.getDefault().register(this);
         Log.d(TAG, "MDB_COIN: 0");
@@ -573,9 +573,6 @@ public class IceCreamFragment extends BaseAutoExitFragment implements View.OnCli
             serialPortHelper.setSphResultCallback(new SphResultCallback() {
                 @Override
                 public void onSendData(SphCmdEntity sendCom) {
-                    if (sendCom.commandsHex!=null){
-                        LogUtils.logWrite("MDB_COIN1:"+sendCom.commandsHex);
-                    }
                 }
 
                 @Override

config.gradle

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