diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java index df83f351c0..5ab0bcf696 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppEnum.java @@ -57,9 +57,11 @@ public enum AppEnum { //"均衡器", Equlizer( "均衡器", "com.zhidao.equalizer", R.drawable.module_apps_ic_equlizer ), + Equlizer_NWD( "均衡器", "com.nwd.audioset", R.drawable.module_apps_ic_equlizer ), //"方控学习", SteerProduct( "方控学习", "com.zd.steerproduct", R.drawable.module_apps_ic_stee_product ), + SteerProduct_NWD( "方控学习", "com.nwd.wheel.learning", R.drawable.module_apps_ic_stee_product ), //"车载设置", CarSettings( "车载设置", "com.zhidao.settings", R.drawable.module_apps_ic_car_setting ), @@ -78,12 +80,25 @@ public enum AppEnum { // 本地视频 LocalVideo( "本地视频", "com.zhidao.video", R.drawable.module_apps_ic_local_video ), + LocalVideo_NWD( "本地视频", "com.nwd.android.video.ui", R.drawable.module_apps_ic_local_video ), // 车辆信息 CanBus( "车辆信息", "com.nwd.can.setting", R.drawable.module_apps_ic_canbus ), // 蓝牙电话 BT_PHONE( "蓝牙电话", "com.nwd.android.phone", R.drawable.module_apps_ic_bt_phone ), + + // 本地音乐 + LOCAL_MUSIC( "本地音乐", "", R.drawable.module_apps_ic_local_music ), + + // 天气 + WEATHER( "天气", "com.zhidao.weather", R.drawable.module_apps_ic_weather ), + + // 蓝牙音乐 + BT_MUSIC( "蓝牙音乐", "com.nwd.bt.music", R.drawable.module_apps_ic_bt_music ), + + // 高德地图 + AUTO_NAVI( "高德地图", "com.autonavi.amapauto", R.drawable.module_apps_ic_auto_navi ), ; private String mName; diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_auto_navi.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_auto_navi.png new file mode 100644 index 0000000000..acf89ddcf8 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_auto_navi.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_bt_music.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_bt_music.png new file mode 100644 index 0000000000..2c73d6b637 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_bt_music.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_local_music.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_local_music.png new file mode 100644 index 0000000000..5b1ec9b795 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_local_music.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_weather.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_weather.png new file mode 100644 index 0000000000..3f610a671d Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_weather.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_auto_navi.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_auto_navi.png new file mode 100644 index 0000000000..6608281c32 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_auto_navi.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_bt_music.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_bt_music.png new file mode 100644 index 0000000000..ab2049675a Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_bt_music.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_local_music.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_local_music.png new file mode 100644 index 0000000000..bc3f813916 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_local_music.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_weather.png b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_weather.png new file mode 100644 index 0000000000..5c4d7eea82 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_weather.png differ 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 0abc7a6f27..49c0dd467e 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 @@ -10,7 +10,7 @@ android:id="@+id/module_apps_id_app_icon" android:layout_width="@dimen/module_apps_navigation_icon_width" android:scaleType="fitXY" - android:src="@drawable/module_apps_ic_chat" + android:src="@drawable/module_apps_ic_im" android:layout_height="@dimen/module_apps_navigation_icon_height" /> com.android.calculator2 com.nwd.guidebookskin com.iflytek.inputmethod.pad + com.nwd.tools.reboot + com.android.car.setting diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java index f8ab53ca9d..47f9d1857f 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWayItem.java @@ -15,6 +15,7 @@ public class MarkerExploreWayItem implements Serializable { private String thumbnail; private String url; private String content; + private double illegalCount; public String getThumbnail() { if (TextUtils.isEmpty(thumbnail)) { @@ -46,12 +47,21 @@ public class MarkerExploreWayItem implements Serializable { this.content = content; } + public double getIllegalCount() { + return illegalCount; + } + + public void setIllegalCount(double illegalCount) { + this.illegalCount = illegalCount; + } + @Override public String toString() { return "MarkerExploreWayItem{" + "thumbnail='" + thumbnail + '\'' + ", url='" + url + '\'' + ", content='" + content + '\'' + + ", illegalCount='" + illegalCount + '\'' + '}'; } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index 71d7303ea9..951a8dea9d 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -35,23 +35,24 @@ public class MogoModulesManager implements MogoModulesHandler { private Map< MogoModule, IMogoModuleProvider > mModuleProviders = new HashMap<>(); // 空间换效率 private Map< String, IMogoModuleProvider > mModuleNameProviders = new HashMap<>(); - + private static volatile MogoModulesManager sInstance; - - private MogoModulesManager(){} - - public static MogoModulesManager getInstance(){ - if( sInstance == null ){ - synchronized( MogoModulesManager.class ) { - if( sInstance == null ){ + + private MogoModulesManager() { + } + + public static MogoModulesManager getInstance() { + if ( sInstance == null ) { + synchronized ( MogoModulesManager.class ) { + if ( sInstance == null ) { sInstance = new MogoModulesManager(); } } } return sInstance; } - - public synchronized void release(){ + + public synchronized void release() { sInstance = null; } @@ -131,7 +132,7 @@ public class MogoModulesManager implements MogoModulesHandler { @Override public void loadBaseModule() { - List baseModules = MogoModulePaths.getBaseModules(); + List< MogoModule > baseModules = MogoModulePaths.getBaseModules(); for ( MogoModule baseModule : baseModules ) { if ( baseModule == null ) { continue; @@ -142,7 +143,11 @@ public class MogoModulesManager implements MogoModulesHandler { } private IMogoModuleProvider load( String path ) { - return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); + try { + return ( IMogoModuleProvider ) ARouter.getInstance().build( path ).navigation( getContext() ); + } catch ( Exception e ) { + return null; + } } private void addFragment( IMogoModuleProvider provider, int containerId ) {