From 5abaeb855461db0e97558099273f5aaafb118fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 3 Aug 2021 16:44:35 +0800
Subject: [PATCH] Complete mogo-module-warning fragment show

---
 .idea/misc.xml                                |  9 ++++++
 .../com/mogo/launcher/MogoApplication.java    |  4 +--
 .../com/mogo/module/main/MainActivity.java    |  1 +
 .../module/main/cards/MogoModulesHandler.java | 18 ++++++++---
 .../module/main/cards/MogoModulesManager.java | 11 +++++++
 .../res/drawable/main_bitmap_splash_icon.xml  | 12 ++++++++
 .../res/layout/module_main_activity_main.xml  |  6 ++--
 .../small/map/SmallMapDirectionView.java      | 14 ++-------
 .../src/main/AndroidManifest.xml              |  2 +-
 .../module/warning/MoGoWarningProvider.java   | 30 ++++++++++++++-----
 .../com/mogo/module/warning/WaringConst.java  | 10 +++++++
 .../warning/ui/MoGoWarningFragment.java       | 29 ++++++++++++++++++
 .../module/warning/ui/WaringPresenter.java    | 13 ++++++++
 .../mogo/module/warning/ui/WaringView.java    | 10 +++++++
 .../src/main/res/layout/fragment_warning.xml  |  7 +++++
 .../service/module/IMogoModuleProvider.java   |  4 ++-
 .../service/warning/IMoGoWaringProvider.java  | 15 ++--------
 17 files changed, 153 insertions(+), 42 deletions(-)
 create mode 100644 modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_icon.xml
 create mode 100644 modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java
 create mode 100644 modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.java
 create mode 100644 modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringPresenter.java
 create mode 100644 modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringView.java
 create mode 100644 modules/mogo-module-warning/src/main/res/layout/fragment_warning.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 955cec9389..e0db5eedc8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,6 +11,8 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="modules/mogo-module-adas/src/main/res/layout/dialog_adas_dispatch_remind.xml" value="0.1" />
+        <entry key="modules/mogo-module-left-panel/src/main/res/layout/module_left_panel_simple_speed.xml" value="0.202734375" />
         <entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.25" />
         <entry key="modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml" value="0.202734375" />
       </map>
@@ -19,4 +21,11 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.1" />
+      </ProjectState>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index ce9685bbb8..9ce346e737 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -305,9 +305,9 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_CRASH_WARNING, "CrashWarning"));
 
         // OBU 模块
-        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "MoGoObuProvider"));
+        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_V2X_OBU_MOGO, "IMoGoObuProvider"));
         // widgets 模块
-        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_V2X_WARNING, "MoGoWarningProvider"));
+        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_V2X_WARNING, "IMoGoWaringProvider"));
         // 小地图模块
         MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_SMALL_MAP, "IMogoSmallMapProvider"));
         // ADAS模块
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index e0ec16d265..9ff1c6930f 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -278,6 +278,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         MogoModulesManager.getInstance().loadEntrancesModule(R.id.module_main_id_entrance_fragment_container);
         MogoModulesManager.getInstance().loadEventPanelModule(R.id.module_main_id_event_panel_fragment_container);
         MogoModulesManager.getInstance().loadLeftPanelModule(R.id.module_main_id_left_panel_fragment_container);
+        MogoModulesManager.getInstance().loadWaringModule(R.id.module_main_id_waring_fragment);
     }
 
     @Override
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
index 442e314597..83183f53f0 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
@@ -22,28 +22,28 @@ public interface MogoModulesHandler {
      *
      * @return
      */
-    List< IMogoModuleProvider > loadCardsModule();
+    List<IMogoModuleProvider> loadCardsModule();
 
     /**
      * 加载地图
      *
      * @param containerId 容器id
      */
-    void loadMapModule( int containerId );
+    void loadMapModule(int containerId);
 
     /**
      * 加载所有应用
      *
      * @param containerId 容器id
      */
-    void loadAppsListModule( int containerId );
+    void loadAppsListModule(int containerId);
 
     /**
      * 加载快捷操作
      *
      * @param containerId
      */
-    void loadEntrancesModule( int containerId );
+    void loadEntrancesModule(int containerId);
 
     /**
      * 加载基本服务模块，需要不启动页面就能运行
@@ -53,20 +53,30 @@ public interface MogoModulesHandler {
      */
     void loadBaseModule();
 
+    /**
+     * 加载预警面板
+     *
+     * @param containerId
+     */
+    void loadWaringModule(int containerId);
+
     /**
      * 加载事件面板
+     *
      * @param containerId
      */
     void loadEventPanelModule(int containerId);
 
     /**
      * 加载左侧面板
+     *
      * @param containerId
      */
     void loadLeftPanelModule(int containerId);
 
     /**
      * 加载比亚迪模块
+     *
      * @param containerId
      */
     void loadSplashModule(int containerId);
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index 8f1dc8c03b..96a3cd4d6b 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -12,6 +12,8 @@ import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.main.MainActivity;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.obu.IMoGoObuProvider;
+import com.mogo.service.warning.IMoGoWaringProvider;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.logger.Logger;
 
@@ -160,6 +162,15 @@ public class MogoModulesManager implements MogoModulesHandler {
         }
     }
 
