[2.13.0 修改限速的开关]
This commit is contained in:
@@ -1145,7 +1145,7 @@ class DebugSettingView @JvmOverloads constructor(
|
|||||||
* 限速数据,优先使用obu,默认打开
|
* 限速数据,优先使用obu,默认打开
|
||||||
*/
|
*/
|
||||||
tbRoadLimitSpeed.setOnCheckedChangeListener { _, isChecked ->
|
tbRoadLimitSpeed.setOnCheckedChangeListener { _, isChecked ->
|
||||||
HmiBuildConfig.isShowObuLimitSpeedView = !isChecked
|
HmiBuildConfig.isShowObuLimitSpeedView = isChecked
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.setting
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
|
import android.util.Log
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
@@ -94,6 +95,11 @@ class SOPSettingView @JvmOverloads constructor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tbRoadLimitSpeedSop.setOnCheckedChangeListener { _, isChecked ->
|
||||||
|
//默认关闭
|
||||||
|
HmiBuildConfig.isShowObuLimitSpeedView = isChecked
|
||||||
|
}
|
||||||
|
|
||||||
//红绿灯标识
|
//红绿灯标识
|
||||||
tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
|
tbTrafficLight.isChecked = HmiBuildConfig.isShowTrafficLightView
|
||||||
tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
|
tbTrafficLight.setOnCheckedChangeListener { _, isChecked ->
|
||||||
|
|||||||
@@ -1082,8 +1082,8 @@
|
|||||||
android:layout_columnWeight="1"
|
android:layout_columnWeight="1"
|
||||||
android:layout_margin="2dp"
|
android:layout_margin="2dp"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:textOff="关闭路侧限速"
|
android:textOff="获取路侧限速提醒"
|
||||||
android:textOn="获取路侧限速"
|
android:textOn="关闭路侧限速提醒"
|
||||||
android:textSize="@dimen/dp_24" />
|
android:textSize="@dimen/dp_24" />
|
||||||
|
|
||||||
</GridLayout>
|
</GridLayout>
|
||||||
|
|||||||
@@ -167,12 +167,24 @@
|
|||||||
app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
|
app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<ToggleButton
|
||||||
|
android:id="@+id/tbRoadLimitSpeedSop"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:padding="@dimen/dp_20"
|
||||||
|
android:background="@drawable/radio_button_normal_background_right"
|
||||||
|
android:textColor="#000"
|
||||||
|
android:textOff="获取路侧限速提醒"
|
||||||
|
android:textOn="关闭路侧限速提醒"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
|
||||||
|
android:textSize="@dimen/dp_24" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvSpeedThresholdTitle"
|
android:id="@+id/tvSpeedThresholdTitle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
app:layout_constraintLeft_toLeftOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tbIPCReport"
|
app:layout_constraintTop_toBottomOf="@id/tbRoadLimitSpeedSop"
|
||||||
android:text="变道速度阈值:"
|
android:text="变道速度阈值:"
|
||||||
android:textSize="@dimen/dp_36"
|
android:textSize="@dimen/dp_36"
|
||||||
android:textColor="#1A1A1A"
|
android:textColor="#1A1A1A"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.mogo.eagle.core.function.obu.mogo
|
package com.mogo.eagle.core.function.obu.mogo
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.util.Log
|
||||||
import com.mogo.eagle.core.data.config.FunctionBuildConfig
|
import com.mogo.eagle.core.data.config.FunctionBuildConfig
|
||||||
import com.mogo.eagle.core.data.config.HmiBuildConfig
|
import com.mogo.eagle.core.data.config.HmiBuildConfig
|
||||||
import com.mogo.eagle.core.data.config.HmiBuildConfig.isShowObuLimitSpeedView
|
import com.mogo.eagle.core.data.config.HmiBuildConfig.isShowObuLimitSpeedView
|
||||||
|
|||||||
@@ -98,6 +98,6 @@ object HmiBuildConfig {
|
|||||||
*/
|
*/
|
||||||
@JvmField
|
@JvmField
|
||||||
@Volatile
|
@Volatile
|
||||||
var isShowObuLimitSpeedView = true
|
var isShowObuLimitSpeedView = false
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user