diff --git a/.idea/misc.xml b/.idea/misc.xml index 21e99e2dc0..cd77a1f062 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml index 1770c16984..ca1346e002 100644 --- a/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values-xhdpi/dimens.xml @@ -1053,5 +1053,6 @@ 42px 48px -10px + 10px diff --git a/modules/mogo-module-common/src/main/res/values/dimens.xml b/modules/mogo-module-common/src/main/res/values/dimens.xml index 1e2c7b1cdc..170c5a430d 100644 --- a/modules/mogo-module-common/src/main/res/values/dimens.xml +++ b/modules/mogo-module-common/src/main/res/values/dimens.xml @@ -1044,4 +1044,5 @@ 22.9688px 26.2500px -8px + 8px 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 b84ccdcde8..e962718e6c 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 @@ -81,8 +81,10 @@ android:id="@+id/module_entrance_id_move2_current_location" android:layout_width="@dimen/module_ext_operation_panel_width" android:layout_height="@dimen/module_ext_operation_panel_move2_height" - android:background="@drawable/module_ext_dw_common_corner_bkg" + 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" /> 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 d4118d06e7..703bb00968 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 @@ -73,8 +73,8 @@ 26px + 66px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 0304873cfe..4d5d931a5b 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px - 120px + 140px + 140px 120px - 30px + 20px 30px 32px 32px @@ -146,4 +146,5 @@ 40px 45px + 120px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index 6e8de9e26f..ce413ccb95 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -30,17 +30,17 @@ 32px 2px - 120px + 140px 32px 60px 92px 24px 48px 2px - 120px + 140px 120px 120px - 30px + 20px 30px 32px 32px @@ -148,4 +148,5 @@ 175px 30px 45px + 120px \ No newline at end of file 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 2f344bce6f..4c65427b84 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -30,17 +30,17 @@ 20px 1px - 66px + 82px 20px 34.5px 58px 17px 31.4px 1.2px - 66px + 82px 66px 66px - 16px + 8px 16px 34.5px 20px @@ -153,5 +153,6 @@ 19px 16px 26px + 66px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index a9cf9fe2a5..592d7824ff 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -48,6 +48,12 @@ android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:padding="@dimen/module_main_entrance_fragment_container_padding" /> + + + - - - 13px 8px 13px - 15px + 17px 3px 18px 26px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml index d93494cf3a..a3ea0c5760 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -85,7 +85,7 @@ 19px 13px 23px - 15px + 30px 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml index a0c1f15833..caf019b61c 100644 --- a/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values-xhdpi/dimens.xml @@ -85,7 +85,7 @@ 19px 13px 23px - 15px + 30px 9px 27px 46px diff --git a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml index b616be35ca..caa0a414c4 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -85,7 +85,7 @@ 13px 8px 13px - 15px + 17px 3px 18px 26px 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 c77bea6db8..a203930b68 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 @@ -1,63 +1,64 @@ package com.mogo.module.v2x.utils.animation; -import android.graphics.drawable.AnimationDrawable; -import android.util.Log; +import android.os.Handler; +import android.os.Looper; +import android.os.Message; import android.view.View; import android.widget.ImageView; -import com.mogo.utils.ThreadPoolService; -import com.mogo.utils.UiThreadHandler; - public class V2XAnimationManager implements Animation { private static final String TAG = "V2XAnimationManager"; private ImageView targetImageView; - private Animation delegate; private boolean isStarted = false; + private int mStartIndex = 0; + + private final static int MSG_LOOP = 3004; + private long INTERVAL = 100L; + + private Handler mHandler = new Handler( Looper.getMainLooper() ) { + @Override + public void handleMessage( Message msg ) { + super.handleMessage( msg ); + switch ( msg.what ) { + case MSG_LOOP: + if ( isStarted ) { + targetImageView.setImageResource( AnimationResources.loadingRes[mStartIndex++ % AnimationResources.loadingRes.length] ); + mHandler.sendEmptyMessageDelayed( MSG_LOOP, INTERVAL ); + } + break; + } + } + }; + public void animationWithTarget(ImageView imageView, int[] resources, int duration) { targetImageView = imageView; - ThreadPoolService.execute(() -> { - final AnimationDrawable drawable = new AnimationDrawable(); - for (int i = 0; i < resources.length; i++) { - drawable.setOneShot(false); - drawable.addFrame(targetImageView.getResources().getDrawable(resources[i]), duration); - } - UiThreadHandler.post(() -> { - targetImageView.setBackground(drawable); - delegate = new DelegateDrawable(drawable); - start(); - }); - }); + INTERVAL = duration; + start(); } @Override synchronized public void start() { - if (delegate != null && !isStarted) { - targetImageView.setVisibility(View.VISIBLE); - isStarted = true; - delegate.start(); - } + isStarted = true; + mHandler.sendEmptyMessage( MSG_LOOP ); + targetImageView.setVisibility(View.VISIBLE); } @Override synchronized public void stop() { - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); - targetImageView.setVisibility(View.INVISIBLE); - } + isStarted = false; + mHandler.removeMessages( MSG_LOOP ); + targetImageView.setVisibility(View.INVISIBLE); } public void soptWithError(){ - if (delegate != null && isStarted) { - isStarted = false; - delegate.stop(); - } + stop(); + targetImageView.setVisibility(View.VISIBLE); } public void release() { - delegate = null; + stop(); } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png index 957c298fd6..b964d6b4ad 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png new file mode 100644 index 0000000000..e02a57044f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png index dabf25dbbb..5480b6d165 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png old mode 100644 new mode 100755 index 892b93afaf..bb3e2b1195 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif b/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif deleted file mode 100644 index 5e3b79bbed..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable/loading_image.gif and /dev/null differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 312c36232a..36eaea608e 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -86,11 +86,11 @@ android:id="@+id/tvFaultHelpEventTime" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/dp_24" android:alpha="0.59" - android:textColor="@color/v2x_FFF_666" + android:textColor="@color/v2x_FFF_999" android:textSize="@dimen/dp_29" app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginBottom="@dimen/dp_24" app:layout_constraintStart_toStartOf="@+id/tvFaultHelpName" app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" tools:text="15:30发布求助信息" />