diff --git a/app/src/em4/AndroidManifest.xml b/app/src/em4/AndroidManifest.xml index d755054676..bc09a4cda1 100644 --- a/app/src/em4/AndroidManifest.xml +++ b/app/src/em4/AndroidManifest.xml @@ -1,6 +1,6 @@ + \ No newline at end of file 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 7e2a44aee4..6ef394fe31 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 @@ -159,7 +159,7 @@ class CosStatusController : CosStatusCallback { } } else { //上传图片成功, 如果是上报路况，直接上传，TODO - Log.d(TAG, "uploadCosCompleted 分享成功 ----mType = $mType") + Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType") // if (mType.equals("1") || mType.equals("-1")) { sendInformationDirectly( INFO_TYPE_IMG, diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_ai_assist_bkg.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_ai_assist_bkg.png new file mode 100755 index 0000000000..c340cb9785 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_ai_assist_bkg.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist.png old mode 100644 new mode 100755 index f884758d3d..74d147a76d Binary files a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist.png and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im.png old mode 100644 new mode 100755 index 7a959f1ca1..e15c5811c7 Binary files a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im.png and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media.png old mode 100644 new mode 100755 index d9f6df313d..d84c66fd70 Binary files a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media.png and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi.png old mode 100644 new mode 100755 index 2401ce7c2a..0a756a1ecc Binary files a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi.png and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_disable.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_disable.png old mode 100644 new mode 100755 index 3df9f14026..d4765dae41 Binary files a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_disable.png and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_disable.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ai_assist_bkg.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ai_assist_bkg.png old mode 100644 new mode 100755 index e86c3454df..79761a6c19 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ai_assist_bkg.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ai_assist_bkg.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_apps.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_apps.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_chat_icon.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_chat_icon.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_chat_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_chat_unchecked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_equlizer.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_equlizer.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_fm.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_fm.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_fota.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_fota.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_icon_map.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_icon_map.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_interest.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_interest.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_interest_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_interest_unchecked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_lrts.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_lrts.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center_checked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_media_center_checked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_music.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_music.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigation.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigation.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist.png index b95bc4576f..5bf7356145 100755 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im.png old mode 100755 new mode 100644 index 3ee3703675..0b47d2f33c Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media.png index bcfdb9cfa9..a27975f9fb 100755 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi.png index deee86ed15..930b016a25 100755 Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png old mode 100644 new mode 100755 index 6a00c94c9d..0cfd3f47cb Binary files a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_disable.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_news.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_news.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_news_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_news_unchecked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_online_car.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_online_car.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_online_car_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_online_car_unchecked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_qiyi.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_qiyi.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_qq_music.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_qq_music.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_retract.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_retract.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_stee_product.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_stee_product.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_tanlu.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_tanlu.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_tanlu_unchecked.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_tanlu_unchecked.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_welfare.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_welfare.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ximalaya.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_ximalaya.png old mode 100755 new mode 100644 diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 0e89455b55..02a1b7e671 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -20,6 +20,6 @@ android:layout_marginTop="@dimen/module_apps_app_name_marginTop" android:gravity="center" android:maxLines="2" - android:textColor="#FFFFFF" + android:textColor="@color/module_apps_id_app_name_textColor" android:textSize="@dimen/module_apps_app_name_textSize" /> \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index a9ba5a2fef..c335dd18d9 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -21,8 +21,8 @@ 94px 94px - 140px - 140px + 160px + 160px 30px 100px 100px diff --git a/modules/mogo-module-apps/src/main/res/values/colors.xml b/modules/mogo-module-apps/src/main/res/values/colors.xml index 7d6ca3277b..155daf49f1 100644 --- a/modules/mogo-module-apps/src/main/res/values/colors.xml +++ b/modules/mogo-module-apps/src/main/res/values/colors.xml @@ -16,6 +16,7 @@ #080625 #3E7FFC - #0C0C0C + #E6000000 + #FFFFFF diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index 679816b821..d335541a42 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -24,6 +24,6 @@ 78px 78px 17px - 60px - 60px + 55px + 55px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index dca074dae0..bf2ac37b46 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -46,6 +46,7 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.entrance.ButtonIndex; +import com.mogo.service.fragmentmanager.IFragmentProvider; import com.mogo.service.fragmentmanager.IMogoFragmentManager; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.map.IMogoMapService; @@ -295,7 +296,12 @@ public class EntranceFragment extends MvpFragment { - ARouter.getInstance().build("/push/ui/message").navigation(getContext()); + try { + IFragmentProvider provider = (IFragmentProvider)ARouter.getInstance().build("/push/ui/message").navigation(getContext()); + provider.createFragment( getActivity(), mMogoFragmentManager.getMessageHistoryContainerId(), null ); + } catch( Exception e ){ + + } }); mMsgCounter = findViewById(R.id.module_ext_id_msg_counter); mUserHeadImg.setOnClickListener(view -> { 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 1870c90b65..d19c0f9d04 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 @@ -61,6 +61,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected View mApps; protected View mEntrance; protected View mEventPanel; + protected View mHistoryMessagePanel; protected FrameLayout mFloatingLayout; protected View mCoverUpLayout; protected FrameLayout mLeftPanelLayout; @@ -84,6 +85,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame ); mCoverUpLayout = findViewById( R.id.module_main_id_cover_up ); mLeftPanelLayout = findViewById( R.id.module_main_id_left_panel_fragment_container ); + mHistoryMessagePanel = findViewById( R.id.module_main_id_message_history_fragment_container ); // 避免事件穿透导致地图被滑动 mLeftShadowFrame.setOnClickListener( view -> { @@ -166,6 +168,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoFragmentManager = mServiceApis.getFragmentManagerApi(); mMogoFragmentManager.init( this, R.id.module_main_id_search_fragment ); + mMogoFragmentManager.initMessageHistoryContainerId( R.id.module_main_id_message_history_fragment_container ); mMogoFragmentManager.registerMainFragmentStackTransactionListener( ( size ) -> { if ( size == 0 ) { showLayout(); 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 ce44459946..5f69da7e64 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 @@ -55,6 +55,12 @@ android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:padding="@dimen/module_main_entrance_fragment_container_padding" /> + + 599px 200px - 30px + 20px 30px 830px 590px diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 9f6dd8ba91..89b96d6620 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -16,7 +16,7 @@ 599px 200px - 30px + 20px 30px 830px 800px diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 2085349e18..f0316ac8e9 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -277,6 +277,9 @@ public class MapPresenter extends Presenter< MapView > implements for ( String cmd : VoiceConstants.sUnUnRegisterCmds ) { mMogoIntentManager.registerIntentListener( cmd, this ); } + for ( Map.Entry< String, String[] > entry : VoiceConstants.sUnRegisterVoiceCmds.entrySet() ) { + AIAssist.getInstance( getContext() ).registerUnWakeupCommand( entry.getKey(), entry.getValue(), this ); + } initBroadcast(); mCustomVoiceCommandHandler = new MapControlCommandHandler(); @@ -313,6 +316,13 @@ public class MapPresenter extends Presenter< MapView > implements } mRegisterCenter.unregisterMogoNaviListener( TAG ); mRegisterCenter.unregisterADASControlStatusChangedListener( TAG ); + + for ( String cmd : VoiceConstants.sUnUnRegisterCmds ) { + mMogoIntentManager.unregisterIntentListener( cmd, this ); + } + for ( Map.Entry< String, String[] > entry : VoiceConstants.sUnRegisterVoiceCmds.entrySet() ) { + AIAssist.getInstance( getContext() ).unregisterUnWakeupCommand( entry.getKey(), this ); + } } private void registerVoiceCmd() { @@ -365,4 +375,5 @@ public class MapPresenter extends Presenter< MapView > implements public void onStopNavi() { MapBroadCastHelper.getInstance( getContext() ).stopNavi(); } + } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java index aff22c0b1c..1cf7743744 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/VoiceConstants.java @@ -158,8 +158,13 @@ public class VoiceConstants { public static final String CMD_MAP_SPEAK_REMAIN_UN_WAKEUP = "CMD_MAP_SPEAK_REMAIN_UN_WAKEUP"; public static final String[] CMD_MAP_SPEAK_REMAIN_TRIGGER_WORDS = {"还有多久", "多久到", "还有多远"}; + // 免唤醒 public static final Map< String, String[] > sVoiceCmds = new HashMap<>(); + // 不注销的免唤醒 + public static final Map< String, String[] > sUnRegisterVoiceCmds = new HashMap<>(); + // 唤醒 public static final List< String > sCmds = new ArrayList<>(); + // 不注销的唤醒 public static final List< String > sUnUnRegisterCmds = new ArrayList<>(); static { @@ -168,9 +173,6 @@ public class VoiceConstants { sVoiceCmds.put( VoiceConstants.CMD_MAP_ZOOM_OUT_UN_WAKEUP, VoiceConstants.CMD_MAP_ZOOM_OUT_TRIGGER_WORDS ); //sVoiceCmds.put( VoiceConstants.CMD_MAP_2D_UN_WAKEUP, VoiceConstants.CMD_MAP_2D_TRIGGER_WORDS ); //sVoiceCmds.put( VoiceConstants.CMD_MAP_3D_UN_WAKEUP, VoiceConstants.CMD_MAP_3D_TRIGGER_WORDS ); - sVoiceCmds.put( VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DAY_TIME_MODE_TRIGGER_WORDS ); - sVoiceCmds.put( VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_NIGHT_MODE_TRIGGER_WORDS ); - sVoiceCmds.put( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_TRIGGER_WORDS ); sVoiceCmds.put( VoiceConstants.CMD_MAP_TRAFFIC_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_TRAFFIC_MODE_TRIGGER_WORDS ); sVoiceCmds.put( VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE_TRIGGER_WORDS ); //sVoiceCmds.put( VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE_TRIGGER_WORDS ); @@ -185,16 +187,18 @@ public class VoiceConstants { sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_DETAIL_MODE_TRIGGER_WORDS ); sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_DRAFT_MODE_TRIGGER_WORDS ); //sVoiceCmds.put( VoiceConstants.CMD_MAP_SPEAK_REMAIN_UN_WAKEUP, VoiceConstants.CMD_MAP_SPEAK_REMAIN_TRIGGER_WORDS ); + + sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_DAY_TIME_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_DAY_TIME_MODE_TRIGGER_WORDS ); + sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_NIGHT_MODE_TRIGGER_WORDS ); + sUnRegisterVoiceCmds.put( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_UN_WAKEUP, VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE_TRIGGER_WORDS ); + // 唤醒 sCmds.add( VoiceConstants.CMD_MAP_ZOOM_IN ); sCmds.add( VoiceConstants.CMD_MAP_ZOOM_OUT ); sCmds.add( VoiceConstants.CMD_MAP_2D ); sCmds.add( VoiceConstants.CMD_MAP_3D ); - sCmds.add( VoiceConstants.CMD_MAP_DAY_TIME_MODE ); - sCmds.add( VoiceConstants.CMD_MAP_NIGHT_MODE ); sCmds.add( VoiceConstants.CMD_MAP_TRAFFIC_MODE ); sCmds.add( VoiceConstants.CMD_MAP_UN_TRAFFIC_MODE ); - sCmds.add( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE ); sCmds.add( VoiceConstants.CMD_MAP_CAR_UP_MODE ); sCmds.add( VoiceConstants.CMD_MAP_NORTH_UP_MODE ); sCmds.add( VoiceConstants.CMD_MAP_STOP_NAVI_MODE ); @@ -206,5 +210,8 @@ public class VoiceConstants { sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_CONTINUE_NAVI_MODE ); sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_DISPLAY_OVERVIEW_MODE ); sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_HISTORY ); + sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_DAY_TIME_MODE ); + sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_NIGHT_MODE ); + sUnUnRegisterCmds.add( VoiceConstants.CMD_MAP_AUTO_LIGHT_NIGHT_MODE ); } } diff --git a/modules/mogo-module-push-noop/build.gradle b/modules/mogo-module-push-noop/build.gradle index 369d2a1a49..c8d6872f33 100644 --- a/modules/mogo-module-push-noop/build.gradle +++ b/modules/mogo-module-push-noop/build.gradle @@ -43,14 +43,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // 小智语音，免唤醒词等服务 - compileOnly rootProject.ext.dependencies.mogoserviceapi - compileOnly rootProject.ext.dependencies.arouter + implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - if( Boolean.valueOf(RELEASE) ){ implementation rootProject.ext.dependencies.modulepushbase + implementation rootProject.ext.dependencies.mogoserviceapi } else { implementation project(":modules:mogo-module-push-base") + implementation project(':services:mogo-service-api') } } diff --git a/modules/mogo-module-push/src/main/AndroidManifest.xml b/modules/mogo-module-push/src/main/AndroidManifest.xml index 3334a218b2..6a39ac26a4 100644 --- a/modules/mogo-module-push/src/main/AndroidManifest.xml +++ b/modules/mogo-module-push/src/main/AndroidManifest.xml @@ -4,14 +4,4 @@ - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java new file mode 100644 index 0000000000..dd389a6bdb --- /dev/null +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java @@ -0,0 +1,39 @@ +package com.mogo.module.push; + +import android.content.Context; +import android.os.Bundle; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.module.push.base.PushUIConstants; +import com.mogo.module.push.fragment.MessageHistoryFragment; +import com.mogo.service.fragmentmanager.IFragmentProvider; + +public +/** + * @author congtaowang + * @since 2020/9/1 + * + * 描述 + */ +@Route( path = PushUIConstants.Push_MESSAGE_ACTIVITY_PATH ) +class PushHistoryUiProvider implements IFragmentProvider { + + @Override + public Fragment createFragment( FragmentActivity activity, int containerId, Bundle date ) { + Fragment fragment = new MessageHistoryFragment(); + activity.getSupportFragmentManager() + .beginTransaction() + .add( containerId, fragment, PushUIConstants.Push_MESSAGE_ACTIVITY_PATH ) + .show( fragment ) + .commitNowAllowingStateLoss(); + return fragment; + } + + @Override + public void init( Context context ) { + + } +} diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt deleted file mode 100644 index 195aa828ab..0000000000 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/activity/PushMessageActivity.kt +++ /dev/null @@ -1,126 +0,0 @@ -package com.mogo.module.push.activity - -import android.content.Intent -import android.os.Bundle -import android.view.View -import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.module.push.Config -import com.mogo.module.push.R -import com.mogo.module.push.adapter.PushMessageAdapter -import com.mogo.module.push.base.PushUIConstants -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.repository.PushRepository -import com.mogo.module.push.utils.AnalyticsUtils -import com.mogo.module.push.utils.HandlerUtils -import com.mogo.module.push.utils.startClearAnimator -import com.mogo.module.push.view.PushItemAnimator -import com.mogo.module.push.view.SwipeItemLayout -import com.mogo.module.push.view.getApis -import com.mogo.module.push.viewmodel.MessageViewModel -import com.mogo.service.intent.IMogoIntentListener -import com.mogo.utils.UiThreadHandler -import com.mogo.utils.logger.Logger -import kotlinx.android.synthetic.main.module_push_message_activity.* - -@Route(path = PushUIConstants.Push_MESSAGE_ACTIVITY_PATH) -class PushMessageActivity : AppCompatActivity(), IMogoIntentListener { - private lateinit var viewModel: MessageViewModel - private var adapter = PushMessageAdapter() - private var clearing = false - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) -// window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN) - setContentView(R.layout.module_push_message_activity) - AnalyticsUtils.track(Config.NEWS_HISTORY_OPEN) - module_push_activity_close.setOnClickListener { - AnalyticsUtils.track(Config.NEWS_HISTORY_CLOSE) - finish() - } - module_push_activity_clear.setOnClickListener { - AnalyticsUtils.track(Config.NEWS_HISTORY_ALL_CLEAR) - if (!clearing) { - clearing = true - startClearAnimator(module_push_activity_recycler_view) { - viewModel.deleteAll() - clearing = false - } - } - } - adapter.deletePushBean = object : PushMessageAdapter.PushAdapterListener { - override fun lastItemShow(show: Boolean) { - if (!show && !clearing) { - val size = viewModel.list?.size ?: 0 - if (size > 0 && size < module_push_activity_recycler_view.childCount) { - return - } - } - module_push_activity_clear.visibility = - if (show) View.VISIBLE else View.GONE - } - - override fun deleteBean(bean: PushBean, action: Boolean) { - if (clearing) return - viewModel.delete(bean) - if (action) { - AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLICK, "title", bean.title) - finish() - } else { - AnalyticsUtils.track(Config.NEWS_HISTORY_ONE_CLEAR, "title", bean.title) - adapter.removeItem(bean) - if (adapter.datas?.size ?: 0 == 0) { - module_push_activity_not_data.visibility = View.VISIBLE - } - updateHistoryMessageCount() - } - } - } - module_push_activity_recycler_view.layoutManager = LinearLayoutManager(this) - module_push_activity_recycler_view.adapter = adapter - module_push_activity_recycler_view.itemAnimator = PushItemAnimator() - module_push_activity_recycler_view.addOnItemTouchListener( - SwipeItemLayout.OnSwipeItemTouchListener(this) - ) - viewModel = MessageViewModel(object : - MessageViewModel.MessageListChange { - override fun messageListChange(list: MutableList?) { - runOnUiThread { - var size = list?.size ?: 0 - adapter.datas = list - module_push_activity_not_data.visibility = if (size > 0) View.GONE else View.VISIBLE - updateHistoryMessageCount() - } - } - }) - - getApis(this).intentManagerApi.registerIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this) - } - - private fun updateHistoryMessageCount(){ - HandlerUtils.mBgHandler.post{ - var count = PushRepository.pushRepository.pushBeanDao.getAllCount() - UiThreadHandler.post { - module_push_activity_title.text = if (count > 0) "历史消息（${count}）" else "历史消息" - } - } - } - - override fun onResume() { - super.onResume() - adapter.notifyDataSetChanged() - } - - override fun onIntentReceived(intentStr: String?, intent: Intent?) { - if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(intentStr)) { - Logger.d("PushMessageActivity", "close by home key.") - finish() - } - } - - override fun onDestroy() { - super.onDestroy() - getApis(this).intentManagerApi.unregisterIntentListener(Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this) - } -} \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt index 868a609d29..da8aa2bc98 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt @@ -45,7 +45,7 @@ class PushMessageAdapter : RecyclerView.Adapter= 0) { it.removeAt(position) - notifyItemRemoved(position) + notifyDataSetChanged() } if (itemCount == 0) { deletePushBean.lastItemShow(false) diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java new file mode 100644 index 0000000000..17f97556a5 --- /dev/null +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java @@ -0,0 +1,192 @@ +package com.mogo.module.push.fragment; + +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.analytics.AnalyticsUtils; +import com.mogo.commons.mvp.MvpFragment; +import com.mogo.module.push.Config; +import com.mogo.module.push.R; +import com.mogo.module.push.adapter.PushMessageAdapter; +import com.mogo.module.push.model.PushBean; +import com.mogo.module.push.repository.PushRepository; +import com.mogo.module.push.utils.AnimatorUtilsKt; +import com.mogo.module.push.utils.HandlerUtils; +import com.mogo.module.push.view.GlobalToolsKt; +import com.mogo.module.push.view.PushItemAnimator; +import com.mogo.module.push.view.SwipeItemLayout; +import com.mogo.module.push.viewmodel.MessageViewModel; +import com.mogo.service.statusmanager.IMogoMsgCenterListener; +import com.mogo.utils.UiThreadHandler; + +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; + +public +/** + * @author congtaowang + * @since 2020/9/1 + * + * 描述 + */ +class MessageHistoryFragment extends MvpFragment< MessageHistoryView, MessageHistoryPresenter > implements MessageHistoryView, IMogoMsgCenterListener { + + private static final String TAG = "MessageHistoryFragment"; + + private View mClear; + private RecyclerView mHistoryList; + private TextView mTitle; + private View mEmptyPlaceHolder; + private View mClose; + + private boolean mClearing = false; + private PushMessageAdapter mAdapter = new PushMessageAdapter(); + private MessageViewModel mViewModel; + + @Override + protected int getLayoutId() { + return R.layout.module_push_message_hisotry_fragment; + } + + @Override + protected void initViews() { + mClear = findViewById( R.id.module_push_id_clear ); + mHistoryList = findViewById( R.id.module_push_id_recycler_view ); + mTitle = findViewById( R.id.module_push_id_title ); + mEmptyPlaceHolder = findViewById( R.id.module_push_id_not_data ); + mClose = findViewById( R.id.module_push_id_close ); + + AnalyticsUtils.track( Config.NEWS_HISTORY_OPEN, null ); + mClose.setOnClickListener( view -> { + exitSelf(); + } ); + mClear.setOnClickListener( view -> { + AnalyticsUtils.track( Config.NEWS_HISTORY_ALL_CLEAR, null ); + if ( !mClearing ) { + mClearing = true; + AnimatorUtilsKt.startClearAnimator( + mHistoryList, + () -> { + mViewModel.deleteAll(); + mClearing = false; + } + ); + } + } ); + mAdapter.deletePushBean = new PushMessageAdapter.PushAdapterListener() { + @Override + public void deleteBean( @NotNull PushBean bean, boolean action ) { + if ( mClearing ) { + return; + } + mViewModel.delete( bean ); + if ( action ) { + Map< String, Object > prop = new HashMap<>(); + prop.put( "title", bean.getTitle() ); + AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLICK, prop ); + exitSelf(); + } else { + AnalyticsUtils.track( Config.NEWS_HISTORY_ONE_CLEAR, null ); + mAdapter.removeItem( bean ); + if ( mAdapter.getItemCount() == 0 ) { + mEmptyPlaceHolder.setVisibility( View.VISIBLE ); + } + updateHistoryMessageCount(); + } + } + + @Override + public void lastItemShow( boolean show ) { + if ( !show && !mClearing ) { + if ( mViewModel.getList() != null ) { + int size = mViewModel.getList().size(); + if ( size > 0 && size < mHistoryList.getChildCount() ) { + return; + } + } + } + mClear.setVisibility( show ? View.VISIBLE : View.GONE ); + } + }; + mViewModel = new MessageViewModel( list -> { + UiThreadHandler.post( () -> { + int size = list == null ? 0 : list.size(); + mAdapter.setDatas( list ); + mEmptyPlaceHolder.setVisibility( size > 0 ? View.GONE : View.VISIBLE ); + updateHistoryMessageCount(); + } ); + } ); + + mHistoryList.setLayoutManager( new LinearLayoutManager( AbsMogoApplication.getApp() ) ); + mHistoryList.setAdapter( mAdapter ); + mHistoryList.setItemAnimator( new PushItemAnimator() ); + mHistoryList.addOnItemTouchListener( new SwipeItemLayout.OnSwipeItemTouchListener( getContext() ) ); + + mRootView.setOnClickListener( view -> { + } ); + GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().registerMsgCenterListener( this ); + } + + private void exitSelf() { + try { + getActivity().getSupportFragmentManager().beginTransaction() + .remove( this ) + .commitNowAllowingStateLoss(); + } catch ( Exception e ) { + e.printStackTrace(); + } + } + + private void updateHistoryMessageCount() { + HandlerUtils.INSTANCE.getMBgHandler().post( () -> { + int count = 0; + try { + count = PushRepository.Companion.getPushRepository().getPushBeanDao().getAllCount(); + } catch ( Exception e ) { + count = 0; + } + renderHistoryMessageCount( count ); + } ); + } + + private void renderHistoryMessageCount( int count ) { + UiThreadHandler.post( () -> { + try { + mTitle.setText( count > 0 ? "历史消息(" + count + ")" : "历史消息" ); + } catch ( Exception e ) { + e.printStackTrace(); + } + } ); + } + + @Override + public void onMsgChanged( boolean hasMsg, int amount ) { + HandlerUtils.INSTANCE.getMBgHandler().post( () -> { + mViewModel.setList( PushRepository.Companion.getPushRepository().getAll() ); + } ); + } + + @Override + public void onResume() { + super.onResume(); + } + + @NonNull + @Override + protected MessageHistoryPresenter createPresenter() { + return new MessageHistoryPresenter( this ); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + GlobalToolsKt.getApis( getContext() ).getMsgCenterApi().unregisterMsgCenterListener( this ); + } +} diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java new file mode 100644 index 0000000000..836da23c93 --- /dev/null +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java @@ -0,0 +1,17 @@ +package com.mogo.module.push.fragment; + +import com.mogo.commons.mvp.Presenter; + +public +/** + * @author congtaowang + * @since 2020/9/1 + * + * 描述 + */ +class MessageHistoryPresenter extends Presenter< MessageHistoryView > { + + public MessageHistoryPresenter( MessageHistoryView view ) { + super( view ); + } +} diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java new file mode 100644 index 0000000000..4ad76d5b6b --- /dev/null +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java @@ -0,0 +1,13 @@ +package com.mogo.module.push.fragment; + +import com.mogo.commons.mvp.IView; + +public +/** + * @author congtaowang + * @since 2020/9/1 + * + * 描述 + */ +interface MessageHistoryView extends IView { +} diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt index c48ae6ea08..9c50449846 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt @@ -85,6 +85,12 @@ class PushRepository(mContext: Context) { } pushBeanQueue.offer(bean) } + if ( bean != null) { + HandlerUtils.mBgHandler.post { + pushBeanDao.insertAll(bean) + updateMsgNum() + } + } startIterate() } }) @@ -158,13 +164,6 @@ class PushRepository(mContext: Context) { } fun iterateNext(needSave: Boolean = false) { - if (needSave && pushViewModel.pushBean != null) { - val bean = pushViewModel.pushBean!! - HandlerUtils.mBgHandler.post { - pushBeanDao.insertAll(bean) - updateMsgNum() - } - } try { val nextBean = pushBeanQueue.peek() if (nextBean == null) { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt index 44f9b5b7fe..e121e2e957 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt +++ b/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt @@ -4,8 +4,11 @@ import android.view.View import android.view.ViewGroup import androidx.core.view.get import androidx.core.view.isNotEmpty +import com.mogo.utils.logger.Logger -fun startClearAnimator(root: ViewGroup, method: () -> Unit) { +val TAG: String = "AnimatorUtils.kt" + +fun startClearAnimator(root: ViewGroup, runnable: Runnable) { if (root.isNotEmpty()) { var view: View var size = root.childCount - 1 @@ -13,13 +16,19 @@ fun startClearAnimator(root: ViewGroup, method: () -> Unit) { view = root[i] view.animate().translationX(-view.width.toFloat()).apply { if (i == 0) { - withEndAction(method) + try { + withEndAction(runnable) + } catch (e: Exception) { + Logger.e(TAG, e, "startClearAnimator->withEndAction") + } } duration = 200 startDelay = 100 * (size - i).toLong() } } } else { - method() + runnable?.apply { + run() + } } } \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png old mode 100644 new mode 100755 index 73e64634fd..c1381dc44c Binary files a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png and b/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png old mode 100644 new mode 100755 index 71a46c2cc2..bb3e2b1195 Binary files a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png and b/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_activity_clear_bg.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_clear_bg.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_activity_clear_bg.xml rename to modules/mogo-module-push/src/main/res/drawable/module_push_clear_bg.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_close.png b/modules/mogo-module-push/src/main/res/drawable/module_push_close.png old mode 100644 new mode 100755 index 71a46c2cc2..c1381dc44c Binary files a/modules/mogo-module-push/src/main/res/drawable/module_push_close.png and b/modules/mogo-module-push/src/main/res/drawable/module_push_close.png differ diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml similarity index 58% rename from modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml rename to modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml index 0c3a036b3e..5adad50e3d 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_message_activity_background.xml +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.xml @@ -1,5 +1,6 @@ - + + diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml b/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml index d755aba46d..2c16e3f684 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml +++ b/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml @@ -2,8 +2,8 @@ - - + + true @android:style/Animation.Translucent - @drawable/module_push_message_activity_background + @drawable/module_push_message_background diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt index 1c2ccc322d..fe57ab63b7 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt @@ -149,13 +149,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener { SettingManager.mapType = checkedId when (checkedId) { R.id.rb_navi_day -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Light) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Light) } R.id.rb_navi_night -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_Night) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_Night) } R.id.rb_navi_auto -> { - SearchApisHolder.getUiControllerApis().changeMapMode(EnumMapUI.Type_AUTO_LIGHT_Night) + SearchApisHolder.getApis().adasControllerApi.changeAdasControlMode(EnumMapUI.Type_AUTO_LIGHT_Night) } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 5cde04fe27..b106e6f283 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -52,7 +52,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { } protected void initView( Context context ) { - LayoutInflater.from( context ).inflate( R.layout.view_map_marker_info, this ); + LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_layout_info, this ); ivUserHead = findViewById( R.id.ivUserHead ); ivIcon = findViewById( R.id.ivIcon ); clMarkerContent = findViewById( R.id.clMarkerContent ); 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 761a83dc2e..3621019256 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 @@ -36,6 +36,7 @@ import com.mogo.module.service.utils.ViewUtils; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.module.IMogoBizActionDoneListener; +import com.mogo.utils.AppUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; @@ -959,7 +960,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, switch ( mapUI ) { case Type_Light: case Type_Night: - if ( !MarkerServiceHandler.getApis().getStatusManagerApi().isMainPageOnResume() ) { + if ( !AppUtils.isAppForeground( mContext ) ) { return; } if ( mLastDataResult != null ) { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 6d2d7affe2..f9664bcc23 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -3,7 +3,6 @@ package com.mogo.module.service.marker; import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.widget.ImageView; import androidx.annotation.Nullable; @@ -43,7 +42,7 @@ public class MapMarkerView extends MapMarkerBaseView { } protected void initView( Context context ) { - LayoutInflater.from( context ).inflate( R.layout.view_map_marker, this ); + LayoutInflater.from( context ).inflate( R.layout.modudle_services_marker_layout, this ); ivIcon = findViewById( R.id.ivIcon ); ivCar = findViewById( R.id.ivCar ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java index b038ac044e..42048bc2eb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java @@ -8,7 +8,6 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.SubscribeImpl; import com.mogo.map.marker.IMogoInfoWindowAdapter; @@ -22,7 +21,6 @@ import com.mogo.module.service.R; import com.mogo.module.service.network.RefreshApiService; import com.mogo.module.service.network.RefreshModel; import com.mogo.module.service.network.bean.DemoUserInfoEntity; -import com.mogo.service.MogoServicePaths; import com.mogo.service.imageloader.MogoImageView; import com.mogo.service.network.IMogoNetwork; import com.mogo.utils.UiThreadHandler; @@ -92,7 +90,7 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter { } if ( mInfoWindowView == null ) { - mInfoWindowView = LayoutInflater.from( mContext ).inflate( R.layout.view_map_data_user_info_window, null ); + mInfoWindowView = LayoutInflater.from( mContext ).inflate( R.layout.modudle_services_marker_info_window_layout, null ); mContentContainer = mInfoWindowView.findViewById( R.id.module_service_id_marker_content ); mUserHeader = mInfoWindowView.findViewById( R.id.module_service_id_user_header ); mContent = mInfoWindowView.findViewById( R.id.module_service_id_content ); diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_dark.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/bg_map_marker_dark.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_dark.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_dark.png deleted file mode 100644 index f12819ecfc..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/bg_map_marker_dark.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png new file mode 100755 index 0000000000..2dff68497d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml similarity index 100% rename from modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml rename to modules/mogo-module-service/src/main/res/layout/modudle_services_marker_info_window_layout.xml diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml similarity index 95% rename from modules/mogo-module-service/src/main/res/layout/view_map_marker.xml rename to modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml index 7651639cf3..c8b06a6245 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/modudle_services_marker_layout.xml @@ -12,7 +12,7 @@ + android:endColor="#5CC1FF" + android:startColor="#256BFF" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml new file mode 100644 index 0000000000..2c862044c3 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/v2x_panel_color_bg.xml @@ -0,0 +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 7ac15899e1..8d8ef310db 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 @@ -3,6 +3,6 @@ + android:endColor="@color/panel_shadow_shape_color"/> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index db5cb0e6ee..b516dedff0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -25,7 +25,7 @@ android:layout_marginStart="@dimen/dp_32" android:layout_marginEnd="@dimen/dp_32" android:text="没有更多记录了" - android:textColor="#99FFFFFF" + android:textColor="@color/share_event_no_more_color" android:textSize="@dimen/dp_26" app:layout_constraintEnd_toStartOf="@+id/viewLinEnd" app:layout_constraintStart_toEndOf="@+id/viewLinStart" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index 328ace0186..bb45e400c0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -1,110 +1,120 @@ - + android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground"> - + - + - + - + - + - + - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml index e25e2db5f7..aec79a948f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml @@ -6,45 +6,52 @@ android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_event_window_height"> - + android:layout_height="match_parent" + app:cardBackgroundColor="#FFFFFF" + app:cardCornerRadius="12px" + app:layout_constraintTop_toTopOf="parent"> - + - + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 2452269d9f..d9afa4955a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -1,105 +1,123 @@ - + android:layout_marginLeft="10px" + android:layout_marginRight="10px" + android:layout_marginBottom="14px"> - + app:cardBackgroundColor="@color/share_event_item_bg_color" + app:cardCornerRadius="12px" + app:layout_constraintTop_toTopOf="parent"> - + - + - + - + - + - + - + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index bc036adf46..cc9e7d8fdd 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -1,132 +1,147 @@ - + android:layout_marginLeft="10px" + android:layout_marginRight="10px" + android:layout_marginBottom="14px"> - + app:cardBackgroundColor="@color/share_event_item_bg_color" + app:cardCornerRadius="12px" + app:layout_constraintTop_toTopOf="parent"> - + - + - + - + - + - + - - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index f96911d38e..c3e82ff512 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -4,8 +4,8 @@ android:id="@+id/clPanelContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_v2x_event_surrounding_item"> - +> + @@ -23,7 +23,7 @@ android:gravity="top" android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:text="周围5公里，共15条交通信息" - android:textColor="@color/white" + android:textColor="@color/v2x_white" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> @@ -111,7 +111,7 @@ android:background="@drawable/bg_v2x_go_to_share" android:gravity="center" android:text="@string/v2x_surrounding_go_to_share" - android:textColor="@color/white" + android:textColor="@color/v2x_white" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> @@ -126,7 +126,7 @@ android:background="@drawable/bg_v2x_refresh" android:gravity="center" android:text="@string/v2x_surrounding_refresh" - android:textColor="@color/white" + android:textColor="@color/v2x_white_refresh" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml index 5e497f6ba6..71284be35c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml @@ -34,7 +34,7 @@ android:layout_toRightOf="@+id/iv_event_type" android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left" android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize" - android:textColor="@color/white" + android:textColor="@color/v2x_item_white" android:text="求助" /> - - + android:layout_height="match_parent" + app:cardBackgroundColor="@color/panel_shadow_shape_color" + app:cardCornerRadius="16px"> - + - + - + - + - - + - + - + + - + - + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index a0f5bd3e2c..43c372672e 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -22,7 +22,7 @@ android:alpha="0.7" android:gravity="bottom" android:text="你还没有分享过道路事件，快去试试吧" - android:textColor="#FFFFFF" + android:textColor="@color/v2x_FFF_333_white" android:textSize="18px" /> 150px 48px 32px - 130px + 110px 10px 20px 190px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 45ca7333ff..36754f0fc3 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -37,7 +37,7 @@ 150px 48px 32px - 130px + 110px 10px 20px 190px diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index 448070e539..918a85b0b2 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -3,12 +3,21 @@ #256BFF #3F4057 #10121E - #FFFFFF + #FFFFFF + #FFFFFF + #FFFFFF #B3FFFFFF #1F2131 #1F2131 #FFFFFF #FFFFFF + #10121E + #99FFFFFF + #FFFFFF + #FFFFFF + #ff616381 + //endColor="#ff616381" android:startColor="#ff48495e" + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index c6458087a1..c14b11c750 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -39,7 +39,7 @@ 150px 48px 32px - 130px + 90px 10px 20px 190px diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java new file mode 100644 index 0000000000..548e0f1e0d --- /dev/null +++ b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java @@ -0,0 +1,20 @@ +package com.mogo.service.fragmentmanager; + +import android.os.Bundle; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + +import com.alibaba.android.arouter.facade.template.IProvider; + +public +/** + * @author congtaowang + * @since 2020/9/1 + * + * 描述 + */ +interface IFragmentProvider extends IProvider { + + Fragment createFragment( FragmentActivity activity, int containerId, Bundle date ); +} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IMogoFragmentManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IMogoFragmentManager.java index 2832fee695..5a006f9195 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IMogoFragmentManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IMogoFragmentManager.java @@ -64,4 +64,12 @@ public interface IMogoFragmentManager extends IProvider { * @param containerId */ void init( AppCompatActivity activity, int containerId ); + + /** + * 缓存历史消息 + * @param layoutId + */ + void initMessageHistoryContainerId(int layoutId); + + int getMessageHistoryContainerId(); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java index 0aea3f824d..083ea0ddd8 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java @@ -35,6 +35,7 @@ public class FragmentStack { private FragmentStackTransactionListener mFragmentStackTransactionListener; private List< FragmentStackTransactionListener > mFragmentStackTransactionListeners = new ArrayList<>(); + private int mMessageHistoryContainerId; private FragmentStack() { } @@ -60,6 +61,18 @@ public class FragmentStack { mContainerId = containerId; } + /** + * 缓存历史消息 + * @param layoutId + */ + public void initMessageHistoryContainerId(int layoutId){ + mMessageHistoryContainerId = layoutId; + } + + public int getMessageHistoryContainerId() { + return mMessageHistoryContainerId; + } + public void push( FragmentDescriptor descriptor ) { if ( descriptor == null || descriptor.getFragment() == null ) { return; diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java index 0dd914713a..9894728619 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java @@ -59,6 +59,16 @@ public class MogoFragmentManager implements IMogoFragmentManager { FragmentStack.getInstance().init( activity, containerId ); } + @Override + public void initMessageHistoryContainerId( int layoutId ) { + FragmentStack.getInstance().initMessageHistoryContainerId( layoutId ); + } + + @Override + public int getMessageHistoryContainerId() { + return FragmentStack.getInstance().getMessageHistoryContainerId(); + } + @Override public void init( Context context ) { diff --git a/skin/mogo-skin-light/build.gradle b/skin/mogo-skin-light/build.gradle index fbffb0f6dc..27b4dd2f14 100644 --- a/skin/mogo-skin-light/build.gradle +++ b/skin/mogo-skin-light/build.gradle @@ -31,13 +31,13 @@ android { res.srcDirs = [ 'src/main/res', 'src/main/module-apps-res', - 'src/main/module-callchat-res', 'src/main/module-extensions-res', 'src/main/module-v2x-res', 'src/main/module-back-res', 'src/main/module-services-res', 'src/main/module-push-res', 'src/main/module-share-res', + 'src/main/module-main-res', 'src/main/module-tanlu-res', 'src/main/module-commons-res', 'src/main/module-media-res', diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png new file mode 100755 index 0000000000..402c1def01 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_ai_assist_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png new file mode 100755 index 0000000000..0438b180a1 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_applist_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png new file mode 100755 index 0000000000..e1d31d23fc Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_im_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png new file mode 100755 index 0000000000..9c4ddd35f3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_media_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png new file mode 100644 index 0000000000..6138ca850c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_disable_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png new file mode 100755 index 0000000000..6abad98484 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-mdpi/module_apps_ic_navigator_navi_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_ai_assist_bkg_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_ai_assist_bkg_light.png new file mode 100755 index 0000000000..d051a63791 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_ai_assist_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_light.png new file mode 100755 index 0000000000..97b67efdad Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_applist_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_light.png new file mode 100755 index 0000000000..b1ff28e6c3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_im_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_light.png new file mode 100755 index 0000000000..3971dd0bf6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_media_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_light.png new file mode 100755 index 0000000000..1de8baa9da Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_navigator_navi_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_retract_light.png b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_retract_light.png new file mode 100755 index 0000000000..88fe0aa4fc Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-apps-res/drawable-xhdpi/module_apps_ic_retract_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml new file mode 100644 index 0000000000..bff99886f4 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-apps-res/drawable/module_apps_pager_indicator_light.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml index ff5c5d096b..0f4ba56af4 100644 --- a/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-apps-res/values/colors.xml @@ -1,4 +1,5 @@ - #B2F5F5F5 + #F5F5F5 + #333333 diff --git a/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml new file mode 100644 index 0000000000..46fe20fe0d --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-main-res/drawable/module_main_dw_left_frame_bkg_light.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png new file mode 100755 index 0000000000..d25aa13032 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-push-res/drawable-mdpi/module_push_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_close_light.png b/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_close_light.png new file mode 100755 index 0000000000..cbf14c5566 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-push-res/drawable-xhdpi/module_push_close_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_clear_bg_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_clear_bg_light.xml new file mode 100644 index 0000000000..d518d9b0ab --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_clear_bg_light.xml @@ -0,0 +1,7 @@ + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.xml new file mode 100644 index 0000000000..d55da005a7 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_message_background_light.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_recycler_item_background_light.xml b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_recycler_item_background_light.xml new file mode 100644 index 0000000000..fb455c4e47 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/drawable/module_push_recycler_item_background_light.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml new file mode 100644 index 0000000000..f3c9b8e297 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/values-ldpi/dimens.xml @@ -0,0 +1,6 @@ + + + 16px + 12px + 24px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml new file mode 100644 index 0000000000..f3c9b8e297 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/values-mdpi/dimens.xml @@ -0,0 +1,6 @@ + + + 16px + 12px + 24px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..7aabd7e78b --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/values-xhdpi/dimens.xml @@ -0,0 +1,6 @@ + + + 29px + 22px + 45px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml index 045e125f3d..7a6ecee38d 100644 --- a/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-push-res/values/colors.xml @@ -1,3 +1,7 @@ + #333333 + #333333 + #666666 + #999999 diff --git a/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml new file mode 100644 index 0000000000..f3c9b8e297 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-push-res/values/dimens.xml @@ -0,0 +1,6 @@ + + + 16px + 12px + 24px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png new file mode 100755 index 0000000000..8044b0458f Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_marker_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png new file mode 100755 index 0000000000..d43d74c08c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_marker_bkg_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml new file mode 100644 index 0000000000..a6ee48b155 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_alert_window_bg_light.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml new file mode 100644 index 0000000000..7c8291b6c3 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-share-res/drawable/v2x_shadow_shape_view_light.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi.png new file mode 100644 index 0000000000..1e635c539a Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-mdpi/tanlu_navi.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi.png b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi.png new file mode 100644 index 0000000000..564236aaba Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable-xhdpi/tanlu_navi.png differ diff --git a/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_gradual_change_bg_light.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_gradual_change_bg_light.xml new file mode 100644 index 0000000000..1dc5930dc8 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/drawable/tanlu_gradual_change_bg_light.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file 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 new file mode 100644 index 0000000000..ff75ac58ed --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,100 @@ + + + + + 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 new file mode 100644 index 0000000000..ff75ac58ed --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-tanlu-res/values-xhdpi/dimens.xml @@ -0,0 +1,100 @@ + + + + + 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/colors.xml b/skin/mogo-skin-light/src/main/module-tanlu-res/values/colors.xml index 635503f358..abd5bac484 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 @@ -1,6 +1,6 @@ - #333333 - #666666 + #333333 + #666666 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 ff75ac58ed..a39e44cd6d 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,100 +1,98 @@ - - 98px - 98px + 52px + 52px 48px 48px 72px 5px - 106px - 106px + 56px + 56px 96px 96px - 100px + 90px 700px - 12px + 10px - 135px - 50px - 50px - 30px - 92px - 40px - 800px + 72px + 25px + 25px + 16px + 48px + 22px + 700px - 30px - 28px - 4px - 32px - 255px - 82px + + 10px + 15px + 2px + 19px + 136px + 44px 2px - 205px - 20px - 40px - 60px - 50px - 32px - 40px - 50px + 109px + 10px + 23px + 30px + 28px + 16px + 22px + 26px - 10px + 6px - 750px - 270px - 120px - 60px + 400px + 150px + 80px + 32px - 488px - 82px + 260px + 44px - 34px - 24px - 28px - 26px - 30px + 18px + 14px + 15px + 13px + 16px - 790px - 524px - 130px - 40px - 66px - 36px - 59px + 418px + 278px + 69px + 22px + 36px + 18px + 32px - 44px - 105px - 44px + 20px + 56px + 23px - 20px - 16px + 10px + 8px - 1060px - 350px - 480px - 320px + 642px + 194px + 266px + 194px 45px - 23px - 15px - 25px + 16px + 8px + 13px 15px 10px - 27px - 46px - - 50px - 98px - 6px - 30px - - + 18px + 26px + 28px + 56px + 3px + 16px + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml new file mode 100644 index 0000000000..0b615ca429 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/color/radiobutton_textcolor_light.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_share_empty_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_share_empty_light.png new file mode 100644 index 0000000000..03da771490 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/icon_share_empty_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png new file mode 100644 index 0000000000..57abc3ccb6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/icon_parking_nav.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png new file mode 100755 index 0000000000..6756d3e6a8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_accident_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png new file mode 100755 index 0000000000..6a9605f5a9 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_blank_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png new file mode 100755 index 0000000000..5b93e817d8 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png new file mode 100755 index 0000000000..8a3b38601e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_daolushigong_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png new file mode 100755 index 0000000000..d4f16ca8fe Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png new file mode 100755 index 0000000000..d7207113b6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_fenglu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png new file mode 100755 index 0000000000..870bf87e82 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png new file mode 100755 index 0000000000..b3092ae360 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongjiancha_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png new file mode 100755 index 0000000000..547bd4ce22 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiaotongshigu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png new file mode 100644 index 0000000000..dcef2a496c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png new file mode 100755 index 0000000000..b4fb7eda7d Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jiebing_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png new file mode 100755 index 0000000000..75489d8075 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png rename to skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_jishui_small_light.png diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png new file mode 100755 index 0000000000..f9347adaf3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png new file mode 100755 index 0000000000..1c51c47115 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_nongwu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png new file mode 100755 index 0000000000..a5d9f22c18 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png new file mode 100755 index 0000000000..377f3ee1ca Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_qiuzhu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png new file mode 100755 index 0000000000..dcf7a4fc97 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishilukuang_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png new file mode 100755 index 0000000000..6e069f57de Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_shishlukuang_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png new file mode 100755 index 0000000000..508d6b2ebf Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png new file mode 100755 index 0000000000..1bcc7852d1 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/mogo_image_yongdu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png deleted file mode 100644 index 1b039bafed..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png deleted file mode 100644 index 815dc5b40c..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png new file mode 100755 index 0000000000..e1354bab9c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png deleted file mode 100644 index c77748e661..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png new file mode 100755 index 0000000000..57fc9d6829 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png new file mode 100755 index 0000000000..76847aaee9 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png deleted file mode 100644 index 33e7d8873e..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png new file mode 100755 index 0000000000..9bf06bf948 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png new file mode 100755 index 0000000000..2538c35258 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png deleted file mode 100644 index 28f0db939b..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png new file mode 100755 index 0000000000..263a63a1c1 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png new file mode 100755 index 0000000000..307d137ef4 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png deleted file mode 100644 index 0efac11676..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png new file mode 100755 index 0000000000..9a2ca23726 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png new file mode 100755 index 0000000000..bfea0e04b9 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongshigu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png new file mode 100644 index 0000000000..dcef2a496c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png deleted file mode 100644 index 37ed59c3b4..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png new file mode 100755 index 0000000000..cddfe149f1 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png new file mode 100755 index 0000000000..af4fd037ae Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png new file mode 100644 index 0000000000..c93bd218fb Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png new file mode 100755 index 0000000000..5c965dbf11 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png deleted file mode 100644 index 698b84ffbc..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png new file mode 100755 index 0000000000..963694c6af Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png new file mode 100755 index 0000000000..5ebfc76a29 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png deleted file mode 100644 index a247ac6428..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png new file mode 100755 index 0000000000..ea26ce1853 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png deleted file mode 100644 index 632d1e5ad3..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png new file mode 100755 index 0000000000..f6d348cc83 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png new file mode 100755 index 0000000000..33a17d184c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishlukuang_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png new file mode 100755 index 0000000000..a72533bfb0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_nor_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png deleted file mode 100644 index bdba45d7e0..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png new file mode 100755 index 0000000000..cc0e15621e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml new file mode 100644 index 0000000000..5132bd085c --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_go_to_share_light.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml new file mode 100644 index 0000000000..17e43ef185 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_refresh_light.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml new file mode 100644 index 0000000000..6c0812711e --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_panel_color_bg_light.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml new file mode 100644 index 0000000000..6e1f3d1496 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi-1920x1000/dimens.xml @@ -0,0 +1,7 @@ + + + 24px + + + + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml new file mode 100644 index 0000000000..6e1f3d1496 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values-xhdpi/dimens.xml @@ -0,0 +1,7 @@ + + + 24px + + + + diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index a24e6487fd..c354dea572 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -4,5 +4,13 @@ #DDDDDD #999999 #333333 + #F5F5F5 + #333333 + #FFFFFF + #FFFFFF + #333333 + #333333 + #999999 + #333333 diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml new file mode 100644 index 0000000000..6e1f3d1496 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/dimens.xml @@ -0,0 +1,7 @@ + + + 24px + + + +