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

# Conflicts:
#	core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java

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

@@ -1931,12 +1931,12 @@ internal class DebugSettingView @JvmOverloads constructor(
     }
 
     /**
-     * 车辆挂挡档位
+     * 车辆挂档档位
      * @param gear 档位
      */
     override fun onAutopilotGearData(gear: Chassis.GearPosition) {
         ThreadUtils.runOnUiThread {
-            tvGearInfo.text = "挂挡档位：${gear}"
+            tvGearInfo.text = "挂档档位：${gear}"
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/VersionNameView.kt

@@ -60,7 +60,7 @@ class VersionNameView @JvmOverloads constructor(
     @SuppressLint("SetTextI18n")
     private fun showCurrentPadVersion() {
         tvAppVersionName?.let {
-//            it.text = "APP:${AppUtils.getAppVersionName()}"
+            it.text = "APP:${AppUtils.getAppVersionName()}"
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1009,7 +1009,7 @@
                         style="@style/DebugSettingText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="挂挡档位:" />
+                        android:text="挂档档位:" />
 
                     <View
                         android:layout_width="match_parent"