Merge branch 'qa_1.1.8' into dev

# Conflicts:
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java

@@ -44,6 +44,8 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent
             getWindow().setStatusBarColor( Color.BLACK );
         }
         super.onCreate( savedInstanceState );
+        // 透明 activity 不会让前一个 activity 走 onStop 方法
+        AppServiceHandler.getApis().getStatusManagerApi().setMainPageIsBackgroundStatus( TAG, true );
         AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true );
     }
 

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java

@@ -17,14 +17,14 @@ public class NavigatorApps {
     private static AppInfo app_ = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_disable, 1 );
 //    private static AppInfo app2 = new AppInfo( "音乐", "com.tencent.wecarflow", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 );
     private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media_selector, 2 );
-    private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 );
+//    private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 );
     private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist_selector, 4 );
 
     public static List< AppInfo > getApps() {
         List< AppInfo > sApps = new ArrayList<>();
         sApps.add( app );
         sApps.add( app2 );
-        sApps.add( app3 );
+//        sApps.add( app3 );
         sApps.add( app4 );
         return sApps;
     }
@@ -33,7 +33,7 @@ public class NavigatorApps {
         List< AppInfo > sApps = new ArrayList<>();
         sApps.add( app );
         sApps.add( app2 );
-        sApps.add( app3 );
+//        sApps.add( app3 );
         sApps.add( app4 );
         return sApps;
     }

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

@@ -26,6 +26,7 @@
         <item>com.android.messaging</item>
         <item>com.android.contacts</item>
         <item>com.android.dialer</item>
+        <item>com.zhidao.imdemo</item>
     </string-array>
     <string-array name="module_apps_array_filter_packages">
         <item>com.mogo.launcher</item>
@@ -44,5 +45,6 @@
         <item>com.iflytek.inputmethod.pad</item>
         <item>com.nwd.tools.reboot</item>
         <item>com.android.car.setting</item>
+        <item>com.zhidao.imdemo</item>
     </string-array>
 </resources>

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java

@@ -120,9 +120,6 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
             // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改
             requestUserInfo();
         }
-        if(DebugConfig.isMapBased()) {
-            requestCarModelList();
-        }
         getCommonConfig();
     }
 
@@ -242,38 +239,4 @@ public class EntrancePresenter extends Presenter<EntranceView> implements Weathe
             return "";
         }
     }
-
-    private void requestCarModelList() {
-        Map<String, String> params = new HashMap<>(8);
-        params.put("sn", Utils.getSn());
-//        params.put("sn", "ZD802B1932L00617");
-        mNetWork.create(UserInfoNetApiServices.class, DztHttpConstant.getBaseUrl()).
-                requestCarModelList(params).
-                subscribeOn(Schedulers.io()).
-                observeOn(Schedulers.io()).
-                subscribe(new SubscribeImpl<CarModelListResponse>(RequestOptions.create(context)) {
-                    @Override
-                    public void onSuccess(CarModelListResponse o) {
-                        super.onSuccess(o);
-                        Logger.d(TAG, "请求车模列表成功: " + o);
-                        // todo 保存到sp中
-                        SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST",
-                                GsonUtil.jsonFromObject(o.getResult()));
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-                        super.onError(e);
-                        Logger.e(TAG, e, "请求自车模型失败");
-                    }
-
-                    @Override
-                    public void onError(String message, int code) {
-                        super.onError(message, code);
-                        Logger.e(TAG, "请求自车模型失败: " + message);
-                    }
-                });
-
-    }
-
 }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java

@@ -23,7 +23,4 @@ public interface UserInfoNetApiServices {
      */
     @GET("carlife/carMachine/getAccountInfo")
     Single<UserInfoResponse> requestUserInfo(@QueryMap Map<String, String> params);
-
-    @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1")
-    Observable<CarModelListResponse> requestCarModelList(@QueryMap Map<String, String> params);
 }

modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml

@@ -32,8 +32,8 @@
 
     <dimen name="module_main_panel_margin_right">0px</dimen>
     <!--事件面板-->
-    <dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingTop">0px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingBottom">0px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingLeft">6px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
 </resources>

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -399,11 +399,14 @@ public class MogoServices implements IMogoMapListener,
      * 关闭所有模块的控制面板
      */
     private void closeAllPanel() {
-        mCallProviderResponse = new ICallChatResponse() {
-            @Override
-            public void hideUserWindowError(@NotNull String errorMsg) {
-            }
-        };
+
+        if ( mCallProviderResponse != null ) {
+            mCallProviderResponse = new ICallChatResponse() {
+                @Override
+                public void hideUserWindowError(@NotNull String errorMsg) {
+                }
+            };
+        }
         MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog();
         MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
         MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
@@ -480,6 +483,10 @@ public class MogoServices implements IMogoMapListener,
         }
 
         AutoPilotRemoteController.getInstance().start();
+
+        Intent intent = new Intent( "com.freedom.ser.ACTION" );
+        intent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES );
+        mContext.sendBroadcast( intent );
     }
 
     private void initLocationServiceProcess(Context context) {

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java

@@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements
 
     @Override
     public void showPanelWithSelectedItem(int item) {
-        if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
-            V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
-        }
+        V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
     }
 
     @Override
     public void showPanel() {
-        if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
-            V2XEventPanelFragment.Companion.getInstance().showPanel();
-        }
+        V2XEventPanelFragment.Companion.getInstance().showPanel();
     }
 
     @Override
     public void hidePanel() {
-        if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
-            V2XEventPanelFragment.Companion.getInstance().hidePanel();
-        }
+        V2XEventPanelFragment.Companion.getInstance().hidePanel();
     }
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XLocationListener.java

@@ -35,6 +35,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP;
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
 
 /**
@@ -167,6 +168,12 @@ public class V2XLocationListener implements IMogoLocationListener, CarStatusList
             v2XMessageEntity.setContent(v2XRoadEventEntity);
             v2XMessageEntity.setShowState(true);
             V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity);
+
+            //如果poiType是道路拥堵，则调用接口查询拥堵状态
+            String poiType = v2XRoadEventEntity.getPoiType();
+            if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
+                V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
+            }
         }
     }
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java

@@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout
             // 道路事件行驶到了50米附近，弹出事件纠错框给用户
             //Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity);
 
-            //如果poiType是道路拥堵，则调用接口查询拥堵状态
-            String poiType = v2XRoadEventEntity.getPoiType();
-            if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){
-                V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus();
-            }
-
             //  进行类型分发
             switch (v2XRoadEventEntity.getPoiType()) {
                 case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查