fix bug

app/src/main/java/com/emato/ich/MainActivity.java

@@ -24,12 +24,14 @@ import com.emato.ich.utils.JacksonUtils;
 import com.emato.ich.utils.LoggingUtils;
 import com.emato.ich.utils.ResourceUtils;
 import com.emato.ich.utils.StringUtils;
+import com.emato.ich.utils.ToastUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.os.Looper;
 import android.provider.SyncStateContract;
 import com.emato.ich.utils.Log;
 import android.view.KeyEvent;
@@ -107,7 +109,7 @@ public class MainActivity extends AppCompatActivity  {
         MessageHandler.openLocker(ichSubscribeClient, ichPublishClient);
 
         // 注册柜子信息
-        cabinetInfoReport(ichPublishClient);
+        //cabinetInfoReport(ichPublishClient);
 
         // TODO 更新版本监听
         MessageHandler.autoUpdateVersion(getApplication(), ichSubscribeClient);
@@ -120,6 +122,9 @@ public class MainActivity extends AppCompatActivity  {
         ICSPClient.getSystemConfig("", BaseUtils.getClientId(), new Callback() {
             @Override
             public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                Looper.prepare();
+                ToastUtils.make(getApplicationContext(), "获取系统配置错误! 网络错误! ");
+                Looper.loop();
                 Log.e(TAG, "onFailure: 获取系统配置错误! 网络错误! ", e);
                 LoggingUtils.sendErrorLog("业务异常: 获取系统配置错误! 网络错误!  ", e);
             }

app/src/main/java/com/emato/ich/fragment/ExceptionFragment.java

@@ -313,6 +313,7 @@ public class ExceptionFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 
 

app/src/main/java/com/emato/ich/fragment/InputInfoFragment.java

@@ -437,5 +437,6 @@ public class InputInfoFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/MainFragment.java

@@ -100,6 +100,7 @@ public class MainFragment extends Fragment {
     public void onDestroyView() {
         super.onDestroyView();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 
 }

app/src/main/java/com/emato/ich/fragment/SendFragment.java

@@ -426,6 +426,7 @@ public class SendFragment extends Fragment {
         }
         super.onDestroyView();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 
 }

app/src/main/java/com/emato/ich/fragment/SendInfoConfirmFragment.java

@@ -191,8 +191,8 @@ public class SendInfoConfirmFragment extends Fragment {
 //            finalActivity.getBundleMap().put(SendInfoConfirmFragment.class.getName(), bundle);
             AlertDialog alertDialog = new AlertDialog.Builder(finalActivity)
                     .setTitle("e站通")
-                    .setMessage("确定要取消本次投递吗？")
-                    .setPositiveButton("是", (dialog, which) -> {
+                    .setMessage("点击未投递会取消本次投递！并且取消投递后的订单状态为预下单！确认取消吗？")
+                    .setPositiveButton("确认", (dialog, which) -> {
                         // 是, 取消本次投递
                         ConfirmOrderVo confirmOrderVo = new ConfirmOrderVo();
                         confirmOrderVo.setOrderSn(finalOrderSn);
@@ -219,7 +219,7 @@ public class SendInfoConfirmFragment extends Fragment {
                                 });
                             }
                         });
-                    }).setNegativeButton("否", (dialog, which) -> {
+                    }).setNegativeButton("取消", (dialog, which) -> {
                         // 否
                         dialog.dismiss();
                     }).create();
@@ -232,13 +232,17 @@ public class SendInfoConfirmFragment extends Fragment {
             }
             AlertDialog alertDialog = new AlertDialog.Builder(finalActivity)
                     .setTitle("e站通")
-                    .setMessage("返回主页会取消本次投递！确认取消吗？")
-                    .setPositiveButton("是", ((dialog, which) -> {
+                    .setMessage("返回主页会取消本次投递！并且本次投递的订单状态为预下单！确认取消吗？")
+                    .setPositiveButton("确认", ((dialog, which) -> {
                         timer.cancel();
-                        LocalStorage.getInstance().cleanSession(((MainActivity) getActivity()));
+                        boolean isException = false;
+                        if (LocalStorage.getInstance().getSession().getException()) {
+                            isException = true;
+                        }
+                        LocalStorage.getInstance().cleanSession(((MainActivity) getActivity()), isException);
                         NavHostFragment.findNavController(SendInfoConfirmFragment.this)
                                 .navigate(R.id.action_sendInfoConfirmFragment_to_mainFragment);
-                    })).setNegativeButton("否", ((dialog, which) -> {
+                    })).setNegativeButton("取消", ((dialog, which) -> {
                         dialog.dismiss();
                     })).create();
             alertDialog.show();
@@ -254,5 +258,6 @@ public class SendInfoConfirmFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/SendMainFragment.java

@@ -96,5 +96,6 @@ public class SendMainFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/SendSuccessFragment.java

@@ -72,7 +72,7 @@ public class SendSuccessFragment extends Fragment {
             }
             // 清空Session
             MainActivity activity = (MainActivity) getActivity();
-            LocalStorage.getInstance().cleanSession(activity);
+            LocalStorage.getInstance().cleanSession(activity, false);
             timer.cancel();
             NavHostFragment.findNavController(SendSuccessFragment.this)
                     .navigate(R.id.action_sendSuccessFragment_to_mainFragment);
@@ -84,7 +84,7 @@ public class SendSuccessFragment extends Fragment {
             }
             timer.cancel();
             MainActivity activity = (MainActivity) getActivity();
-            LocalStorage.getInstance().cleanSession(activity);
+            LocalStorage.getInstance().cleanSession(activity, false);
             NavHostFragment.findNavController(SendSuccessFragment.this)
                     .navigate(R.id.action_sendSuccessFragment_to_mainFragment);
         });
@@ -99,5 +99,6 @@ public class SendSuccessFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/TakeCodeFragment.java

@@ -307,5 +307,6 @@ public class TakeCodeFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/TakeFragment.java

@@ -121,5 +121,6 @@ public class TakeFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/fragment/TakeSuccessFragment.java

@@ -91,7 +91,7 @@ public class TakeSuccessFragment extends Fragment {
             timer.cancel();
             timer2.cancel();
             MainActivity activity = (MainActivity) getActivity();
-            LocalStorage.getInstance().cleanSession(activity);
+            LocalStorage.getInstance().cleanSession(activity, false);
             NavHostFragment.findNavController(TakeSuccessFragment.this)
                     .navigate(R.id.action_takeSuccessFragment_to_mainFragment);
         });
@@ -210,5 +210,6 @@ public class TakeSuccessFragment extends Fragment {
         }
         super.onDestroy();
         binding = null;
+        Log.i(TAG, TAG + "被销毁。。。");
     }
 }

