diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java index fbab69e62f..3a439ec7ea 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/AttrsController.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.mogo.och.taxi.passenger.R; -import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils; +import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils; public class AttrsController { diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt index 0bcf57b165..47a993e1d7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/indicator/option/IndicatorOptions.kt @@ -7,7 +7,7 @@ import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorSlideMo import com.mogo.och.taxi.passenger.widget.indicator.annotation.AIndicatorStyle import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorOrientation import com.mogo.och.taxi.passenger.widget.indicator.enums.IndicatorSlideMode -import com.mogo.eagle.core.widget.indicator.utils.IndicatorUtils +import com.mogo.och.taxi.passenger.widget.indicator.utils.IndicatorUtils /** *
diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
index fb56249b62..d9ea6a223b 100644
--- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java
@@ -87,15 +87,15 @@ public class BindingcarNetWorkManager {
                             }
 
                             //根据车辆类型切换不同的车辆模型
-                            if (info.getData().getVendor().equals("一汽红旗")) { //TODO
-                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
-                            } else if (info.getData().getVendor().equals("东风")) {
-                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
-                            } else if (info.getData().getVendor().equals("金旅星辰")) {
-                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
-                            } else {
-                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
-                            }
+//                            if (info.getData().getVendor().equals("一汽红旗")) { //TODO
+//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
+//                            } else if (info.getData().getVendor().equals("东风")) {
+//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
+//                            } else if (info.getData().getVendor().equals("金旅星辰")) {
+//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
+//                            } else {
+//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
+//                            }
 
                             SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData()));
                         }
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 5d2a5cdae6..5fabab1775 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 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_tap_position.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
index 263bee811c..a2a8beedd6 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
@@ -15,6 +15,7 @@
         android:textColor="@color/p_default_txt_color"
         android:textSize="@dimen/dp_46"
         android:textStyle="bold"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/tap_r"
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 b940564d5b..e96bc08d6a 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
@@ -49,7 +49,6 @@
         android:id="@+id/traffic_position"
         android:layout_width="@dimen/dp_220"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_28"
         android:layout_marginTop="@dimen/dp_70"
         android:layout_marginRight="@dimen/dp_80"
         app:defaultColor="@color/acc_default_txt_color"
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 22876725e2..b001e213e5 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
@@ -764,6 +764,7 @@ public class AMapCustomView
             markerOption.icon(BitmapDescriptorFactory.fromBitmap(
                     bitmap
             ));
+            markerOption.zIndex(2f);
             posInfMap.put(latLng, structureList);
             markerOptionsList.add(markerOption);
         }
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 0392a650c8..b994fca1a4 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,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginRight="30px"
         android:layout_marginBottom="30px"
-        android:visibility="gone"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />