Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java

@@ -13,5 +13,8 @@ public class Config {
     public final static String downLoadPath = Environment.getExternalStorageDirectory().getAbsolutePath()
             + "/downloads/";
 
+    public final static String downLoadObuPath = Environment.getExternalStorageDirectory().getAbsolutePath()
+            + "/obu/";
+
     public final static String DOWN_LOAD_TAG = "Package-DownLoad";
 }

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java

@@ -618,6 +618,7 @@ public final class DeviceUtils {
 //                // 联想PAD 获取SN,2022-2023款PAD无法获取暂时不启用
 //                serial = (String) get.invoke(c, "ro.odm.lenovo.gsn");
 //            }
+            Log.d("getSerialNumber()", "serial = " + serial);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -702,7 +703,8 @@ public final class DeviceUtils {
      * @return 当前的设备SN信息，优先使用设备固定的sn，
      */
     public static String getDeviceSN() {
-        String devicesSN = SPUtils.getInstance().getString(KEY_DEVICE_ID);
+//        String devicesSN = SPUtils.getInstance().getString(KEY_DEVICE_ID);
+        String devicesSN = "";
         if (TextUtils.isEmpty(devicesSN)) {
             // 获取设备唯一SN
             devicesSN = getSerialNumber();