From 39d9878d30dd1db66844b13316a8bed1d9589d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 10 May 2021 12:05:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=89=88=E5=B0=8F=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=20=E5=AE=9E=E7=8E=B0=20=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-module-main-launcher/build.gradle           |  2 ++
 .../module/main/launcher/MainLauncherActivity.java   | 12 ++++++++++++
 .../main/res/layout/module_main_activity_main.xml    |  6 ++++++
 .../mogo/module/small/map/SmallVisionProvider.java   | 10 ++++++++++
 ...ection_view.xml => module_small_map_fragment.xml} |  0
 .../com/mogo/service/map/IMogoSmallMapProvider.java  | 10 ++++++++++
 6 files changed, 40 insertions(+)
 rename modules/mogo-module-smp/src/main/res/layout/{module_small_map_direction_view.xml => module_small_map_fragment.xml} (100%)

diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/main-extensions/mogo-module-main-launcher/build.gradle
index efd300157a..bda491d407 100644
--- a/main-extensions/mogo-module-main-launcher/build.gradle
+++ b/main-extensions/mogo-module-main-launcher/build.gradle
@@ -44,10 +44,12 @@ dependencies {
         api rootProject.ext.dependencies.modulemain
         implementation rootProject.ext.dependencies.mogooch
         implementation rootProject.ext.dependencies.moduleservice
+        implementation rootProject.ext.dependencies.moduleSmallMap
     } else {
         api project(":modules:mogo-module-main")
         implementation project(":OCH:mogo-och")
         implementation project(':modules:mogo-module-service')
+        implementation project(':modules:mogo-module-smp')
     }
 }
 
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
index c426c99a24..b8d5d84ae5 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
@@ -18,6 +18,7 @@ import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.main.MainActivity;
 import com.mogo.module.main.cards.MogoModulesManager;
 import com.mogo.module.service.receiver.MogoReceiver;
+import com.mogo.module.small.map.SmallVisionProvider;
 import com.mogo.och.IMogoOCH;
 import com.mogo.service.intent.IMogoIntentListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
@@ -116,6 +117,7 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
     protected void loadOthersModules() {
         super.loadOthersModules();
         loadOCHModule();
+        loadSmpModule();
     }
 
     /**
@@ -128,6 +130,16 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis
         }
     }
 
+    /**
+     * 加载小地图模块
+     */
+    private void loadSmpModule() {
+        SmallVisionProvider smp = ARouter.getInstance().navigation(SmallVisionProvider.class);
+        if (smp != null) {
+            smp.init(this, R.id.module_main_id_smp_fragment);
+        }
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
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 148d071f3a..5456d236a3 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
@@ -141,6 +141,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!--小地图视图-->
+    <FrameLayout
+        android:id="@+id/module_main_id_smp_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
     <!--冷启动过渡Logo-->
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/module_main_id_cover_up"
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
index 9dc29557a2..50d3ab9dc4 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallVisionProvider.java
@@ -10,6 +10,7 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.amap.api.col.n3.lg;
@@ -35,6 +36,8 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
     private final String TAG = "SmallVisionProvider";
 
     private Context mContext;
+    private int mContainerId;
+    private FragmentActivity mActivity;
 
     private WindowManagerView mWindowManagerView;
     private SmallMapDirectionView mSmallMapDirectionView;
@@ -60,6 +63,12 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
         return ModuleType.TYPE_SERVICE;
     }
 
+    @Override
+    public void init(FragmentActivity activity, int containerId) {
+        mContainerId = containerId;
+        mActivity = activity;
+    }
+
     @Override
     public void init(Context context) {
         Log.d(TAG, "小地图模块初始化……");
@@ -91,6 +100,7 @@ public class SmallVisionProvider implements IMogoSmallMapProvider, IMogoStatusCh
         mWindowManagerView = null;
     }
 
+
     @Override
     public void showPanel() {
         Log.d(TAG, "小地图模块触发展示……");
diff --git a/modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml b/modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
similarity index 100%
rename from modules/mogo-module-smp/src/main/res/layout/module_small_map_direction_view.xml
rename to modules/mogo-module-smp/src/main/res/layout/module_small_map_fragment.xml
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
index 4ec381d393..36a4110c30 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoSmallMapProvider.java
@@ -1,5 +1,8 @@
 package com.mogo.service.map;
 
+import androidx.annotation.IdRes;
+import androidx.fragment.app.FragmentActivity;
+
 import com.mogo.service.module.IMogoModuleProvider;
 
 /**
@@ -8,6 +11,13 @@ import com.mogo.service.module.IMogoModuleProvider;
  */
 public interface IMogoSmallMapProvider extends IMogoModuleProvider {
 
+    /**
+     * 初始化网约车容器
+     *
+     * @param activity
+     * @param containerId 容器ID
+     */
+    void init(FragmentActivity activity, @IdRes int containerId );
 
     /**
      * 显示面板