app/src/main/java/com/emato/ich/local/LocalStorage.java

@@ -3,6 +3,7 @@ package com.emato.ich.local;
 import android.os.Bundle;
 
 import com.emato.ich.MainActivity;
+import com.emato.ich.fragment.InputInfoFragment;
 import com.emato.ich.utils.StringUtils;
 
 import java.util.Map;
@@ -39,13 +40,20 @@ public class LocalStorage {
         return SESSION;
     }
 
-    public void cleanSession(MainActivity activity){
+    public void cleanSession(MainActivity activity, boolean isException){
         SESSION.phone = "";
         SESSION.token = "";
         SESSION.exception = true;
         Map<String, Bundle> bundleMap = activity.getBundleMap();
+        Bundle inputInfo = null;
+        if (isException) {
+            inputInfo = bundleMap.get(InputInfoFragment.class.getName());
+        }
         if (activity != null && bundleMap != null && bundleMap.size() > 0) {
             bundleMap.clear();
+            if (null != inputInfo) {
+                bundleMap.put(InputInfoFragment.class.getName(), inputInfo);
+            }
         }
     }
 

app/src/main/java/com/emato/ich/utils/TimeOutUtils.java

@@ -46,8 +46,13 @@ public class TimeOutUtils {
                 int fragmentAction = getFragmentAction(fragment);
                 if (fragmentAction != 0) {
                     NavHostFragment.findNavController(fragment).navigate(fragmentAction);
-                    // 清空session和页面传值
-                    LocalStorage.getInstance().cleanSession(mainActivity);
+                    // 清空session和页面传值, 异常处理有不同处理方式
+                    boolean isException = false;
+                    if ( LocalStorage.getInstance().getSession().getException() &&
+                         (fragment instanceof SendInfoConfirmFragment || fragment instanceof SendSuccessFragment)) {
+                        isException = true;
+                    }
+                    LocalStorage.getInstance().cleanSession(mainActivity, isException);
                     fragment.onDestroy();
                 }
             }