yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_1.1.2

Browse Source
This commit is contained in:
董宏宇
2020-07-29 11:55:04 +08:00
parent 6e086a40f0 13685ba00a
commit 0705f98a25
14 changed files with 182 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@@ -109,6 +109,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
}
// e系列，采用Launcher方案
e8xx {
@@ -118,6 +119,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
}
// 同上
em4 {
@@ -127,6 +129,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
}
// e系列-2+32，对标D系列2+32，采用独立app的形式
em3 {
@@ -136,6 +139,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// e系列-1+16，对标D系列1+16，采用独立app形式
em1 {
@@ -145,6 +149,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// d系列
d8xx {
@@ -154,6 +159,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// d系列 1+16 版本
d82x{
@@ -163,6 +169,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
// 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
}
// 比亚迪
bydauto{
@@ -172,6 +179,7 @@ android {
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
// 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1
buildConfigField 'int', 'CAR_MACHINE_TYPE', '1'
buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
}
qa {
dimension "env"

24
app/functions/eventpanel.gradle
View File

@@ -2,24 +2,24 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
d8xxImplementation rootProject.ext.dependencies.moduleventpanel
d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop
em1Implementation rootProject.ext.dependencies.moduleventpanelnoop
bydautoImplementation rootProject.ext.dependencies.moduleventpanelnoop
d8xxImplementation rootProject.ext.dependencies.moduleventpanel
em4Implementation rootProject.ext.dependencies.moduleventpanel
e8xxImplementation rootProject.ext.dependencies.moduleventpanel
f8xxImplementation rootProject.ext.dependencies.moduleventpanel
em3Implementation rootProject.ext.dependencies.moduleventpanel
em4Implementation rootProject.ext.dependencies.moduleventpanelnoop
e8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
f8xxImplementation rootProject.ext.dependencies.moduleventpanelnoop
em3Implementation rootProject.ext.dependencies.moduleventpanelnoop
} else {
d8xxImplementation project(':modules:mogo-module-event-panel')
d82xImplementation project(':modules:mogo-module-event-panel-noop')
em1Implementation project(':modules:mogo-module-event-panel-noop')
bydautoImplementation project(':modules:mogo-module-event-panel-noop')
d8xxImplementation project(':modules:mogo-module-event-panel')
em4Implementation project(':modules:mogo-module-event-panel')
e8xxImplementation project(':modules:mogo-module-event-panel')
f8xxImplementation project(':modules:mogo-module-event-panel')
em3Implementation project(':modules:mogo-module-event-panel')
em4Implementation project(':modules:mogo-module-event-panel-noop')
e8xxImplementation project(':modules:mogo-module-event-panel-noop')
f8xxImplementation project(':modules:mogo-module-event-panel-noop')
em3Implementation project(':modules:mogo-module-event-panel-noop')
}
}

1
app/src/main/java/com/mogo/launcher/MogoApplication.java
View File

@@ -95,6 +95,7 @@ public class MogoApplication extends AbsMogoApplication {
DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE );
DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product );
DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID );
DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED );
}
@Override

13
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -237,4 +237,17 @@ public class DebugConfig {
public static String getSocketAppId() {
return sSocketAppId;
}
/**
* 道路事件动画
*/
private static boolean sRoadEventAnimated = false;
public static boolean isRoadEventAnimated() {
return sRoadEventAnimated;
}
public static void setRoadEventAnimated( boolean sRoadEventAnimated ) {
DebugConfig.sRoadEventAnimated = sRoadEventAnimated;
}
}

16
modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml
View File

@@ -5,9 +5,7 @@
android:layout_height="match_parent"
android:background="#2D2E3D"
android:clickable="true"
android:orientation="vertical"
>
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_navi_setting_title"
@@ -35,7 +33,7 @@
android:layout_toRightOf="@id/iv_back"
android:text="@string/navi_setting"
android:textColor="@color/white"
android:textSize="@dimen/txt_title" />
android:textSize="@dimen/module_search_title_textSize" />
</RelativeLayout>
@@ -44,8 +42,8 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:overScrollMode="never"
android:paddingLeft="@dimen/module_search_dp_160"
android:paddingRight="@dimen/module_search_dp_160"
android:paddingLeft="@dimen/module_search_setting_container_padding"
android:paddingRight="@dimen/module_search_setting_container_padding"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title">
@@ -53,12 +51,12 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/module_search_dp_150">
android:paddingBottom="@dimen/module_search_setting_container_paddingBottom">
<LinearLayout
android:id="@+id/ll_navi_sound"
android:layout_width="@dimen/module_search_180dp"
android:layout_height="@dimen/module_search_dp_120"
android:layout_width="@dimen/module_search_setting_item_width"
android:layout_height="@dimen/module_search_setting_item_height"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"