+    @Override
+    public void loadWaringModule(int containerId) {
+        IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
+                .build( MogoServicePaths.PATH_V2X_WARNING )
+                .navigation( getContext() );
+        addFragment( provider, containerId );
+    }
+
+
     private IMogoModuleProvider load( String path ) {
         try {
             return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() );
diff --git a/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_icon.xml b/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_icon.xml
new file mode 100644
index 0000000000..b92cdb3d10
--- /dev/null
+++ b/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_icon.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--单独的slogan图片 并且设置下间距-->
+    <!--如果使用svg可以直接 drawable-->
+    <item>
+        <bitmap
+            android:gravity="center"
+            android:scaleType="centerCrop"
+            android:src="@drawable/mogo_slogan"
+            android:tileMode="disabled" />
+    </item>
+</layer-list>
\ No newline at end of file
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 8489db03b4..6bd455216a 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
@@ -152,9 +152,9 @@
             android:visibility="gone" />
     </FrameLayout>
 
-    <!--网约车视图-->
+    <!--预警视图 OBU、云端下发、自车感知、自车策略-->
     <FrameLayout
-        android:id="@+id/module_main_id_hmi_fragment"
+        android:id="@+id/module_main_id_waring_fragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
@@ -168,7 +168,7 @@
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/main_bitmap_splash_bg"
+            android:background="@drawable/main_bitmap_splash_icon"
             android:scaleType="centerCrop"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index bf62c852c6..9f707b7b13 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -30,7 +30,6 @@ import com.mogo.module.common.view.RoundLayout;
 import com.mogo.module.small.map.animation.DirectionRotateAnimation;
 import com.mogo.module.small.map.utils.MapAssetStyleUtils;
 import com.mogo.module.small.map.view.ISmallMapDirectionView;
-import com.mogo.utils.logger.Logger;
 
 import java.math.RoundingMode;
 import java.text.NumberFormat;
@@ -47,7 +46,7 @@ public class SmallMapDirectionView
         implements IMogoCarLocationChangedListener2, ISmallMapDirectionView {
 
     //小地图名称
-    public static final String MODULE_NAME = "SmallMap";
+    public static final String MODULE_NAME = "SmallMapDirectionView";
 
     private RoundLayout rlSmallMapBorder;
     private ImageView mIvMapBorder;
@@ -248,7 +247,7 @@ public class SmallMapDirectionView
 
     @Override
     public void onCarLocationChanged2(Location latLng) {
-        Logger.d(MODULE_NAME, "onCarLocationChanged2 latLng:" + latLng);
+        //Logger.d(MODULE_NAME, "onCarLocationChanged2 latLng:" + latLng);
         if (mAMapNavi != null) {
             NumberFormat nf = NumberFormat.getNumberInstance();
             // 保留两位小数
@@ -269,7 +268,7 @@ public class SmallMapDirectionView
 
     @Override
     public void onCarLocationChanged(MogoLatLng latLng) {
-        Logger.d(MODULE_NAME, "onCarLocationChanged latLng:" + latLng);
+        //Logger.d(MODULE_NAME, "onCarLocationChanged latLng:" + latLng);
     }
 
     @Override
@@ -289,13 +288,6 @@ public class SmallMapDirectionView
      */
     public void changeAngle(int angle) {
         int tempAngle = 360 - angle;
-
-//        if (tempAngle <= 180) {
-//            tempAngle = tempAngle;
-//        } else {
-//            tempAngle = -(360 - tempAngle);
-//        }
-
         mRotateAnimation.setFromDegrees(lastAngle);
         mRotateAnimation.setToDegrees(tempAngle);
 
diff --git a/modules/mogo-module-warning/src/main/AndroidManifest.xml b/modules/mogo-module-warning/src/main/AndroidManifest.xml
index 9ce179b5b1..e89b92d70a 100644
--- a/modules/mogo-module-warning/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-warning/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.module.hmi">
+    package="com.mogo.module.warning">
 
 </manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/MoGoWarningProvider.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/MoGoWarningProvider.java
index 8311530046..ec1f124221 100644
--- a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/MoGoWarningProvider.java
+++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/MoGoWarningProvider.java
@@ -1,10 +1,13 @@
 package com.mogo.module.warning;
 
 import android.content.Context;
+import android.os.Bundle;
 
-import androidx.fragment.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.module.warning.ui.MoGoWarningFragment;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.warning.IMoGoWaringProvider;
 import com.mogo.utils.logger.Logger;
@@ -18,15 +21,26 @@ import com.mogo.utils.logger.Logger;
 public class MoGoWarningProvider implements IMoGoWaringProvider {
     private String TAG = "MoGoWarningProvider";
 
-
-    @Override
-    public void init(FragmentActivity activity, int containerId) {
-
-    }
-
     @Override
     public void init(Context context) {
-        Logger.d(TAG, "初始化蘑菇预警模块……");
+        Logger.d(TAG, "初始化蘑菇预警模块 ……");
 
     }
+
+    @Override
+    public Fragment createFragment(Context context, Bundle data) {
+        Logger.d(TAG, "初始化蘑菇预警模块 Fragment……");
+        return new MoGoWarningFragment();
+    }
+
+    @NonNull
+    @Override
+    public String getModuleName() {
+        return WaringConst.MODULE_NAME;
+    }
+
+    @Override
+    public int getType() {
+        return 0;
+    }
 }
diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java
new file mode 100644
index 0000000000..1890c30da2
--- /dev/null
+++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/WaringConst.java
@@ -0,0 +1,10 @@
+package com.mogo.module.warning;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/8/3 4:26 下午
+ */
+public class WaringConst {
+    public static String MODULE_NAME = "MODULE_LEFT_PANEL";
+    public static String PATH_NAME = "/left/panel";
+}
diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.java
new file mode 100644
index 0000000000..88f7f33d68
--- /dev/null
+++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/MoGoWarningFragment.java
@@ -0,0 +1,29 @@
+package com.mogo.module.warning.ui;
+
+import androidx.annotation.NonNull;
+
+import com.mogo.commons.mvp.MvpFragment;
+import com.mogo.module.warning.R;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/8/3 2:40 下午
+ */
+public class MoGoWarningFragment extends MvpFragment<WaringView, WaringPresenter> implements WaringView {
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_warning;
+    }
+
+    @Override
+    protected void initViews() {
+
+    }
+
+    @NonNull
+    @Override
+    protected WaringPresenter createPresenter() {
+        return new WaringPresenter(this);
+    }
+}
diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringPresenter.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringPresenter.java
new file mode 100644
index 0000000000..13d0bb7946
--- /dev/null
+++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringPresenter.java
@@ -0,0 +1,13 @@
+package com.mogo.module.warning.ui;
+
+import com.mogo.commons.mvp.Presenter;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/8/3 3:55 下午
+ */
+public class WaringPresenter extends Presenter< WaringView > {
+    public WaringPresenter(WaringView view) {
+        super(view);
+    }
+}
diff --git a/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringView.java b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringView.java
new file mode 100644
index 0000000000..dfa76a712b
--- /dev/null
+++ b/modules/mogo-module-warning/src/main/java/com/mogo/module/warning/ui/WaringView.java
@@ -0,0 +1,10 @@
+package com.mogo.module.warning.ui;
+
+import com.mogo.commons.mvp.IView;
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/8/3 3:54 下午
+ */
+public interface WaringView extends IView {
+}
diff --git a/modules/mogo-module-warning/src/main/res/layout/fragment_warning.xml b/modules/mogo-module-warning/src/main/res/layout/fragment_warning.xml
new file mode 100644
index 0000000000..63d12a49d1
--- /dev/null
+++ b/modules/mogo-module-warning/src/main/res/layout/fragment_warning.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
index fec00c557c..37352b4303 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java
@@ -38,7 +38,9 @@ public interface IMogoModuleProvider extends IProvider {
      * @param context
      * @return
      */
-    View createView( Context context );
+    default View createView( Context context ){
+        return null;
+    }
 
     /**
      * 模块唯一标识
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.java
index 23738792ec..5ff63db342 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/warning/IMoGoWaringProvider.java
@@ -1,20 +1,11 @@
 package com.mogo.service.warning;
 
-import androidx.annotation.IdRes;
-import androidx.fragment.app.FragmentActivity;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
+import com.mogo.service.module.IMogoModuleProvider;
 
 /**
  * @author xiaoyuzhou
  * @date 2021/8/2 7:36 下午
  */
-public interface IMoGoWaringProvider extends IProvider {
-    /**
-     * 初始化网约车容器
-     *
-     * @param activity activity
-     * @param containerId 容器ID
-     */
-    void init(FragmentActivity activity, @IdRes int containerId);
+public interface IMoGoWaringProvider extends IMogoModuleProvider {
+
 }