From 58c45992638873782fd12b690855cd51baa3c0d7 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Tue, 7 Jul 2020 18:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=901+16=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/fragment/SimpleSpeedFragment.kt     |  7 +++++
 .../panel/presenter/SimpleSpeedPresenter.kt   |  1 +
 .../layout/module_left_panel_simple_speed.xml | 31 ++++++++++++++-----
 .../src/main/res/values/dimens.xml            |  5 +++
 .../res/layout/module_main_activity_main.xml  |  2 +-
 .../src/main/res/values-xhdpi/dimens.xml      |  2 ++
 .../src/main/res/values/dimens.xml            |  1 +
 7 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 modules/mogo-module-left-panel/src/main/res/values/dimens.xml

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<SimpleSpeedFragment, SimpleSpeedPresenter>() {
     override fun getLayoutId(): Int {
         return R.layout.module_left_panel_simple_speed
@@ -24,5 +25,11 @@ class SimpleSpeedFragment: MvpFragment<SimpleSpeedFragment, SimpleSpeedPresenter
 
     fun refreshSpeed(speed: Int) {
         tvModuleLeftPanelSpeed.text = speed.toString()
+        if (speed >= 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 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <ImageView
+        android:id="@+id/ivContainerBg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/module_left_panel_speed_container_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
 
     <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:id="@+id/tvModuleLeftPanelSpeed"
-        android:text="50"
+        android:text="0"
         android:gravity="center"
-        android:textSize="40sp"
+        android:textStyle="bold"
+        android:textSize="@dimen/module_left_panel_simple_speed_text_size"
+        app:layout_constraintLeft_toLeftOf="@id/ivContainerBg"
+        app:layout_constraintRight_toRightOf="@id/ivContainerBg"
+        app:layout_constraintTop_toTopOf="@id/ivContainerBg"
+        android:layout_marginTop="@dimen/module_left_panel_simple_speed_text_margin_top"
         android:textColor="#fff"
-        android:background="#000" />
+        android:background="@drawable/module_left_panel_normal_speed_bg" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_left_panel_simple_speed_text_size">80px</dimen>
+    <dimen name="module_left_panel_simple_speed_text_margin_top">69.6px</dimen>
+</resources>
\ 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 @@
 
     <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
     <FrameLayout
-        android:layout_width="@dimen/module_main_id_entrance_fragment_container_marginLeft"
+        android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
         android:layout_height="match_parent"
         android:id="@+id/module_main_id_left_panel_fragment_container" />
 
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 @@
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding">30px</dimen>
 
+    <dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>
+
 </resources>
\ 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 @@
     <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
     <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
+    <dimen name="module_main_id_left_panel_fragment_container_width">350px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding">16px</dimen>
 
 </resources>
\ No newline at end of file