From ea9258561e5d48bf7295460aa37630fd483d4cf6 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 29 Aug 2024 18:18:49 +0800
Subject: [PATCH] =?UTF-8?q?[6.6.0]=20[common]=20[=E8=87=AA=E9=A9=BE?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=20Rx=20=E6=94=B9=E4=B8=BA=20handle]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autopilot/OchAutopilotAnalytics.kt        | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt
index 30c4d592c6..06055bad3e 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt
@@ -12,6 +12,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.DateTimeUtils
 import com.mogo.och.common.module.manager.autopilot.OCHAdasAbilityManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import com.mogo.och.common.module.manager.loop.BizLoopManager
 import com.mogo.och.common.module.utils.RxUtils
 import io.reactivex.disposables.Disposable
 
@@ -55,6 +56,9 @@ abstract class OchAutopilotAnalytics {
             MogoAnalyticUtils.track(EVENT_KEY_START_AUTOPILOT_PARAMETERS, params)
         }
 
+        /**
+         * 底盘收到启动自驾的ack
+         */
         fun triggerStartAutopilotParametersAck(data:String,isSuccess:Boolean){
             val params = HashMap<String, Any>()
             params[EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE
@@ -65,6 +69,9 @@ abstract class OchAutopilotAnalytics {
             MogoAnalyticUtils.track(EVENT_KEY_START_AUTOPILOT_ACK, params)
         }
 
+        /**
+         * 启动自驾判断距离
+         */
         fun triggerDistance2LineorStation(info: String){
             val map = hashMapOf<String, Any>()
             map[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP
@@ -79,10 +86,14 @@ abstract class OchAutopilotAnalytics {
     private var mStartAutopilotKey: String? = null
     private val mStartAutopilotParams = HashMap<String, Any>()
 
-    private var startAutopiloTimeOut: Disposable? = null
+
+    private val timeOutRunnable = Runnable {
+        // 15s内未开启，上报失败埋点
+        triggerStartAutopilotFailureEvent("", "15s后app等待超时", System.currentTimeMillis())
+    }
 
     fun triggerStartAutopilotFailureEventByAdas(failCode: String, failMsg: String, startFailDate: Long) {
-        RxUtils.disposeSubscribe(startAutopiloTimeOut)
+        BizLoopManager.removeCallback(timeOutRunnable)
         triggerStartAutopilotFailureEvent(failCode, failMsg, startFailDate)
     }
 
@@ -126,7 +137,7 @@ abstract class OchAutopilotAnalytics {
         mStartAutopilotKey = if (restart) getEventKeyRestartService() else getEventKeyStartService()
         if (send) {
             if (mStartAutopilotParams.isEmpty()) return
-            RxUtils.disposeSubscribe(startAutopiloTimeOut)
+            BizLoopManager.removeCallback(timeOutRunnable)
             // 开启成功，上报埋点
             mStartAutopilotParams[EVENT_PARAM_START_FAILURE_CODE] = ""
             mStartAutopilotParams[EVENT_PARAM_START_FAILURE_MSG] = ""
@@ -145,10 +156,8 @@ abstract class OchAutopilotAnalytics {
             mStartAutopilotParams[EVENT_PARAM_END_NAME] = endName
             mStartAutopilotParams[EVENT_PARAM_LINE_ID] = lineId
             mStartAutopilotParams[EVENT_PARAM_ORDER_NUMBER] = orderId?:""
-            startAutopiloTimeOut = RxUtils.createSubscribeOnOwnThread(LOOP_PERIOD_15S) {
-                // 15s内未开启，上报失败埋点
-                triggerStartAutopilotFailureEvent("", "15s后app等待超时", System.currentTimeMillis())
-            }
+            BizLoopManager.removeCallback(timeOutRunnable)
+            BizLoopManager.postDelayed(timeOutRunnable,LOOP_PERIOD_15S)
         }
     }
 
@@ -192,7 +201,6 @@ abstract class OchAutopilotAnalytics {
      * 用户点击启动自驾的时间
      */
     fun triggerClickStartAutopilotTime(triggerDate: Long) {
-        val plateNum = AppConfigInfo.plateNumber
         val params = HashMap<String, Any>()
         params[EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE
         params[EVENT_PARAM_CLICK_TIME] = DateTimeUtils.getTimeText(triggerDate,DateTimeUtils.yyyy_MM_dd_HH_mm_ss_SSS)