From a1d514685aac32cf504deee74a21d9bfb16192fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 21 Oct 2021 22:58:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3=E6=97=A0?=
 =?UTF-8?q?=E5=BE=81=E5=85=86=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E8=A7=A3=E5=86=B3=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 .idea/gradle.xml                              |  2 --
 app/build.gradle                              |  1 -
 .../com/mogo/launcher/MogoApplication.java    |  3 ---
 .../core/data/constants/MogoServicePaths.java | 21 -------------------
 .../impl/custom/search/PoiSearchClient.java   | 10 ++++++---
 modules.txt                                   |  2 --
 .../com/mogo/module/main/MainActivity.java    |  3 ---
 .../module/main/cards/MogoModulesHandler.java |  7 -------
 .../module/main/cards/MogoModulesManager.java |  8 -------
 .../res/layout/module_main_activity_main.xml  |  6 ------
 .../module_main_activity_main_no_map.xml      |  6 ------
 settings.gradle                               |  2 --
 12 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8b0cecd1c8..f0420c959b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -48,8 +48,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-main" />
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
             <option value="$PROJECT_DIR$/modules/mogo-module-monitor" />
diff --git a/app/build.gradle b/app/build.gradle
index fbe5b0af7a..10558b4e0e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -204,7 +204,6 @@ dependencies {
         implementation project(':modules:mogo-module-apps')
         implementation project(":modules:mogo-module-push-base")
         implementation project(":modules:mogo-module-push")
-        implementation project(':modules:mogo-module-left-panel-noop')
         implementation project(':test:crashreport-upgrade')
         implementation project(':test:crashreport-bugly')
 
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 834d383701..0254e78a17 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -40,7 +40,6 @@ import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
 import com.zhidao.boot.persistent.lib.PersistentManager;
-import com.zhidao.mogo.module.left.panel.LeftPanelConst;
 
 /**
  * @author congtaowang
@@ -271,8 +270,6 @@ public class MogoApplication extends AbsMogoApplication {
             MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
         }
 
-        MogoModulePaths.addModule(new MogoModule(LeftPanelConst.PATH_NAME, LeftPanelConst.MODULE_NAME));
-
         MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder"));
         MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG));
         MogoModulePaths.addBaseModule(new MogoModule(ShareConstants.TAG, ShareConstants.MODEL_NAME));
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
index e8d0a6250f..97c7094d5b 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java
@@ -201,13 +201,6 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_SHARE = "/extensions/share";
 
-    /**
-     * obu相关接口
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_OBU = "/obu/api";
-
     /**
      * 事件面板
      */
@@ -215,20 +208,6 @@ public class MogoServicePaths {
     @Deprecated
     public static final String PATH_EVENT_PANEL = "/event/panel";
 
-    /**
-     * 左侧面板
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_LEFT_PANEL = "/left/panel";
-
-    /**
-     * 比亚迪模块
-     */
-    @Keep
-    @Deprecated
-    public static final String PATH_SPLASH = "/splash/api";
-
     /**
      * 位置上报
      */
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/PoiSearchClient.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/PoiSearchClient.java
index 17728a6bba..d2949ea696 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/PoiSearchClient.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/search/PoiSearchClient.java
@@ -39,9 +39,13 @@ public class PoiSearchClient implements IMogoPoiSearch, OnPoiSearchListener {
     private MogoSearchBound mBound;
 
     public PoiSearchClient( Context context, MogoPoiSearchQuery query ) {
-        mQuery = query;
-        mClient = new PoiSearch( context, ObjectUtils.fromMogo( mQuery ) );
-        mClient.setOnPoiSearchListener( this );
+        try {
+            mQuery = query;
+            mClient = new PoiSearch( context, ObjectUtils.fromMogo( mQuery ) );
+            mClient.setOnPoiSearchListener( this );
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
diff --git a/modules.txt b/modules.txt
index cafd9dbae7..6df49874ac 100644
--- a/modules.txt
+++ b/modules.txt
@@ -45,8 +45,6 @@
 :OCH:mogo-och-noop
 :OCH:mogo-och-taxi
 :main-extensions:mogo-module-main-launcher
-:modules:mogo-module-left-panel
-:modules:mogo-module-left-panel-noop
 :modules:mogo-module-push-base
 :modules:mogo-module-push-noop
 :modules:mogo-module-push
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 0751425b3c..9a2263c4c2 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
@@ -72,7 +72,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
     protected View mHistoryMessagePanel;
     protected FrameLayout mFloatingLayout;
     protected View mCoverUpLayout;
-    protected FrameLayout mLeftPanelLayout;
     protected View mLeftShadowFrame;
 
     protected ImageView mWarningTop;
@@ -117,7 +116,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         mFloatingLayout = findViewById(R.id.module_main_id_floating_view);
         mLeftShadowFrame = findViewById(R.id.module_main_id_map_left_shadow_frame);
         mCoverUpLayout = findViewById(R.id.module_main_id_cover_up);
-        mLeftPanelLayout = findViewById(R.id.module_main_id_left_panel_fragment_container);
         mHistoryMessagePanel = findViewById(R.id.module_main_id_message_history_fragment_container);
 
         mWarningTop = findViewById(R.id.warning_top);
@@ -273,7 +271,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
     protected void loadContainerModules() {
         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);
     }
 
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 0c6aeac7b3..e863e1dbda 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
@@ -70,13 +70,6 @@ public interface MogoModulesHandler {
      */
     void loadEventPanelModule(int containerId);
 
-    /**
-     * 加载左侧面板
-     *
-     * @param containerId
-     */
-    void loadLeftPanelModule(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 2d020cca37..c406f1ac14 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
@@ -161,14 +161,6 @@ public class MogoModulesManager implements MogoModulesHandler {
         addFragment( provider, containerId );
     }
 
-    @Override
-    public void loadLeftPanelModule( int containerId ) {
-        IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
-                .build( MogoServicePaths.PATH_LEFT_PANEL )
-                .navigation( getContext() );
-        addFragment( provider, containerId );
-    }
-
     @Override
     public void loadBaseModule() {
         List< MogoModule > baseModules = MogoModulePaths.getBaseModules();
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 191e010b0a..066073f5d0 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
@@ -99,12 +99,6 @@
         android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
-    <!-- 左侧浮层,布局位置目前只考虑了1+16独立app情况 -->
-    <FrameLayout
-        android:id="@+id/module_main_id_left_panel_fragment_container"
-        android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
-        android:layout_height="match_parent" />
-
     <!-- 快捷操作浮层 -->
     <FrameLayout
         android:id="@+id/module_main_id_entrance_fragment_container"
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
index 02fc71c920..23ec500f03 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
@@ -31,12 +31,6 @@
         android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/>
 
-    <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
-    <FrameLayout
-        android:id="@+id/module_main_id_left_panel_fragment_container"
-        android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
-        android:layout_height="match_parent" />
-
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"
         android:layout_width="match_parent"
diff --git a/settings.gradle b/settings.gradle
index 4f35b89719..2d72716516 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -54,8 +54,6 @@ include ':libraries:mogo-map'
 include ':modules:tanlulib'
 include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
-include ':modules:mogo-module-left-panel-noop'
-include ':modules:mogo-module-left-panel'
 include ':modules:mogo-module-obu'
 include ':modules:mogo-module-adas'
 include ':modules:mogo-module-map'