Merge branch 'dev' into dev_opt_drawable

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;

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" />
 
     <TextView

modules/mogo-module-apps/src/main/res/values/strings.xml

@@ -17,5 +17,7 @@
         <item>com.android.calculator2</item>
         <item>com.nwd.guidebookskin</item>
         <item>com.iflytek.inputmethod.pad</item>
+        <item>com.nwd.tools.reboot</item>
+        <item>com.android.car.setting</item>
     </string-array>
 </resources>

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);
         }
     }
 }

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<MogoModule> 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 ) {

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;

modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml

@@ -2,8 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#88000000">
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/vBg"