From 7a8d9a8084fc1835ad9a56bc4ceeaeef47795d4f Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 27 Jul 2020 15:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=AF=BC=E8=88=AA=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/functions/baseservices.gradle                    |  2 +-
 .../module/navi/ui/setting/NaviSettingFragment.kt    |  7 +++++++
 .../src/main/res/layout/fragment_navi_setting.xml    | 12 ++++++++++++
 .../java/com/mogo/module/v2x/V2XModuleProvider.java  | 12 ++++++------
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index 3fa534fc32..cd44946ee1 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -19,7 +19,7 @@ project.dependencies {
         d8xxImplementation project(':foudations:mogo-base-services-apk')
         em4Implementation project(':foudations:mogo-base-services-apk')
         e8xxImplementation project(':foudations:mogo-base-services-apk')
-        f8xxImplementation project(':foudations:mogo-base-services-sdk')
+        f8xxImplementation project(':foudations:mogo-base-services-apk')
         em3Implementation project(':foudations:mogo-base-services-apk')
     }
 }
\ No newline at end of file
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
index 1c2ccc322d..6a6d43b32e 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
@@ -17,6 +17,8 @@ import com.mogo.module.navi.manager.AddressManager
 import com.mogo.module.navi.manager.SettingManager
 import com.mogo.module.navi.manager.VolumeManager
 import com.mogo.module.navi.ui.base.BaseFragment
+import com.mogo.utils.TipToast
+import com.mogo.utils.storage.SharedPrefsMgr
 import kotlinx.android.synthetic.main.fragment_navi_setting.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
@@ -227,6 +229,11 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
                     SearchApisHolder.getGpsSimulatorManager().close()
                 }
             }
+            tb_custom_map.isChecked = DebugConfig.isUseCustomMap()
+            tb_custom_map.setOnCheckedChangeListener{ _, isChecked ->
+                TipToast.shortTip("设置完成，下次启动生效")
+                SharedPrefsMgr.getInstance(context!!).putBoolean("useCustomMap", isChecked)
+            }
             tb_navi.isChecked = SettingManager.isMonitor()
             tb_gps.isChecked = SettingManager.isGpsSimulator()
 
diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
index b06ddec62c..3a9dbc7d7a 100644
--- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
+++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
@@ -451,6 +451,18 @@
                     android:textSize="@dimen/module_search_txt_setting_width"
                     app:layout_constraintLeft_toLeftOf="parent" />
 
+                <ToggleButton
+                    android:id="@+id/tb_custom_map"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="50dp"
+                    android:checked="false"
+                    android:textColor="@color/white_80"
+                    android:textOff="启用自研地图"
+                    android:textOn="启用高德地图"
+                    android:textSize="@dimen/module_search_txt_setting_width"
+                    app:layout_constraintLeft_toLeftOf="parent" />
+
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
index 05fa325662..5188f2398a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java
@@ -140,12 +140,12 @@ public class V2XModuleProvider implements
         intentFilter.addAction(V2XConst.BROADCAST_SCENE_HANDLER_ACTION);
         localBroadcastManager.registerReceiver(localReceiver, intentFilter);
 
-        if (BuildConfig.DEBUG) {
-            // TODO 这是测试页面
-            V2XServiceManager
-                    .getIMogoWindowManager()
-                    .addView(new V2XTestConsoleWindow(context), 0, 0, false);
-        }
+//        if (BuildConfig.DEBUG) {
+//            // TODO 这是测试页面
+//            V2XServiceManager
+//                    .getIMogoWindowManager()
+//                    .addView(new V2XTestConsoleWindow(context), 0, 0, false);
+//        }
     }
 
     private void initVoice(Context context) {