20
modules/mogo-module-search/src/main/res/layout/fragment_search.xml
View File

@@ -55,7 +55,7 @@
<View
android:layout_width="1dp"
android:layout_height="@dimen/module_search_dp_72"
android:layout_height="@dimen/module_search_address_divider_height"
android:background="#17D8D8D8" />
<TextView
@@ -74,11 +74,11 @@
<RelativeLayout
android:id="@+id/rl_navi_history"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_height="@dimen/module_search_dp_778"
android:layout_marginTop="@dimen/module_search_dp_32"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="@dimen/module_search_histories_list_height"
android:layout_marginTop="@dimen/module_search_histories_list_marginTop"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_40"
android:padding="@dimen/module_search_histories_list_marginPadding"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_navi_search">
@@ -105,18 +105,18 @@
android:id="@+id/rv_navi_history"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/module_search_dp_60" />
android:layout_marginTop="@dimen/module_search_histories_inner_list_marginTop" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_navi_search"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_32"
android:background="@drawable/shape_round_gray"
android:padding="@dimen/module_search_dp_37"
android:padding="@dimen/module_search_list_padding"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
app:layout_constraintLeft_toLeftOf="parent"
@@ -125,13 +125,13 @@
<TextView
android:id="@+id/tv_navi_list_empty"
android:layout_width="@dimen/module_search_dp_1200"
android:layout_width="@dimen/module_search_histories_list_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_32"
android:background="@drawable/shape_round_gray"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/txt_large"
android:textSize="@dimen/module_search_empty_tip_textSize"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/tv_navi_wash"
app:layout_constraintLeft_toLeftOf="parent"

13
modules/mogo-module-search/src/main/res/layout/fragment_search_category.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/module_search_search_padding"
@@ -11,7 +12,7 @@
<androidx.cardview.widget.CardView
android:id="@+id/cv_search_result"
android:layout_width="@dimen/module_search_dp_838"
android:layout_width="@dimen/module_search_category_panel_width"
android:layout_height="0dp"
android:layout_marginTop="@dimen/module_search_search_result_marginTop"
app:cardBackgroundColor="#3F4057"
@@ -37,7 +38,7 @@
android:id="@+id/tv_navi_navi"
style="@style/txt_btn"
android:layout_width="match_parent"
android:layout_height="@dimen/module_search_dp_104"
android:layout_height="@dimen/module_search_start_navi_button_height"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/module_search_start_button"
android:layout_marginRight="@dimen/module_search_start_button"
@@ -48,8 +49,8 @@
<ImageView
android:id="@+id/iv_path_fail"
android:layout_width="@dimen/module_search_dp_120"
android:layout_height="@dimen/module_search_dp_120"
android:layout_width="@dimen/module_search_setting_item_height"
android:layout_height="@dimen/module_search_setting_item_height"
android:layout_marginTop="@dimen/dp_224"
android:src="@mipmap/icon_path_fail"
app:layout_constraintLeft_toLeftOf="@+id/cv_search_result"
@@ -75,9 +76,9 @@
android:visibility="gone"
app:constraint_referenced_ids="iv_path_fail,tv_path_notice" />
<LinearLayout xmlns:tools="http://schemas.android.com/tools"
<LinearLayout
android:id="@+id/ll_navi_search"
android:layout_width="@dimen/module_search_dp_838"
android:layout_width="@dimen/module_search_category_panel_width"
android:layout_height="@dimen/module_search_et_hight"
android:background="@drawable/shape_round_gray"
android:gravity="center_vertical"

12
modules/mogo-module-search/src/main/res/layout/item_search_poi.xml
View File

