yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev_robotaxi-d_241112_6.8.0

Browse Source
This commit is contained in:
donghongyu
2024-11-21 10:37:28 +08:00
parent 95cf8e76df 7c447af064
commit daeef5f345
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginProvider.kt
View File

@@ -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"

13
OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt
View File

@@ -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<DriverStatusQueryRespBean> {
override fun onSuccess(data: DriverStatusQueryRespBean?) {
val map: MutableMap<String, Any> = HashMap()
map["msg"] = data.toString()
MogoAnalyticUtils.track("QueryCarStatus",map)
go2LoginInfo(data,"接口获取")
}
override fun onError() {
val map: MutableMap<String, Any> = 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<String, Any> = HashMap()
map["msg"] = msg
map["code"] = code
MogoAnalyticUtils.track("QueryCarStatus",map)
LoginStatusManager.setLoginError(code,"msg:${msg}")
ToastUtilsOch.showWithCodeMessage(code, msg)
// 依赖参数

2
OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginStatusManager.kt
View File

@@ -125,7 +125,7 @@ object LoginStatusManager : CallerBase<ILoginCallback>() {
loginService?.let {
return it.getCarModel()
}
return Carmodel.B1
return Carmodel.T2
}

6
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -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 {