diff --git a/gradle.properties b/gradle.properties index e25a1b480c..9661d65a5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -59,11 +59,11 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.5 ## 工程外部模块 # 探路 -MOGO_MODULE_TANLU_VERSION=1.2.1.1 +MOGO_MODULE_TANLU_VERSION=1.2.1.2 # 车聊聊 -CARCHATTING_VERSION=1.0.7 +CARCHATTING_VERSION=1.1.9 # 车聊聊接口 -CARCHATTINGPROVIDER_VERSION=1.0.7 +CARCHATTINGPROVIDER_VERSION=1.1.9 # 视频引导 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT # 视频引导接口 @@ -71,13 +71,13 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x -MOGO_MODULE_V2X_VERSION=1.1.24 +MOGO_MODULE_V2X_VERSION=1.1.27 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 -TANLULIB_VERSION=1.2.1.1 +TANLULIB_VERSION=1.2.1.2 ## 产品库必备配置 applicationId=com.mogo.launcer 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-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java index 6a9aa2c1f1..81b7c02eb5 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsFragment.java @@ -21,8 +21,6 @@ import com.mogo.utils.logger.Logger; import java.util.HashMap; import java.util.Map; -import retrofit2.http.HEAD; - /** * 天气，消息，个人头像 * @@ -128,7 +126,7 @@ public class ExtensionsFragment extends MvpFragment< ExtensionsView, ExtensionsP public void renderUserInfo(UserInfo userInfo) { if(userInfo != null){ Logger.d(TAG, "renderUserInfo: " + userInfo); - GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).circleCrop().into(mUserHeadImg); + GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).placeholder(R.drawable.model_ext_default_user_head).circleCrop().into(mUserHeadImg); } } } 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 ) { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 2153c9a17e..c00caf03df 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -1,19 +1,12 @@ package com.mogo.module.share.dialog; import android.content.Context; -import android.graphics.PixelFormat; -import android.os.Build; -import android.view.Gravity; -import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; -import androidx.annotation.NonNull; - import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.common.dialog.BaseFloatDialog; -import com.mogo.module.common.utils.CarSeries; import com.mogo.module.share.R; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.share.manager.ISeekHelpListener; @@ -23,7 +16,6 @@ import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; import com.mogo.service.analytics.IMogoAnalytics; import com.mogo.service.statusmanager.IMogoStatusManager; -import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; import java.util.HashMap; diff --git a/modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_left.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_left.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_left.png diff --git a/modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_right.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_right.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/module_share_title_icon_right.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/module_share_title_icon_right.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_accident.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_block_up.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_dense_fog.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_real_time_traffic.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_closure.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_construction.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_road_icy.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_seek_help.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_stagnant_water.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png diff --git a/modules/mogo-module-share/src/main/res/drawable/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png similarity index 100% rename from modules/mogo-module-share/src/main/res/drawable/share_traffic_check.png rename to modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png new file mode 100644 index 0000000000..058a752bf6 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_left.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png new file mode 100644 index 0000000000..bbcedd2484 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/module_share_title_icon_right.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png new file mode 100644 index 0000000000..9dd6d425c9 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png new file mode 100644 index 0000000000..b504cffe87 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png new file mode 100644 index 0000000000..6a16103d0e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png new file mode 100644 index 0000000000..7defe6986d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png new file mode 100644 index 0000000000..d20dacee3a Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png new file mode 100644 index 0000000000..3c2ba1225c Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png new file mode 100644 index 0000000000..53585d40d1 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png new file mode 100644 index 0000000000..30f26921aa Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png new file mode 100644 index 0000000000..f125b9f22e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png new file mode 100644 index 0000000000..1b5af5fe54 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-mdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index e3a6a7987d..f5012a4dce 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -2,8 +2,7 @@ + android:layout_height="match_parent">