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

Merge branch 'qa_light' into demo/shunyi_v2v_merge

Browse Source
This commit is contained in:
tongchenfei
2020-09-22 10:59:57 +08:00
parent c63c5ea87b acfe6fb72c
commit e4e01c1176
30 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/mogo-module-apps/src/main/res/values/dimens.xml
View File

@@ -23,7 +23,7 @@
<dimen name="module_apps_navigator_icon_width">94px</dimen>
<dimen name="module_apps_navigator_icon_height">94px</dimen>
<dimen name="module_apps_navigator_icon_divider">17px</dimen>
<dimen name="module_apps_navigator_icon_divider">9px</dimen>
<dimen name="module_apps_voice_icon_width">55px</dimen>
<dimen name="module_apps_voice_icon_height">55px</dimen>
</resources>

7
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -479,7 +479,8 @@ public class TopViewAnimHelper {
tvNextDistance.getId(), ConstraintSet.LEFT,
0);
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP, 0);
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
(int) getDimen(R.dimen.module_common_shadow_width_pos));
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(),
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
@@ -541,7 +542,7 @@ public class TopViewAnimHelper {
// .module_ext_navi_info_panel_height);
constraintSet.connect(naviBg.getId(), ConstraintSet.TOP,
R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP,
0);
(int) getDimen(R.dimen.module_common_shadow_width_pos));
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.TOP, naviBg.getId(),
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
@@ -634,7 +635,7 @@ public class TopViewAnimHelper {
}
private int computeNaviMarginTop(int height) {
int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height)));
int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height))-getDimen(R.dimen.module_common_shadow_width_pos));
Logger.d(TAG, "computeNaviMarginTop: " + height + " result: " + result);
return result;
}

3
modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
View File

@@ -10,6 +10,9 @@
android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
android:focusable="true"
android:clickable="true"
android:layout_marginLeft="@dimen/module_common_shadow_width_pos"
android:layout_marginRight="@dimen/module_common_shadow_width_pos"
android:layout_marginTop="@dimen/module_common_shadow_width_pos"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container"

1
modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
View File

@@ -5,4 +5,5 @@
<dimen name="module_ext_layout_padding">10px</dimen>
<dimen name="module_ext_layout_paddingRight">2px</dimen>
<dimen name="module_ext_layout_paddingBottom">2px</dimen>
<dimen name="module_common_shadow_width_pos">8px</dimen>
</resources>

2
modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
View File

@@ -152,4 +152,6 @@
<dimen name="module_ext_layout_padding">30px</dimen>
<dimen name="module_ext_layout_paddingRight">20px</dimen>
<dimen name="module_ext_layout_paddingBottom">20px</dimen>
<dimen name="module_common_shadow_width_pos">10px</dimen>
</resources>

2
modules/mogo-module-extensions/src/main/res/values/dimens.xml
View File

@@ -157,4 +157,6 @@
<dimen name="module_ext_layout_padding">10px</dimen>
<dimen name="module_ext_layout_paddingRight">2px</dimen>
<dimen name="module_ext_layout_paddingBottom">2px</dimen>
<dimen name="module_common_shadow_width_pos">8px</dimen>
</resources>

8
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
View File

@@ -93,10 +93,10 @@ public class MediaWindow2 implements IMusicView {
return;
}
if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
Log.d(TAG, "not in front");
return;
}
// if(!ServiceMediaHandler.getIMogoStatusManager().isMainPageOnResume()){
// Log.d(TAG, "not in front");
// return;
// }
if (!mHasAddWindow) {
mHasAddWindow = true;

BIN
modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

4
modules/mogo-module-media/src/main/res/values/dimens.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="module_media_music_state_location">468px</dimen>
<dimen name="module_media_music_state_location">467px</dimen>
<dimen name="module_media_music_state_location_x">573px</dimen>
<!-- lcc start-->
@@ -61,7 +61,7 @@
<dimen name="module_media_share_fragment_tv2_margin_top">2px</dimen>
<dimen name="module_media_share_fragment_img_radius">3.2px</dimen>
<dimen name="module_media_pop_window_width">332px</dimen>
<dimen name="module_media_pop_window_width">338px</dimen>
<dimen name="module_media_pop_window_height">82px</dimen>
<dimen name="module_media_pop_window_inner_height">60px</dimen>
<dimen name="module_media_pop_window_inner_padding">18px</dimen>

BIN
modules/mogo-module-tanlu/src/main/res/drawable-mdpi/tanlu_icon_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

16
modules/mogo-module-tanlu/src/main/res/drawable/tanlu_alert_window_bg.xml
View File

@@ -4,10 +4,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size"
android:left="@dimen/tanlu_module_shade_size"
android:right="@dimen/tanlu_module_shade_size"
android:top="@dimen/tanlu_module_shade_size" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>
@@ -15,10 +15,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size"
android:left="@dimen/tanlu_module_shade_size"
android:right="@dimen/tanlu_module_shade_size"
android:top="@dimen/tanlu_module_shade_size" />
<solid android:color="#00000000" />
<corners android:radius="@dimen/dp_30" />
</shape>

7
modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml
View File

@@ -80,16 +80,17 @@
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_card_video_height">158px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>

1
modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -90,6 +90,7 @@
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">90px</dimen>

1
modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml
View File

@@ -90,6 +90,7 @@
<dimen name="tanlu_module_margin_top">9px</dimen>
<dimen name="tanlu_module_mavi_height">27px</dimen>
<dimen name="tanlu_module_button_height">46px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">50px</dimen>
<dimen name="tanlu_image_size">98px</dimen>

7
modules/mogo-module-tanlu/src/main/res/values/dimens.xml
View File

@@ -80,16 +80,17 @@
<dimen name="tanlu_module_card_height">186px</dimen>
<dimen name="tanlu_module_card_inner_height">176px</dimen>
<dimen name="tanlu_module_card_video_width">250px</dimen>
<dimen name="tanlu_module_card_video_height">172px</dimen>
<dimen name="tanlu_module_card_video_height">158px</dimen>
<dimen name="tanlu_module_close_height">45px</dimen>
<dimen name="tanlu_module_card_margin_top">13px</dimen>
<dimen name="tanlu_module_card_margin_left">8px</dimen>
<dimen name="tanlu_module_margin_right">7px</dimen>
<dimen name="tanlu_module_card_margin_left">6px</dimen>
<dimen name="tanlu_module_margin_right">13px</dimen>
<dimen name="tanlu_module_margin_left">17px</dimen>
<dimen name="tanlu_module_margin_top">3px</dimen>
<dimen name="tanlu_module_mavi_height">18px</dimen>
<dimen name="tanlu_module_button_height">26px</dimen>
<dimen name="tanlu_module_shade_size">4px</dimen>
<dimen name="tanlu_head_image_size">28px</dimen>
<dimen name="tanlu_image_size">56px</dimen>

23
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_live_show.xml
View File

@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="#256BFF"
android:startColor="#5CC1FF" />
<corners android:radius="@dimen/dp_30" />
</shape>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<gradient android:angle="135" android:endColor="#ff113361" android:startColor="#ff124B98" android:type="linear" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<gradient android:angle="135" android:endColor="#ff1e57a4" android:startColor="#ff1f7eff" android:type="linear" />
<corners android:radius="@dimen/dp_30" />
</shape>
</item>
</selector>

4
modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml
View File

@@ -12,7 +12,7 @@
android:id="@+id/viewLinStart"
android:layout_width="wrap_content"
android:layout_height="1px"
android:background="#979797"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toStartOf="@+id/tvNoMoreDataTrip"
app:layout_constraintStart_toStartOf="parent"
@@ -35,7 +35,7 @@
android:id="@+id/viewLinEnd"
android:layout_width="wrap_content"
android:layout_height="1px"
android:background="#979797"
android:background="@color/share_event_no_more_color"
app:layout_constraintBottom_toBottomOf="@+id/tvNoMoreDataTrip"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/tvNoMoreDataTrip"

2
modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
View File

@@ -52,7 +52,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_28"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead"
app:layout_constraintTop_toTopOf="@+id/ivFaultHelpHead"

7
modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml
View File

@@ -11,7 +11,7 @@
android:id="@+id/tagEventType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/module_v2x_surrounding_item_bottom_image_height"
android:layout_marginStart="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_24"
android:background="@drawable/bg_v2x_event_type_read"
android:gravity="center"
@@ -47,7 +47,6 @@
android:id="@+id/ivIconP"
android:layout_width="@dimen/module_v2x_history_event_icon_size"
android:layout_height="@dimen/module_v2x_history_event_icon_size"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_16"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintLeft_toLeftOf="@+id/tagEventType"
@@ -58,13 +57,13 @@
android:id="@+id/tvAddress"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_24"
android:layout_marginRight="@dimen/dp_30"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/v2x_FFF_333"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingLike"
app:layout_constraintStart_toEndOf="@+id/ivIconP"

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-ldpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi-1920x1000/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_head_image_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

16
skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_alert_window_bg_light.xml
View File

@@ -4,10 +4,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size_l"
android:left="@dimen/tanlu_module_shade_size_l"
android:right="@dimen/tanlu_module_shade_size_l"
android:top="@dimen/tanlu_module_shade_size_l" />
<solid android:color="#0DCCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>
@@ -15,10 +15,10 @@
<item>
<shape android:shape="rectangle">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
android:bottom="@dimen/tanlu_module_shade_size_l"
android:left="@dimen/tanlu_module_shade_size_l"
android:right="@dimen/tanlu_module_shade_size_l"
android:top="@dimen/tanlu_module_shade_size_l" />
<solid android:color="#26CCCCCC" />
<corners android:radius="@dimen/dp_30" />
</shape>

8
skin/mogo-skin-light/src/main/module-tanlu-res/values-mdpi/dimens.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
<dimen name="tanlu_dialog_radius_l">10px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">8px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

1
skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -3,6 +3,7 @@
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
<dimen name="tanlu_dialog_radius_l">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">16px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

1
skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml
View File

@@ -4,6 +4,7 @@
<dimen name="tanlu_normal_image_radius_size">30px</dimen>
<dimen name="tanlu_dialog_radius_l">20px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">16px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

1
skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml
View File

@@ -3,5 +3,6 @@
<dimen name="tanlu_normal_image_radius_size">16px</dimen>
<dimen name="tanlu_dialog_radius_l">10px</dimen>
<dimen name="tanlu_dialog_neterror_radius_l">8px</dimen>
<dimen name="tanlu_module_shade_size_l">4px</dimen>
</resources>

2
skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml
View File

@@ -8,7 +8,7 @@
<color name="v2x_white_light">#333333</color>
<color name="v2x_item_white_light">#FFFFFF</color>
<color name="v2x_white_refresh_light">#FFFFFF</color>
<color name="share_event_no_more_color_light">#CB333333</color>
<color name="share_event_no_more_color_light">#80333333</color>
<color name="v2x_FFF_999_light">#999999</color>
<color name="v2x_FFF_333_light">#B2333333</color>
<color name="v2x_FFF_666_light">#666666</color>