diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index e962718e6c..581046b9c9 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -83,8 +83,6 @@ android:layout_height="@dimen/module_ext_operation_panel_move2_height" android:background="@drawable/module_ext_shadow_bkg" android:scaleType="centerInside" - android:translationY="@dimen/module_common_shadow_width_pos" - android:translationX="@dimen/module_common_shadow_width_pos" android:src="@drawable/module_map_ic_move2_current_location" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -94,6 +92,7 @@ android:layout_width="@dimen/module_ext_operation_panel_share_width" android:layout_height="@dimen/module_ext_operation_panel_share_height" android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom" + android:layout_marginEnd="@dimen/module_common_shadow_width_pos" android:background="@drawable/module_ext_dw_upload_road_condition_bkg" app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location" diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 703bb00968..f1ac9dc491 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -13,7 +13,6 @@ android:paddingStart="@dimen/module_ext_weather_container_paddingLeft" android:paddingEnd="@dimen/module_ext_weather_container_paddingRight" android:visibility="invisible" - android:translationY="@dimen/module_common_shadow_width" app:layout_goneMarginLeft="@dimen/module_ext_notice_margin_start" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_ext_id_msg" @@ -43,7 +42,6 @@ android:layout_width="@dimen/module_ext_height" android:layout_height="@dimen/module_ext_height" android:layout_marginStart="@dimen/module_ext_notice_margin_start" - android:translationY="@dimen/module_common_shadow_width" android:layout_marginEnd="@dimen/module_ext_msg_marginRight" android:background="@drawable/module_ext_shadow_bkg" android:visibility="gone" @@ -75,6 +73,8 @@ android:id="@+id/ivUserHeadImg" android:layout_width="@dimen/module_ext_user_avator_size" android:layout_height="@dimen/module_ext_user_avator_size" + android:layout_marginRight="@dimen/module_common_shadow_width_pos" + android:layout_marginTop="@dimen/module_common_shadow_width_pos" android:src="@drawable/model_ext_default_user_head" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index 5e019c6b21..677298a2cd 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -157,5 +157,4 @@ 10px 2px 2px - \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 38353f4b23..6f39e995db 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -20,7 +20,7 @@ 30px 830px 800px - 30px + 20px 30px 340px diff --git a/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..32bb1aa442 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-ldpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..32bb1aa442 Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-mdpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png new file mode 100644 index 0000000000..6b21dc37ab Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_alert_bg.9.png differ diff --git a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml b/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml deleted file mode 100644 index 372926f342..0000000000 --- a/modules/mogo-module-media/src/main/res/drawable/module_media_window_alert_bg.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml index a07744e59d..99b57ab445 100644 --- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml @@ -61,8 +61,8 @@ 4px 6px - 580px - 120px + 600px + 140px 112px 30px 90px diff --git a/modules/mogo-module-media/src/main/res/values/dimens.xml b/modules/mogo-module-media/src/main/res/values/dimens.xml index 372e5babff..5c97bf7ec3 100644 --- a/modules/mogo-module-media/src/main/res/values/dimens.xml +++ b/modules/mogo-module-media/src/main/res/values/dimens.xml @@ -61,8 +61,8 @@ 2px 3.2px - 322px - 66.7px + 332px + 76.7px 60px 18px 48px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java index 67c87bea4d..94a760dd65 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/animation/V2XAnimationManager.java @@ -18,15 +18,15 @@ public class V2XAnimationManager implements Animation { private final static int MSG_LOOP = 3004; private long INTERVAL = 100L; - private Handler mHandler = new Handler( Looper.getMainLooper() ) { + private Handler mHandler = new Handler(Looper.getMainLooper()) { @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - switch ( msg.what ) { + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what) { case MSG_LOOP: - if ( isStarted ) { + if (isStarted) { // targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] ); - mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); + mHandler.sendEmptyMessageDelayed(MSG_LOOP, INTERVAL); } break; } @@ -43,20 +43,26 @@ public class V2XAnimationManager implements Animation { @Override synchronized public void start() { isStarted = true; - mHandler.sendEmptyMessage( MSG_LOOP ); - targetImageView.setVisibility(View.VISIBLE); + mHandler.sendEmptyMessage(MSG_LOOP); + if (targetImageView != null) { + targetImageView.setVisibility(View.VISIBLE); + } } @Override synchronized public void stop() { isStarted = false; - mHandler.removeMessages( MSG_LOOP ); - targetImageView.setVisibility(View.INVISIBLE); + mHandler.removeMessages(MSG_LOOP); + if (targetImageView != null) { + targetImageView.setVisibility(View.INVISIBLE); + } } - public void soptWithError(){ + public void soptWithError() { stop(); - targetImageView.setVisibility(View.VISIBLE); + if (targetImageView != null) { + targetImageView.setVisibility(View.VISIBLE); + } } public void release() { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java index c3f59a81fb..99a6cbbad7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XNetworkLoadingView.java @@ -34,8 +34,8 @@ public class V2XNetworkLoadingView extends RelativeLayout { LayoutInflater.from(context).inflate(R.layout.v2x_network_loading_item, this); initView(); /* - 添加动画图片资源 - */ + 添加动画图片资源 + * */ setLoadingImage(AnimationResources.loadingRes); } diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index c09cc9f93d..c6e6df4a03 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -18,13 +18,12 @@ - diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index 179a600a5d..0391d9bb8e 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -31,7 +31,7 @@ 200px 200px 100px - 40px + 50px 90px 36px 40px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 93b3fe83b1..30cb538bad 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -28,7 +28,7 @@ 200px 200px 100px - 80px + 90px 162px 64px 80px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 29c98cc629..3c60d87158 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -29,7 +29,7 @@ 200px 200px 100px - 80px + 90px 162px 64px 80px diff --git a/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png new file mode 100644 index 0000000000..eb26174ed6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-extensions-res/drawable-xhdpi/model_ext_default_user_head_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_alert_bg_light.9.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_alert_bg_light.9.png new file mode 100644 index 0000000000..05cc876e70 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-ldpi/module_media_window_alert_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_alert_bg_light.9.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_alert_bg_light.9.png new file mode 100644 index 0000000000..05cc876e70 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-mdpi/module_media_window_alert_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_default_music_img_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_default_music_img_light.png new file mode 100644 index 0000000000..b7f8c0afa5 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_default_music_img_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_next_song_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_next_song_light.png new file mode 100644 index 0000000000..07b60907da Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_next_song_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_alert_bg_light.9.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_alert_bg_light.9.png new file mode 100644 index 0000000000..56d420a75d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_alert_bg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_pause_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_pause_light.png new file mode 100644 index 0000000000..5a7caf5584 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_pause_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_play_light.png b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_play_light.png new file mode 100644 index 0000000000..d162d64468 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-media-res/drawable-xhdpi/module_media_window_pop_play_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml b/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml deleted file mode 100644 index d30c0a264a..0000000000 --- a/skin/mogo-skin-light/src/main/module-media-res/drawable/module_media_window_alert_bg_light.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_btn_bg_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_btn_bg_light.png new file mode 100644 index 0000000000..671254c046 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-ldpi/module_share_btn_bg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_btn_bg_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_btn_bg_light.png new file mode 100644 index 0000000000..671254c046 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-mdpi/module_share_btn_bg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_btn_bg_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_btn_bg_light.png new file mode 100644 index 0000000000..b2446d00ae Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_btn_bg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_left_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_left_light.png new file mode 100644 index 0000000000..b012995f56 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_left_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_right_light.png b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_right_light.png new file mode 100644 index 0000000000..97392e6258 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-share-res/drawable-xhdpi/module_share_title_icon_right_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml deleted file mode 100644 index 38ac04abf5..0000000000 --- a/skin/mogo-skin-light/src/main/module-share-res/drawable/module_share_btn_bg_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file