Merge branch 'refs/heads/master' into dev_robotaxi-d_241112_6.8.0

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/status/StartAutoPilotStatusView.kt

@@ -216,7 +216,12 @@ class StartAutoPilotStatusView @JvmOverloads constructor(
                 if (isAnyOneError) R.drawable.icon_no_fsm_status_bg_error
                 else R.drawable.icon_no_fsm_status_bg_normal
             )
-        notifyStatus(isAnyOneError)
+        if (!hasFSM.get()) {
+            notifyStatus(isAnyOneError)
+            Logger.d(TAG, "--- handleWithoutFSM --- do update")
+        } else {
+            Logger.d(TAG, "--- handleWithoutFSM --- do not update")
+        }
     }
 
     private fun notifyStatus(isError: Boolean) {

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt

@@ -29,6 +29,7 @@ import com.iflytek.cloud.RecognizerListener
 import com.iflytek.cloud.RecognizerResult
 import com.iflytek.cloud.SpeechError
 import com.iflytek.cloud.SpeechRecognizer
+import com.mogo.commons.env.ProjectUtils
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.report.CategoryInfo
@@ -173,7 +174,9 @@ class FaultReasonView @JvmOverloads constructor(
         iconDown?.setBounds(0, 0, iconDown.minimumWidth, iconDown.minimumHeight)
         iconUp?.setBounds(0, 0, iconUp.minimumWidth, iconUp.minimumHeight)
         //获取一级分类
-        CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
+        if(ProjectUtils.isSaas()){
+            CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
+        }
         //弹窗展示时间
         tvFaultTime.text =
             millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())
@@ -538,7 +541,9 @@ class FaultReasonView @JvmOverloads constructor(
 
     override fun getCategoriesError(msg: String) {
         super.getCategoriesError(msg)
-        ToastUtils.showShort("故障列表获取失败：$msg")
+        if(ProjectUtils.isSaas()){
+            ToastUtils.showShort("故障列表获取失败：$msg")
+        }
     }
 
     override fun onVisibilityAggregated(isVisible: Boolean) {
@@ -546,7 +551,9 @@ class FaultReasonView @JvmOverloads constructor(
         if(visibility == View.VISIBLE){
             CallerDevaToolsListenerManager.addListener(TAG, this)
             //获取一级分类
-            CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
+            if(ProjectUtils.isSaas()){
+                CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId, 1, 0, type, 0)
+            }
             //弹窗展示时间
             tvFaultTime.text =
                 millis2String(System.currentTimeMillis(), TimeUtils.getHourMinSecondFormat())

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt

@@ -191,6 +191,8 @@ class ReportTypeView @JvmOverloads constructor(
             }
         }
         oneClickTimer?.start()
+        //请求一键上报故障码
+        CallerDevaToolsManager.getCategories(BadCaseConfig.tenantId,level,0,4,1)
     }
 
     /**
@@ -296,9 +298,11 @@ class ReportTypeView @JvmOverloads constructor(
             Log.i(TAG,"onAutopilotStatistics status = "+ it.status)
             if(it.status == AutopilotStatistics.AUTOPILOT_START_STATUS.FAILED){
                 //触发一键上报
-                ThreadUtils.runOnUiThread {
-                    if(!typeSelectStatus){
-                        showOneCLickReportView()
+                if(ProjectUtils.isSaas()){
+                    ThreadUtils.runOnUiThread {
+                        if(!typeSelectStatus){
+                            showOneCLickReportView()
+                        }
                     }
                 }
             }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -9,6 +9,8 @@ import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
+import android.os.Environment
+import android.os.Environment.*
 import android.os.Process
 import android.text.Html
 import android.text.TextUtils
@@ -115,6 +117,7 @@ import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.BarUtils
 import com.mogo.eagle.core.utilcode.util.CommonUtils
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.KeyboardUtils
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.mogo.eagle.core.utilcode.util.ParseVersionUtils
@@ -140,6 +143,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.btChangeEnv
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnAppReboot
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnBrakeThreshold
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnConnectServerIp
+import kotlinx.android.synthetic.main.view_debug_setting.view.btnDeleteDB
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnDisconnectIpc
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnDrawFusion
 import kotlinx.android.synthetic.main.view_debug_setting.view.btnHdVisualAdjust
@@ -315,6 +319,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
+import java.io.File
+import java.io.File.*
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Timer
@@ -1375,6 +1381,18 @@ internal class DebugSettingView @JvmOverloads constructor(
                 CallerAutoPilotControlManager.connectSpecifiedServer(ip)
             }
         }
+        btnDeleteDB.setOnClickListener {
+            try{
+                val ROOT_PATH = getExternalStorageDirectory().absolutePath + separator + "Mogo" + separator + "APP_cache" + separator
+                val dbDir = File(ROOT_PATH)
+                if(dbDir.exists()&&dbDir.isDirectory){
+                    FileUtils.deleteFilesInDir(dbDir)
+                }
+            }catch (e:Exception){
+
+            }
+
+        }
 
         //是否开启异常上报
         tbReportWarning.isChecked = FunctionBuildConfig.isReportWarning

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1328,12 +1328,23 @@
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
+                    <Button
+                        android:id="@+id/btnDeleteDB"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:padding="@dimen/dp_20"
+                        android:text="删除业务数据库"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/btnBrakeThreshold" />
+
                     <View
                         android:id="@+id/brakeThresholdDivider"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:background="#F0F0F0"
-                        app:layout_constraintTop_toBottomOf="@id/btnBrakeThreshold" />
+                        app:layout_constraintTop_toBottomOf="@id/btnDeleteDB" />
 
                     <Button
                         android:id="@+id/btnConnectServerIp"