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 685e2506e8..eb40d5102b 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 @@ -621,7 +621,7 @@ object TaxiTaskModel { } if (isArriveAtEndSite) { - //取消自驾,D档位会溜车 map3.6.0 修改 + // 取消自驾,D档位会溜车 map3.6.0 修改 cancelAutopilot() } mLastArrivedSiteId = siteId @@ -906,6 +906,8 @@ object TaxiTaskModel { } TaxiOrderStatusEnum.ArriveAtEnd.code -> { + // 语音送宾 + VoiceNotice.showNotice("感谢您使用蘑菇智行,再见~"); OrderModel.invokeListener(data.data) mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value @@ -917,7 +919,7 @@ object TaxiTaskModel { } TaxiOrderStatusEnum.JourneyCompleted.code -> { - //更新本地标志位 + // 更新本地标志位 mCurrentTaskWithOrder = null OrderModel.invokeListener(data.data) mTaxiTaskWithOrderCallbackMap.forEach {