From 34c9bc21e8efa922cdfb431a16fabc652cc9d1df Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Mon, 25 Jul 2022 21:09:37 +0800
Subject: [PATCH] =?UTF-8?q?[add]=20UI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/layout/bus_base_fragment.xml |   2 +-
 .../core/function/main/MainActivity.java      |   4 +--
 .../src/main/res/layout/hmi_traffic_data.xml  |  31 +++++++++++-------
 .../core/function/overview/OverViewManager.kt |  14 --------
 .../core/function/smp/AMapCustomView.java     |   4 +++
 .../drawable-xhdpi-2560x1440/amap_reset.png   | Bin 0 -> 16704 bytes
 .../res/layout/module_overview_map_view.xml   |  12 ++++---
 .../res/layout/module_small_map_fragment.xml  |   1 +
 .../res/values-xhdpi-2560x1440/dimens.xml     |   1 +
 9 files changed, 36 insertions(+), 33 deletions(-)
 delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt
 create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png

diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
index d7c90ab082..3f491d2e0d 100644
--- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
@@ -21,7 +21,7 @@
             android:id="@+id/bus_arc"
             android:layout_width="@dimen/dp_616"
             android:layout_height="@dimen/dp_320"
-            android:layout_gravity="center" />
+            android:layout_marginLeft="@dimen/dp_13"/>
 
     </FrameLayout>
     <RelativeLayout
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
index 5fabab1775..5d2a5cdae6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java
@@ -303,8 +303,8 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         BaseFragment fragmentHdMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_HMI).navigation();
         addFragment(fragmentHdMap, fragmentHdMap.getTagName(), R.id.module_main_id_waring_fragment);
         // 加载 小地图 图层
-        BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation();
-        addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment);
+//        BaseFragment fragmentSmpMap = (BaseFragment) ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP).navigation();
+//        addFragment(fragmentSmpMap, fragmentSmpMap.getTagName(), R.id.module_main_id_smp_fragment);
     }
 
     /**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
index 824f21cb8b..b2330d66a2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml
@@ -2,14 +2,23 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="@dimen/dp_616"
-    android:layout_height="@dimen/dp_320"
-    android:background="@drawable/traffic_data_back">
+    android:layout_height="@dimen/dp_320">
 
+    <ImageView
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_320"
+        android:src="@drawable/traffic_data_back"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
     <ImageView
         android:id="@+id/speedImage"
         android:layout_width="@dimen/dp_270"
         android:layout_height="@dimen/dp_270"
         android:layout_marginLeft="@dimen/dp_46"
+        android:layout_marginTop="@dimen/dp_25"
+        android:layout_marginBottom="@dimen/dp_25"
         android:background="@drawable/traffic_data_speed"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -46,22 +55,22 @@
     <com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView
         android:id="@+id/traffic_position"
         android:layout_width="@dimen/dp_220"
-        app:defaultColor="@color/acc_default_txt_color"
-        app:selectColor="@color/dark_mode_select_txt_color"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_28"
-        android:layout_marginTop="@dimen/dp_80"
+        android:layout_marginTop="@dimen/dp_70"
         android:layout_marginRight="@dimen/dp_80"
+        app:defaultColor="@color/acc_default_txt_color"
         app:layout_constraintLeft_toRightOf="@+id/speedImage"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:selectColor="@color/dark_mode_select_txt_color" />
 
     <ImageView
         android:id="@+id/brakeStatus"
         android:layout_width="@dimen/dp_66"
         android:layout_height="@dimen/dp_68"
         android:layout_marginLeft="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_174"
+        android:layout_marginTop="@dimen/dp_173"
         android:layout_marginBottom="@dimen/dp_57"
         android:src="@drawable/traffic_data_empty"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -73,13 +82,13 @@
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_56"
         android:layout_marginLeft="@dimen/dp_42"
-        android:layout_marginTop="@dimen/dp_190"
         android:text="a: "
         android:textAlignment="viewStart"
         android:textColor="#fff"
         android:textSize="@dimen/dp_40"
-        app:layout_constraintLeft_toLeftOf="@+id/brakeStatus"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_goneMarginLeft="@dimen/dp_81"
+        app:layout_constraintBottom_toBottomOf="@+id/brakeStatus"
+        app:layout_constraintLeft_toRightOf="@+id/brakeStatus"
+        app:layout_constraintTop_toTopOf="@+id/brakeStatus" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt
deleted file mode 100644
index 44b3c39c97..0000000000
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.mogo.eagle.core.function.overview
-
-class OverViewManager private constructor() {
-
-    private object Holder {
-        val INSTANCE = OverViewManager()
-    }
-
-    companion object {
-        val instance by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
-            Holder.INSTANCE
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
index 0c29f7ed7b..899fabe352 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java
@@ -200,6 +200,10 @@ public class AMapCustomView
         options.setNaviNight(true);
         //导航全程光柱
         options.setTrafficBarEnabled(false);
+        //隐藏摄像头
+        options.setCameraBubbleShow(false);
+        //转向箭头
+        options.setNaviArrowVisible(false);
         //指南针
 //        options.setCompassEnabled(false);
 //        options.setTilt((int) tilt);
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi-2560x1440/amap_reset.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bbe87d40af919d784b31ad83768ea65d18a73ba
GIT binary patch
literal 16704
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
bd-?wlKbTt|HQouo00000NkvXXu0mjfG`Z$0

literal 0
HcmV?d00001

diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
index a8a1ede8d9..25f68c9d41 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_overview_map_view.xml
@@ -24,12 +24,15 @@
 
         <TextView
             android:id="@+id/overLayer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_150"
+            android:layout_height="@dimen/dp_150"
+            android:scaleType="centerInside"
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
-            android:background="@color/blue"
-            android:text="全览模式"
+            android:background="@drawable/amap_reset"
+            android:layout_alignParentEnd="true"
+            android:layout_marginRight="@dimen/dp_100"
+            android:layout_marginBottom="@dimen/dp_100"
             android:textColor="@drawable/white"
             android:textSize="@dimen/dp_34" />
     </RelativeLayout>
@@ -42,5 +45,4 @@
         android:src="@drawable/module_small_map_view_border_north"
         android:visibility="gone" />
 
-
 </merge>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
index 47b8763b7d..0392a650c8 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/module_small_map_fragment.xml
@@ -10,6 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="30px"
         android:layout_marginBottom="30px"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
index cda607535f..4b508254cf 100644
--- a/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-common/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -11,5 +11,6 @@
     <dimen name="warning_distance_right">30px</dimen>
     <dimen name="dp_270">270px</dimen>
     <dimen name="dp_320">320px</dimen>
+    <dimen name="dp_616">616px</dimen>
     <dimen name="dp_630">630px</dimen>
 </resources>