Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt

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

@@ -107,13 +107,17 @@ class BoneTabLayout @JvmOverloads constructor(
 
         faultReasonView.setClickListener(object: FaultReasonView.ClickListener{
             override fun closeFaultReasonView() {
-                updateTabType(TabType.REPORT_INFO)
+                if(tabType == TabType.REPORT_INFO){
+                    updateTabType(TabType.REPORT_INFO)
+                }
             }
         })
 
         workOrderView.setClickListener(object: WorkOrderView.ClickListener{
             override fun closeWorkOrderView() {
-                updateTabType(TabType.REPORT_INFO)
+                if(tabType == TabType.REPORT_INFO){
+                    updateTabType(TabType.REPORT_INFO)
+                }
             }
         })
     }

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

@@ -99,7 +99,7 @@ class FaultReasonView @JvmOverloads constructor(
     private var reportNote: String = "" //上报描述
     private val reportType: Int = 1 //上报方式：0：小程序 1：司机屏 2：云端上报
 
-    private var source: Int = 0 //操作源，0:默认，一级分类 1:类型，二级分类；2:原因，三级分类
+    private var source: Int = 0 //操作源，0:默认，一级分类 ; 1:类型，二级分类; 2:原因，三级分类
     private var hasLevel2: Boolean = false //是否有二级分类
     private var hasLevel3: Boolean = false //是否有三级分类
 
@@ -506,7 +506,6 @@ class FaultReasonView @JvmOverloads constructor(
                 if (source == 0) {
                     level1Id = list[0].id
                     level1Name = list[0].name
-
                     source = 1
                     //获取故障二级分类即故障类型
                     CallerDevaToolsManager.getCategories(
@@ -573,6 +572,7 @@ class FaultReasonView @JvmOverloads constructor(
                 )
             )
             setAudio(false)
+            source = 0
             level1Id = 0 //一级分类ID
             level2Id = 0 //二级分类ID
             level3Id = 0 //三级分类ID
@@ -580,6 +580,8 @@ class FaultReasonView @JvmOverloads constructor(
             level2Name = ""
             level3Name = ""
             reportNote = "" //上报描述
+            tvUploadSuccess.visibility = View.GONE
+            faultReasonGroup.visibility = View.VISIBLE
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt

@@ -6,6 +6,7 @@ import android.text.Editable
 import android.util.AttributeSet
 import android.widget.EditText
 import android.widget.TextView
+import androidx.core.widget.doAfterTextChanged
 import androidx.core.widget.doBeforeTextChanged
 import androidx.core.widget.doOnTextChanged
 import androidx.preference.Preference
@@ -13,6 +14,7 @@ import androidx.preference.PreferenceViewHolder
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.kotlin.onClickWidthDuration
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import java.math.BigDecimal
 import java.util.concurrent.ConcurrentHashMap
@@ -70,20 +72,32 @@ class PreferenceWithSpeedSetting : Preference {
         speedUnit?.text = unit
         val speedLimit = holder.findViewById(R.id.tv_speed_limit) as? TextView
         if (cache.containsKey(key)) {
-            cur = max(cur, cache[key] ?: 0.0)
+            cur = cache[key] ?: cur
         }
+        cur = BigDecimal.valueOf(cur).setScale(1).toDouble()
         if (speedLimit is EditText) {
             speedLimit.setText(cur.toString())
-            speedLimit.doOnTextChanged { text, _, _, _ ->
+            speedLimit.doAfterTextChanged { text ->
                 val current = text?.let { runCatching { it.toString().toDouble() }.getOrNull() }
                 if (current == null) {
-                    return@doOnTextChanged
+                    btnOk.isEnabled = false
+                    holder.itemView.isEnabled =  false
+                    ll.isSelected = false
+                    return@doAfterTextChanged
                 }
                 if (current > max) {
+                    btnOk.isEnabled = false
+                    holder.itemView.isEnabled =  false
+                    ll.isSelected = false
                     ToastUtils.showShort("阈值最大为${BigDecimal.valueOf(max).setScale(1)}$unit")
-                    return@doOnTextChanged
+                    return@doAfterTextChanged
                 }
-                cur = current
+                val temp = BigDecimal.valueOf(current).setScale(1).toDouble()
+                if (cur == temp) {
+                    return@doAfterTextChanged
+                }
+                Logger.d("RWJ", "--- cache ---- 2 ---: $cur, $temp")
+                cur = temp
                 btnOk.isEnabled = true
                 ll.isSelected = true
                 cache[key] = cur
@@ -131,7 +145,6 @@ class PreferenceWithSpeedSetting : Preference {
             btnOk.isEnabled = true
             enabled[key] = true
             if (speedLimit is EditText) {
-                speedLimit.setText("")
                 speedLimit.setText(addAfter.toString())
             } else {
                 speedLimit?.text = addAfter.toString()
@@ -141,7 +154,6 @@ class PreferenceWithSpeedSetting : Preference {
         btnOk.onClick {
             onPreferenceClickListener?.also {
                 enabled[key] = false
-                cache.remove(key)
                 extras.putDouble(KEY_BUNDLE_CURRENT_VALUE, cur)
                 it.onPreferenceClick(this)
             }

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

@@ -38,7 +38,8 @@
         android:textSize="@dimen/sp_32"
         app:layout_constraintTop_toTopOf="@id/tvFaultTitle"
         app:layout_constraintBottom_toBottomOf="@id/tvFaultTitle"
-        app:layout_constraintRight_toRightOf="@id/tvFaultType"
+        app:layout_constraintRight_toRightOf="@id/viewTitleBg"
+        android:layout_marginEnd="@dimen/dp_40"
         />
 
     <View
@@ -332,10 +333,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:constraint_referenced_ids="viewFaultTypeLabel,tvTypeTitle,tvFaultType,
-            viewFaultReasonLabel,tvFaultReasonTitle,viewFaultTimeLabel,
-            tvFaultTimeTitle,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
+            viewFaultReasonLabel,tvFaultReasonTitle,tvFaultReason,viewFaultTimeLabel,
+            tvFaultTimeTitle,viewTimeBg,ivTimeReduce,tvOccurrenceTime,ivTimeAdd,
             viewFaultNoteLabel,tvFaultNoteTitle,tvFaultNoteSupplement,
-            etNoteInput,ivNoteAudio,tvFaultReport,tvFaultCancel,tvFaultReason"
+            etNoteInput,ivNoteAudio,tvFaultReport,tvFaultCancel"
         />
 
 </androidx.constraintlayout.widget.ConstraintLayout>