Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -98,20 +98,20 @@
 
         </activity>
 
-        <activity
-            android:name="com.mogo.eagle.core.function.main.VideoAdAtc"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:exported="true"
-            android:process=":video_ad"
-            android:resizeableActivity="false"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:theme="@style/Main"
-            android:windowSoftInputMode="adjustPan|stateHidden">
+<!--        <activity-->
+<!--            android:name="com.mogo.eagle.core.function.main.VideoAdAtc"-->
+<!--            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="true"-->
+<!--            android:process=":video_ad"-->
+<!--            android:resizeableActivity="false"-->
+<!--            android:resumeWhilePausing="true"-->
+<!--            android:screenOrientation="landscape"-->
+<!--            android:stateNotNeeded="true"-->
+<!--            android:theme="@style/Main"-->
+<!--            android:windowSoftInputMode="adjustPan|stateHidden">-->
 
-        </activity>
+<!--        </activity>-->
 
         <activity
             android:name="com.mogo.eagle.core.function.main.AppListActivity"

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

@@ -21,6 +21,7 @@ import chassis.Chassis
 import chassis.ChassisStatesOuterClass
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.data.app.AppConfigInfo
@@ -117,6 +118,7 @@ internal class DebugSettingView @JvmOverloads constructor(
     private var logInfoView: LogInfoView? = null
     private var logViewAttach = false
 
+    @Volatile
     private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null
     private var mGnssInfo: MogoLocation? = null
 
@@ -126,15 +128,19 @@ internal class DebugSettingView @JvmOverloads constructor(
     private var accelerationThresholdNum: Double = 0.0
 
     // 感知识别「已知类型」数据个数
+    @Volatile
     private var mIdentifyDataSize = 0
 
     // 感知识别「未知类型」数据个数
+    @Volatile
     private var mUnknownIdentifyDataSize = 0
 
     // 引导线点个数
+    @Volatile
     private var mTrajectoryInfoSize = 0
 
     // 全局路径规划点个数
+    @Volatile
     private var mRouteInfoSize = 0
 
     //日志过滤标签集合
@@ -202,7 +208,6 @@ internal class DebugSettingView @JvmOverloads constructor(
         CallerChassisGearStateListenerManager.addListener(TAG, this)
         CallerChassisSteeringStateListenerManager.addListener(TAG, this)
         CallerChassisThrottleStateListenerManager.addListener(TAG, this)
-
         //添加 开发套件工具接口 监听
         CallerDevaToolsListenerManager.addListener(TAG, this)
         //添加 底盘灯光数据 监听
@@ -253,6 +258,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         CallerChassisLamplightListenerManager.removeListener(TAG)
         // 移除 obu获取信息 监听
         CallerObuInfoListenerManager.removeListener(TAG)
+
         // 移除 业务配置监听
         CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener(
             FuncBizConfig.FOUNDATION,
@@ -365,6 +371,7 @@ internal class DebugSettingView @JvmOverloads constructor(
                 swDevelopMode.visibility = View.GONE
             }
         }
+
         /**
          * 开发者模式
          */
@@ -638,12 +645,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isBeautyMode = isChecked
         }
 
-        tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
-        //v2n车端预警
-        tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
-            FunctionBuildConfig.isV2NFromCar = isChecked
-        }
-
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
@@ -1601,6 +1602,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         tvAutopilotInfo.text = autopilotJson
         tvIpcInfo.text = autopilotJson
         tvIpcInfoKey.text = autopilotJson
+        tvCmdbCarInfoContent.text = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO)
 
         tvCarInfo.text =
             "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" +
@@ -2058,4 +2060,5 @@ internal class DebugSettingView @JvmOverloads constructor(
     override fun onObuDeviceId(obuDeviceId: String) {
         mObuDeviceId = obuDeviceId
     }
+
 }

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

@@ -27,6 +27,7 @@ class SpeedPanelView @JvmOverloads constructor(
 
     var mContext: Context
     var mSpeedChartView: SpeedChartView
+    @Volatile
     var mLatLng: MogoLocation? = null
 
     init {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt

@@ -11,19 +11,19 @@ import com.mogo.eagle.core.widget.TextureVideoView
  */
 class VideoAdAtc : AppCompatActivity() {
 
-    private lateinit var svpFrame: TextureVideoView
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_video_ad_atc)
-
-        svpFrame = findViewById(R.id.svp_frame)
-
-        val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad
-        svpFrame.videoPath = url
-        svpFrame.start()
-
-        BarUtils.hideStatusBarAndSticky(this.window)
-    }
+//    private lateinit var svpFrame: TextureVideoView
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//        setContentView(R.layout.activity_video_ad_atc)
+//
+//        svpFrame = findViewById(R.id.svp_frame)
+//
+//        val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad
+//        svpFrame.videoPath = url
+//        svpFrame.start()
+//
+//        BarUtils.hideStatusBarAndSticky(this.window)
+//    }
 
 }

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

@@ -207,6 +207,29 @@
                 android:layout_height="1dp"
                 android:background="#F0F0F0" />
 
+            <TextView
+                android:id="@+id/tvCmdbCarInfo"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="车辆信息: " />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+            <TextView
+                android:id="@+id/tvCmdbCarInfoContent"
+                style="@style/DebugSettingText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minLines="5" />
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="#F0F0F0" />
+
             <ToggleButton
                 android:id="@+id/tbIsDemoMode"
                 android:layout_width="match_parent"
@@ -243,18 +266,6 @@
                 android:textOn="关闭感知优化模式"
                 android:textSize="@dimen/dp_24" />
 
-            <ToggleButton
-                android:id="@+id/tbV2NFromCar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/dp_10"
-                android:padding="@dimen/dp_20"
-                android:background="@drawable/radio_button_normal_background_right"
-                android:textColor="#000"
-                android:textOff="开启车端V2N预警"
-                android:textOn="关闭车端V2N预警"
-                android:textSize="@dimen/dp_24" />
-
             <ToggleButton
                 android:id="@+id/tbDrawAiCloudFusion"
                 android:layout_width="match_parent"

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

@@ -217,8 +217,8 @@
         android:scaleY="1.2"
         android:scaleX="1.2"
         app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop"
-        app:layout_constraintLeft_toRightOf="@id/verticalGuideLine"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/verticalGuideLine"
+        app:layout_constraintLeft_toLeftOf="parent"
         />
 
     <TextView
@@ -226,7 +226,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
+        app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
         android:text="变道速度阈值："
         android:textSize="@dimen/dp_36"
         android:textColor="#1A1A1A"