fix bug

app/src/main/java/com/emato/ich/contant/SystemConfigConstant.java

@@ -13,4 +13,6 @@ public class SystemConfigConstant {
 
     public static final String deliverer_token_expire_seconds = "deliverer_token_expire_seconds";
 
+    public static final String contact_us_tip_info = "contact_us_tip_info";
+
 }

app/src/main/java/com/emato/ich/crash/BootBroadcastReceiver.java

@@ -17,20 +17,16 @@ public class BootBroadcastReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (intent.getAction().equals(ACTION)) {
-            try {
-                // 开机启动的Activity
-                Intent activityIntent = new Intent(context, MainActivity.class);
-                activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                // 启动Activity
-                context.startActivity(activityIntent);
-                //2.如果自启动Activity
-                context.startActivity(activityIntent);
-                Log.i(TAG, "=========================>应用断点重启完成! ");
-                //3.如果自启动服务
+            // 开机启动的Activity
+            Intent activityIntent = new Intent(context, MainActivity.class);
+            activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            // 启动Activity
+            context.startActivity(activityIntent);
+            //2.如果自启动Activity
+            context.startActivity(activityIntent);
+            Log.i(TAG, "=========================>应用断点重启完成! ");
+            //3.如果自启动服务
 //            context.startService(intent);
-            } catch (Exception e) {
-                Log.e(TAG, "=========================>应用断点重启失败! ", e);
-            }
         }
     }
 }

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

@@ -2,6 +2,8 @@ package com.emato.ich.fragment;
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
+
+import com.emato.ich.contant.SystemConfigConstant;
 import com.emato.ich.utils.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -135,13 +137,14 @@ public class ExceptionFragment extends Fragment {
         });
 
         // 联系我们
+        MainActivity finalActivity = activity;
         binding.issueOther.setOnClickListener(view1 -> {
             if (ButtonUtils.isFastClick()) {
                 return;
             }
-            ToastUtils.make(getContext(), "电话: 16274237018! 请说明原由! ");
+            String hint = finalActivity.getConfigMap().get(SystemConfigConstant.contact_us_tip_info);
+            ToastUtils.make(getContext(), StringUtils.isNullOrEmpty(hint) ? "电话: 16274237018! 请说明原由! " : hint);
         });
