[6.5.1]Bus考试合并到主分支

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt

@@ -1244,7 +1244,34 @@ class MoGoAutopilotControlProvider :
         return AdasManager.getInstance().sendRoboBusJinlvM1TaskCmd(roboBusJinlvM1Cmd) > -1
     }
 
+    @ChainLog(
+        linkChainLog = AdasChain.CHAIN_TYPE_SOCKET_AUTOPILOT,
+        linkCode = AdasChain.CHAIN_SOURCE_ADAS,
+        nodeAliasCode = AdasChain.CHAIN_CODE_ADAS_SEND_PLANNING_CMD,
+        paramIndexes = [0]
+    )
     override fun sendPlanningCmd(cmd: Int): Boolean {
         return AdasManager.getInstance().sendPlanningCmd(cmd) > -1
     }
+
+    @ChainLog(
+        linkChainLog = AdasChain.CHAIN_TYPE_SOCKET_AUTOPILOT,
+        linkCode = AdasChain.CHAIN_SOURCE_ADAS,
+        nodeAliasCode = AdasChain.CHAIN_CODE_ADAS_SEND_PLANNING_CMD,
+        paramIndexes = [0]
+    )
+    override fun sendPlanningLineChangeCmd(cmd: Int): Boolean {
+        return AdasManager.getInstance().sendPlanningLaneChangeCmd(cmd) > -1
+    }
+
+    /**
+     * 设置座椅压力接口
+     * @param driver 主驾是否有人
+     * @param copilot 副驾是否有人
+     * @param backRow 后排是否有人
+     */
+    override fun sendSeatPressure(driver: Boolean, copilot: Boolean, backRow: Boolean): Boolean {
+        return AdasManager.getInstance().sendSeatPressure(driver, copilot, backRow) > -1
+    }
+
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/network/StartUpTraceNetWorkModel.kt

@@ -17,7 +17,6 @@ class StartUpTraceNetWorkModel {
             .create(TraceStartUpApiService::class.java)
     }
 
-    private var retryTime = 0
     private var success: ((String) -> Unit)? = null
     private var error: ((String) -> Unit)? = null
     @Volatile
@@ -29,7 +28,8 @@ class StartUpTraceNetWorkModel {
         onError: ((String) -> Unit)? = null
     ) {
         request<BaseResponse<String>> {
-            var map: MutableMap<String, Any> = mutableMapOf()
+            var retryTime = 0
+            var map: MutableMap<String, Any>
             start {
                 if (success == null) {
                     success = onSuccess
@@ -54,11 +54,13 @@ class StartUpTraceNetWorkModel {
             onSuccess {
                 if (it.result != null) {
                     onSuccess?.invoke(it.result)
+                    traceId = ""
                 } else {
                     if (retryTime < 3) {
                         retryTime += 1
-                        report()
+                        report(id)
                     } else {
+                        traceId = ""
                         error?.invoke("startUp report error msg is null")
                     }
                 }
@@ -66,13 +68,13 @@ class StartUpTraceNetWorkModel {
             onError {
                 if (retryTime < 3) {
                     retryTime += 1
-                    report()
+                    report(id)
                 } else if (it.message != null) {
+                    traceId = ""
                     error?.invoke(it.message ?: "startUp report error msg is null")
                 }
 
             }
-
         }
     }
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.hmi.ui.vehicle
 
 import android.content.Context
+import android.os.CountDownTimer
 import android.util.AttributeSet
 import android.util.TypedValue.COMPLEX_UNIT_PX
 import android.view.LayoutInflater
@@ -21,6 +22,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.SoundPoolUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.zhjt.service_biz.BizConfig
 import kotlinx.android.synthetic.main.view_pnc_actions.view.*
@@ -122,6 +124,24 @@ class PncActionsView @JvmOverloads constructor(
                             AppCompatResources.getDrawable(context, bgResources)
                         tvHmiPncActions.text = actions
                     }
+                    //voice tip
+                    if(actions == "已超出ODD"){
+                        val countDownTimer = object : CountDownTimer(3000, 1000){
+                            override fun onTick(p0: Long) {
+                                try {
+                                    SoundPoolUtils.getSoundPool().playSoundWithRedId(context,R.raw.weak_net_tips)
+                                }catch (e: Exception){
+                                    e.printStackTrace()
+                                }
+                            }
+
+                            override fun onFinish() {
+
+                            }
+
+                        }
+                        countDownTimer.start()
+                    }
                 } else {
                     tvHmiPncActions.background = null
                     tvHmiPncActions.text = ""