fix: 倒计时bug

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

@@ -163,6 +163,7 @@ public class ChooseCabinetFragment extends Fragment {
             MainActivity activity = (MainActivity) getActivity();
             activity.getBundleMap().put(ChooseCabinetFragment.class.getName(), bundle);
             Bundle exceptionBundle = activity.getBundleMap().get(ExceptionFragment.class.getName());
+            timer.cancel();
             if (null != exceptionBundle) {
                 NavHostFragment.findNavController(ChooseCabinetFragment.this).navigate(R.id.action_chooseCabinetFragment_to_exceptionFragment);
             } else {
@@ -226,6 +227,7 @@ public class ChooseCabinetFragment extends Fragment {
                                                 MainActivity activity = (MainActivity) getActivity();
                                                 activity.getBundleMap().put(InputInfoFragment.class.getName(), bundle);
                                                 activity.getBundleMap().remove(ExceptionFragment.class.getName());
+                                                timer.cancel();
                                                 NavHostFragment.findNavController(ChooseCabinetFragment.this)
                                                         .navigate(R.id.action_chooseCabinetFragment_to_sendInfoConfirmFragment);
                                             } catch (RuntimeException e) {
@@ -247,6 +249,7 @@ public class ChooseCabinetFragment extends Fragment {
                 }
             } else {
                 // 为空走正常投递流程
+                timer.cancel();
                 activity.getBundleMap().put(ChooseCabinetFragment.class.getName(), bundle);
                 NavHostFragment.findNavController(ChooseCabinetFragment.this)
                         .navigate(R.id.action_chooseCabinetFragment_to_inputInfoFragment, bundle);

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

@@ -88,6 +88,7 @@ public class ExceptionFragment extends Fragment {
             Bundle bundle = new Bundle();
             bundle.putString("exception", "change_cabinet");
             activity1.getBundleMap().put(ExceptionFragment.class.getName(), bundle);
+            timer.cancel();
             NavHostFragment.findNavController(ExceptionFragment.this).navigate(R.id.action_exceptionFragment_to_ChooseCabinetFragment);
         });
         // 门没开换柜门
@@ -106,6 +107,7 @@ public class ExceptionFragment extends Fragment {
         MainActivity finalActivity = activity;
         binding.returnBtn.setOnClickListener(view1 -> {
             Bundle bundle = finalActivity.getBundleMap().get(SendInfoConfirmFragment.class.getName());
+            timer.cancel();
             if (null != bundle) {
                 // 跳转确认投递页面
                 finalActivity.getBundleMap().remove(SendInfoConfirmFragment.class.getName());
@@ -198,6 +200,7 @@ public class ExceptionFragment extends Fragment {
                                         case CANCEL_11:
                                             // 未投递 取消投递 并清空Session
                                             LocalStorage.getInstance().cleanSession();
+                                            timer.cancel();
                                             NavHostFragment.findNavController(ExceptionFragment.this)
                                                     .navigate(R.id.actionExceptionFragment_to_mainFragment);
                                             break;

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

@@ -191,7 +191,7 @@ public class InputInfoFragment extends Fragment {
                                         } catch (RuntimeException e) {
                                             Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
                                         }
-
+                                        timer.cancel();
                                         NavHostFragment.findNavController(InputInfoFragment.this).navigate(R.id.action_inputInfoFragment_to_sendInfoConfirmFragment);
                                     } else {
                                         ICSPResponseCodeEnum.responseHint(view, responseData);
@@ -368,8 +368,11 @@ public class InputInfoFragment extends Fragment {
             }
         });
 
-        binding.returnBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(InputInfoFragment.this)
-                .navigate(R.id.action_inputInfoFragment_to_chooseCabinetFragment));
+        binding.returnBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(InputInfoFragment.this)
+                    .navigate(R.id.action_inputInfoFragment_to_chooseCabinetFragment);
+        });
     }
 
     public PreparedOrderResponseVo getData() {

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

@@ -103,6 +103,7 @@ public class SendFragment extends Fragment {
                                         LocalStorage.getInstance().setSession(session);
                                         // 登录成功
                                         Snackbar.make(view1, "登录成功！", Snackbar.LENGTH_LONG).show();
+                                        timer.cancel();
                                         NavHostFragment.findNavController(SendFragment.this).navigate(R.id.action_sendFragment_to_sendMainFragment);
                                     } else {
                                         ICSPResponseCodeEnum.responseHint(view, responseData);
@@ -240,8 +241,11 @@ public class SendFragment extends Fragment {
                 });
             }
         });
-        binding.returnBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(SendFragment.this)
-        .navigate(R.id.action_sendFragment_to_mainFragment));
+        binding.returnBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(SendFragment.this)
+                    .navigate(R.id.action_sendFragment_to_mainFragment);
+        });
     }
 
     @Override

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

