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/regroup.gradle b/app/regroup.gradle index a30fe32197..84cd73d13d 100644 --- a/app/regroup.gradle +++ b/app/regroup.gradle @@ -3,7 +3,7 @@ afterEvaluate { def independent = ["em3", "em1", "d80x", "d82x", "bydauto"] - def launcher = ["f80x", "em4"] + def launcher = ["f80x", "em4", "e8xx"] it.getTasks().iterator().forEachRemaining { def task = it diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index af05c2dca9..bc9a439f92 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -130,6 +130,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-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java index 7bf13bcf63..9c429602c9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; * 加载并保存 app 列表 */ public class AppsModel { - + private static final String TAG = "AppsModel"; private static volatile AppsModel sInstance; @@ -57,7 +57,6 @@ public class AppsModel { if ( mPagedApps != null ) { mPagedApps.clear(); } - mPagedApps = null; mContext = null; mAppFilter = null; sInstance = null; @@ -116,9 +115,12 @@ public class AppsModel { if ( TextUtils.isEmpty( packageName ) ) { return; } - if ( mPagedApps.isEmpty() ) { + if ( mPagedApps == null || mPagedApps.isEmpty() ) { return; } + if ( mAppFilter == null ) { + mAppFilter = new AppFilterImpl( mContext ); + } try { final PackageManager packageManager = mContext.getPackageManager(); PackageInfo packageInfo = packageManager.getPackageInfo( packageName, 0 ); @@ -183,6 +185,9 @@ public class AppsModel { if ( TextUtils.isEmpty( packageName ) ) { return; } + if ( mPagedApps == null || mPagedApps.isEmpty() ) { + return; + } try { int pageIndex = getPageIndex( packageName, false ); if ( pageIndex == -1 ) { 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/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() ); 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" /> + + + - - - 319px 110px - 16px + 10px 15px 460px 444px 350px - 16px + 10px 16px 658px 8px diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png index a4c313e353..bf455a0ea2 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png index a4c313e353..bf455a0ea2 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png index 1de561aa65..d4a8803684 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png index a4c313e353..80ab4b841f 100644 Binary files a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png and b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png differ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 26e612592d..701215fb6c 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -977,9 +977,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } if ( mLastDataResult != null ) { - MarkerServiceHandler.getMarkerManager().removeMarkers( ModuleNames.CARD_TYPE_ROAD_CONDITION ); - drawMarkerByCurrentType( mLastDataResult ); - mLastCheckMarker = null; + runOnTargetThread( ()->{ + MarkerServiceHandler.getMarkerManager().removeMarkers( ModuleNames.CARD_TYPE_ROAD_CONDITION ); + drawMarkerByCurrentType( mLastDataResult ); + mLastCheckMarker = null; + } ); } break; } 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 15e3a450ea..edba6ffed2 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 @@ -332,12 +332,17 @@ public class TanluSlideAdapterNew extends RecyclerView.Adapter - - - - + \ No newline at end of file diff --git a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml index 81c7cc2c7d..1bc521c085 100644 --- a/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml +++ b/modules/mogo-module-tanlu/src/main/res/layout/tanlu_item_main_media_recycler_new.xml @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true" - tools:src="@drawable/tanlu_normal_image" + android:src="@drawable/tanlu_normal_image" android:scaleType="fitXY" /> diff --git a/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..a1e06f3f9c --- /dev/null +++ b/modules/mogo-module-tanlu/src/main/res/values-mdpi/dimens.xml @@ -0,0 +1,98 @@ + + + + 52px + 52px + 48px + 48px + 72px + 5px + + 56px + 56px + 96px + 96px + 90px + 700px + 10px + + 72px + 25px + 25px + 16px + 48px + 22px + 700px + + + 5px + 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 + 170px + 234px + 156px + 45px + + 13px + 8px + 13px + 17px + 3px + 18px + 26px + + 28px + 56px + 3px + 16px + + \ No newline at end of file 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 f67c962818..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 @@ -25,7 +25,7 @@ 40px 800px - 14px + 11px 28px 4px 32px @@ -82,11 +82,11 @@ 270px 80px - 20px - 15px - 25px - 15px - 5px + 19px + 13px + 23px + 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 bfd073df5f..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 @@ -25,7 +25,7 @@ 40px 800px - 30px + 11px 28px 4px 32px @@ -77,16 +77,16 @@ 1060px - 350px - 480px - 320px + 306px + 421px + 280px 80px - 23px - 15px - 25px - 15px - 10px + 19px + 13px + 23px + 30px + 9px 27px 46px 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 8f5388e27d..ff1c78b482 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/colors.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/colors.xml @@ -49,5 +49,7 @@ #3E7FFC #5CC1FF #50526E + #5E6079 + #3F4057 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 a39e44cd6d..caa0a414c4 100644 --- a/modules/mogo-module-tanlu/src/main/res/values/dimens.xml +++ b/modules/mogo-module-tanlu/src/main/res/values/dimens.xml @@ -25,7 +25,7 @@ 700px - 10px + 5px 15px 2px 19px @@ -82,11 +82,11 @@ 194px 45px - 16px + 13px 8px 13px - 15px - 10px + 17px + 3px 18px 26px diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java index 005984f991..f0e2739521 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/SpacesItemDecoration.java @@ -20,13 +20,6 @@ public class SpacesItemDecoration extends RecyclerView.ItemDecoration { @Override public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { - outRect.left = space; - outRect.right = space; outRect.bottom = space; - - // Add top margin only for the first item to avoid double space between items - if (parent.getChildPosition(view) == 0) { - outRect.top = space; - } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 30d2b671de..fd51aa6146 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -1,7 +1,12 @@ package com.mogo.module.v2x.fragment import android.content.Intent +import android.graphics.Typeface import android.view.View +import android.widget.ImageView +import android.widget.RadioButton +import android.widget.RadioGroup +import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator @@ -11,14 +16,12 @@ import com.mogo.module.v2x.V2XConst.MODULE_NAME import com.mogo.module.v2x.V2XServiceManager import com.mogo.module.v2x.adapter.V2XEventPagerAdapter import com.mogo.module.v2x.presenter.EventPanelPresenter -import com.mogo.module.v2x.presenter.ShareEventsPresenter import com.mogo.module.v2x.utils.TrackUtils import com.mogo.module.v2x.view.V2XEventPanelHistoryCountView import com.mogo.module.v2x.voice.V2XVoiceCallbackListener import com.mogo.module.v2x.voice.V2XVoiceConstants import com.mogo.module.v2x.voice.V2XVoiceManager import com.mogo.utils.logger.Logger -import kotlinx.android.synthetic.main.module_v2x_event_panel_fragment_event_panel.* /** @@ -38,6 +41,14 @@ class V2XEventPanelFragment : MvpFragment try { - rbScenarioHistory?.isChecked = true + mRbScenarioHistory?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -60,7 +71,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbSurroundingEvent?.isChecked = true + mRbSurroundingEvent?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -69,7 +80,7 @@ class V2XEventPanelFragment : MvpFragment try { - rbShareEvents?.isChecked = true + mRbShareEvents?.isChecked = true } catch (e: java.lang.Exception) { e.printStackTrace() } @@ -92,48 +103,75 @@ class V2XEventPanelFragment : MvpFragment + mRgTabSelect?.setOnCheckedChangeListener { group, checkedId -> when (checkedId) { R.id.rbScenarioHistory -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(2) - vpEventPanel.setCurrentItem(0, false) + mVpEventPanel?.setCurrentItem(0, false) } R.id.rbSurroundingEvent -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + TrackUtils.trackV2xHistoryEvent(3) - vpEventPanel.setCurrentItem(1, false) + mVpEventPanel?.setCurrentItem(1, false) } R.id.rbShareEvents -> { + // 更改选中是否加粗 + mRbScenarioHistory?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbSurroundingEvent?.typeface = Typeface.defaultFromStyle(Typeface.NORMAL) + mRbShareEvents?.typeface = Typeface.defaultFromStyle(Typeface.BOLD) + TrackUtils.trackV2xHistoryEvent(4) - vpEventPanel.setCurrentItem(2, false) + mVpEventPanel?.setCurrentItem(2, false) } } } - btnHidePanels.setOnClickListener { + mBtnHidePanels?.setOnClickListener { TrackUtils.trackV2xHistoryEvent(5) hidePanel() } mV2XEventPanelHistoryCountView = V2XEventPanelHistoryCountView(context) mV2XEventPanelHistoryCountView!!.setOnClickListener { - if (clPanelContainer != null) { + if (mClPanelContainer == null) { + mClPanelContainer = mRootView.findViewById(R.id.clPanelContainer); + } + if (mClPanelContainer != null) { if (!isPanelShow()) { TrackUtils.trackV2xHistoryEvent(1) showPanel() } } } - V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView) + V2XServiceManager.getMogoEntranceButtonController() + .addBottomLayerView(mV2XEventPanelHistoryCountView) changeEventCount() } catch (e: Exception) { e.printStackTrace() @@ -151,7 +189,7 @@ class V2XEventPanelFragment : MvpFragment { - 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/java/com/mogo/module/v2x/view/RoundLayout.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java index e9b051e379..b0645b5823 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/RoundLayout.java @@ -9,6 +9,8 @@ import android.util.AttributeSet; import android.widget.RelativeLayout; import com.mogo.module.v2x.R; +import com.mogo.skin.support.IMogoSkinCompatSupportable; +import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; /** * author : donghongyu @@ -17,29 +19,34 @@ import com.mogo.module.v2x.R; * desc : * version: 1.0 */ -public class RoundLayout extends RelativeLayout { +public class RoundLayout extends RelativeLayout implements IMogoSkinCompatSupportable { private float roundLayoutRadius = 14f; private Path roundPath; private RectF rectF; + private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper; public RoundLayout(Context context) { this(context, null); } - public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) { - this(context, attrs); + public RoundLayout(Context context, AttributeSet attrs) { + this(context, attrs, 0); } - public RoundLayout(Context context, AttributeSet attrs) { - super(context, attrs); + public RoundLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RoundLayout); roundLayoutRadius = typedArray.getDimensionPixelSize(R.styleable.RoundLayout_roundLayoutRadius, (int) roundLayoutRadius); typedArray.recycle(); init(); + + mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this); + mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr); } + private void init() { setWillNotDraw(false);//如果你继承的是ViewGroup,注意此行,否则draw方法是不会回调的; roundPath = new Path(); @@ -72,5 +79,12 @@ public class RoundLayout extends RelativeLayout { } super.draw(canvas); } + + @Override + public void applySkin() { + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.applySkin(); + } + } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java index 5099c33fbb..205b9d43d5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XLiveGSYVideoView.java @@ -25,6 +25,7 @@ import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.skin.support.IMogoSkinCompatSupportable; +import com.mogo.skin.support.helper.MogoSkinCompatBackgroundHelperDelegate; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.tencent.rtmp.ITXLivePlayListener; @@ -51,6 +52,8 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS private ConstraintLayout mClLoadError; private TextView mTvRefreshButton; + private MogoSkinCompatBackgroundHelperDelegate mBackgroundTintHelper; + private MarkerCarInfo.CarLiveInfo mCarLiveInfo; // 重新刷新直播流 private V2XVoiceCallbackListener v2XVoiceCallbackRefreshListener = new V2XVoiceCallbackListener() { @@ -76,6 +79,9 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS public V2XLiveGSYVideoView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); initView(context); + + mBackgroundTintHelper = new MogoSkinCompatBackgroundHelperDelegate(this); + mBackgroundTintHelper.loadFromAttributes(attrs, defStyleAttr); } private void initView(Context context) { @@ -282,6 +288,8 @@ public class V2XLiveGSYVideoView extends RoundLayout implements IMogoSkinCompatS @Override public void applySkin() { - + if (mBackgroundTintHelper != null) { + mBackgroundTintHelper.applySkin(); + } } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png deleted file mode 100644 index 5480b6d165..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_default_black_logo.png and /dev/null differ 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-ldpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png index 6ab0b1547c..b1ab35dc0a 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/icon_default_black_logo.png rename to modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_icon_live_logo.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png index 2466405ac2..e6a5e8d333 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png deleted file mode 100644 index e02a57044f..0000000000 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_default_black_logo.png and /dev/null 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-xhdpi/v2x_shadow_bg.9.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png index 239b9eb114..07523abcbf 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_shadow_bg.9.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index a7d161b299..7602d95ba0 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + - - + \ No newline at end of file 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/drawable/v2x_alert_window_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml index 376de58348..da72944890 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_alert_window_bg.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml index 12e6ec50cf..2b616f3e68 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_shadow_shape_view.xml @@ -1,6 +1,6 @@ - + @@ -13,7 +13,7 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index 7b835f3f95..7a75859e33 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -25,9 +25,9 @@ android:layout_width="@dimen/module_v2x_event_image_width" android:layout_height="@dimen/module_v2x_event_image_height" android:scaleType="center" - app:miv_failureHolder="@drawable/icon_default_black_logo" - app:miv_overlayImageId="@drawable/icon_default_black_logo" - app:miv_placeHolder="@drawable/icon_default_black_logo" /> + app:miv_failureHolder="@drawable/v2x_icon_live_logo" + app:miv_overlayImageId="@drawable/v2x_icon_live_logo" + app:miv_placeHolder="@drawable/v2x_icon_live_logo" /> @@ -121,77 +121,88 @@ app:miv_shape="circle" app:miv_shapeBorderWidth="@dimen/dp_4" /> - + app:layout_constraintTop_toBottomOf="@+id/ivEventDistanceLogo"> - + - + - + - + + + + + + - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml index 20bacf4ae4..dd7f9200b1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml @@ -7,7 +7,7 @@ android:background="@drawable/v2x_alert_window_bg" android:gravity="center" app:roundLayoutRadius="@dimen/dp_40" - tools:layout_height="@dimen/dp_382"> + tools:layout_height="@dimen/module_v2x_event_window_height"> + android:paddingTop="@dimen/dp_40" + android:paddingBottom="@dimen/dp_40">