Merge branch 'dev_robotaxi-d_240227_6.3.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_240227_6.3.0

This commit is contained in:
xinfengkun
2024-03-15 14:01:10 +08:00
230 changed files with 812 additions and 221 deletions

View File

@@ -81,6 +81,7 @@ import kotlinx.android.synthetic.main.view_sop_setting.view.scV2XSwitch
import kotlinx.android.synthetic.main.view_sop_setting.view.scV2iPnc
import kotlinx.android.synthetic.main.view_sop_setting.view.scV2nPnc
import kotlinx.android.synthetic.main.view_sop_setting.view.scWeakNetSlowDown
import kotlinx.android.synthetic.main.view_sop_setting.view.scWeatherSwitch
import kotlinx.android.synthetic.main.view_sop_setting.view.sopLayout
import kotlinx.android.synthetic.main.view_sop_setting.view.tvOverTakeLimit
import kotlinx.android.synthetic.main.view_sop_setting.view.tvPullTimeTitle
@@ -737,6 +738,17 @@ internal class SOPSettingView @JvmOverloads constructor(
}
}
scWeatherSwitch?.also {
if (!AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
it.visibility = GONE
} else {
it.visibility = VISIBLE
it.setOnCheckedChangeListener { _, isChecked ->
CallerMapUIServiceManager.getMapUIController()?.setWeatherEnable(isChecked)
}
}
}
// 清扫车业务模式切换
scSweeperModeSwitch?.also { switchView ->
switchView.isChecked =

View File

@@ -757,6 +757,20 @@
app:layout_constraintRight_toRightOf="@id/otherGuideLine"
app:layout_constraintTop_toBottomOf="@id/scNew360LookAround" />
<!--天气效果开关-->
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/scWeatherSwitch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_25"
android:scaleX="1.2"
android:scaleY="1.2"
android:checked="true"
android:text="天气效果开关"
app:layout_constraintLeft_toLeftOf="@id/scIPCReport"
app:layout_constraintRight_toRightOf="@id/scIPCReport"
app:layout_constraintTop_toBottomOf="@id/scIPCReport" />
<TextView
android:id="@+id/tvPullTimeTitle"
android:layout_width="wrap_content"