@@ -124,6 +124,7 @@ public class SendInfoConfirmFragment extends Fragment {
                             if (code.equals(ICSPResponseCodeEnum.OK.getCode())) {
                                 // TODO 确认投递成功逻辑处理
                                 Snackbar.make(view, "投递成功! ", Snackbar.LENGTH_LONG).show();
+                                timer.cancel();
                                 NavHostFragment.findNavController(SendInfoConfirmFragment.this)
                                         .navigate(R.id.action_sendInfoConfirmFragment_to_sendSuccessFragment);
                             } else {
@@ -145,7 +146,8 @@ public class SendInfoConfirmFragment extends Fragment {
         MainActivity finalActivity = activity;
         binding.exceptionBtn.setOnClickListener(view1 -> {
             Bundle bundle = new Bundle();
-            bundle.getString("exception", "exception_page");
+            timer.cancel();
+            bundle.putString("exception", "exception_page");
             finalActivity.getBundleMap().put(SendInfoConfirmFragment.class.getName(), bundle);
             NavHostFragment.findNavController(SendInfoConfirmFragment.this)
                     .navigate(R.id.action_sendInfoConfirmFragment_to_exceptionFragment);
@@ -154,8 +156,9 @@ public class SendInfoConfirmFragment extends Fragment {
         // 未投递按钮
         binding.noneSend.setOnClickListener(view1 -> {
             Bundle bundle = new Bundle();
-            bundle.getString("exception", "exception_page");
+            bundle.putString("exception", "exception_page");
             finalActivity.getBundleMap().put(SendInfoConfirmFragment.class.getName(), bundle);
+            timer.cancel();
             NavHostFragment.findNavController(SendInfoConfirmFragment.this)
                     .navigate(R.id.action_sendInfoConfirmFragment_to_exceptionFragment);
         });

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

@@ -52,13 +52,22 @@ public class SendMainFragment extends Fragment {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);
         }
         // 输入快件信息
-        binding.sendConfirmBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(SendMainFragment.this)
-                                                            .navigate(R.id.action_sendMainFragment_to_chooseCabinetFragment));
+        binding.sendConfirmBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(SendMainFragment.this)
+                    .navigate(R.id.action_sendMainFragment_to_chooseCabinetFragment);
+        });
         // 异常处理
-        binding.exceptionHandleBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(SendMainFragment.this)
-                                                            .navigate(R.id.action_sendMainFragment_to_exceptionFragment));
-        binding.returnBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(SendMainFragment.this)
-        .navigate(R.id.action_sendMainFragment_to_sendFragment));
+        binding.exceptionHandleBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(SendMainFragment.this)
+                    .navigate(R.id.action_sendMainFragment_to_exceptionFragment);
+        });
+        binding.returnBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(SendMainFragment.this)
+                    .navigate(R.id.action_sendMainFragment_to_sendFragment);
+        });
     }
 
 

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

@@ -49,6 +49,7 @@ public class SendSuccessFragment extends Fragment {
 
         // 继续投递
         binding.continueSendBtn.setOnClickListener(view1 -> {
+            timer.cancel();
             NavHostFragment.findNavController(SendSuccessFragment.this)
                     .navigate(R.id.action_sendSuccessFragment_to_chooseCabinetFragment);
         });
@@ -58,6 +59,7 @@ public class SendSuccessFragment extends Fragment {
             // 清空Session
             LocalStorage.getInstance().cleanSession();
             ((MainActivity) getActivity()).getBundleMap().clear();
+            timer.cancel();
             NavHostFragment.findNavController(SendSuccessFragment.this)
                     .navigate(R.id.action_sendSuccessFragment_to_mainFragment);
         });

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

@@ -201,6 +201,7 @@ public class TakeCodeFragment extends Fragment {
                                     bundle.putString("takeParcelCode", takeParcelCode);
                                     bundle.putString("takeCabinetNo", responseData.getData().getLockerName());
                                     ((MainActivity) getActivity()).getBundleMap().put(TakeCodeFragment.class.getName(), bundle);
+                                    timer.cancel();
                                     NavHostFragment.findNavController(TakeCodeFragment.this).navigate(R.id.action_takeCodeFragment_to_takeSuccessFragment);
                                 }
                             } catch (RuntimeException e) {
@@ -215,8 +216,11 @@ public class TakeCodeFragment extends Fragment {
             }
 
         });
-        binding.returnBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(TakeCodeFragment.this)
-        .navigate(R.id.action_takeCodeFragment_to_takeFragment));
+        binding.returnBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(TakeCodeFragment.this)
+                    .navigate(R.id.action_takeCodeFragment_to_takeFragment);
+        });
         binding.editTextTextPersonName6.requestFocus();
     }
 

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

@@ -89,10 +89,16 @@ public class TakeFragment extends Fragment {
         // TODO 对接微信
 
         // 跳转输入取件码
-        binding.toInputTakeCodeBtn.setOnClickListener( view1 -> NavHostFragment.findNavController(TakeFragment.this)
-                .navigate(R.id.action_takeFragment_to_takeCodeFragment));
-        binding.returnBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(TakeFragment.this)
-                .navigate(R.id.action_takeFragment_to_mainFragment));
+        binding.toInputTakeCodeBtn.setOnClickListener( view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(TakeFragment.this)
+                    .navigate(R.id.action_takeFragment_to_takeCodeFragment);
+        });
+        binding.returnBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(TakeFragment.this)
+                    .navigate(R.id.action_takeFragment_to_mainFragment);
+        });
     }
 
 

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

@@ -66,11 +66,17 @@ public class TakeSuccessFragment extends Fragment {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);
         }
 
-        binding.continueTakeBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(TakeSuccessFragment.this)
-        .navigate(R.id.action_takeSuccessFragment_to_takeCodeFragment));
+        binding.continueTakeBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(TakeSuccessFragment.this)
+                    .navigate(R.id.action_takeSuccessFragment_to_takeCodeFragment);
+        });
 
-        binding.returnMainBtn.setOnClickListener(view1 -> NavHostFragment.findNavController(TakeSuccessFragment.this)
-            .navigate(R.id.action_takeSuccessFragment_to_mainFragment));
+        binding.returnMainBtn.setOnClickListener(view1 -> {
+            timer.cancel();
+            NavHostFragment.findNavController(TakeSuccessFragment.this)
+                    .navigate(R.id.action_takeSuccessFragment_to_mainFragment);
+        });
 
         try {
             MainActivity activity = (MainActivity) getActivity();