Merge branch 'qa_d82x'

1+16已封版发布

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
#	modules/mogo-module-search/src/main/res/values/dimens.xml

modules/mogo-module-search/build.gradle

@@ -49,7 +49,6 @@ dependencies {
     implementation rootProject.ext.dependencies.androidxcardview
     kapt rootProject.ext.dependencies.aroutercompiler
     implementation rootProject.ext.dependencies.rxandroid
-    implementation rootProject.ext.dependencies.guideshowprovider
 
 
     if (Boolean.valueOf(RELEASE)) {

modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java

@@ -7,7 +7,6 @@ import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.navi.IMogoNavi;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.gps.simulator.IMogoGpsSimulatorManager;
-import com.mogo.module.guideshow.provider.IGuideShowProvider;
 import com.mogo.module.navi.cp.PersonalInfoManagerImpl;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.analytics.IMogoAnalytics;
@@ -31,7 +30,6 @@ public class SearchApisHolder {
     private static final String TAG = "SearchApisHolder";
 
     private static IMogoServiceApis sApis;
-    private static IGuideShowProvider sGuideShowApis;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
 
     private static PersonalInfoManagerImpl mPersonalInfoManager;
@@ -40,7 +38,6 @@ public class SearchApisHolder {
         Logger.d( TAG, "static block init." );
         sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
-        sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
     }
 
     public static IMogoServiceApis getApis() {
@@ -90,13 +87,6 @@ public class SearchApisHolder {
         return getApis().getIntentManagerApi();
     }
 
-    public static IGuideShowProvider getGuideShowApis() {
-        if ( sGuideShowApis == null ) {
-            sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
-        }
-        return sGuideShowApis;
-    }
-
     public static IMogoSettingManager getSettingManager() {
         return getApis().getSettingManagerApi();
     }

modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt

@@ -223,9 +223,6 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
         SearchApisHolder.getNaviApis().startNavi(!SettingManager.isMonitor())
         SearchApisHolder.getUiControllerApis().recoverLockMode()
 
-        if (SearchApisHolder.getGuideShowApis().isPlayingVideo()) {
-            SearchApisHolder.getGuideShowApis().closeGuideShowView()
-        }
         isStartedNavi = true
         SearchApisHolder.getFragmentManager().clearAll()
     }

modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="moudle_search_fragment_padding">@dimen/dp_60</dimen>
-    <dimen name="moudle_search_fragment_padding_top">@dimen/dp_40</dimen>
-    <dimen name="moudle_search_et_width">600dp</dimen>
-    <dimen name="moudle_search_et_hight">@dimen/dp_120</dimen>
-    <dimen name="moudle_search_iv_back_hight">@dimen/dp_80</dimen>
-    <dimen name="moudle_search_iv_back_margin_left">@dimen/dp_24</dimen>
-    <dimen name="moudle_search_iv_back_margin_right">@dimen/dp_20</dimen>
+    <!--    module_main_activity_main.xml-->
+    <dimen name="txt_normal">@dimen/sp_32</dimen>
+    <dimen name="txt_title">@dimen/sp_40</dimen>
+    <dimen name="txt_large">25sp</dimen>
+    <dimen name="module_search_fragment_padding">@dimen/dp_60</dimen>
+    <dimen name="module_search_fragment_padding_top">@dimen/dp_40</dimen>
+    <dimen name="module_search_et_width">600dp</dimen>
+    <dimen name="module_search_et_hight">@dimen/dp_120</dimen>
+    <dimen name="module_search_iv_back_hight">@dimen/dp_80</dimen>
+    <dimen name="module_search_iv_back_margin_left">@dimen/dp_24</dimen>
+    <dimen name="module_search_iv_back_margin_right">@dimen/dp_20</dimen>
     <dimen name="module_search_et_margin_right">@dimen/dp_50</dimen>
     <dimen name="module_search_et_text_size">40px</dimen>
     <dimen name="module_search_btn_width">266px</dimen>
@@ -39,9 +42,9 @@
     <dimen name="module_search_dp_120">120px</dimen>
     <dimen name="module_search_txt_setting_width">45px</dimen>
     <dimen name="module_search_dp_838">838px</dimen>
-    <dimen name="module_search_category_margin_bottom">142px</dimen>
+    <dimen name="module_search_category_margin_bottom">184px</dimen>
     <dimen name="module_search_dp_104">104px</dimen>
-    <dimen name="module_search_strategy_name_width">154px</dimen>
+    <dimen name="module_search_strategy_name_width" >154px</dimen>
     <dimen name="module_search_marker_number_textSize">32px</dimen>
     <dimen name="module_search_choose_path_item_height">212px</dimen>
     <dimen name="module_search_calculate_item_strategy_name_textSize">26px</dimen>