@@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/module_search_dp_180"
android:layout_height="@dimen/module_search_poi_item_height"
>
<ImageView
android:id="@+id/iv_position"
android:layout_width="@dimen/module_search_dp_80"
android:layout_height="@dimen/module_search_dp_80"
android:layout_width="@dimen/module_search_poi_item_icon_size"
android:layout_height="@dimen/module_search_poi_item_icon_size"
android:src="@mipmap/icon_navi_position"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
@@ -19,12 +19,12 @@
<TextView
android:id="@+id/tv_position"
android:layout_width="0dp"
android:layout_height="@dimen/module_search_dp_70"
android:layout_height="@dimen/module_search_poi_item_position_height"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_30"
android:gravity="center_vertical"
android:textColor="@color/white"
android:textSize="@dimen/module_search_25sp"
android:textSize="@dimen/module_search_poi_item_position_textSize"
app:layout_constraintLeft_toRightOf="@id/iv_position"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -34,7 +34,7 @@
<TextView
android:id="@+id/tv_position_des"
android:layout_width="0dp"
android:layout_height="@dimen/module_search_dp_42"
android:layout_height="@dimen/module_search_poi_item_desc_height"
android:layout_marginTop="@dimen/dp_8"
android:ellipsize="marquee"
android:singleLine="true"

48
modules/mogo-module-search/src/main/res/values-ldpi/dimens.xml
View File

@@ -2,7 +2,8 @@
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="module_search_fragment_padding" >32px</dimen>
<dimen name="module_search_title_textSize">20px</dimen>
<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>
@@ -19,32 +20,31 @@
<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_address_divider_height">38px</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_histories_list_height">410px</dimen>
<dimen name="module_search_histories_list_width">640px</dimen>
<dimen name="module_search_histories_list_marginTop">16px</dimen>
<dimen name="module_search_histories_list_marginPadding">20px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">30px</dimen>
<dimen name="module_search_list_padding">20px</dimen>
<dimen name="module_search_empty_tip_textSize">28px</dimen>
<dimen name="module_search_category_width">144px</dimen>
<dimen name="module_search_category_height">126px</dimen>
<dimen name="module_search_poi_item_height">96px</dimen>
<dimen name="module_search_poi_item_icon_size">42px</dimen>
<dimen name="module_search_poi_item_position_height">38px</dimen>
<dimen name="module_search_poi_item_position_textSize">28px</dimen>
<dimen name="module_search_poi_item_desc_height">23px</dimen>
<dimen name="module_search_setting_container_padding">96px</dimen>
<dimen name="module_search_setting_container_paddingBottom">69px</dimen>
<dimen name="module_search_setting_item_width">192px</dimen>
<dimen name="module_search_setting_item_height">64px</dimen>
<dimen name="module_search_txt_setting_width">24px</dimen>
<dimen name="module_search_dp_838">446px</dimen>
<dimen name="module_search_category_panel_width">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_start_navi_button_height">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>

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

@@ -2,7 +2,8 @@
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="module_search_fragment_padding" >32px</dimen>
<dimen name="module_search_title_textSize">20px</dimen>
<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>
@@ -19,32 +20,31 @@
<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_address_divider_height">38px</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_histories_list_height">410px</dimen>
<dimen name="module_search_histories_list_width">640px</dimen>
<dimen name="module_search_histories_list_marginTop">16px</dimen>
<dimen name="module_search_histories_list_marginPadding">20px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">30px</dimen>
<dimen name="module_search_list_padding">20px</dimen>
<dimen name="module_search_empty_tip_textSize">28px</dimen>
<dimen name="module_search_category_width">144px</dimen>
<dimen name="module_search_category_height">126px</dimen>
<dimen name="module_search_poi_item_height">96px</dimen>
<dimen name="module_search_poi_item_icon_size">42px</dimen>
<dimen name="module_search_poi_item_position_height">38px</dimen>
<dimen name="module_search_poi_item_position_textSize">28px</dimen>
<dimen name="module_search_poi_item_desc_height">23px</dimen>
<dimen name="module_search_setting_container_padding">96px</dimen>
<dimen name="module_search_setting_container_paddingBottom">69px</dimen>
<dimen name="module_search_setting_item_width">192px</dimen>
<dimen name="module_search_setting_item_height">64px</dimen>
<dimen name="module_search_txt_setting_width">24px</dimen>
<dimen name="module_search_dp_838">446px</dimen>
<dimen name="module_search_category_panel_width">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_start_navi_button_height">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>

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

@@ -2,16 +2,16 @@
<resources>
<!-- 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_title_textSize">40px</dimen>
<dimen name="module_search_empty_tip_textSize">50px</dimen>
<dimen name="module_search_fragment_padding">60px</dimen>
<dimen name="module_search_fragment_padding_top">40px</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_hight">120px</dimen>
<dimen name="module_search_iv_back_hight">80px</dimen>
<dimen name="module_search_iv_back_margin_left">24px</dimen>
<dimen name="module_search_iv_back_margin_right">20px</dimen>
<dimen name="module_search_et_margin_right">50px</dimen>
<dimen name="module_search_et_text_size">40px</dimen>
<dimen name="module_search_btn_width">266px</dimen>
<dimen name="module_search_btn_right_margin">8px</dimen>
@@ -21,29 +21,28 @@
<dimen name="module_search_navi_home_height">120px</dimen>
<dimen name="module_search_navi_home_margin_left">32px</dimen>
<dimen name="module_search_navi_home_padding_left">75px</dimen>
<dimen name="module_search_dp_72">72px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_dp_778">778px</dimen>
<dimen name="module_search_dp_1200">1200px</dimen>
<dimen name="module_search_dp_32">32px</dimen>
<dimen name="module_search_dp_40">40px</dimen>
<dimen name="module_search_dp_60">60px</dimen>
<dimen name="module_search_dp_37">37px</dimen>
<dimen name="module_search_dp_268">268px</dimen>
<dimen name="module_search_dp_236">236px</dimen>
<dimen name="module_search_dp_180">180px</dimen>
<dimen name="module_search_dp_80">80px</dimen>
<dimen name="module_search_dp_70">70px</dimen>
<dimen name="module_search_25sp">25sp</dimen>
<dimen name="module_search_dp_42">42px</dimen>
<dimen name="module_search_dp_160">160px</dimen>
<dimen name="module_search_dp_150">150px</dimen>
<dimen name="module_search_180dp">180dp</dimen>
<dimen name="module_search_dp_120">120px</dimen>
<dimen name="module_search_address_divider_height">72px</dimen>
<dimen name="module_search_histories_list_height">778px</dimen>
<dimen name="module_search_histories_list_width">1200px</dimen>
<dimen name="module_search_histories_list_marginTop">32px</dimen>
<dimen name="module_search_histories_list_marginPadding">40px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">60px</dimen>
<dimen name="module_search_list_padding">37px</dimen>
<dimen name="module_search_category_width">268px</dimen>
<dimen name="module_search_category_height">236px</dimen>
<dimen name="module_search_poi_item_height">180px</dimen>
<dimen name="module_search_poi_item_icon_size">80px</dimen>
<dimen name="module_search_poi_item_position_height">70px</dimen>
<dimen name="module_search_poi_item_position_textSize">25px</dimen>
<dimen name="module_search_poi_item_desc_height">42px</dimen>
<dimen name="module_search_setting_container_padding">160px</dimen>
<dimen name="module_search_setting_container_paddingBottom">150px</dimen>
<dimen name="module_search_setting_item_width">180dp</dimen>
<dimen name="module_search_setting_item_height">120px</dimen>
<dimen name="module_search_txt_setting_width">45px</dimen>
<dimen name="module_search_dp_838">838px</dimen>
<dimen name="module_search_category_panel_width">838px</dimen>
<dimen name="module_search_category_margin_bottom">184px</dimen>
<dimen name="module_search_dp_104">104px</dimen>
<dimen name="module_search_start_navi_button_height">104px</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>

