Merge branch 'qa_1.1' into dev_1.1.2

app/proguard-rules.pro

@@ -335,6 +335,7 @@
 
 #-----ZhiDaoService-----
 -keep class com.zhidao.auto.platform.**{*;}
+-keep class com.zhidao.auto.carcorder.**{*;}
 -keep class com.zhidaohulian.**{*;}
 -keep class com.zhidao.boot.**{*;}
 -keep class com.elegant.**{*;}

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -58,11 +58,12 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
         //运营位卡片，需要默认显示，放在第一个加载
-        if ( DebugConfig.isLauncher() ) {
+        if (DebugConfig.isLauncher() ) {
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
         }
-
-        MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
+        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
+            MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
+        }
         MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );
 

gradle.properties

@@ -63,9 +63,9 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.1.6
+MOGO_MODULE_TANLU_VERSION=1.3.1.10
 # 车聊聊
-CARCHATTING_VERSION=1.4.6
+CARCHATTING_VERSION=1.4.8
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导
@@ -81,7 +81,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.1.6
+TANLULIB_VERSION=1.3.1.10
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块
@@ -103,5 +103,5 @@ MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT
 ## 产品库必备配置
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
-versionCode=80006
-versionName=8.0.6
+versionCode=80007
+versionName=8.0.7-qa_1.1

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    module_main_activity_main.xml-->
+
+    <dimen name="module_search_fragment_padding" >32px</dimen>
+    <dimen name="module_search_fragment_padding_top">32px</dimen>
+    <dimen name="module_search_et_width">640px</dimen>
+    <dimen name="module_search_et_hight">64px</dimen>
+    <dimen name="module_search_iv_back_hight">42px</dimen>
+    <dimen name="module_search_iv_back_margin_left">12px</dimen>
+    <dimen name="module_search_iv_back_margin_right">10px</dimen>
+    <dimen name="module_search_et_margin_right">30px</dimen>
+    <dimen name="module_search_et_text_size">22px</dimen>
+    <dimen name="module_search_btn_width">142px</dimen>
+    <dimen name="module_search_btn_right_margin">4px</dimen>
+    <dimen name="module_search_txt_big">22px</dimen>
+    <dimen name="module_search_btn_height">55.5px</dimen>
+    <dimen name="module_search_navi_home_width">304px</dimen>
+    <dimen name="module_search_navi_home_height">64px</dimen>
+    <dimen name="module_search_navi_home_margin_left">16px</dimen>
+    <dimen name="txt_normal">18px</dimen>
+    <dimen name="module_search_dp_72">38px</dimen>
+    <dimen name="module_search_dp_75">75px</dimen>
+    <dimen name="module_search_navi_home_padding_left">40px</dimen>
+    <dimen name="module_search_dp_778">410px</dimen>
+    <dimen name="module_search_dp_1200">640px</dimen>
+    <dimen name="module_search_dp_32">16px</dimen>
+    <dimen name="module_search_dp_40">20px</dimen>
+    <dimen name="module_search_dp_60">30px</dimen>
+    <dimen name="module_search_dp_37">20px</dimen>
+    <dimen name="txt_large">28px</dimen>
+    <dimen name="module_search_dp_268">144px</dimen>
+    <dimen name="module_search_dp_236">126px</dimen>
+    <dimen name="module_search_dp_180">96px</dimen>
+    <dimen name="module_search_dp_80">42px</dimen>
+    <dimen name="module_search_dp_70">38px</dimen>
+    <dimen name="module_search_25sp">28px</dimen>
+    <dimen name="module_search_dp_42">23px</dimen>
+    <dimen name="module_search_dp_160">96px</dimen>
+    <dimen name="module_search_dp_150">69px</dimen>
+    <dimen name="module_search_180dp">192px</dimen>
+    <dimen name="module_search_dp_120">64px</dimen>
+    <dimen name="module_search_txt_setting_width">24px</dimen>
+    <dimen name="module_search_dp_838">446px</dimen>
+    <dimen name="module_search_category_margin_bottom">83px</dimen>
+    <dimen name="module_search_dp_104">56px</dimen>
+    <dimen name="module_search_strategy_name_width" >100px</dimen>
+    <dimen name="module_search_marker_number_textSize">18px</dimen>
+    <dimen name="module_search_choose_path_item_height">111px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_textSize">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_marginLeft">20px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingLeft">12px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingRight">12px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingTop">2px</dimen>
+    <dimen name="module_search_calculate_item_strategy_name_paddingBottom">2px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_textSize">22px</dimen>
+    <dimen name="module_search_calculate_item_strategy_time_marginTop">3px</dimen>
+    <dimen name="module_search_calculate_item_strategy_divider_marginLeft">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_textSize">16px</dimen>
+    <dimen name="module_search_calculate_item_strategy_desc_marginTop">2px</dimen>
+    <dimen name="module_search_search_padding">32px</dimen>
+    <dimen name="module_search_search_paddingTop">34px</dimen>
+    <dimen name="module_search_search_result_marginTop">16px</dimen>
+    <dimen name="module_search_start_button">20px</dimen>
+
+</resources>