diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt index 89230db8d3..ca71d33501 100644 --- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt +++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/fragment/SimpleSpeedFragment.kt @@ -10,6 +10,7 @@ import kotlinx.android.synthetic.main.module_left_panel_simple_speed.* * * @author tongchenfei */ +private const val SPEED_THRESHOLD = 90 class SimpleSpeedFragment: MvpFragment() { override fun getLayoutId(): Int { return R.layout.module_left_panel_simple_speed @@ -24,5 +25,11 @@ class SimpleSpeedFragment: MvpFragment= SPEED_THRESHOLD) { + // 速度超过90,需要改变背景颜色 + tvModuleLeftPanelSpeed.setBackgroundResource(R.drawable.module_left_panel_warn_speed_bg) + }else{ + tvModuleLeftPanelSpeed.setBackgroundResource(R.drawable.module_left_panel_normal_speed_bg) + } } } \ No newline at end of file diff --git a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt index 880efe5fa5..179d925c22 100644 --- a/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt +++ b/modules/mogo-module-left-panel/src/main/java/com/zhidao/mogo/module/left/panel/presenter/SimpleSpeedPresenter.kt @@ -11,6 +11,7 @@ import com.zhidao.mogo.module.left.panel.LeftPanelConst.MODULE_NAME import com.zhidao.mogo.module.left.panel.fragment.SimpleSpeedFragment import java.lang.Thread.sleep import kotlin.concurrent.thread +import kotlin.random.Random /** * 临时左侧车速逻辑的presenter diff --git a/modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml b/modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml index 29b83f1787..d11ae4695f 100644 --- a/modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml +++ b/modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml @@ -1,16 +1,31 @@ - + + + + android:background="@drawable/module_left_panel_normal_speed_bg" /> \ No newline at end of file diff --git a/modules/mogo-module-left-panel/src/main/res/values/dimens.xml b/modules/mogo-module-left-panel/src/main/res/values/dimens.xml new file mode 100644 index 0000000000..7c45135ef1 --- /dev/null +++ b/modules/mogo-module-left-panel/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 80px + 69.6px + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 033fdc6160..a3be7e8723 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -36,7 +36,7 @@ diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 3bf4256b72..f05ec80366 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -22,4 +22,6 @@ 800px 30px + 340px + \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 3f01bfe959..5cec246a84 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -21,6 +21,7 @@ 15px 460px 444px + 350px 16px \ No newline at end of file