From 1cf364d32525d7af789308b5a6f9ab834fa6675b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 26 Sep 2024 18:29:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[6.7.0]=20[fea]=20[debug=20=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/facade/route/FacadeProvider.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt index 62e3b7c16a..5f90dfd11b 100644 --- a/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt +++ b/OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt @@ -231,6 +231,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback { removeStatusBar() } else { onBusinessChange(businessEnum) + FunctionBuildConfig.isOffLine = true LoginStatusManager.setLoginStatus(LoginStatusEnum.Login) val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager val fragment = getFragment() From 82e8f993865518c08305f71aa968cbadedb960b3 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 27 Sep 2024 10:10:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[6.7.0]UI=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/bone/tab/adapter/MsgBoxTabAdapter.kt | 6 ---- .../src/main/res/layout/item_tab_bad_case.xml | 2 +- .../src/main/res/layout/item_tab_fm.xml | 31 +++++++------------ .../main/res/layout/item_tab_ipc_report.xml | 28 +++++++---------- 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt index abfa103b25..9b840e0ed4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt @@ -183,8 +183,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : //时间显示 holder.tvFmTime.text = "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" - holder.tvFmTime.text = - fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1,getHourMinFormat()) } //建议操作 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ //建议操作暂无 @@ -361,8 +359,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvReportTime.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" - holder.tvReportShowTime.text = - TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) var resultStr = "类型：" for (result in reportEntity.resultList) { resultStr = @@ -612,7 +608,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : class FmInfoHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ var ivFmImage: ImageView = itemView.findViewById(R.id.ivFmImage) //故障级别图标 var tvFmTitle: TextView = itemView.findViewById(R.id.tvFmTitle) //标题展示故障策略 - var tvFmShowTime: TextView = itemView.findViewById(R.id.tvFmShowTime) //展示时间 var tvFmShowStatus: TextView = itemView.findViewById(R.id.tvFmShowStatus) //折叠状态 var tvFmTime: TextView = itemView.findViewById(R.id.tvFmTime) //发生时间 var tvFmAction: TextView = itemView.findViewById(R.id.tvFmAction) //建议操作 @@ -630,7 +625,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : var tvReportReason: TextView = itemView.findViewById(R.id.tvReportReason) var tvReportSrc: TextView = itemView.findViewById(R.id.tvReportSrc) var tvReportAction: TextView = itemView.findViewById(R.id.tvReportAction) - var tvReportShowTime: TextView = itemView.findViewById(R.id.tvReportShowTime) var tvReportShowStatus: TextView = itemView.findViewById(R.id.tvReportShowStatus) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml index 839a7adef1..ea54011cf0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml @@ -1,7 +1,7 @@ - - - @@ -59,7 +51,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmTitle" app:layout_constraintLeft_toLeftOf="@id/tvFmTitle" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" /> @@ -71,7 +63,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmTime" app:layout_constraintLeft_toLeftOf="@id/tvFmTime" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" /> @@ -83,7 +75,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmAction" app:layout_constraintLeft_toLeftOf="@id/tvFmAction" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" @@ -96,7 +88,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmFault" app:layout_constraintLeft_toLeftOf="@id/tvFmFault" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" @@ -109,7 +101,8 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmReason" app:layout_constraintLeft_toLeftOf="@id/tvFmReason" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" + android:paddingBottom="@dimen/dp_30" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml index c665b26351..ba364ff59a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="@id/ivReportImage" app:layout_constraintLeft_toRightOf="@id/ivReportImage" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toLeftOf="@id/tvReportShowStatus" android:textColor="@color/white" android:textSize="@dimen/sp_38" android:layout_marginStart="@dimen/dp_30" @@ -32,7 +32,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportLevel" app:layout_constraintLeft_toLeftOf="@id/tvReportLevel" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportTime" app:layout_constraintLeft_toLeftOf="@id/tvReportTime" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportType" app:layout_constraintLeft_toLeftOf="@id/tvReportType" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportReason" app:layout_constraintLeft_toLeftOf="@id/tvReportReason" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" @@ -78,32 +78,26 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportSrc" app:layout_constraintLeft_toLeftOf="@id/tvReportSrc" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" + android:paddingBottom="@dimen/dp_30" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" /> - - \ No newline at end of file From d7a52f7f8cf1254cde1901c87be9c3baf4161dd8 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 27 Sep 2024 11:26:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[6.7.0][=E8=BF=90=E8=90=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF][V2X]=20=E7=A7=BB=E9=99=A4V2N=E6=96=B0=E9=93=BE?= =?UTF-8?q?=E8=B7=AF=E5=BC=80=E5=85=B3=EF=BC=8C=E9=BB=98=E8=AE=A4=E8=B5=B0?= =?UTF-8?q?=E6=96=B0=E9=93=BE=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/functions/test/V2NTest.kt | 15 +++----- .../eagle/function/biz/FuncBizProvider.kt | 2 +- .../biz/v2x/overview/OverViewDataManager.kt | 2 +- .../function/biz/v2x/v2n/V2XEventManager.kt | 6 ++-- .../biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt | 12 +++---- .../autopilot/MoGoAutopilotControlProvider.kt | 1 - .../autopilot/telematic/TeleMsgHandler.kt | 1 - .../hmi/ui/operate/OperatePanelLayout.kt | 24 ++++++------- .../function/hmi/ui/setting/SOPSettingView.kt | 34 +++++++++---------- .../operate_panel_preference_details_v2x.xml | 16 ++++----- .../core/data/config/FunctionBuildConfig.kt | 7 ---- .../autopilot/CallerV2XListenerManager.kt | 4 +-- 12 files changed, 54 insertions(+), 70 deletions(-) diff --git a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt index 7987fb199f..2d8d811713 100644 --- a/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt +++ b/app/src/androidTest/java/com/mogo/functions/test/V2NTest.kt @@ -58,12 +58,11 @@ class V2NTest { if (millis > 0) { delay(millis) } - FunctionBuildConfig.v2nNewLinked = true +// FunctionBuildConfig.v2nNewLinked = true FunctionBuildConfig.v2nTotalSwitch = true runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } @@ -99,12 +98,11 @@ class V2NTest { if (millis > 0) { delay(millis) } - FunctionBuildConfig.v2nNewLinked = true +// FunctionBuildConfig.v2nNewLinked = true FunctionBuildConfig.v2nTotalSwitch = true runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } @@ -179,12 +177,11 @@ class V2NTest { } val newPoint = DrivingDirectionUtils.calculateNewPoint(car.longitude, car.latitude, car.heading , 200.0) Log.d(TAG, "获取到路口数据..., 自车:[${car.longitude}, ${car.latitude}]前方200米外的点: [${newPoint.first}, ${newPoint.second}]") - FunctionBuildConfig.v2nNewLinked = true +// FunctionBuildConfig.v2nNewLinked = true FunctionBuildConfig.v2nTotalSwitch = true runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } @@ -211,12 +208,11 @@ class V2NTest { if (millis > 0) { delay(millis) } - FunctionBuildConfig.v2nNewLinked = true +// FunctionBuildConfig.v2nNewLinked = true FunctionBuildConfig.v2nTotalSwitch = true runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } @@ -261,12 +257,11 @@ class V2NTest { if (millis > 0) { delay(millis) } - FunctionBuildConfig.v2nNewLinked = true +// FunctionBuildConfig.v2nNewLinked = true FunctionBuildConfig.v2nTotalSwitch = true runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt index 58e067f854..cd5048facd 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt @@ -115,7 +115,7 @@ class FuncBizProvider : IMoGoFuncBizProvider { } override fun queryV2XEvents() { - if (V2NCarTypeCheck.verifyCarType() && (!FunctionBuildConfig.v2nTotalSwitch || !FunctionBuildConfig.v2nNewLinked)) { + if (V2NCarTypeCheck.verifyCarType() && (!FunctionBuildConfig.v2nTotalSwitch)) { v2xPoiLoader.queryWholeRoadEvents() } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt index e121438401..8b055c9c5c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt @@ -107,7 +107,7 @@ object OverViewDataManager { .observeOn(AndroidSchedulers.mainThread()) .subscribe { it?.apply { - if (V2NCarTypeCheck.verifyCarType() && (!FunctionBuildConfig.v2nTotalSwitch || !FunctionBuildConfig.v2nNewLinked)) { + if (V2NCarTypeCheck.verifyCarType() && (!FunctionBuildConfig.v2nTotalSwitch)) { CallerFuncBizListenerManager.invokeV2XEvents(this) } } diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index dd3b9092d5..1ce090ad8e 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -196,8 +196,8 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, } is V2XEvent.RoadEventX -> { val flag = verifyCarType() - Log.d("$M_V2X$TAG", "---- 收到ai云V2N事件 ---:${flag}, ${FunctionBuildConfig.v2nTotalSwitch}, ${FunctionBuildConfig.v2nNewLinked}") - if (flag && (!FunctionBuildConfig.v2nTotalSwitch || !FunctionBuildConfig.v2nNewLinked)) { + Log.d("$M_V2X$TAG", "---- 收到ai云V2N事件 ---:${flag}, ${FunctionBuildConfig.v2nTotalSwitch}") + if (flag && (!FunctionBuildConfig.v2nTotalSwitch)) { // try { if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { Log.d("$M_V2X$TAG", "onAck -> 司机端: 将收到云端事件给到乘客端...") @@ -210,7 +210,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, // } handleRoadMarkerEvent(event.data.toRoadMarker()) } else{ - V2XBizTrace.onAck("事件未触发,被开关拦截",mapOf("roadEvent" to event, "v2nMainSwitch" to FunctionBuildConfig.v2nTotalSwitch,"isNewV2NData" to FunctionBuildConfig.v2nNewLinked), true) + V2XBizTrace.onAck("事件未触发,被开关拦截",mapOf("roadEvent" to event, "v2nMainSwitch" to FunctionBuildConfig.v2nTotalSwitch,"isNewV2NData" to true), true) } } else -> { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt index 516feb66b2..e6271b1d69 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/pnc/V2NIdentifyDrawer.kt @@ -483,42 +483,42 @@ internal object V2NIdentifyDrawer: IEventDismissListener { } private fun drawShiGong(events: List) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_SHIGONE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGONE, events)) } } private fun drawShiGu(events: List) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_SHIGU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_SHIGU, events)) } } private fun drawYongDu(events: List) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_YONGDU) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_YONGDU, events)) } } private fun drawOtherRetrogradeVehicle(event: MessagePad.Event) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_OTHER_RETROGRADE_VEHICLE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_OTHER_RETROGRADE_VEHICLE, event)) } } private fun drawGreenWave(crossSpeed: V2nCrossSpeed) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_GREEN_WAVE) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_GREEN_WAVE, crossSpeed)) } } private fun drawPeopleCross(event: MessagePad.Event) { - if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (V2NCarTypeCheck.verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { handler.removeMessages(MSG_WHAT_DRAW_PEOPLE_CROSS) handler.sendMessage(Message.obtain(handler, MSG_WHAT_DRAW_PEOPLE_CROSS, event)) } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 107722103d..93f9295869 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -1166,7 +1166,6 @@ class MoGoAutopilotControlProvider : runCatching { val map = HashMap().also { it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index b49fc78e30..33cdf7b4f5 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -150,7 +150,6 @@ class TeleMsgHandler : IMsgHandler { val f2 = data["f2"] as Boolean Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 3 ---:$data, f1: $f1, f2:$f2") FunctionBuildConfig.v2nTotalSwitch = f1 - FunctionBuildConfig.v2nNewLinked = f2 } catch (t: Throwable) { t.printStackTrace() Log.e(TAG, "乘客屏收到司机屏转发的新链路开关异常", t) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index f10ec9b29f..cd2dba7b31 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -301,7 +301,7 @@ class OperatePanelLayout : LinearLayout { companion object { private const val KEY_V2X_TOTAL_SWITCH = "v2x_total_switch" private const val KEY_V2N_TOTAL_SWITCH = "v2n_total_switch" - private const val KEY_V2N_NEW_LINKED = "v2n_new_linked" +// private const val KEY_V2N_NEW_LINKED = "v2n_new_linked" private const val KEY_V2N_NEW_LINKED_TO_PNC = "v2n_new_linked_to_pnc" private const val KEY_V2N_NEW_LINKED_GREEN_WAVE = "v2n_new_linked_green_wave" private const val KEY_V2I_TOTAL_SWITCH = "v2i_total_switch" @@ -324,9 +324,9 @@ class OperatePanelLayout : LinearLayout { KEY_V2N_TOTAL_SWITCH -> { return FunctionBuildConfig.v2nTotalSwitch } - KEY_V2N_NEW_LINKED -> { - return FunctionBuildConfig.v2nNewLinked - } +// KEY_V2N_NEW_LINKED -> { +// return FunctionBuildConfig.v2nNewLinked +// } KEY_V2N_NEW_LINKED_TO_PNC -> { return FunctionBuildConfig.v2nNewLinkedToPNC } @@ -382,19 +382,19 @@ class OperatePanelLayout : LinearLayout { hmiAction("V2N总开关, ", isChecked) clickEventAnalytics("V2N总开关", isChecked) if (!isChecked) { - preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED)?.also { changeValue(it, false) } +// preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED)?.also { changeValue(it, false) } preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED_TO_PNC)?.also { changeValue(it, false) } preferenceScreen.findPreferenceReal(KEY_V2N_NEW_LINKED_GREEN_WAVE)?.also { changeValue(it, false) } } return true } - KEY_V2N_NEW_LINKED -> { - val isChecked = newValue as? Boolean ?: false - FunctionBuildConfig.v2nNewLinked = isChecked - hmiAction("V2N新链路", isChecked) - clickEventAnalytics("V2N新链路", isChecked) - return true - } +// KEY_V2N_NEW_LINKED -> { +// val isChecked = newValue as? Boolean ?: false +// FunctionBuildConfig.v2nNewLinked = isChecked +// hmiAction("V2N新链路", isChecked) +// clickEventAnalytics("V2N新链路", isChecked) +// return true +// } KEY_V2N_NEW_LINKED_TO_PNC -> { val isChecked = newValue as? Boolean ?: false FunctionBuildConfig.v2nNewLinkedToPNC = isChecked diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index d131746232..e613c87307 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -199,8 +199,8 @@ internal class SOPSettingView @JvmOverloads constructor( clickEventAnalytics("V2N总开关",isChecked) if (isChecked) { //V2N新链路 - scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked - hmiAction("SOP 是否是V2N新链路(云->工控机->App)", FunctionBuildConfig.v2nNewLinked) +// scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked + hmiAction("SOP 是否是V2N新链路(云->工控机->App)", true) //V2N场景进PNC scV2nPnc.isChecked = FunctionBuildConfig.v2nNewLinkedToPNC hmiAction("SOP V2N场景进PNC, ", FunctionBuildConfig.v2nNewLinkedToPNC) @@ -237,7 +237,6 @@ internal class SOPSettingView @JvmOverloads constructor( FunctionBuildConfig.v2nTotalSwitch = isChecked val map = HashMap().also { it["f1"] = isChecked - it["f2"] = FunctionBuildConfig.v2nNewLinked } CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) } @@ -291,21 +290,20 @@ internal class SOPSettingView @JvmOverloads constructor( } //V2N新链路 - scNewV2NData.isChecked = FunctionBuildConfig.v2nNewLinked - scNewV2NData.setOnCheckedChangeListener { compoundButton, isChecked -> - if (!compoundButton.isPressed) { - return@setOnCheckedChangeListener - } - clickEventAnalytics("V2N新链路",isChecked) - hmiAction("SOP 是否是V2N新链路(云->工控机->App)", isChecked) - FunctionBuildConfig.v2nNewLinked = isChecked - - val map = HashMap().also { - it["f1"] = FunctionBuildConfig.v2nTotalSwitch - it["f2"] = isChecked - } - CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) - } + scNewV2NData.isEnabled = false +// scNewV2NData.setOnCheckedChangeListener { compoundButton, isChecked -> +// if (!compoundButton.isPressed) { +// return@setOnCheckedChangeListener +// } +// clickEventAnalytics("V2N新链路",isChecked) +// hmiAction("SOP 是否是V2N新链路(云->工控机->App)", isChecked) +// FunctionBuildConfig.v2nNewLinked = isChecked +// +// val map = HashMap().also { +// it["f1"] = FunctionBuildConfig.v2nTotalSwitch +// } +// CallerTelematicManager.sendMsgToAllClients(TelematicConstant.V2N_NEW_LINK_SWITCH, GsonUtils.toJson(map).toByteArray()) +// } //V2N场景进PNC scV2nPnc.isChecked = FunctionBuildConfig.v2nNewLinkedToPNC diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml index 5b90d3a274..8f365bb6fe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/xml/operate_panel_preference_details_v2x.xml @@ -18,14 +18,14 @@ android:defaultValue="@bool/v2n_total_switch" android:layout="@layout/layout_operate_panel_preference_switch_compat" android:widgetLayout="@layout/layout_operate_panel_preference_widget_switch_compat"/> - + + + + + + + + 工控机->App) - */ - @Volatile - @JvmField - var v2nNewLinked = false - /** * 是否开启PNC障碍物颜色提醒 */ diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt index 17110a96e1..f598002061 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerV2XListenerManager.kt @@ -35,7 +35,7 @@ object CallerV2XListenerManager : CallerBase() { override fun doSomeAfterAddListener(tag: String, listener: IMoGoV2XListener) { if (eventCountTmp >= 0) { - if (verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { listener.onV2nGlobalPathEvents(eventCountTmp, constructTmp, triangleTmp, congestionTmp, parkingViolationTmp) } } @@ -52,7 +52,7 @@ object CallerV2XListenerManager : CallerBase() { parkingViolationTmp = parkingViolation M_LISTENERS.forEach { val listener = it.value - if (verifyCarType() && FunctionBuildConfig.v2nTotalSwitch && FunctionBuildConfig.v2nNewLinked) { + if (verifyCarType() && FunctionBuildConfig.v2nTotalSwitch) { listener.onV2nGlobalPathEvents(eventCount, construct, triangle, congestion, parkingViolation) } }