-        MainActivity finalActivity = activity;
         binding.returnBtn.setOnClickListener(view1 -> {
             if (ButtonUtils.isFastClick()) {
                 return;

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

@@ -351,7 +351,9 @@ public class InputInfoFragment extends Fragment {
                     Editable text = binding.delivererPhoneConfirm.getText();
                     int start = binding.delivererPhoneConfirm.getSelectionStart();
                     if (text.length() > 0) {
-                        text.delete(start-1, start);
+                        if (start > 0) {
+                            text.delete(start-1, start);
+                        }
                         binding.delivererPhoneConfirm.setText(text, TextView.BufferType.EDITABLE);
                         binding.delivererPhoneConfirm.setSelection(start-1<0 ? text.length() : start-1);
                     }
@@ -410,7 +412,9 @@ public class InputInfoFragment extends Fragment {
                     Editable text = binding.mailNo.getText();
                     int start = binding.mailNo.getSelectionStart();
                     if (text.length() > 0) {
-                        text.delete(start-1, start);
+                        if (start > 0) {
+                            text.delete(start-1, start);
+                        }
                         binding.mailNo.setText(text, TextView.BufferType.EDITABLE);
                         binding.mailNo.setSelection(start-1<0 ? text.length() : start-1);
                     }
@@ -429,6 +433,11 @@ public class InputInfoFragment extends Fragment {
             }
             NavUtils.navigate(this, R.id.action_inputInfoFragment_to_chooseCabinetFragment);
         });
+
+        // 默认选中运单号输入框
+        if (StringUtils.isNullOrEmpty(binding.mailNo.getText().toString())) {
+            binding.mailNo.requestFocus();
+        }
     }
 
     public PreparedOrderResponseVo getData() {

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

@@ -191,7 +191,9 @@ public class SendFragment extends Fragment {
                         Editable text = binding.editTextTextPersonName4.getText();
                         int start = binding.editTextTextPersonName4.getSelectionStart();
                         if (text.length() > 0) {
-                            text.delete(start-1, start);
+                            if (start > 0) {
+                                text.delete(start-1, start);
+                            }
                             binding.editTextTextPersonName4.setText(text, TextView.BufferType.EDITABLE);
                             binding.editTextTextPersonName4.setSelection(start-1<0 ? text.length() : start-1);
                         }
@@ -378,7 +380,9 @@ public class SendFragment extends Fragment {
                     Editable text = binding.editTextTextPersonName5.getText();
                     int start = binding.editTextTextPersonName5.getSelectionStart();
                     if (text.length() > 0) {
-                        text.delete(start-1, start);
+                        if (start > 0) {
+                            text.delete(start-1, start);
+                        }
                         binding.editTextTextPersonName5.setText(text, TextView.BufferType.EDITABLE);
                         binding.editTextTextPersonName5.setSelection(start-1<0 ? text.length() : start-1);
                     }

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

@@ -212,7 +212,9 @@ public class TakeCodeFragment extends Fragment {
                     Editable text = binding.editTextTextPersonName6.getText();
                     int start = binding.editTextTextPersonName6.getSelectionStart();
                     if (text.length() > 0) {
-                       text.delete(start-1, start);
+                       if (start > 0) {
+                           text.delete(start-1, start);
+                       }
                        binding.editTextTextPersonName6.setText(text, TextView.BufferType.EDITABLE);
                        binding.editTextTextPersonName6.setSelection(start-1<0 ? text.length() : start-1);
                    }

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

@@ -136,7 +136,10 @@ public class TakeSuccessFragment extends Fragment {
             if (ButtonUtils.isFastClick()) {
                 return;
             }
-
+            binding.openCabinetCountDownHint.setText("已超时，不可开门！");
+            if (null != timer2) {
+                timer2.cancel();
+            }
             binding.reOpenCabinetBtn.setEnabled(false);
 
             // TODO 取件逻辑

app/src/main/java/com/emato/ich/update/PackageManagerCompat.java

@@ -100,7 +100,7 @@ public class PackageManagerCompat implements OnInstallListener {
 
                 if(!userLabel.contains("内部存储") && !storageVolumeElement.isEmulated()){
                     targetpath = path;
-                    targetpath = targetpath +"/app-release.apk";
+                    targetpath = targetpath +"/com.emato.ich.apk";
                     file = new File(targetpath);
                     if (!file.exists()) {
                         ToastUtils.make(mContext, "U盘根目录下不存在升级所需APK！请检查APK存放目录！");

app/src/main/java/com/emato/ich/update/USBUpdateReceiver.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.emato.ich.utils.Log;
+import com.emato.ich.utils.LoggingUtils;
 import com.emato.ich.utils.ToastUtils;
 
 import java.io.File;
@@ -37,7 +38,8 @@ public class USBUpdateReceiver extends BroadcastReceiver {
             File apkFile = PackageManagerCompat.getUpdateAPKFile(context);
 
             // 文件不存在直接退出
-            if (!apkFile.exists()) {
+            if (null == apkFile) {
+                Log.w(TAG, "U盘根目录下不存在升级所需APK！");
                 ToastUtils.make(context, "U盘根目录下不存在升级所需APK！请检查APK存放目录！");
                 return;
             }

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

@@ -24,17 +24,14 @@ public class NavUtils {
      * @param fragment  Fragment
      * @param navId     action_id
      * @param bundle    参数
-     * @param flag      清空session场景
      */
-    public static void navigate(Fragment fragment, int navId, Bundle bundle, boolean flag) {
+    public static void navigate(Fragment fragment, int navId, Bundle bundle) {
         try {
             NavController navController = NavHostFragment.findNavController(fragment);
             NavBackStackEntry currentBackStackEntry = navController.getCurrentBackStackEntry();
             if (currentBackStackEntry != null) {
                 if (currentBackStackEntry.getDestination().getAction(navId) != null) {
                     navController.navigate(navId, bundle);
-                    // 清空session和页面传值, 异常处理有不同处理方式
-                    LocalStorage.getInstance().cleanSession((MainActivity) fragment.getActivity(), flag);
                 }
             }
         } catch (Exception e) {
@@ -42,16 +39,8 @@ public class NavUtils {
         }
     }
 
-    public static void navigate(Fragment fragment, int navId, Bundle bundle) {
-        navigate(fragment, navId, bundle, false);
-    }
-
-    public static void navigate(Fragment fragment, int navId, boolean flag) {
-        navigate(fragment, navId, null, flag);
-    }
-
     public static void navigate(Fragment fragment, int navId) {
-        navigate(fragment, navId, null, false);
+        navigate(fragment, navId, null);
     }
 
 }

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

@@ -39,22 +39,31 @@ public class TimeOutUtils {
             @Override
             public void onTick(long millisUntilFinished) {
                 textView.setText(String.valueOf((millisUntilFinished / 1000)));
+                if (millisUntilFinished <= 1999) {
+                    int fragmentAction = getFragmentAction(fragment);
+                    if (fragmentAction != 0) {
+                        NavUtils.navigate(fragment, fragmentAction);
+                        fragment.onDestroy();
+                    }
+                }
             }
 
             @Override
             public void onFinish() {
                 int fragmentAction = getFragmentAction(fragment);
                 if (fragmentAction != 0) {
-                    // 异常处理的清空session
+                    // 清空session和页面传值, 异常处理有不同处理方式
+                    boolean isException = false;
                     if ( LocalStorage.getInstance().getSession().getException() &&
-                         (fragment instanceof SendInfoConfirmFragment)) {
-                        NavUtils.navigate(fragment, fragmentAction, true);
-                    } else {
-                        NavUtils.navigate(fragment, fragmentAction);
+                            (fragment instanceof SendInfoConfirmFragment || fragment instanceof SendSuccessFragment)) {
+                        isException = true;
                     }
+                    LocalStorage.getInstance().cleanSession(mainActivity, isException);
                     fragment.onDestroy();
                 }
             }
+
+
         };
     }