From 79230f439622878bb6260f48ebe29b2789254642 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 14 Sep 2020 15:48:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8Launcher=E6=83=85=E5=86=B5?= =?UTF-8?q?=E4=B8=8B=E9=9A=90=E8=97=8F=E4=B8=8A=E6=8A=A5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhidao/roadcondition/service/CosStatusController.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index 9cf32f0e38..502e6b1c5a 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.util.Log import com.google.gson.Gson import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.utils.TipToast import com.zhidao.cosupload.DbPriorityConfig import com.zhidao.cosupload.callback.CosStatusCallback @@ -105,7 +106,10 @@ class CosStatusController : CosStatusCallback { } else { //重试一次，如果还失败就提示 if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) { - sendGetInfoFailedReceiver("100") + if(DebugConfig.isLauncher()) { + // 只有Launcher上报的时候，失败会提示，独立app不会提示 + sendGetInfoFailedReceiver("100") + } } if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) { From 476939a46533cf69d26afd6800355844ece960b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 14 Sep 2020 19:09:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20http://jira.zhidaoh?= =?UTF-8?q?ulian.com/browse/FX-438=20http://jira.zhidaohulian.com/browse/F?= =?UTF-8?q?X-443?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/codeStyles/Project.xml | 15 ++++-- .../V2XScenarioHistoryIllegalParkVH.java | 1 + .../V2XScenarioHistoryOtherSeekHelpVH.java | 2 +- .../holder/V2XScenarioHistoryRoadEventVH.java | 4 +- .../mogo/module/v2x/view/HeartLikeView.java | 50 +++++++++++-------- .../mogo/module/v2x/view/HeartUnLikeView.java | 48 ++++++++++-------- 6 files changed, 72 insertions(+), 48 deletions(-) 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-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 { - 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(); + } }); } From fe72696a8a8f8e5bccb104ff5524585ad4ca18cb Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 14 Sep 2020 21:00:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E7=99=BD?= =?UTF-8?q?=E5=A4=A9=E9=BB=91=E5=A4=9C=E6=A8=A1=E5=BC=8F=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9A=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=82=B9=E4=BC=9A=E8=A2=AB=E6=B8=85=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 20 +++++++++++++++++++ .../com/mogo/launcher/MogoApplication.java | 1 + .../com/mogo/commons/debug/DebugConfig.java | 10 ++++++++++ .../com/mogo/module/main/MainActivity.java | 4 +++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index d31249a591..33615bd328 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,6 +111,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' } // f系列-分体机 f80x { @@ -127,6 +129,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' } // e系列，采用Launcher方案 e8xx { @@ -143,6 +147,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' } // 同上 em4 { @@ -159,6 +165,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -175,6 +183,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -191,6 +201,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } // d系列 d8xx { @@ -207,6 +219,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } // d系列 2 + 32 d80x { @@ -223,6 +237,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } // d系列 1+16 版本 d82x { @@ -239,6 +255,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } // 比亚迪 bydauto { @@ -255,6 +273,8 @@ android { buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false' + // 是否支持换肤 + buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 58c4a17564..bcfdde8a13 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -127,6 +127,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID ); DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED ); DebugConfig.setLoadGuideModule( BuildConfig.LOAD_GUIDE_MODULE ); + DebugConfig.setSkinSupported( BuildConfig.IS_SKIN_SUPPORTED ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 084326da6e..4f9761ca27 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -267,4 +267,14 @@ public class DebugConfig { public static String getSpGuide(){ return SP_GUIDE; } + + private static boolean isSkinSupported = false; + + public static void setSkinSupported( boolean isSkinSupported ) { + DebugConfig.isSkinSupported = isSkinSupported; + } + + public static boolean isSkinSupported() { + return isSkinSupported; + } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 0c0ef0ba16..85a097bb79 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -163,7 +163,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme // obuManager.registerObuDataChangedListener(EventDispatchCenter.getInstance()); // } - initAdasControlStatusListener(); + if ( DebugConfig.isSkinSupported() ) { + initAdasControlStatusListener(); + } EventDispatchCenter.getInstance().setMapLoadedCallback( () -> { Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );