[6.7.4]

1、增加无人化Taxi到站播报
2、统一默认车型为T2,实际车型以接口查询变更；
3、增加查询车辆状态接口日志上报

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"

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<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)
                         // 依赖参数

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

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

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