63
modules/mogo-module-search/src/main/res/values/dimens.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- module_main_activity_main.xml-->
<dimen name="txt_normal">@dimen/sp_32</dimen>
<dimen name="fragment_left_margin">@dimen/dp_60</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_title_textSize">40px</dimen>
<dimen name="module_search_empty_tip_textSize">50px</dimen>
<dimen name="module_search_fragment_padding">60px</dimen>
<dimen name="module_search_fragment_padding_top">40px</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_hight">120px</dimen>
<dimen name="module_search_iv_back_hight">80px</dimen>
<dimen name="module_search_iv_back_margin_left">24px</dimen>
<dimen name="module_search_iv_back_margin_right">20px</dimen>
<dimen name="module_search_et_margin_right">50px</dimen>
<dimen name="module_search_et_text_size">40px</dimen>
<dimen name="module_search_btn_width">266px</dimen>
<dimen name="module_search_btn_right_margin">8px</dimen>
@@ -21,29 +21,28 @@
<dimen name="module_search_navi_home_height">120px</dimen>
<dimen name="module_search_navi_home_margin_left">32px</dimen>
<dimen name="module_search_navi_home_padding_left">75px</dimen>
<dimen name="module_search_dp_72">72px</dimen>
<dimen name="module_search_dp_75">75px</dimen>
<dimen name="module_search_dp_778">778px</dimen>
<dimen name="module_search_dp_1200">1200px</dimen>
<dimen name="module_search_dp_32">32px</dimen>
<dimen name="module_search_dp_40">40px</dimen>
<dimen name="module_search_dp_60">60px</dimen>
<dimen name="module_search_dp_37">37px</dimen>
<dimen name="module_search_dp_268">268px</dimen>
<dimen name="module_search_dp_236">236px</dimen>
<dimen name="module_search_dp_180">180px</dimen>
<dimen name="module_search_dp_80">80px</dimen>
<dimen name="module_search_dp_70">70px</dimen>
<dimen name="module_search_25sp">25sp</dimen>
<dimen name="module_search_dp_42">42px</dimen>
<dimen name="module_search_dp_160">160px</dimen>
<dimen name="module_search_dp_150">150px</dimen>
<dimen name="module_search_180dp">180dp</dimen>
<dimen name="module_search_dp_120">120px</dimen>
<dimen name="module_search_address_divider_height">72px</dimen>
<dimen name="module_search_histories_list_height">778px</dimen>
<dimen name="module_search_histories_list_width">1200px</dimen>
<dimen name="module_search_histories_list_marginTop">32px</dimen>
<dimen name="module_search_histories_list_marginPadding">40px</dimen>
<dimen name="module_search_histories_inner_list_marginTop">60px</dimen>
<dimen name="module_search_list_padding">37px</dimen>
<dimen name="module_search_category_width">268px</dimen>
<dimen name="module_search_category_height">236px</dimen>
<dimen name="module_search_poi_item_height">180px</dimen>
<dimen name="module_search_poi_item_icon_size">80px</dimen>
<dimen name="module_search_poi_item_position_height">70px</dimen>
<dimen name="module_search_poi_item_position_textSize">25px</dimen>
<dimen name="module_search_poi_item_desc_height">42px</dimen>
<dimen name="module_search_setting_container_padding">160px</dimen>
<dimen name="module_search_setting_container_paddingBottom">150px</dimen>
<dimen name="module_search_setting_item_width">180dp</dimen>
<dimen name="module_search_setting_item_height">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_dp_104">104px</dimen>
<dimen name="module_search_category_panel_width">838px</dimen>
<dimen name="module_search_category_margin_bottom">184px</dimen>
<dimen name="module_search_start_navi_button_height">104px</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>

10
modules/mogo-module-search/src/main/res/values/styles.xml
View File

@@ -17,29 +17,29 @@
</style>
<style name="txt_navi_style">
<item name="android:layout_width">@dimen/module_search_dp_268</item>
<item name="android:layout_width">@dimen/module_search_category_width</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:textSize">@dimen/txt_normal</item>
<item name="android:textColor">@color/white</item>
<item name="android:background">@drawable/shape_round_gray</item>
<item name="android:layout_height">@dimen/module_search_dp_236</item>
<item name="android:layout_height">@dimen/module_search_category_height</item>
<item name="android:paddingTop">@dimen/dp_44</item>
</style>
<style name="rb_setting">
<item name="android:layout_width">@dimen/module_search_180dp</item>
<item name="android:layout_width">@dimen/module_search_setting_item_width</item>
<item name="android:button">@color/translate</item>
<item name="android:gravity">center</item>
<item name="android:textSize">@dimen/sp_40</item>
<item name="android:textColor">@color/selector_white_gray</item>
<item name="android:layout_height">@dimen/module_search_dp_120</item>
<item name="android:layout_height">@dimen/module_search_setting_item_height</item>
<item name="android:background">@drawable/selector_setting_bg</item>
</style>
<style name="txt_btn">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">@dimen/txt_title</item>
<item name="android:textSize">@dimen/module_search_title_textSize</item>
<item name="android:gravity">center</item>
<item name="android:background">@drawable/shape_round_blue_grident</item>
</style>

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -373,7 +373,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
if ( mogoMarker == null || mogoMarker.isDestroyed() ) {
Logger.d( TAG, "draw road condition, sn = %s", sn );
try {
post2AddAndStartAnimation( markerShowEntity, i * 100L );
if ( DebugConfig.isRoadEventAnimated() ) {
post2AddAndStartAnimation( markerShowEntity, i * 100L );
} else {
mogoMarker = drawMapMarker( markerShowEntity, ServiceConst.MARKER_Z_INDEX_HIGH );
}
} catch ( Exception e ) {
e.printStackTrace();
}