From 1e7796f4207d679bd8807745464a95f1da21c3ea Mon Sep 17 00:00:00 2001 From: EmArrow Date: Fri, 30 Aug 2024 19:01:46 +0800 Subject: [PATCH] [6.6.0] union deviceUtil check and fix bug, close the multi device --- .../ui/BusPassengerBaseFragment.java | 2 +- .../passenger/ui/TaxiPassengerBaseFragment.kt | 2 +- .../passenger/ui/TaxiPassengerBaseFragment.kt | 2 +- .../mogo/launcher/startup/ConfigStartUp.kt | 8 ++-- .../eagle/function/biz/FuncBizProvider.kt | 3 +- .../autopilot/MoGoAutopilotControlProvider.kt | 3 +- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 2 +- .../DevaToolsProvider.kt | 4 ++ .../hmi/ui/widget/RomaPassengerView.kt | 6 +-- .../function/main/MainLauncherActivity.java | 4 +- .../main/PassengerLauncherActivity.java | 2 +- .../eagle/core/function/MapBizProvider.kt | 2 +- .../business/identify/IdentifyFactory.kt | 44 +++++++++++-------- .../startup/stageone/HttpDnsStartUp.kt | 2 +- .../eagle/core/utilcode/util/DeviceUtils.java | 4 ++ 15 files changed, 53 insertions(+), 37 deletions(-) diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java index 2cd6bd2a61..c6cbf8c23e 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java @@ -51,7 +51,7 @@ public abstract class BusPassengerBaseFragment { override fun onMessageResponseClient( msg: MogoProtocolMsg?, diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index b21ccbd6b8..97fb8f0dd2 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -323,7 +323,7 @@ class MoGoAdasListenerImpl : OnAdasListener { } //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 - private val limit = DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model() + private val limit = DeviceUtils.isLeOrEb5Model() override fun onPointCloud(header: MessagePad.Header, pointCloud: ByteArray?) { if (limit) { //点云数据透传 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 8580d41720..245502e039 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -14,6 +14,8 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.EnvConfig import com.mogo.eagle.core.data.app.AppConfigInfo +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.config.HmiBuildConfig.isShowRouteStrategy import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo import com.mogo.eagle.core.data.deva.chain.ChainConstant @@ -36,6 +38,7 @@ import com.mogo.eagle.core.function.api.map.route.IMapRouteProvider import com.mogo.eagle.core.function.api.upgrade.IMoGoUpgradeProvider import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.utilcode.kotlin.lifeCycleScope +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.CallerLogger.w import com.mogo.eagle.core.utilcode.util.AppStateManager @@ -296,6 +299,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { * AppIdentityModeUtils.getMisChannelCode */ override fun updateAppChannel() { + isShowRouteStrategy = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) bizConfigCenter.updateChannelRole() //功能开关配置更新 traceManager.syncConfig() //同步信息至ms BindingCarManager.queryAppUpgrade() //更新App升级信息 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt index 354eb0ef1c..36f5bfb470 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt @@ -37,7 +37,7 @@ class RomaPassengerView @JvmOverloads constructor( private var controlVisible = true init { - if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ + if(DeviceUtils.isLeOrEb5Model()){ LayoutInflater.from(context).inflate(R.layout.view_roma_passenger_bg, this, true) val a = context.obtainStyledAttributes(attrs, R.styleable.RomaPassengerView, defStyleAttr, 0) @@ -65,7 +65,7 @@ class RomaPassengerView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ + if(DeviceUtils.isLeOrEb5Model()){ CallerMapRomaListener.addListener(TAG, this) } } @@ -116,7 +116,7 @@ class RomaPassengerView @JvmOverloads constructor( override fun onDetachedFromWindow() { super.onDetachedFromWindow() - if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ + if(DeviceUtils.isLeOrEb5Model()){ CallerMapRomaListener.removeListener(TAG) } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index ca5dbc3aee..27f121fae8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -50,7 +50,7 @@ public class MainLauncherActivity extends MainActivity { // 多进程方案 CallerLogger.i(M_HMI + TAG, "MultiDisplayUtils startActWithSecond"); // MultiDisplayUtils.INSTANCE.startActWithSecond(this, "com.mogo.launcher.passenger"); - MultiDisplayUtils.INSTANCE.startActWithSecond(this, PassengerLauncherActivity.class); +// MultiDisplayUtils.INSTANCE.startActWithSecond(this, PassengerLauncherActivity.class); } catch (Exception e) { e.printStackTrace(); } @@ -105,7 +105,7 @@ public class MainLauncherActivity extends MainActivity { } else { // 目前只有金旅星辰乘客屏是连接的双屏 ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/passenger/api") + .build("/driver/api") .navigation(getContext()); } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java index 65ff7394d9..746c255a0a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java @@ -49,7 +49,7 @@ public class PassengerLauncherActivity extends MainActivity { */ private void loadOCHModule() { IMoGoFunctionProvider ochProvider = (IMoGoFunctionProvider) ARouter.getInstance() - .build("/driver/api") + .build("/passenger/api") .navigation(getContext()); if (ochProvider != null) { ochProvider.createCoverage(this, R.id.module_main_id_och_fragment); diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt index 25cd1cdca7..226149d26f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/MapBizProvider.kt @@ -35,7 +35,7 @@ class MapBizProvider :IMoGoFunctionServerProvider, IMogoRoma { MapPointCloudSubscriber.instance SpeedLimitDataManager.getInstance().start() RoadCrossCameraManager.instance.init(context) - if(DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()){ //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 + if(DeviceUtils.isLeOrEb5Model()){ //todo 新增稳定设备类型需要添加，目的避免在nuc设备上使用此类功能 romaManager.init() aiCloudIdentifyDataManager.initServer(AbsMogoApplication.getApp()) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt index 3bc2708508..a264edfa63 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt @@ -39,6 +39,7 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf private var identify: Identify? = null private var aiCloudIdentify: Identify? = null private var startTime: Long = 0L + private var dockerVersion: String? = null fun initType() { drawType("默认开启感知优化，等待docker版本") @@ -50,24 +51,7 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf } override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { - val dockerVersion = carConfigResp.dockVersion - if (dockerVersion != null && dockerVersion.isNotEmpty()) { - try { - val version = ParseVersionUtils.parseVersion(true, dockerVersion) - identify = if (version >= 30100 && isT1T2(FunctionBuildConfig.appIdentityMode)) { - FunctionBuildConfig.isBeautyMode = false - drawType("关闭感知优化模式") - DriverIdentify.originDataDrawer - } else { - FunctionBuildConfig.isBeautyMode = true - drawType("开启感知优化模式") - UserIdentify.beautifyDataDrawer - } - } catch (e: Exception) { - drawType("解析docker异常:$dockerVersion") - identify = UserIdentify.beautifyDataDrawer - } - } + dockerVersion = carConfigResp.dockVersion } @ChainLog( @@ -93,6 +77,29 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf object : Handler(WorkThreadHandler.newInstance("IdentifyFactoryDrawer").looper) { override fun handleMessage(msg: Message) { super.handleMessage(msg) + + if(identify == null){ + if (dockerVersion != null && dockerVersion!!.isNotEmpty()) { + try { + val version = ParseVersionUtils.parseVersion(true, dockerVersion) + identify = if (version >= 30100 && isTaxi(FunctionBuildConfig.appIdentityMode)) { + FunctionBuildConfig.isBeautyMode = false + drawType("关闭感知优化模式") + DriverIdentify.originDataDrawer + } else { + FunctionBuildConfig.isBeautyMode = true + drawType("开启感知优化模式") + UserIdentify.beautifyDataDrawer + } + } catch (e: Exception) { + drawType("解析docker异常:$dockerVersion") + identify = UserIdentify.beautifyDataDrawer + } + }else{ + return + } + } + if (!FunctionBuildConfig.isBeautyMode) { // 非感知美化优化模式，清除旧数据，使用 DriverIdentify originDataDrawer 原始数据绘制 if (identify is IdentifyBeautifyDataDrawer) { @@ -108,6 +115,7 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf identify = UserIdentify.beautifyDataDrawer } } + when (msg.what) { MSG_CHECK -> { if(startTime == 0L){ diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index cb0f336ea5..aa39533ce7 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -152,7 +152,7 @@ class HttpDnsStartUp : AndroidStartup(), IMoGoCloudListener { // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备） // TODO 现在这块逻辑因为网约车业务那后台的限制，还没有更换，条件成熟后替换为 DeviceIdUtils.getWidevineIDWithMd5(context) // 这里影响当前Activity的身份信息，多进程先保持与原来一样，主进程为司机端，:passenger 进程为乘客端 - if (ProcessUtils.getCurrentProcessName().contains(":passenger")) { //todo emArrow passenger需要放到下面,司乘互换 + if (ProcessUtils.getCurrentProcessName().contains(":passenger")) { clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN() + "_passenger" } else { clientConfig.thirdPartyDeviceId = DeviceUtils.getDeviceSN() diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index 7068f5bf0a..c934c53f94 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -312,6 +312,10 @@ public final class DeviceUtils { return Build.MANUFACTURER; } + public static Boolean isLeOrEb5Model() { + return isLenovoModel() || isEB5Model(); + } + public static Boolean isLenovoModel() { return getModel().contains("Lenovo") || getBrand().contains("Lenovo"); }