Merge branch 'local' into dev_robotaxi-d-app-module_290_220715_2.9.0

OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml

@@ -9,10 +9,8 @@
             android:id="@+id/fl_speed"
             android:layout_width="@dimen/dp_616"
             android:layout_height="@dimen/dp_320"
-            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginLeft="@dimen/dp_13"
             android:layout_marginTop="@dimen/dp_40"
-            android:elevation="@dimen/bus_dp_10"
-            android:padding="@dimen/bus_dp_20"
             android:visibility="visible"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -21,7 +19,7 @@
             android:id="@+id/bus_arc"
             android:layout_width="@dimen/dp_616"
             android:layout_height="@dimen/dp_320"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"/>
 
     </FrameLayout>
     <RelativeLayout

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);
     }
 
     /**

core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_traffic_data.xml

@@ -5,11 +5,21 @@
     android:layout_height="@dimen/dp_320"
     android:background="@drawable/traffic_data_back">
 
+<!--    <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 +56,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 +83,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>

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverViewManager.kt

@@ -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
-        }
-    }
-}

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/AMapCustomView.java

@@ -138,6 +138,11 @@ public class AMapCustomView
         View smpView = LayoutInflater.from(context).inflate(R.layout.module_overview_map_view, this);
         mAMapNaviView = smpView.findViewById(R.id.aMapNaviView);
         overLayerView = findViewById(R.id.overLayer);
+        if(AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+            overLayerView.setBackground(getResources().getDrawable(R.drawable.amap_reset));
+        }else {
+            overLayerView.setBackground(getResources().getDrawable(R.drawable.amap_reset_bus));
+        }
         mAMapNavi = AMapNavi.getInstance(context);
         mAMapNavi.addAMapNaviListener(this);
         mAMapNaviView.setAMapNaviViewListener(this);
@@ -200,6 +205,10 @@ public class AMapCustomView
         options.setNaviNight(true);
         //导航全程光柱
         options.setTrafficBarEnabled(false);
+        //隐藏摄像头
+        options.setCameraBubbleShow(false);
+        //转向箭头
+        options.setNaviArrowVisible(false);
         //指南针
 //        options.setCompassEnabled(false);
 //        options.setTilt((int) tilt);

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_116"
+            android:layout_height="@dimen/dp_116"
+            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_40"
+            android:layout_marginBottom="@dimen/dp_158"
             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>

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" />
 

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>