Merge branch 'dev' into demo/shunyi_v2v_merge

# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-extensions/src/main/res/values/dimens.xml
#	modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
#	modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml
#	modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
#	modules/mogo-module-v2x/src/main/res/values/dimens.xml
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	upload.sh

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -30,9 +30,10 @@ import com.mogo.service.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
-import com.mogo.service.tanlu.IMogoTanluProvider;
-import com.mogo.service.tanlu.IMogoTanluUiProvider;
+import com.mogo.service.share.IMogoTanluProvider;
+import com.mogo.service.share.IMogoTanluUiProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoWindowManager;
 import com.mogo.skin.support.IMogoSkinSupportInstaller;
@@ -58,6 +59,7 @@ public interface IMogoServiceApis extends IProvider {
      *
      * @return
      */
+    @Deprecated
     IMogoCardManager getCardManagerApi();
 
     /**
@@ -269,4 +271,10 @@ public interface IMogoServiceApis extends IProvider {
      * @return
      */
     IMogoCrashWarnProvider getCrashWarnProvider();
+
+    /**
+     * 在线车辆面板
+     * @return
+     */
+    IMogoOnlineCarListPanelProvider getOnlineCarPanelApi();
 }

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -261,4 +261,9 @@ public class MogoServicePaths {
      * 悬浮小控件
      */
     public static final String PATH_WIDGETS = "/widgets/provider";
+
+    /**
+     * 在线好友面板
+     */
+    public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel";
 }

services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java

@@ -68,4 +68,11 @@ public interface IMogoADASController extends IProvider {
      * @return
      */
     EnumMapUI getCurrentSkinMode();
+
+    /**
+     * 给adas传递数据
+     *
+     * @param json
+     */
+    void notifyAdas( String json );
 }

services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java

@@ -8,6 +8,7 @@ import com.alibaba.android.arouter.facade.template.IProvider;
  * <p>
  * 卡片管理
  */
+@Deprecated
 public interface IMogoCardManager extends IProvider {
 
     /**

services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IFragmentProvider.java

@@ -17,4 +17,6 @@ public
 interface IFragmentProvider extends IProvider {
 
     Fragment createFragment( FragmentActivity activity, int containerId, Bundle date );
+
+    public void onDestroy();
 }

services/mogo-service-api/src/main/java/com/mogo/service/fragmentmanager/IMogoFragmentManager.java

@@ -43,6 +43,11 @@ public interface IMogoFragmentManager extends IProvider {
      */
     void registerMainFragmentStackTransactionListener( FragmentStackTransactionListener listener );
 
+    /**
+     * 主页移除栈变化监听
+     */
+    void unregisterMainFragmentStackTransactionListener();
+
     /**
      * 其他注册栈变化监听
      *
@@ -67,9 +72,10 @@ public interface IMogoFragmentManager extends IProvider {
 
     /**
      * 缓存历史消息
+     *
      * @param layoutId
      */
-    void initMessageHistoryContainerId(int layoutId);
+    void initMessageHistoryContainerId( int layoutId );
 
     int getMessageHistoryContainerId();
 }

services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoModuleProvider.java

@@ -2,6 +2,7 @@ package com.mogo.service.module;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -13,6 +14,8 @@ import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.navi.IMogoNaviListener;
 
+import java.util.logging.Logger;
+
 /**
  * @author congtaowang
  * @since 2019-12-24
@@ -128,4 +131,8 @@ public interface IMogoModuleProvider extends IProvider {
     default String getAppName() {
         return "";
     }
+
+    default void onDestroy(){
+        Log.d( "IMogoModuleProvider", "onDestroy" );
+    }
 }

services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoShareManager.java

@@ -25,4 +25,6 @@ public interface IMogoShareManager extends IProvider {
      * @param context 待重置的上下文
      */
     void resetContext(Context context);
+
+    void releaseContext();
 }

services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluProvider.java

@@ -1,4 +1,4 @@
-package com.mogo.service.tanlu;
+package com.mogo.service.share;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
 

services/mogo-service-api/src/main/java/com/mogo/service/share/IMogoTanluUiProvider.java

@@ -1,4 +1,4 @@
-package com.mogo.service.tanlu;
+package com.mogo.service.share;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
 import com.mogo.map.MogoLatLng;

services/mogo-service-api/src/main/java/com/mogo/service/share/TanluUploadParams.java

@@ -1,4 +1,4 @@
-package com.mogo.service.tanlu;
+package com.mogo.service.share;
 
 import com.mogo.map.MogoLatLng;
 

services/mogo-service-api/src/main/java/com/mogo/service/strategy/IMogoOnlineCarListPanelProvider.java

@@ -0,0 +1,24 @@
+package com.mogo.service.strategy;
+
+import androidx.annotation.IdRes;
+import androidx.fragment.app.FragmentActivity;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/21
+ *
+ * 描述
+ */
+interface IMogoOnlineCarListPanelProvider extends IProvider {
+
+    void initContainer( @IdRes int containerId, FragmentActivity activity );
+
+    void showPanel();
+
+    void hidePanel();
+
+    void clear();
+}

services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

@@ -38,9 +38,10 @@ import com.mogo.service.passport.IMogoPassportManager;
 import com.mogo.service.share.IMogoShareManager;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.mogo.service.strategy.IMogoOnlineCarListPanelProvider;
 import com.mogo.service.strategy.IMogoRefreshStrategyController;
-import com.mogo.service.tanlu.IMogoTanluProvider;
-import com.mogo.service.tanlu.IMogoTanluUiProvider;
+import com.mogo.service.share.IMogoTanluProvider;
+import com.mogo.service.share.IMogoTanluUiProvider;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoWindowManager;
 import com.mogo.skin.support.IMogoSkinSupportInstaller;
