From 17313225198c900b720bb37a61711018aec12791 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 18 Nov 2024 15:44:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[FSM]=20fix=EF=BC=9A=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E5=B9=B2=E9=A2=84=E6=97=B6=20=E8=83=8C=E6=99=AF=E8=89=B2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/bone/status/StartAutoPilotStatusView.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/StartAutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/StartAutoPilotStatusView.kt index b70126a41a..ecb7e589d9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/StartAutoPilotStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/StartAutoPilotStatusView.kt @@ -216,7 +216,12 @@ class StartAutoPilotStatusView @JvmOverloads constructor( if (isAnyOneError) R.drawable.icon_no_fsm_status_bg_error else R.drawable.icon_no_fsm_status_bg_normal ) - notifyStatus(isAnyOneError) + if (!hasFSM.get()) { + notifyStatus(isAnyOneError) + Logger.d(TAG, "--- handleWithoutFSM --- do update") + } else { + Logger.d(TAG, "--- handleWithoutFSM --- do not update") + } } private fun notifyStatus(isError: Boolean) { From 9faf18592589fb86c8e60f096a7c68b74b776bb1 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 20 Nov 2024 10:53:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.4]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E5=8C=96Taxi=E5=88=B0=E7=AB=99=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=202=E3=80=81=E7=BB=9F=E4=B8=80=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E4=B8=BAT2,=E5=AE=9E=E9=99=85=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E4=BB=A5=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=EF=BC=9B=203=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BD=A6=E8=BE=86=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/biz/login/LoginProvider.kt | 2 +- .../java/com/mogo/och/biz/login/model/LoginModel.kt | 13 +++++++++++++ .../common/module/biz/login/LoginStatusManager.kt | 2 +- .../mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt | 4 +++- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt index 4943a79453..f2ff3972c5 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt @@ -45,7 +45,7 @@ class LoginProvider : LoginService { private var loginStatus: LoginStatusEnum = LoginStatusEnum.None private var businessEnum: BusinessEnum = BusinessEnum.None private var openOrderStatusEnum: OpenOrderStatusEnum = OpenOrderStatusEnum.None - private var carModel: Carmodel = Carmodel.B1 + private var carModel: Carmodel = Carmodel.T2 private var loginInfo: LoginInfo? = null private val loginInfoKey = "LOGININFOKEY" diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt index c3b1a9f691..5523af518f 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt @@ -8,6 +8,7 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.module.intent.IMogoIntentListener import com.mogo.commons.module.intent.IntentManager import com.mogo.commons.storage.SharedPrefsMgr +import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -192,10 +193,17 @@ object LoginModel { } OchCommonServiceManager.queryDriverServiceStatus(it, object : OchCommonServiceCallback { override fun onSuccess(data: DriverStatusQueryRespBean?) { + val map: MutableMap = HashMap() + map["msg"] = data.toString() + MogoAnalyticUtils.track("QueryCarStatus",map) go2LoginInfo(data,"接口获取") } override fun onError() { + val map: MutableMap = HashMap() + map["msg"] = "网络错误" + MogoAnalyticUtils.track("QueryCarStatus",map) + if (!NetworkUtils.isConnected(mContext)) { ToastCharterUtils.showToastShort(mContext!!.getString(R.string.network_error_tip)) } else { @@ -208,6 +216,11 @@ object LoginModel { } override fun onFail(code: Int, msg: String) { + val map: MutableMap = HashMap() + map["msg"] = msg + map["code"] = code + MogoAnalyticUtils.track("QueryCarStatus",map) + LoginStatusManager.setLoginError(code,"msg:${msg}") ToastUtilsOch.showWithCodeMessage(code, msg) // 依赖参数 diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt index 764b248f8f..5a34579154 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt @@ -125,7 +125,7 @@ object LoginStatusManager : CallerBase() { loginService?.let { return it.getCarModel() } - return Carmodel.B1 + return Carmodel.T2 } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index 77f79bbfd9..f52f91a4ed 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -620,8 +620,10 @@ object TaxiTaskModel { } if (isArriveAtEndSite) { - //取消自驾,D档位会溜车 map3.6.0 修改 + // 取消自驾,D档位会溜车 map3.6.0 修改 cancelAutopilot() + // 语音送宾 + VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~"); } mLastArrivedSiteId = siteId mIsSubmitArrivedSiteRequesting = false