From f719b508e3595c0b935d992a506424ac0974fbfc Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 13 Nov 2020 10:15:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AF=B9CarSeries=E7=B1=BB=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/apps/AppFilterImpl.java | 3 ++- .../mogo/module/apps/anim/AnimWrapper.java | 2 +- .../mogo/module/apps/model/UnScannedApps.java | 3 ++- .../authorize/layout/AuthorizeDialog.kt | 2 +- .../mogo/module/common/utils/CarSeries.java | 21 +++++++++++++++++++ .../com/mogo/module/main/MainActivity.java | 3 +++ .../media/widget/AnimCircleImageView.java | 4 ++-- .../navi/ui/search/CategorySearchFragment.kt | 3 ++- .../mogo/module/navi/uitls/BitmapUtils.java | 3 ++- .../intent/AccStatusIntentHandler.java | 5 +++-- .../strategy/CarIconDisplayStrategy.java | 3 ++- .../share/dialog/GridFixableShareDialog.kt | 2 +- .../share/dialog/LaucherShareDialog.java | 2 +- .../mogo/module/v2x/utils/MarkerUtils.java | 2 +- .../service/impl/adas/MogoADASController.java | 3 ++- 15 files changed, 46 insertions(+), 15 deletions(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java index c000684d06..3616c0ab99 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java @@ -6,6 +6,7 @@ import android.text.TextUtils; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.utils.CarSeries; import java.io.BufferedReader; import java.io.File; @@ -29,7 +30,7 @@ public class AppFilterImpl { private static List< String > sExternalConfigPackages = new ArrayList<>(); static { - if ( !DebugConfig.getProductFlavor().startsWith( "f8" ) ) { + if ( !CarSeries.isF8xxSeries() ) { final String[] values = AbsMogoApplication.getApp().getResources().getStringArray( R.array.module_apps_array_filter_packages ); if ( values != null ) { mFilterPackages = new ArrayList( Arrays.asList( values ) ); diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java index aad3f187c8..058ac981ef 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/anim/AnimWrapper.java @@ -27,7 +27,7 @@ public class AnimWrapper implements Anim { public void initAnim( ImageView target ) { mTarget = target; - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + if ( CarSeries.isF8xxSeries() ) { mDelegate = new OthersAnim( target ); start(); } else { diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java index b55d9adb37..bdbd9ec863 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/UnScannedApps.java @@ -1,5 +1,6 @@ package com.mogo.module.apps.model; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.utils.CarSeries; import java.util.ArrayList; @@ -16,7 +17,7 @@ public class UnScannedApps { private static List< AppInfo > sUnScannedApps = new ArrayList<>(); static { - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + if ( CarSeries.isF8xxSeries() ) { sUnScannedApps.add( new AppInfo( AppEnum.BT_PHONE.getName(), AppEnum.BT_PHONE.getPkg(), null, 0, null, AppEnum.BT_PHONE.getIconResId() ) ); sUnScannedApps.add( new AppInfo( AppEnum.BT_MUSIC.getName(), AppEnum.BT_MUSIC.getPkg(), null, 0, null, AppEnum.BT_PHONE.getIconResId() ) ); } else { diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt index dfba896633..0d4654de5a 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/layout/AuthorizeDialog.kt @@ -64,7 +64,7 @@ class AuthorizeDialog(invokeTag: String, context: Context) : BaseFloatDialog(con val mWindow = window mWindow?.let { if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { - if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + if (CarSeries.isF8xxSeries()) { val lp = it.attributes lp.width = 1920 lp.height = 1080 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java index 71bcd12274..b59987f50e 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java @@ -2,6 +2,8 @@ package com.mogo.module.common.utils; import android.text.TextUtils; +import com.mogo.commons.debug.DebugConfig; + import java.lang.reflect.Method; /** @@ -12,21 +14,39 @@ import java.lang.reflect.Method; */ public class CarSeries { + public static boolean isF8xxSeries(){ + return DebugConfig.getProductFlavor().startsWith( "f8" ); + } + + @Deprecated public static final int CAR_SERIES_C80X = 10; + @Deprecated public static final int CAR_SERIES_D80X = 20; + @Deprecated public static final int CAR_SERIES_D81X = 21; + @Deprecated public static final int CAR_SERIES_D82X = 22; + @Deprecated public static final int CAR_SERIES_D84X = 23; + @Deprecated public static final int CAR_SERIES_F80X = 30; + @Deprecated public static final int CAR_SERIES_G80X = 40; + @Deprecated public static final int CAR_SERIES_E84X = 50; + @Deprecated public static final int CAR_SERIES_E84XCD = 51; + @Deprecated public static final int CAR_SERIES_E85X = 50; + @Deprecated public static final int CAR_SERIES_E85XCD = 51; + @Deprecated public static final int CAR_SERIES_E85XJD = 51; + @Deprecated public static int CAR_SERIES = 0; + @Deprecated public static int getSeries() { if ( CAR_SERIES != 0 ) { return CAR_SERIES; @@ -76,6 +96,7 @@ public class CarSeries { } } + @Deprecated private static String get( String key ) { String value = ""; try { 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 eae7c2e181..38f81fd1df 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 @@ -65,6 +65,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected int getLayoutId() { + if ( !DebugConfig.isMapBased() ) { + return R.layout.module_main_activity_main_no_map; + } return R.layout.module_main_activity_main; } diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java index 2217bbdab2..52ad46443b 100644 --- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java +++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/widget/AnimCircleImageView.java @@ -63,8 +63,8 @@ public class AnimCircleImageView extends ImageView implements IMogoSkinCompatSup mDrawbleSrc = getDrawable(); isRotateEnable = false; isRotating = false; - delayMilliseconds = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 10 : 450; - mRotateAngleStep = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 1 : 3; + delayMilliseconds = CarSeries.isF8xxSeries() ? 10 : 450; + mRotateAngleStep = CarSeries.isF8xxSeries() ? 1 : 3; } @Override diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt index f021babef5..8245a45bf3 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/CategorySearchFragment.kt @@ -7,6 +7,7 @@ import android.os.Bundle import android.view.View import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack import com.mogo.map.MogoLatLng @@ -189,7 +190,7 @@ class CategorySearchFragment : BaseFragment(), CategoryView, IMogoVoiceCmdCallBa arrayList[mAdapter.current].icon(getMarkerIcon(mAdapter.current)) if (moveToCenter) { SearchApisHolder.getStatusManager().setUserInteractionStatus(TAG, true, false) - SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.CAR_SERIES_F80X == CarSeries.getSeries()) + SearchApisHolder.getUiControllerApis().moveToCenter(current.position, CarSeries.isF8xxSeries()) } } diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java index defe711056..0ec594ac5f 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/uitls/BitmapUtils.java @@ -8,6 +8,7 @@ import android.graphics.Rect; import androidx.core.content.ContextCompat; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.utils.CarSeries; /** @@ -55,7 +56,7 @@ public class BitmapUtils { } else { x = ( width - bounds.width() ) / 2; } - if ( CarSeries.CAR_SERIES_F80X == CarSeries.getSeries() ) { + if ( CarSeries.isF8xxSeries() ) { y = ( height - bounds.height() ) / 2 + bounds.height() - 5.5f; } else { y = ( height - bounds.height() ) / 2 + bounds.height() - 2.5f; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 088cb16919..4b04d99478 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -3,6 +3,7 @@ package com.mogo.module.service.intent; import android.content.Context; import android.content.Intent; +import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.utils.CarSeries; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.ServiceConst; @@ -50,12 +51,12 @@ class AccStatusIntentHandler implements IntentHandler { public void handle( Context context, Intent intent ) { String action = intent.getAction(); if ( Intent.ACTION_POWER_CONNECTED.equals( action ) ) { - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + if ( CarSeries.isF8xxSeries() ) { MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, true ); Logger.d( TAG, "acc status: %s", true ); } } else if ( Intent.ACTION_POWER_DISCONNECTED.equals( action ) ) { - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + if ( CarSeries.isF8xxSeries() ) { MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, false ); Logger.d( TAG, "acc status: %s", false ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java index 6883d00204..1c69e2f5ed 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/CarIconDisplayStrategy.java @@ -6,6 +6,7 @@ import android.os.Handler; import android.os.Message; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.map.uicontroller.CarCursorOption; @@ -128,7 +129,7 @@ public class CarIconDisplayStrategy { private CarCursorOption mOption; public void changeCarIconStatus( boolean seekHelpingStatus ) { - if ( CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ) { + if ( CarSeries.isF8xxSeries() ) { if ( seekHelpingStatus ) { playSeekHelpingAnim(); } else { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 5e664af43e..59658be08a 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -35,7 +35,7 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { private fun setWrapContent() { val window = window - if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + if (CarSeries.isF8xxSeries()) { if (window != null) { val lp = window.attributes lp.width = 1920 diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 1d1aa71708..1437b26665 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -84,7 +84,7 @@ public class LaucherShareDialog extends BaseFloatDialog implements View.OnClickL lp.height = 600; window.setAttributes(lp); } - }else if(CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X){ + }else if(CarSeries.isF8xxSeries()){ if (window != null) { WindowManager.LayoutParams lp = window.getAttributes(); lp.width = 1920; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java index 194f5280c8..93ef3aa774 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/MarkerUtils.java @@ -73,7 +73,7 @@ public class MarkerUtils { final int paddingBottom; final int paddingRight; final int paddingLeft; - if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + if (CarSeries.isF8xxSeries()) { paddingTop = WindowUtils.dip2px(context, 250); paddingBottom = WindowUtils.dip2px(context, 100); paddingRight = WindowUtils.dip2px(context, 100); diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index af9bdd2f12..7079caffe6 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -9,6 +9,7 @@ import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.utils.CarSeries; import com.mogo.service.MogoServicePaths; @@ -103,7 +104,7 @@ public class MogoADASController implements IMogoADASController { } private void invokeShowADASOperation() { - int delay = CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ? 0 : 100; + int delay = CarSeries.isF8xxSeries() ? 0 : 100; UiThreadHandler.postDelayed( () -> { From 5721256e8a907332a91e3d635192a149ae2dabc1 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 13 Nov 2020 10:56:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[add]=20=E5=8F=96=E6=B6=88=E6=B1=82?= =?UTF-8?q?=E5=8A=A9=E9=BB=91=E7=99=BD=E6=A8=A1=E5=BC=8F.9=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable-mdpi/v2x_cancel_help.9.png} | Bin .../res/drawable-xhdpi/v2x_cancel_help.9.png | Bin 0 -> 3934 bytes .../res/layout/module_ext_layout_entrance.xml | 41 ++++++++++-------- .../scene/help/V2XSeekHelpButton.java | 1 - .../v2x_cancel_help.9.png} | Bin .../main/res/drawable/v2x_cancel_help.9.png | Bin 0 -> 2460 bytes .../drawable-mdpi/v2x_cancel_help_light.9.png | Bin 0 -> 2802 bytes .../v2x_cancel_help_light.9.png | Bin 0 -> 4686 bytes .../drawable/v2x_cancel_help_light.9.png | Bin 0 -> 2806 bytes 9 files changed, 22 insertions(+), 20 deletions(-) rename modules/{mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png => mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png} (100%) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png rename modules/mogo-module-v2x/src/main/res/{drawable-mdpi/module_v2x_shadow_bkg.9.png => drawable-ldpi/v2x_cancel_help.9.png} (100%) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/v2x_cancel_help.9.png create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-mdpi/v2x_cancel_help_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/v2x_cancel_help_light.9.png create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/v2x_cancel_help_light.9.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-ldpi/module_v2x_shadow_bkg.9.png rename to modules/mogo-module-extensions/src/main/res/drawable-mdpi/v2x_cancel_help.9.png diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/v2x_cancel_help.9.png new file mode 100644 index 0000000000000000000000000000000000000000..afdc5519bf8654f4eba16a599d4f7bbe67f3ff55 GIT binary patch literal 3934 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 L=G^nM_=x`k3Wku5 literal 0 HcmV?d00001 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 88bb46a57e..e70efd4eeb 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 @@ -9,7 +9,7 @@ + android:layout_height="wrap_content" /> + + android:background="#7f000000" + android:visibility="gone" /> + + android:layout_height="wrap_content" /> @@ -268,6 +270,7 @@ android:textSize="20sp" app:layout_constraintBottom_toTopOf="@id/btnShowTextTip" app:layout_constraintLeft_toLeftOf="parent" /> +