@@ -112,6 +113,7 @@ public class MogoServiceApis implements IMogoServiceApis {
     }
 
     @Override
+    @Deprecated
     public synchronized IMogoCardManager getCardManagerApi() {
         return getApiInstance( IMogoCardManager.class, MogoServicePaths.PATH_CARD_MANAGER );
     }
@@ -231,7 +233,12 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMogoCrashWarnProvider.class, MogoServicePaths.PATH_CRASH_WARNING);
     }
 
-    private static < T extends IProvider > T getApiInstance(Class< T > clazz, String path ) {
+    @Override
+    public IMogoOnlineCarListPanelProvider getOnlineCarPanelApi() {
+        return getApiInstance( IMogoOnlineCarListPanelProvider.class, MogoServicePaths.PATH_ONLINE_CAR_PANEL);
+    }
+
+    private static < T extends IProvider > T getApiInstance( Class< T > clazz, String path ) {
         T inst = SingletonsHolder.get( clazz );
         if ( inst == null ) {
             synchronized ( sLock ) {

services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

@@ -5,22 +5,16 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
-import android.os.RemoteException;
 import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.debug.DebugConfig;
-import com.mogo.map.MogoOverlayManager;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.module.common.utils.CarSeries;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
-import com.mogo.service.impl.MogoServiceApis;
 import com.mogo.service.impl.singleton.SingletonsHolder;
-import com.mogo.service.impl.statusmanager.MogoStatusManager;
 import com.mogo.service.statusmanager.IMogoStatusManager;
-import com.mogo.skin.support.SkinMode;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.storage.SharedPrefsMgr;
@@ -35,7 +29,7 @@ import org.json.JSONObject;
 
 import java.util.List;
 
-import static com.mogo.commons.debug.DebugConfig.getSpGuide;
+import static com.mogo.module.common.utils.SPConst.getSpGuide;
 
 /**
  * @author congtaowang
@@ -78,14 +72,9 @@ public class MogoADASController implements IMogoADASController {
 
     @Override
     public void showADAS() {
-
-        // TODO: 2020/9/4 和引导模块交互
-        if ( DebugConfig.isLoadGuideModule() ) {
-            if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) {
-                return;
-            }
+        if ( !SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getBoolean( getSpGuide(), false ) ) {
+            return;
         }
-
         Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
         init( AbsMogoApplication.getApp() );
         AutopilotServiceManage.getInstance().registerAutopilotServiceStatusListener( new IAutopilotServiceStatusListener() {
@@ -170,40 +159,6 @@ public class MogoADASController implements IMogoADASController {
         mIsReleased = false;
     }
 
-    //获取已安装应用的 uid，-1 表示未安装此应用或程序异常
-    public static int getPackageUid( Context context, String packageName ) {
-        try {
-            ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo( packageName, 0 );
-            if ( applicationInfo != null ) {
-                return applicationInfo.uid;
-            }
-        } catch ( Exception e ) {
-            return -1;
-        }
-        return -1;
-    }
-
-    /**
-     * 判断某一 uid 的程序是否有正在运行的进程，即是否存活
-     * Created by cafeting on 2017/2/4.
-     *
-     * @param context 上下文
-     * @param uid     已安装应用的 uid
-     * @return true 表示正在运行，false 表示没有运行
-     */
-    public static boolean isProcessRunning( Context context, int uid ) {
-        ActivityManager am = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
-        List< ActivityManager.RunningServiceInfo > runningServiceInfos = am.getRunningServices( 200 );
-        if ( runningServiceInfos.size() > 0 ) {
-            for ( ActivityManager.RunningServiceInfo appProcess : runningServiceInfos ) {
-                if ( uid == appProcess.uid ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
     @Override
     public void setSettingStatus( boolean show ) {
         AutopilotServiceManage.getInstance().setSettingStatus( show );
@@ -256,6 +211,15 @@ public class MogoADASController implements IMogoADASController {
         return EnumMapUI.Type_Light;
     }
 
+    @Override
+    public void notifyAdas( String json ) {
+        try {
+//            AutopilotServiceManage.getInstance().aiCloudToAdasData( json );
+        } catch ( Exception e ) {
+            Logger.e( TAG, e, "notifyAdas" );
+        }
+    }
+
     @Override
     public void release() {
         mIsReleased = true;

services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/FragmentStack.java

@@ -30,7 +30,6 @@ public class FragmentStack {
     private FragmentManager mFragmentManager;
     //private FragmentTransaction mFragmentTransaction;
     private int mContainerId;
-    private Activity mActivity;
     private FragmentDescriptor mCurrentFragment;
 
     private FragmentStackTransactionListener mFragmentStackTransactionListener;
@@ -56,7 +55,6 @@ public class FragmentStack {
     }
 
     public void init( AppCompatActivity activity, int containerId ) {
-        mActivity = activity;
         mFragmentManager = activity.getSupportFragmentManager();
         mContainerId = containerId;
     }

services/mogo-service/src/main/java/com/mogo/service/impl/fragmentmanager/MogoFragmentManager.java

@@ -44,6 +44,11 @@ public class MogoFragmentManager implements IMogoFragmentManager {
         FragmentStack.getInstance().setFragmentStackTransactionListener( listener );
     }
 
+    @Override
+    public void unregisterMainFragmentStackTransactionListener() {
+        FragmentStack.getInstance().setFragmentStackTransactionListener( null );
+    }
+
     @Override
     public void addMainFragmentStackTransactionListener( FragmentStackTransactionListener listener ) {
         FragmentStack.getInstance().addFragmentStackTransactionListener( listener );