From ad528aaa47f70cc3c7c280c331e20d60f31f4f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 22 Sep 2021 14:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B0=8F=E5=9C=B0=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=94=BE=E5=88=B0=E4=BA=86=E5=B0=8F?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .../core/function/smp/SmallMapDirectionView.java     |  9 ++-------
 .../src/main/res/layout/module_small_map_view.xml    | 12 ++++++------
 .../java/com/mogo/commons/AbsMogoApplication.java    | 11 +----------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
index 256efe4caf..f85f4914df 100644
--- a/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
+++ b/core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
@@ -21,13 +21,11 @@ import com.amap.api.maps.model.CustomMapStyleOptions;
 import com.amap.api.navi.AMapNavi;
 import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.function.smp.animation.DirectionRotateAnimation;
 import com.mogo.eagle.core.function.smp.utils.MapAssetStyleUtils;
 import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView;
-import com.mogo.eagle.core.widget.RoundLayout;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 
@@ -48,7 +46,6 @@ public class SmallMapDirectionView
     //小地图名称
     public static final String MODULE_NAME = "SmallMapDirectionView";
 
-    private RoundLayout rlSmallMapBorder;
     private ImageView mIvMapBorder;
     private DirectionRotateAnimation mRotateAnimation;
     private int lastAngle = 0;
@@ -80,12 +77,10 @@ public class SmallMapDirectionView
 
         LayoutInflater.from(context).inflate(R.layout.module_small_map_view, this);
 
-        mAMapNaviView = AbsMogoApplication.getMapNaviView();
-        rlSmallMapBorder = findViewById(R.id.rlSmallMapBorder);
-        rlSmallMapBorder.addView(mAMapNaviView);
+        mAMapNaviView = findViewById(R.id.aMapNaviView);
+        mAMapNaviView.onCreate(null);
         mIvMapBorder = findViewById(R.id.ivMapBorder);
 
-
         initAMapView();
 
         // 注册定位监听
diff --git a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
index 90d5f94e31..b8d74339e7 100644
--- a/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
+++ b/core/function-impl/mogo-core-function-smp/src/main/res/layout/module_small_map_view.xml
@@ -20,14 +20,14 @@
         app:roundLayoutRadius="360dp">
 
         <!--TODO Hook方案在Pad上有问题,优先 效果,后面在看如何解决-->
-        <!-- <com.amap.api.navi.AMapNaviView
-             android:id="@+id/aMapNaviView"
-             android:layout_width="@dimen/module_small_map_view_width"
-             android:layout_height="@dimen/module_small_map_view_width" />-->
-        <!--<com.amap.api.maps.TextureMapView
+        <com.amap.api.navi.AMapNaviView
             android:id="@+id/aMapNaviView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />-->
+            android:layout_height="match_parent" />
+        <!-- <com.amap.api.maps.TextureMapView
+             android:id="@+id/aMapNaviView"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent" />-->
     </com.mogo.eagle.core.widget.RoundLayout>
 
     <ImageView
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
index 6fe6e20428..c330c54261 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -13,7 +13,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.amap.api.navi.AMapNaviView;
 import com.mogo.aicloud.services.httpdns.IMogoHttpDns;
 import com.mogo.aicloud.services.httpdns.MogoHttpDnsHandler;
 import com.mogo.commons.analytics.AnalyticsUtils;
@@ -54,23 +53,15 @@ public abstract class AbsMogoApplication extends Application {
         return sApp;
     }
 
-    public static AMapNaviView aMapNaviView;
-
-    public static AMapNaviView getMapNaviView() {
-        return aMapNaviView;
-    }
-
     private static IMogoHttpDns sApis;
 
     @Override
     public void onCreate() {
         super.onCreate();
-        aMapNaviView = new AMapNaviView(this);
-        aMapNaviView.onCreate(null);
         sApp = this;
         initARouter();
         Utils.init(this);
-        if ( shouldInit() ) {
+        if (shouldInit()) {
             init();
         }
     }