diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 663459aa50..0d156937bb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -3,9 +3,18 @@ + diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 5dc24ee1a3..3cf294e319 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -50,6 +50,8 @@ public class EntrancePresenter extends Presenter implements Weathe private IMogoNetwork mNetWork; + private boolean isResumed = false; + public EntrancePresenter(Context context, EntranceView view) { super(view); mWeatherModel = new WeatherModel( getContext() ); @@ -91,6 +93,10 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onResume( @NonNull LifecycleOwner owner ) { super.onResume( owner ); + isResumed = true; + if (userInfo != null) { + mView.renderUserInfo(userInfo); + } if(ExtensionsConfig.needRequestUserInfo()){ // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); @@ -100,6 +106,7 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onPause( @NonNull LifecycleOwner owner ) { super.onPause( owner ); + isResumed = false; } @Override @@ -128,11 +135,13 @@ public class EntrancePresenter extends Presenter implements Weathe @Override public void onSuccess(UserInfoResponse userInfoBaseResponse) { userInfo = userInfoBaseResponse.getResult(); - if(userInfo!=null) { - Logger.d(TAG, "获取个人信息成功: " + userInfo); - mView.renderUserInfo(userInfo); - }else{ - Logger.e(TAG,"获取个人信息失败"); + if(isResumed) { + if (userInfo != null) { + Logger.d(TAG, "获取个人信息成功: " + userInfo); + mView.renderUserInfo(userInfo); + } else { + Logger.e(TAG, "获取个人信息失败"); + } } } diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml index 61251bd7a5..80015e691b 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bg.xml @@ -1,9 +1,9 @@ + android:angle="0" + android:endColor="@color/tanlu_dialog_endcolor" + android:startColor="@color/tanlu_dialog_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml index 21152d5aac..21a7a34f19 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_bottom_button_right_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml index b4f3a4a62e..03926e4a3a 100644 --- a/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml +++ b/modules/mogo-module-tanlu/src/main/res/drawable/tanlu_dialog_button_bg.xml @@ -2,8 +2,8 @@ + android:endColor="@color/tanlu_dialog_bt_endcolor" + android:startColor="@color/tanlu_dialog_bt_startcolor" /> \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml index 7e4ab5e49f..87fcf17536 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_cutom_layout.xml @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="抱歉，无法获取到相关数据" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> @@ -74,7 +74,7 @@ android:background="@drawable/tanlu_dialog_bottom_button_right_bg" android:gravity="center" android:text="取消" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_bt_defalt_text_color" android:textSize="@dimen/tanlu_dialog_content_size" android:textStyle="bold" /> diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml index 8b19f35380..3babec8500 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_dialog_neterror_layout.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:gravity="center" android:text="由于网络原因上传失败" - android:textColor="@color/white" + android:textColor="@color/tanlu_dialog_textcolor" android:textSize="@dimen/tanlu_dialog_content_size" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values/colors.xml b/modules/mogo-module-tanlu/src/main/res/values/colors.xml index 24181bdd65..8f5388e27d 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -41,4 +41,13 @@ #59FFFFFF #FFFFFF + #FFFFFF + #3F4057 + #2A2B38 + #FFFFFF + #FFFFFF + #3E7FFC + #5CC1FF + #50526E + diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index 03d346838b..e32d6aef52 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -100,6 +100,7 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder try { - rbScenarioHistory?.isChecked=true + rbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -60,7 +60,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbSurroundingEvent?.isChecked=true + rbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -69,7 +69,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbShareEvents?.isChecked=true + rbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -126,9 +126,11 @@ class V2XEventPanelFragment : MvpFragment { - if (mAnimatorSet == null) { - mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(), - R.anim.v2x_like_heart_animation); - mAnimatorSet.setTarget(mIllegalParkingLike); - } - mAnimatorSet.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - + if (!isAnimator) { + isAnimator = true; + if (mAnimatorSet == null) { + mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(), + R.anim.v2x_like_heart_animation); + mAnimatorSet.setTarget(mIllegalParkingLike); } + mAnimatorSet.addListener(new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animation) { - @Override - public void onAnimationEnd(Animator animation) { - if (mOnClickCallListener != null) { - mOnClickCallListener.onClicked(HeartLikeView.this); } - } - @Override - public void onAnimationCancel(Animator animation) { + @Override + public void onAnimationEnd(Animator animation) { + isAnimator = false; + if (mOnClickCallListener != null) { + mOnClickCallListener.onClicked(HeartLikeView.this); + } + } - } + @Override + public void onAnimationCancel(Animator animation) { - @Override - public void onAnimationRepeat(Animator animation) { + } - } - }); - mAnimatorSet.start(); + @Override + public void onAnimationRepeat(Animator animation) { + + } + }); + mAnimatorSet.start(); + } }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java index 65524495b3..129b23e03a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java @@ -23,6 +23,7 @@ public class HeartUnLikeView extends LinearLayout { private ImageView mIllegalParkingUnLike; private AnimatorSet mAnimatorSet; private OnClickCallListener mOnClickCallListener; + private boolean isAnimator = false; public HeartUnLikeView(Context context) { this(context, null); @@ -38,35 +39,40 @@ public class HeartUnLikeView extends LinearLayout { mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike); setOnClickListener(v -> { - if (mAnimatorSet == null) { - mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(), - R.anim.v2x_unlike_heart_animation); - mAnimatorSet.setTarget(mIllegalParkingUnLike); - } - mAnimatorSet.addListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { + if (!isAnimator) { + isAnimator = true; + if (mAnimatorSet == null) { + mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(), + R.anim.v2x_unlike_heart_animation); + mAnimatorSet.setTarget(mIllegalParkingUnLike); } + mAnimatorSet.addListener(new Animator.AnimatorListener() { + @Override + public void onAnimationStart(Animator animation) { - @Override - public void onAnimationEnd(Animator animation) { - if (mOnClickCallListener != null) { - mOnClickCallListener.onClicked(HeartUnLikeView.this); } - } - @Override - public void onAnimationCancel(Animator animation) { + @Override + public void onAnimationEnd(Animator animation) { + isAnimator = false; + if (mOnClickCallListener != null) { + mOnClickCallListener.onClicked(HeartUnLikeView.this); + } + } - } + @Override + public void onAnimationCancel(Animator animation) { - @Override - public void onAnimationRepeat(Animator animation) { + } - } - }); - mAnimatorSet.start(); + @Override + public void onAnimationRepeat(Animator animation) { + + } + }); + mAnimatorSet.start(); + } }); } diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index abd5bac484..d0216dca8d 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml @@ -3,4 +3,13 @@ #333333 #666666 + #333333 + #F5F5F5 + #FFFFFF + #333333 + #2896FF + #FFFFFF + #FFFFFF + #E8E8E8 +