From 6e6bc8a2327d3bfa844414512d0bf6e70fdbc3b4 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 9 Sep 2020 15:24:12 +0800 Subject: [PATCH 1/2] opt --- .../recycler/TanluSlideAdapterNew.java | 2 +- .../res/values-xhdpi-1920x1000/dimens.xml | 3 +- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../values-xhdpi-1920x1000/dimens.xml | 93 ------------------- .../module-tanlu-res/values-xhdpi/dimens.xml | 92 ------------------ .../main/module-tanlu-res/values/dimens.xml | 93 ------------------- 6 files changed, 4 insertions(+), 281 deletions(-) diff --git a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java index 050e630c24..15e3a450ea 100644 --- a/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java +++ b/modules/mogo-module-tanlu/src/main/java/com/mogo/module/tanlu/fragment/recycler/TanluSlideAdapterNew.java @@ -485,7 +485,7 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter300px 480px 270px - + 80px + 20px 15px 25px 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 ff75ac58ed..bfd073df5f 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 @@ -80,7 +80,7 @@ 350px 480px 320px - 45px + 80px 23px 15px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml index ff75ac58ed..abd9150dc2 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml @@ -1,98 +1,5 @@ - - - 98px - 98px - 48px - 48px - 72px - 5px - - 106px - 106px - 96px - 96px - 100px - 700px - 12px - - 135px - 50px - 50px - 30px - 92px - 40px - 800px - - 30px - 28px - 4px - 32px - 255px - 82px - 2px - 205px - 20px - 40px - 60px - 50px - 32px - 40px - 50px - - - 10px - - 750px - 270px - 120px - 60px - - 488px - 82px - - - 34px - 24px - 28px - 26px - 30px - - - 790px - 524px - 130px - 40px - 66px - 36px - 59px - - 44px - 105px - 44px - - 20px - 16px - - - 1060px - 350px - 480px - 320px - 45px - - 23px - 15px - 25px - 15px - 10px - 27px - 46px - - 50px - 98px - 6px 30px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml index ff75ac58ed..ee228e322c 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml @@ -1,98 +1,6 @@ - - 98px - 98px - 48px - 48px - 72px - 5px - - 106px - 106px - 96px - 96px - 100px - 700px - 12px - - 135px - 50px - 50px - 30px - 92px - 40px - 800px - - 30px - 28px - 4px - 32px - 255px - 82px - 2px - 205px - 20px - 40px - 60px - 50px - 32px - 40px - 50px - - - 10px - - 750px - 270px - 120px - 60px - - 488px - 82px - - - 34px - 24px - 28px - 26px - 30px - - - 790px - 524px - 130px - 40px - 66px - 36px - 59px - - 44px - 105px - 44px - - 20px - 16px - - - 1060px - 350px - 480px - 320px - 45px - - 23px - 15px - 25px - 15px - 10px - 27px - 46px - - 50px - 98px - 6px 30px diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml index a39e44cd6d..c35c322fdd 100644 --- a/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values/dimens.xml @@ -1,98 +1,5 @@ - - 52px - 52px - 48px - 48px - 72px - 5px - - 56px - 56px - 96px - 96px - 90px - 700px - 10px - - 72px - 25px - 25px - 16px - 48px - 22px - 700px - - - 10px - 15px - 2px - 19px - 136px - 44px - 2px - 109px - 10px - 23px - 30px - 28px - 16px - 22px - 26px - - - 6px - - 400px - 150px - 80px - 32px - - 260px - 44px - - - 18px - 14px - 15px - 13px - 16px - - - 418px - 278px - 69px - 22px - 36px - 18px - 32px - - 20px - 56px - 23px - - 10px - 8px - - - 642px - 194px - 266px - 194px - 45px - - 16px - 8px - 13px - 15px - 10px - 18px - 26px - - 28px - 56px - 3px 16px \ No newline at end of file From f06ee9b03e74fdc5d666fd4df2f31b1633d1683b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 9 Sep 2020 15:37:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E6=95=85=E9=9A=9C=E6=B1=82=E5=8A=A9=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8C=85=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/scenario/scene/help/V2XCarForHelpScenario.java | 1 - .../scenario/scene/{seek => help}/V2XSeekHelpButton.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/{seek => help}/V2XSeekHelpButton.java (94%) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java index eaee87ac30..ffce83b1a0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XCarForHelpScenario.java @@ -10,7 +10,6 @@ import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.impl.AbsV2XScenario; -import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpButton; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java similarity index 94% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpButton.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java index 5adcb00886..54ba834788 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpButton.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java @@ -1,4 +1,4 @@ -package com.mogo.module.v2x.scenario.scene.seek; +package com.mogo.module.v2x.scenario.scene.help; import android.content.Intent; import android.view.View; @@ -70,12 +70,12 @@ public class V2XSeekHelpButton implements IV2XButton { if (tv != null) { AIAssist.getInstance(V2XUtils.getApp()).speakTTSVoice("将为您取消", null); tv.setVisibility(View.GONE); - V2XServiceManager - .getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback() { + V2XServiceManager.getV2XRefreshModel().cancelHelpSignal(new V2XRefreshCallback() { @Override public void onSuccess(BaseData result) { tv.setVisibility(View.GONE); } + @Override public void onFail(String msg) { tv.setVisibility(View.VISIBLE); @@ -85,6 +85,7 @@ public class V2XSeekHelpButton implements IV2XButton { } unRegisterVoice(); } + @Override public void registerVoice() { V2XVoiceManager.INSTANCE.registerWakeCmd(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_CANCEL_HELP, cancelCb);