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

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!523

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -587,6 +587,8 @@ class MogoPrivateObuNewManager private constructor() {
                     EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
                 ttsContent =
                     EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType)
+
+//                ObuManager.getInstance().obuRvToTrackedObject(info) //todo emArrow
             }
 
             //交叉路口碰撞预警
@@ -734,7 +736,6 @@ class MogoPrivateObuNewManager private constructor() {
                         }, direction
                     )
                 }
-//                ObuManager.getInstance().obuRvToTrackedObject(info)
                 //更新周边车辆进行预警颜色变换，车辆实时移动和变色 ，UUID不需要匹配了
                 TrafficDataConvertUtilsNew.cvxV2vThreatIndInfo2TrafficData(info)?.let {
                     CallerMapUIServiceManager.getMarkerService()

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

@@ -101,7 +101,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     }
 
     fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
-        BindingCarNetWorkManager.instance.modifyBindingcar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType)
+        BindingCarNetWorkManager.instance.modifyBindingCar(mContext!!, mAddress, mWidevineIDWithMd5, callBack, screenType)
     }
 
     private fun driverScreen(macAddress: String, widevineIDWithMd5: String) {

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

@@ -74,12 +74,10 @@ 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())
-                        //根据车辆类型切换不同的车辆模型,只针对红旗做处理,当mac地址不一致，切换模型
+                        d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString())
                         if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress) && DebugConfig.isCarModelChange()) {
-                            updateCarVrIconRes(info.getData().brandId)
+                            updateCarVrIconRes(info.getData().brandId);
                         }
-
                         when (info.getData().compare) {
                             "0" -> showBindingCarDialog()
                             "3" -> showModifyBindingCarDialog()
@@ -93,7 +91,7 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onError(e: Throwable) {
                     e(
                         SceneConstant.M_BINDING + TAG,
-                        "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
+                        "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message
                     )
                 }
 
@@ -105,7 +103,7 @@ class BindingCarNetWorkManager private constructor() {
      * 绑定和修改绑定车辆
      * mac: 48:b0:2d:3a:9c:19
      */
-    fun modifyBindingcar(
+    fun modifyBindingCar(
         context: Context,
         macAddress: String?,
         widevineIDWithMd5: String?,
@@ -133,12 +131,11 @@ class BindingCarNetWorkManager private constructor() {
                         callBack.invoke(info)
                         d(
                             SceneConstant.M_BINDING + TAG,
-                            "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()
+                            "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()
                         )
                         if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress) && DebugConfig.isCarModelChange()) {
-                            updateCarVrIconRes(info.data.brandId)
+                            updateCarVrIconRes(info.data.brandId);
                         }
-
                         SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.MAC_ADDRESS, macAddress)
                     }
                 }
@@ -146,7 +143,7 @@ class BindingCarNetWorkManager private constructor() {
                 override fun onError(e: Throwable) {
                     e(
                         SceneConstant.M_BINDING + TAG,
-                        "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.message
+                        "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message
                     )
                 }
 

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

@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.os.Build
 import android.text.Html
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.RequiresApi
@@ -607,7 +608,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             tbIsDemoMode.visibility = View.GONE
         }
 
-
         // 雨天模式，上一次勾选的数据
         tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
@@ -624,36 +624,30 @@ internal class DebugSettingView @JvmOverloads constructor(
         //感知优化模式
         tbBeautyMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isBeautyMode = isChecked
-            if (!FunctionBuildConfig.isBeautyMode) {
-                tbBeautyMode.isChecked = false
-            }
         }
 
         tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
         //v2n车端预警
         tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isV2NFromCar = isChecked
-            if (!FunctionBuildConfig.isV2NFromCar) {
-                tbV2NFromCar.isChecked = false
-            }
         }
 
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isDrawAiCloudFusion = isChecked
-            if (!FunctionBuildConfig.isDrawAiCloudFusion) {
-                tbDrawAiCloudFusion.isChecked = false
-            }
         }
 
         tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
         //roma
         tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isRomaMode = isChecked
-            if (!FunctionBuildConfig.isRomaMode) {
-                tbDrawRomaMode.isChecked = false
-            }
+        }
+
+        tbObuWarningFusionUnion.isChecked = FunctionBuildConfig.isObuWarningFusionUnion
+        //ObuWarningFusionUnion
+        tbObuWarningFusionUnion.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isObuWarningFusionUnion = isChecked
         }
 
         //重启工控机所有节点
@@ -749,12 +743,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isDrawUnknownIdentifyData = isChecked
         }
 
-//        // 初始化 OBU感知数据是否绘制 选择情况
-//        tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
-//        tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
-//            FunctionBuildConfig.isDrawObuIdentifyData = isChecked
-//        }
-
         //TODO
         tbIsDrawPath.setOnCheckedChangeListener { _, isChecked ->
 
@@ -1062,18 +1050,6 @@ internal class DebugSettingView @JvmOverloads constructor(
      * 设置Hmi点击监听
      */
     private fun setHmiCheckedChangeListener() {
-
-        /**
-         * 隐藏、显示小地图
-         */
-        tbControlView.setOnCheckedChangeListener { _, isChecked ->
-//            if (isChecked) {
-//                CallerSmpManager.hidePanel()
-//            } else {
-//                CallerSmpManager.showPanel()
-//            }
-        }
-
         /**
          * sn绑定控制
          */

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import kotlinx.android.synthetic.main.view_steering_brake.view.*
 
@@ -73,13 +74,16 @@ class SteeringBrakeView(context: Context, attrs: AttributeSet?) : ConstraintLayo
         //can数据转发  转向灯状态 0是正常 1是左转 2是右转
         if (lightSwitch != null) {
             CallerLogger.d("$M_HMI$TAG", "---lightSwitch.getNumber() = " + lightSwitch.number)
-            if (lightSwitch.number == 1 || lightSwitch.number == 2) {
-                isShowTurnLight = true
-                brakeView.visibility = View.VISIBLE
-                brakeView.setBrakeLight(0)
-            } else {
-                brakeView.visibility = View.GONE
-                isShowTurnLight = false
+            ThreadUtils.runOnUiThread {
+                if (lightSwitch.number == 1 || lightSwitch.number == 2) {
+                    isShowTurnLight = true
+                    brakeView.visibility = View.VISIBLE
+                    brakeView.setBrakeLight(0)
+                } else {
+                    brakeView.visibility = View.GONE
+                    isShowTurnLight = false
+                }
+                turnLightView.visibility = View.VISIBLE
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.api.map.angle.Turning
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import kotlinx.android.synthetic.main.view_steering_brake.view.*
 import kotlinx.android.synthetic.main.view_turn_light_status.view.*
 import kotlinx.coroutines.Dispatchers
@@ -71,8 +72,10 @@ open class TurnLightViewStatus @JvmOverloads constructor(
     override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) {
         super.onAutopilotLightSwitchData(lightSwitch)
         lightSwitch?.let {
-            turnLightView.visibility = View.VISIBLE
-            setTurnLight(it)
+            ThreadUtils.runOnUiThread {
+                turnLightView.visibility = View.VISIBLE
+                setTurnLight(it)
+            }
         }
     }
 

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

@@ -278,6 +278,18 @@
                 android:textOn="关闭漫游模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbObuWarningFusionUnion"
+                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="开启obu预警融合"
+                android:textOn="关闭obu预警融合"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"
@@ -1310,18 +1322,6 @@
                         app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
                         app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
 
-                    <ToggleButton
-                        android:id="@+id/tbControlView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_20"
-                        android:textOff="隐藏「小地图」"
-                        android:textOn="显示「小地图」"
-                        android:textSize="@dimen/dp_24" />
-
                     <ToggleButton
                         android:id="@+id/tbOpenSnBinding"
                         android:layout_width="wrap_content"

core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt

@@ -15,7 +15,6 @@ import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.network.NetConfigUtils
-import com.mogo.commons.network.Utils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL
 import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST
@@ -32,10 +31,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 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.storage.SharedPrefsMgr
-import com.mogo.eagle.core.utilcode.util.AppUtils
-import com.mogo.eagle.core.utilcode.util.ProcessUtils
-import com.mogo.eagle.core.utilcode.util.ThreadPoolService
-import com.mogo.eagle.core.utilcode.util.TimeUtils
+import com.mogo.eagle.core.utilcode.util.*
 import com.rousetime.android_startup.AndroidStartup
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
@@ -114,9 +110,9 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
         // TODO 现在这块逻辑因为网约车业务那后台的限制，还没有更换，条件成熟后替换为 DeviceIdUtils.getWidevineIDWithMd5(context)
         // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端
         if (ProcessUtils.getCurrentProcessName().contains(":passenger")) {
-            clientConfig.thirdPartyDeviceId = Utils.getDevicesId() + "_passenger"
+            clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN() + "_passenger"
         } else {
-            clientConfig.thirdPartyDeviceId = Utils.getDevicesId()
+            clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN()
         }
         //设置长链接的secretKey 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作
         clientConfig.secretKey = "YMj2VFDFxJ3Q4gNoZceJ"

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestV2XReceiver.java

@@ -10,7 +10,6 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.entity.V2XMessageEntity;
 import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity;
 import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes;
-import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
 
 import java.util.List;

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt

@@ -12,7 +12,7 @@ import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerResponse
 import com.mogo.eagle.core.function.v2x.internal.http.api.V2XApiService
 import com.mogo.eagle.core.function.v2x.internal.http.body.V2XRefreshEntity
 import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback
-import com.mogo.eagle.core.function.v2x.internal.utils.DeviceUtils
+import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
@@ -64,7 +64,7 @@ internal class V2XRefreshModel {
                 handled
             })
             this["netType"] = CommonUtils.getNetworkType(config.context)
-            this["cellId"] = DeviceUtils.getCellId(config.context) ?: ""
+            this["cellId"] = DeviceUtils.getCellId() ?: ""
             this["sn"] = config.aiCloudConfig.sn
             this["ticket"] = config.aiCloudConfig.token
             this["sig"] = SignUtil.createSign(this, "JGjZx6")

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/utils/DeviceUtils.kt

@@ -1,46 +0,0 @@
-package com.mogo.eagle.core.function.v2x.internal.utils
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import android.telephony.CellLocation
-import android.telephony.TelephonyManager
-import android.telephony.cdma.CdmaCellLocation
-import android.telephony.gsm.GsmCellLocation
-import java.lang.Exception
-
-internal class DeviceUtils {
-
-    companion object {
-
-        @SuppressLint("MissingPermission")
-        @JvmStatic
-        fun getCellId(context: Context): String? {
-            val tm = context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-            val pm = context.packageManager
-            val accessCoarseLocationPermission = PackageManager.PERMISSION_GRANTED ==
-                    pm.checkPermission(Manifest.permission.ACCESS_COARSE_LOCATION, context.packageName)
-            val accessFineLocationPermission = PackageManager.PERMISSION_GRANTED ==
-                    pm.checkPermission(Manifest.permission.ACCESS_FINE_LOCATION, context.packageName)
-            if (!accessCoarseLocationPermission || !accessFineLocationPermission) return "noPermission"
-            var location: CellLocation? = null
-            try {
-                location = tm.cellLocation
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
-            if (location != null) {
-                // Gsm网络 , 联通移动的网络属于这一套
-                if (location is GsmCellLocation) {
-                    val cellid = location.cid
-                    return cellid.toString()
-                    // Cdma网络 , 电信网络属于这一种
-                } else if (location is CdmaCellLocation) {
-                    return location.baseStationId.toString()
-                }
-            }
-            return null
-        }
-    }
-}