[8.5.0]

[f2a 登录]

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

@@ -46,6 +46,7 @@ import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BAG_RECORD
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_BEAUTY_MODE
+import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LOGIN_MODE
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_FULL_LOG
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE
 import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_WARNING_UPLOAD
@@ -97,6 +98,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
 import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager
 import com.mogo.eagle.core.function.call.obu.CallerObuInfoListenerManager
+import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.function.call.och.CallerOchBizFunctionCall4EagleManager
 import com.mogo.eagle.core.function.call.setting.CallerMapShowNameManager
 import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager
@@ -263,6 +265,7 @@ import kotlinx.android.synthetic.main.view_debug_setting.view.tbLanguage
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbLogCatch
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbLogcatCenter
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbLoginLogout
+import kotlinx.android.synthetic.main.view_debug_setting.view.tbLoginMode
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbNetLog
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuController
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbObuLog
@@ -1152,6 +1155,18 @@ internal class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+
+        tbLoginMode.isChecked = FunctionBuildConfig.loginMode == 0
+        tbLoginMode.setOnCheckedChangeListener { compoundButton, isChecked ->
+            if (!compoundButton.isPressed) {
+                return@setOnCheckedChangeListener
+            }
+            CallerOchBizFunctionCall4EagleManager.onLoginStateChange()
+        }
+        if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
+            tbLoginMode.visibility = View.GONE
+        }
+
         // 雨天模式，上一次勾选的数据
         tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
@@ -2453,6 +2468,12 @@ internal class DebugSettingView @JvmOverloads constructor(
             tbIsRainMode?.text = "开启雨天模式"
         }
 
+        if(FunctionBuildConfig.loginMode==0){
+            tbLoginMode?.text = "手机号验证码登录"
+        }else{
+            tbLoginMode?.text = "二次验证登录"
+        }
+
         obuConnectStatusTv.text = Html.fromHtml(
             "OBU连接状态：${
                 if (AppConfigInfo.isConnectObu) {
@@ -2545,6 +2566,19 @@ internal class DebugSettingView @JvmOverloads constructor(
                 tbIsDemoMode.setPadding(left, top, right, bottom)
             }
 
+            BIZ_LOGIN_MODE -> {
+                tbLoginMode.isClickable = !lock
+                val (left, top, right, bottom) = tbLoginMode.currentPadding()
+                if (lock) {
+                    tbLoginMode.background =
+                        resources.getDrawable(R.drawable.radio_button_lock_background)
+                } else {
+                    tbLoginMode.background =
+                        resources.getDrawable(R.drawable.radio_button_normal_background_right)
+                }
+                tbLoginMode.setPadding(left, top, right, bottom)
+            }
+
             BIZ_RAIN_MODE -> {
                 tbIsRainMode.isClickable = !lock
                 val (left, top, right, bottom) = tbIsRainMode.currentPadding()
@@ -2897,6 +2931,10 @@ internal class DebugSettingView @JvmOverloads constructor(
         tbIsRainMode.isChecked = status
     }
 
+    override fun onLoginModeClickEvent(status: Boolean) {
+        tbLoginMode.isChecked = status
+    }
+
     /**
      * 点云模式
      */

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

@@ -331,6 +331,18 @@
                 android:textOn="关闭美化模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbLoginMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:padding="@dimen/dp_20"
+                android:textOff="二次验证登录"
+                android:textOn="手机号验证码登录"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbIsRainMode"
                 android:layout_width="match_parent"