Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify

OCH/bus/driver/src/main/java/com/mogo/och/bus/util/BusTrajectoryManager.java

@@ -10,6 +10,7 @@ import com.mogo.och.bus.bean.BusRoutesResult;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.model.OrderModel;
 import com.mogo.och.common.module.biz.constant.LoginStatusManager;
+import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager;
 import com.zhidao.socket.utils.LoginStatusUtil;
 
 import java.util.concurrent.TimeUnit;
@@ -72,30 +73,36 @@ public class BusTrajectoryManager {
         if ("ISYS_INIT_TRAJECTORY_START".equals(guardianInfo.getCode())) {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹开始下载");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             // ToastUtils.showShort("轨迹开始下载");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS".equals(guardianInfo.getCode())) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载成功");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             // ToastUtils.showShort("轨迹下载成功");
             stopTrajReqLoop();
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE".equals(guardianInfo.getCode())) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地无对应轨迹");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING".equals(guardianInfo.getCode())) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() " +
                     "轨迹下载失败，本地有对应轨迹，认为成功");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT".equals(guardianInfo.getCode())) {
             // 5. 轨迹管理_轨迹下载超时
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() 轨迹下载超时");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             // ToastUtils.showShort("轨迹下载超时");
         } else if ("ISSM_FUNC_AUTO_PILOT_READY".equals(guardianInfo.getCode())) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             CallerLogger.d(M_BUS + TAG, "onAutopilotGuardian() ssm ready，再次发起下载");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 再次发起下载", true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
             syncTrajectoryInfo();
         }
     }
@@ -186,7 +193,7 @@ public class BusTrajectoryManager {
             CallerLogger.e(M_BUS + TAG, "sendTrajectoryReq(): mAutoPilotLine is null!!!");
             return;
         }
-
+        OchChainLogManager.writeChainLog("轨迹监控","sendTrajectoryReq() 下发轨迹 轨迹id"+mAutoPilotLine.getLineId(), true, OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY);
         CallerAutoPilotControlManager.INSTANCE.sendTrajectoryDownloadReq(mAutoPilotLine);
         CallerLogger.d(M_BUS + TAG, "sendTrajectoryReq(): "
                 + GsonUtils.toJson(mAutoPilotLine));

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt

@@ -15,6 +15,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.och.common.module.biz.constant.LoginStatusManager
+import com.mogo.och.common.module.manager.orderlogmanager.OchChainLogManager
 import com.mogo.och.common.module.utils.SoundPoolHelper
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -63,11 +64,13 @@ object CharterTrajectoryManager {
             // 1. 轨迹管理_轨迹开始下载（本地已有对应轨迹也触发）
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹开始下载")
             // ToastUtils.showShort("轨迹开始下载");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹开始下载", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             stopTrajReqLoop()
         } else if ("ISYS_INIT_TRAJECTORY_SUCCESS" == guardianInfo.code) {
             // 2. 轨迹管理_轨迹下载成功（本地已有对应轨迹也触发）
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载成功")
             // ToastUtils.showShort("轨迹下载成功");
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载成功", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             stopTrajReqLoop()
         } else if ("ISYS_INIT_TRAJECTORY_FAILURE" == guardianInfo.code) {
             // 3. 轨迹管理_轨迹下载失败，本地无对应轨迹
@@ -75,6 +78,7 @@ object CharterTrajectoryManager {
                 SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() " +
                         "轨迹下载失败，本地无对应轨迹"
             )
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地无对应轨迹", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             // ToastUtils.showShort("轨迹下载失败，本地无对应轨迹");
         } else if ("ISYS_INIT_TRAJECTORY_WARNING" == guardianInfo.code) {
             // 4. 轨迹管理_轨迹下载失败，本地有对应轨迹，认为成功
@@ -82,14 +86,17 @@ object CharterTrajectoryManager {
                 SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() " +
                         "轨迹下载失败，本地有对应轨迹，认为成功"
             )
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载失败，本地有对应轨迹，认为成功", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             // ToastUtils.showShort("轨迹下载失败，本地有对应轨迹，认为成功");
         } else if ("ISYS_INIT_TRAJECTORY_TIMEOUT" == guardianInfo.code) {
             // 5. 轨迹管理_轨迹下载超时
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时")
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 轨迹下载超时", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             // ToastUtils.showShort("轨迹下载超时");
         }  else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
