From b06b855faf3706059676b14c2f981e030aade707 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 14 Sep 2022 18:05:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[biz]=20=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BAsn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt | 6 ++++++ .../src/main/res/layout/taxi_login_view.xml | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt index 1697eee8e7..19da74fbae 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiLoginDialogFragment.kt @@ -15,6 +15,8 @@ import androidx.core.widget.addTextChangedListener import androidx.fragment.app.DialogFragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentTransaction +import com.mogo.cloud.passport.MoGoAiCloudClient +import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.mvp.MvpDialogFragment import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -22,6 +24,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.KeyboardUtils import com.mogo.och.taxi.R +import com.mogo.och.taxi.constant.TaxiConst import com.mogo.och.taxi.presenter.TaxiLoginPresenter @@ -35,6 +38,7 @@ class TaxiLoginDialogFragment : MvpDialogFragment + - + + \ No newline at end of file From c22a967e1e8ccdd7660a50759f970b104848644c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 14 Sep 2022 18:10:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[2.10.0]=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF,?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=B0=E7=AB=99=E6=B8=85=E9=99=A4=E5=B7=A6?= =?UTF-8?q?=E4=B8=8B=E8=A7=92=E5=9C=B0=E5=9B=BE=E8=B7=AF=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 0153576032..8f74c6ff54 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -470,6 +470,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement showOrHideNavi(false); setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.raw.star_marker); setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); + clearSmallMapRouteLine(); break; case JourneyCompleted: mCurrentOrder = null; @@ -497,6 +498,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement mNoDataView.setVisibility(View.GONE); mBeingOrderLayout.setVisibility(View.VISIBLE); mTaxiFragment.changeOperationViewVisible(View.GONE); + clearSmallMapRouteLine(); } else { mNoDataView.setVisibility(View.VISIBLE); mNoDatasTv.setText("暂无进行中订单"); From 0adf85f61f5fc12663856af3522b261ddfe6825a Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 14 Sep 2022 19:28:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=BE=AA=E8=BF=B9/=E7=AE=97=E8=B7=AF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=80=BB=E8=BE=91=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/entity/Status.kt | 17 ++++++----------- .../status/flow/trace/TracingImpl.kt | 5 +++-- .../CallerAutoPilotStatusListenerManager.kt | 10 ++++++++++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt index 6639a3fb46..4e9b503deb 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/entity/Status.kt @@ -230,18 +230,13 @@ class TracingStatus(var state: Tracing = UNKNOWN): Status() { override fun isException(): Boolean = state.isException() } -fun String.toState(): Tracing? { - val ss = split("|") - var code = "" - if (ss.isNotEmpty()) { - code = ss[0] - } +fun String.toState(msg: String?): Tracing? { + val ss = msg?.split("|") var extra: Map? = null - if (ss.size > 1) { - + if (ss != null && ss.isNotEmpty()) { val sb = StringBuilder() - for (i in 1 until ss.size) { - sb.append(ss[i]) + for (element in ss) { + sb.append(element) sb.append(",") } if (sb.isNotEmpty()) { @@ -249,7 +244,7 @@ fun String.toState(): Tracing? { } extra = mutableMapOf("extra" to sb.toString()) } - return when(code) { + return when(this) { "IMAP_TRA_EXIST" -> TRACK_FINDED.apply { this.extra = extra } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt index c44b3372dc..5c047e2b61 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/trace/TracingImpl.kt @@ -21,7 +21,8 @@ internal class TracingImpl(ctx: Context): IFlow(ctx), IMoGoAutopi override fun onCreate() { val code = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageCode() - val state = code.toState() ?: UNKNOWN + val msg = CallerAutoPilotStatusListenerManager.getAutoPilotReportMessageContent() + val state = code.toState(msg) ?: UNKNOWN old = state send(TracingStatus(state)) CallerAutoPilotStatusListenerManager.addListener(TAG, this) @@ -31,7 +32,7 @@ internal class TracingImpl(ctx: Context): IFlow(ctx), IMoGoAutopi override fun onAutopilotGuardian(guardianInfo: MogoReportMessage?) { super.onAutopilotGuardian(guardianInfo) val current = guardianInfo?.code - val newState = current?.toState() + val newState = current?.toState(guardianInfo.msg) if (newState != null && newState != old) { send(TracingStatus(newState)) old = newState diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index df63a364f3..0c915a5f31 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -1,10 +1,12 @@ package com.mogo.eagle.core.function.call.autopilot +import android.util.* import androidx.annotation.Nullable import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.util.GsonUtils import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -29,6 +31,10 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { @Volatile private var autoPilotMessageCode: String = "" + + @Volatile + private var autoPilotMessageContent: String = "" + /** * 查询AutoPilot状态 */ @@ -45,6 +51,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { fun getAutoPilotReportMessageCode(): String = autoPilotMessageCode + fun getAutoPilotReportMessageContent(): String = autoPilotMessageContent + /** * 通过Gnss定位更新来同步更新自动驾驶状态 */ @@ -171,6 +179,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase() { M_AUTOPILOT_STATUS_LISTENERS.forEach { val listener = it.value autoPilotMessageCode = guardianInfo?.code ?: "" + autoPilotMessageContent = guardianInfo?.msg ?: "" + Logger.d("XXXXX", "code: ${guardianInfo?.code}, msg: ${guardianInfo?.msg}") listener.onAutopilotGuardian(guardianInfo) } } From 885b1e8e79eed8ac3d35b166367eb65e18bb9409 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 14 Sep 2022 20:00:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[Fix]=E5=90=8C=E6=AD=A5=E7=BE=8E=E5=8C=96?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/autopilot/MoGoAutopilotProvider.kt | 2 +- .../autopilot/telematic/TeleMsgHandler.kt | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index a95120b060..e701e71223 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -379,7 +379,7 @@ class MoGoAutopilotProvider : override fun setDemoMode(isEnable: Boolean) { // 同步给乘客端 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { - var byteArray = if (isEnable) byteArrayOf(1) else byteArrayOf(0) + val byteArray = "${FunctionBuildConfig.isDemoMode},${FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData}".toByteArray() if (NSDNettyManager.getInstance().isServerStart) { NSDNettyManager.getInstance() .sendMsgToAllClients( diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt index 758f6e6cd6..62c733e268 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt @@ -56,11 +56,15 @@ class TeleMsgHandler : IMsgHandler { } } MogoProtocolMsg.SYNC_MODE_STATUS -> { - FunctionBuildConfig.isDemoMode = when (it.body[0].toInt()) { - 1 -> true - else -> false + val demoModeAndTrajectoryString = String(it.body) + invokeNettyConnResult("乘客屏收到的美化模式状态为：${demoModeAndTrajectoryString}") + if (demoModeAndTrajectoryString.contains(",")) { + val strArray = demoModeAndTrajectoryString.split(",") + if (strArray.size == 2) { + FunctionBuildConfig.isDemoMode = (strArray[0] == "true") + FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = (strArray[1] == "true") + } } - setDemoMode(FunctionBuildConfig.isDemoMode) } MogoProtocolMsg.REQ_MAC_ADDRESS -> { val carConfig = MessagePad.CarConfigResp.parseFrom(msg.body) @@ -140,8 +144,7 @@ class TeleMsgHandler : IMsgHandler { override fun handleClientConn2Server(channel: Channel?) { val socketAddress = channel?.remoteAddress().toString() CallerLogger.d("${SceneConstant.M_ADAS_IMPL}$TAG", "Client ip is:${socketAddress}") - val byteArray = - if (FunctionBuildConfig.isDemoMode) byteArrayOf(1) else byteArrayOf(0) + val byteArray = "${FunctionBuildConfig.isDemoMode},${FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData}".toByteArray() NSDNettyManager.getInstance().sendMsgToSpecifiedClient( MogoProtocolMsg( MogoProtocolMsg.SYNC_MODE_STATUS,