[6.10.0]

[fea]
[减少对登录信息请求的频次]

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/model/DriverM1Model.kt

@@ -147,9 +147,6 @@ class DriverM1Model {
         //定位，长连接等异常提示
         startLoopAbnormalFactors(mContext!!)
 
-        //网络监听
-        IntentManager.getInstance().registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
-
         //2022.1.28
         // 调用Disposable.dispose() 时候会出现InterruptedException 导致出现崩溃
         // The exception could not be delivered to the consumer because it has already canceled/disposed
@@ -321,17 +318,6 @@ class DriverM1Model {
             }
         }
 
-    //监听网络变化，避免启动机器时无网导致无法更新订单信息
-    private val mNetWorkIntentListener =
-        IMogoIntentListener { intentStr, _ ->
-            d(SceneConstant.M_TAXI + TAG, "onIntentReceived = %s", intentStr)
-            if (ConnectivityManager.CONNECTIVITY_ACTION == intentStr) {
-                if (NetworkUtils.isConnected(mContext)) {
-                    LoginStatusManager.queryLoginStatusByNet()
-                }
-            }
-        }
-
     // 自车定位
     private val mMapLocationListener: IMoGoChassisLocationGCJ02Listener =
         object : IMoGoChassisLocationGCJ02Listener {

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

@@ -181,7 +181,7 @@ object LoginServiceManager {
 
     }
 
-    fun queryLoginStatusByNet() {
+    private fun queryLoginStatusByNet() {
         LoginModel.queryCarStatus(false)
     }
 

OCH/common/common/src/main/java/com/mogo/och/common/module/network/interceptor/FRetryWithTime.kt

@@ -3,8 +3,9 @@ package com.mogo.och.common.module.network.interceptor
 import com.mogo.cloud.passport.MoGoAiCloudClient
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON
 import com.mogo.och.common.module.biz.login.LoginStatusManager
-import com.mogo.och.common.module.biz.login.EnumLoginStatus
+import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Function
@@ -17,7 +18,9 @@ class FRetryWithTime<T : BaseData> : Function<T, ObservableSource<T>> {
                 MoGoAiCloudClient.getInstance().refreshToken()
                 return Observable.error(OchCommonRetryException())
             }else if(it.code == 1003){
-                CallerLogger.d("FRetryWithTime", "接口失败报错 1003:${EnumLoginStatus.Logout}")
+                CallerLogger.e(M_OCHCOMMON, "接口失败报错 1003:需重新查询登录状态")
+                OchChainLogManager.writeChainLogNet(true,"接口错误",
+                    "错误code:${it.code} 后台登录状态变更 前台重新查询登录状态接口来确定")
                 LoginStatusManager.queryLoginStatusByNet(false)
             }
         }

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

@@ -225,8 +225,6 @@ object TaxiTaskModel {
             OCHSocketMessageManager.msgMonitorType,
             OperateAction2()
         )
-        IntentManager.getInstance()
-            .registerIntentListener(ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener)
         AbnormalFactorsLoopManager.startLoopAbnormalFactors(mContext)
         TrajectoryAndDistanceManager.addDistanceListener(TAG, localCalculateDistanceListener)
         TrajectoryAndDistanceManager.addTrajectoryListener(TAG, localCalculateTrajectoryListener)
@@ -465,20 +463,6 @@ object TaxiTaskModel {
             }
         }
 
-    //监听网络变化，避免启动机器时无网导致无法更新订单信息
-    private val mNetWorkIntentListener: IMogoIntentListener =
-        IMogoIntentListener { intentStr, _ ->
-            d(TAG, "mNetWorkIntentListener: onIntentReceived=$intentStr")
-            if ((ConnectivityManager.CONNECTIVITY_ACTION == intentStr)) {
-                if (NetworkUtils.isConnected(mContext)) {
-                    LoginStatusManager.queryLoginStatusByNet()
-                    DebugView.printInfoMsg("[网络状态变化] isConnected=true")
-                } else {
-                    DebugView.printErrorMsg("[网络状态变化] isConnected=false")
-                }
-            }
-        }
-
     private val localCalculateDistanceListener: IDistanceListener = object : IDistanceListener {
         override fun distanceCallback(distance: Float) {
             val lastTime = distance / TaxiUnmannedConst.TAXI_AVERAGE_SPEED * 3.6 //秒