+            OchChainLogManager.writeChainLog("轨迹监控","onAutopilotGuardian() 当前位置距离轨迹距离大于15m", eventID = OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY)
             get().getBusOrderResult()?.lineId?.let {
                 syncTrajectoryInfo(it,
                     get().getBusOrderResult()?.lineName!!)
@@ -219,6 +226,13 @@ object CharterTrajectoryManager {
 //        mAutoPilotLine.setStopMd5("1bb098b244922649bf3e7bada0d3950f");
 //        mAutoPilotLine.setTimestamp(1654761600000L); //20220609 16:00
 //        mAutoPilotLine.setVehicleModel("红旗H9");
+        mAutoPilotLine?.let {
+            OchChainLogManager.writeChainLog("轨迹监控", "sendTrajectoryReq() 下发轨迹 轨迹id" + it.lineId,
+                true,
+                OchChainLogManager.EVENT_KEY_INFE_WITH_TRAJECTORY
+            )
+        }
+
         sendTrajectoryDownloadReq(mAutoPilotLine!!)
         d(
             SceneConstant.M_CHARTER_D + TAG,

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/orderlogmanager/OchChainLogManager.kt

@@ -16,6 +16,7 @@ object OchChainLogManager {
     private val TAG = OchChainLogManager::class.java.simpleName
 
     const val EVENT_KEY_INFE_WITH_CHANGE = "event_key_och_common_info_and_changeinfo"
+    const val EVENT_KEY_INFE_WITH_TRAJECTORY = "event_key_och_trajectory_info"
 
     /**
      * @param Info 订单详细信息
@@ -27,7 +28,8 @@ object OchChainLogManager {
         nodeAliasCode = ChainConstant.CHAIN_CODE_OCH_COMMON_DISTANCE,
         paramIndexes = [0,1]
     )
-    fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true) {
+    @JvmStatic
+    fun writeChainLog(Info: String, changeInfo: String,upload:Boolean = true,eventID:String=EVENT_KEY_INFE_WITH_CHANGE) {
         try {
             d(SceneConstant.M_OCHCOMMON + TAG, Info)
             d(SceneConstant.M_OCHCOMMON + TAG, changeInfo)
@@ -40,17 +42,10 @@ object OchChainLogManager {
                 params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss)
                 params["info"] = Info
                 params["changeInfo"] = changeInfo
-                MogoAnalyticUtils.track(EVENT_KEY_INFE_WITH_CHANGE, params)
+                MogoAnalyticUtils.track(eventID, params)
             }
         }catch (e:Exception){
-            val plateNum = AppConfigInfo.plateNumber
-            val params = HashMap<String, Any>()
-            params["sn"] = MoGoAiCloudClientConfig.getInstance().sn
-            params["env"] = DebugConfig.getNetMode()
-            params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum
-            params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss)
-            params["exception"] = e.toString()
-            MogoAnalyticUtils.track(EVENT_KEY_INFE_WITH_CHANGE, params)
+           e.printStackTrace()
         }
     }
 

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/map/AmapNaviToDestinationModel.java

@@ -78,6 +78,7 @@ public class AmapNaviToDestinationModel implements AMapNaviListener {
     public void setVoiceIsMute(boolean isPlay) {
         ThreadUtils.getSinglePool().execute(() -> {
             if (mAMapNavi == null) return;
+            CallerLogger.i(TAG, "setVoiceIsMute()--"+isPlay);
             this.isPlay = isPlay;
             if (isPlay) {
                 mAMapNavi.startSpeak();

OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/ZhiView.kt

@@ -35,7 +35,7 @@ class ZhiView @JvmOverloads constructor(
         const val TAG = "ZhiView"
     }
 
-    private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 20,this)
+    private var currentAnim = FrameAnimatorContainer(R.array.xiaozhi_normal, 12,this)
 
     @Volatile
     private var status = ZhiRecordWinUi.RecordStatus.STATUS_SILENCE