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

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!676

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt

@@ -72,7 +72,7 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onSubscribe(d: Disposable) {}
                 override fun onNext(info: BindingCarInfo) {
                     if (info != null && info.getData() != null) {
-                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString())
+                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString() + "---getDefaultId() : ${getDefaultId()}")
                         SharedPrefsMgr.getInstance(context).putString(
                             SharedPrefsConstants.CAR_INFO,
                             GsonUtils.toJson(info.getData())
@@ -82,16 +82,16 @@ class BindingCarNetWorkManager private constructor() {
                             "3" -> showModifyBindingCarDialog()
                             "null" -> TipToast.shortTip("当前工控机没有入库")
                         }
-                        updateCarVrIconRes(info.getData().brandId);
+                        updateCarVrIconRes(info.getData().brandId)
                     } else {
                         SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
-                        e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ")
+                        e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ---getDefaultId() : ${getDefaultId()} ")
                     }
                 }
 
                 override fun onError(e: Throwable) {
                     SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
-                    e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message)
+                    e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message + "---getDefaultId() : ${getDefaultId()}")
                 }
 
                 override fun onComplete() {}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -68,6 +68,7 @@ import com.mogo.eagle.core.utilcode.kotlin.currentPadding
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt

@@ -153,14 +153,14 @@ enum class EventTypeEnumNew(
     TYPE_USECASE_ID_ICW(
         2009.toString(),
         "交叉路口碰撞预警",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
+        poiTypeSrcVr = R.drawable.icon_warning_v2x_crossroads_warning,
         content = "交叉路口碰撞预警",
         tts = "注意交叉路口车辆"
     ),
     TYPE_USECASE_ID_LTA(
         2001.toString(),
         "左转辅助",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
+        poiTypeSrcVr = R.drawable.icon_warning_v2x_turn_left,
         content = "左转碰撞预警",
         tts = "注意路口对向来车"
     ),
@@ -196,7 +196,7 @@ enum class EventTypeEnumNew(
     TYPE_USECASE_ID_AVW(
         2006.toString(),
         "异常车辆提醒",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle,
+        poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_car,
         content = "%s车异常",
         tts = "小心%s异常车辆"
     ),
@@ -269,7 +269,7 @@ enum class EventTypeEnumNew(
     TYPE_USECASE_ID_BREAKDOWN_WARNING( //故障车辆
         101.toString(),
         "车辆故障",
-        poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning,
+        poiTypeSrcVr = R.drawable.icon_warning_v2x_car_breakdown,
         content = "前方%s米有故障车辆，影响路段%s米",
         tts = "前方%s米有故障车辆，影响路段%s米"
     ),

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java

@@ -4,6 +4,7 @@ import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE
 import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED;
 import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT;
 import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS;
+import static com.mogo.eagle.core.utilcode.mogo.logger.Logger.d;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP;
 import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300;
 import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS;
@@ -40,6 +41,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager;
 import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.hdcache.IHdCacheListener;