Merge branch 'dev_robotaxi-d_230912_6.1.0' into dev_minibus-d_230926_6.1.0

2023-10-08 19:05:39 +08:00
parent 72d9c83fdb f5c8c1084b
commit 9dd7ad48e3
12 changed files with 66 additions and 4 deletions
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java
@@ -211,6 +211,8 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
        if (!TaxiTaskModel.INSTANCE.checkCurrentTaskCondition()) {
            mView.showDebugPanel();
        }
+
+        TaxiTaskModel.INSTANCE.updatePrepareTaskDelayUI();
    }

    @Override
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -1468,4 +1468,13 @@ object TaxiTaskModel {
            listener.onStartAutopilot(remainingTime)
        }
    }
+
+    fun updatePrepareTaskDelayUI() {
+        if (!TaxiCarServingStatusManager.isCarServingStatus()){
+            mTaxiTaskWithOrderCallbackMap.forEach {
+                val listener = it.value
+                listener.onStartPrepareTaskUI(0, false)
+            }
+        }
+    }
 }
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterProvider
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
 import com.mogo.eagle.core.function.datacenter.location.MoGoLocationDispatcher
 import com.mogo.eagle.core.function.datacenter.v2x.SpeedLimitDispatcher
 import com.mogo.eagle.core.function.datacenter.v2x.TrafficLightDispatcher
@@ -18,6 +19,7 @@ class DataCenterProvider: IDataCenterProvider {
        MoGoLocationDispatcher.initListener()

        context?.let {
+            CallerMsgBoxManager.queryAllMessages(it)
            TrafficLightDispatcher.INSTANCE.initServer(it)
            SpeedLimitDispatcher.INSTANCE.initLimit(it)
        }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -240,6 +240,10 @@ class DevaToolsProvider : IDevaToolsProvider {
        traceManager.setTraceLogEnable(enable)
    }

+    override fun setTraceEnable(enable: Boolean) {
+        traceManager.setTraceEnable(enable)
+    }
+
    override fun getTraceInfo(): HashMap<Int, ChainLogParam> {
        return traceManager.getTraceInfo()
    }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.fw.FileWriteManager
@@ -37,6 +38,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
    companion object {

        const val TAG = "TraceManager"
+        private const val TRACE_ENABLE = "TRACE_ENABLE"
        private const val DELAY_UPLOAD = 60 * 60 * 1000L

        val traceManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
@@ -119,7 +121,11 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
            }
            CallerDevaToolsListenerManager.invokeDevaToolsFwThreadClose()
        }
-        delayUpload()
+        val traceEnable = SharedPrefsMgr.getInstance(context).getBoolean(TRACE_ENABLE,true)
+        FileWriteManager.getInstance().setCloseRecord(traceEnable)
+        if(traceEnable){
+            delayUpload()
+        }
        init = true
    }

@@ -136,6 +142,10 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
        FileWriteManager.getInstance().logger = enable
    }

+    fun setTraceEnable(enable: Boolean) {
+        FileWriteManager.getInstance().setCloseRecord(enable)
+    }
+
    fun getTraceLogStatus(): Boolean {
        return FileWriteManager.getInstance().logger
    }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -66,6 +66,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener
 import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView
+import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
 import com.mogo.eagle.core.utilcode.kotlin.currentPadding
 import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
 import com.mogo.eagle.core.utilcode.kotlin.onClick
@@ -1352,6 +1353,16 @@ internal class DebugSettingView @JvmOverloads constructor(
            mogoMapData.get()?.setDebugMode(isChecked)
        }

+        /**
+         * 设置是否开启pre check, true-打开，false-关闭
+         */
+        tbTraceEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true)
+        tbTraceEnable.setOnCheckedChangeListener { _, isChecked ->
+            HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked)
+            SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked)
+            CallerDevaToolsManager.setTraceEnable(isChecked)
+        }
+
        cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus()
        //链路Log输出日志
        cbTraceLog.setOnCheckedChangeListener { _, isChecked ->
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt
@@ -126,6 +126,7 @@ class ParallelDriveView @JvmOverloads constructor(
                isAutoDriving = false
                Log.d(TAG, "onAutopilotStatusResponse-7")
                ThreadUtils.runOnUiThread({
+                    this.state = PARALLEL_DRIVING
                    updateUI(PARALLEL_DRIVING)
                }, ThreadUtils.MODE.QUEUE)
            }
@@ -159,12 +160,14 @@ class ParallelDriveView @JvmOverloads constructor(
        if (!isParallelDrivingAbility) {
            Log.d(TAG, "onParallelDrivingAbility-UNAVAILABLE")
            ThreadUtils.runOnUiThread({
+                if (state == PARALLEL_DRIVING) return@runOnUiThread
                state = UNAVAILABLE
                updateUI(UNAVAILABLE)
            }, ThreadUtils.MODE.QUEUE)
        } else {
            Log.d(TAG, "onParallelDrivingAbility-AVAILABLE")
            ThreadUtils.runOnUiThread({
+                if (state == PARALLEL_DRIVING) return@runOnUiThread
                state = 0
                updateUI(0)
            }, ThreadUtils.MODE.QUEUE)
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -46,8 +46,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {

        initTipToast();
        initModules();
-        //todo
-        CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
    }

    /**
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -2099,6 +2099,17 @@
                        android:textOn="关闭「HD-MAP」Log"
                        android:textSize="@dimen/dp_24" />

+                    <ToggleButton
+                        android:id="@+id/tbTraceEnable"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
+                        android:gravity="center"
+                        android:textOff="打开链路写/检查"
+                        android:textOn="关闭链路写/检查"
+                        android:textSize="@dimen/dp_24" />
+
                </com.google.android.flexbox.FlexboxLayout>

                <com.google.android.flexbox.FlexboxLayout
--- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt
@@ -58,6 +58,11 @@ interface IDevaToolsProvider : IProvider {
     */
    fun setTraceLogEnable(enable: Boolean)

+    /**
+     * 设置链路是否写入，preCheck是否执行
+     */
+    fun setTraceEnable(enable: Boolean)
+
    /**
     * 获取链路信息
     */
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt
@@ -84,6 +84,13 @@ object CallerDevaToolsManager {
        devaToolsProviderApi?.setTraceLogEnable(enable)
    }

+    /**
+     * 链路是否写入,preCheck是否开启
+     */
+    fun setTraceEnable(enable: Boolean) {
+        devaToolsProviderApi?.setTraceEnable(enable)
+    }
+
    /**
     * 获取链路节点信息
     */
--- a/gradle.properties
+++ b/gradle.properties
@@ -58,7 +58,7 @@ bytex.ASM_API=ASM7

 ################  外部依赖引用 ################
 # loglib
-LOGLIB_VERSION=1.9.12
+LOGLIB_VERSION=1.9.16
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
 MOGO_NETWORK_VERSION=1.4.7.17