Merge remote-tracking branch 'origin/dev' into dev

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

@@ -34,6 +34,7 @@ public class V2XEventPanelModuleProvider implements
 
     @Override
     public Fragment createFragment(Context context, Bundle data) {
+        V2XServiceManager.init(context);
         return V2XEventPanelFragment.Companion.getInstance();
     }
 

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

@@ -11,10 +11,10 @@ import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.carchattingprovider.ICarsChattingProvider;
 import com.mogo.module.v2x.alarm.V2XCalculateServer;
-import com.mogo.module.v2x.network.V2XRefreshModel;
 import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager;
 import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
 import com.mogo.module.v2x.manager.IMoGoV2XStatusManager;
+import com.mogo.module.v2x.network.V2XRefreshModel;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
@@ -45,6 +45,9 @@ import com.zhidao.carchattingprovider.CallChattingProviderConstant;
  */
 public class V2XServiceManager {
     private static final String TAG = "V2XServiceManager";
+
+    private static boolean isInit;
+
     private static Context mContext;
     private static IMogoServiceApis mMogoServiceApis;
 
@@ -88,45 +91,49 @@ public class V2XServiceManager {
 
 
     public static void init(final Context context) {
-        mContext = context;
-        mMogoServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
+        if (!isInit) {
+            isInit = true;
 
-        mMapService = mMogoServiceApis.getMapServiceApi();
-        mImageLoader = mMogoServiceApis.getImageLoaderApi();
-        mMogoStatusManager = mMogoServiceApis.getStatusManagerApi();
-        mMogoSocketManager = mMogoServiceApis.getSocketManagerApi(context);
-        mMogoAnalytics = mMogoServiceApis.getAnalyticsApi();
-        mIMogoWindowManager = mMogoServiceApis.getWindowManagerApi();
-        mMogoRegisterCenter = mMogoServiceApis.getRegisterCenterApi();
-        mIMogoRefreshStrategyController = mMogoServiceApis.getRefreshStrategyControllerApi();
-        mIMogoADASController = mMogoServiceApis.getAdasControllerApi();
-        mMogoEntranceButtonController = mMogoServiceApis.getEntranceButtonController();
-        mMogoActionManager = mMogoServiceApis.getActionManagerApi();
-        mMogoTopViewManager =  mMogoServiceApis.getTopViewManager();
-        mIMogoSearchManager =  mMogoServiceApis.getSearchManagerApi();
-        mIMogoMarkerService = mMogoServiceApis.getMarkerService();
-        mIMogoShareManager = mMogoServiceApis.getShareManager();
-        mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
+            mContext = context;
+            mMogoServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
 
-        mMarkerManager = mMapService.getMarkerManager(context);
-        mNavi = mMapService.getNavi(context);
-        mMapUIController = mMapService.getMapUIController();
-        mMogoLocationClient = mMapService.getSingletonLocationClient(context);
-        mMogoOverlayManager = mMapService.getOverlayManager(context);
-        mIMogoGeoSearch = mMapService.getGeoSearch(context);
+            mMapService = mMogoServiceApis.getMapServiceApi();
+            mImageLoader = mMogoServiceApis.getImageLoaderApi();
+            mMogoStatusManager = mMogoServiceApis.getStatusManagerApi();
+            mMogoSocketManager = mMogoServiceApis.getSocketManagerApi(context);
+            mMogoAnalytics = mMogoServiceApis.getAnalyticsApi();
+            mIMogoWindowManager = mMogoServiceApis.getWindowManagerApi();
+            mMogoRegisterCenter = mMogoServiceApis.getRegisterCenterApi();
+            mIMogoRefreshStrategyController = mMogoServiceApis.getRefreshStrategyControllerApi();
+            mIMogoADASController = mMogoServiceApis.getAdasControllerApi();
+            mMogoEntranceButtonController = mMogoServiceApis.getEntranceButtonController();
+            mMogoActionManager = mMogoServiceApis.getActionManagerApi();
+            mMogoTopViewManager = mMogoServiceApis.getTopViewManager();
+            mIMogoSearchManager = mMogoServiceApis.getSearchManagerApi();
+            mIMogoMarkerService = mMogoServiceApis.getMarkerService();
+            mIMogoShareManager = mMogoServiceApis.getShareManager();
+            mIMogoTanluProvider = mMogoServiceApis.getTanluApi();
 
-        mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
-        mMogoIntentManager = mMogoServiceApis.getIntentManagerApi();
+            mMarkerManager = mMapService.getMarkerManager(context);
+            mNavi = mMapService.getNavi(context);
+            mMapUIController = mMapService.getMapUIController();
+            mMogoLocationClient = mMapService.getSingletonLocationClient(context);
+            mMogoOverlayManager = mMapService.getOverlayManager(context);
+            mIMogoGeoSearch = mMapService.getGeoSearch(context);
 
-        mV2XRefreshModel = V2XRefreshModel.getInstance(context);
-        mV2XMarkerService = V2XMarkerService.getInstance(context);
-        mV2XStatusManager = V2XStatusManager.getInstance();
-        mV2XSocketManager = V2XSocketManager.getInstance();
-        mV2XCalculateServer = V2XCalculateServer.getInstance();
+            mCarsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
+            mMogoIntentManager = mMogoServiceApis.getIntentManagerApi();
 
-        moGoV2XMarkerManager = (IMoGoV2XMarkerManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER).navigation(context);
-        moGoV2XPolylineManager = (IMoGoV2XPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_POLYLINE_MANAGER).navigation(context);
-        moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(context);
+            mV2XRefreshModel = V2XRefreshModel.getInstance(context);
+            mV2XMarkerService = V2XMarkerService.getInstance(context);
+            mV2XStatusManager = V2XStatusManager.getInstance();
+            mV2XSocketManager = V2XSocketManager.getInstance();
+            mV2XCalculateServer = V2XCalculateServer.getInstance();
+
+            moGoV2XMarkerManager = (IMoGoV2XMarkerManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_MARKER_MANAGER).navigation(context);
+            moGoV2XPolylineManager = (IMoGoV2XPolylineManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_POLYLINE_MANAGER).navigation(context);
+            moGoV2XStatusManager = (IMoGoV2XStatusManager) ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STATUS_MANAGER).navigation(context);
+        }
     }
 
     public static Context getContext() {
@@ -258,5 +265,4 @@ public class V2XServiceManager {
     }
 
 
-
 }

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt

@@ -131,17 +131,13 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                     showPanel()
                 }
             }
+            V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
             changeEventCount()
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        V2XServiceManager.getMogoEntranceButtonController().addBottomLayerView(mV2XEventPanelHistoryCountView)
-    }
-
     override fun onDestroyView() {
         mediator?.detach()
         super.onDestroyView()

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml

@@ -12,7 +12,7 @@
         android:id="@+id/road_case_card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="#1F2131"
+        app:cardBackgroundColor="@color/share_event_item_bg_color"
         app:cardCornerRadius="12px"
         app:layout_constraintTop_toTopOf="parent">
 
@@ -92,7 +92,7 @@
                 android:lines="1"
                 android:paddingTop="2px"
                 android:text="东城区北三环附近维多欧美"
-                android:textColor="#FFFFFF"
+                android:textColor="@color/share_event_address_color"
                 android:textSize="18px" />
 
             <TextView
@@ -106,7 +106,7 @@
                 android:gravity="left"
                 android:text="时间:"
                 android:paddingTop="2px"
-                android:textColor="#FFFFFF"
+                android:textColor="@color/share_event_share_time_color"
                 android:textSize="16px" />
         </RelativeLayout>
     </androidx.cardview.widget.CardView>

modules/mogo-module-v2x/src/main/res/values/colors.xml

@@ -7,6 +7,8 @@
     <color name="transparent_white_30">#B3FFFFFF</color>
     <color name="surrounding_item_bottom_color">#1F2131</color>
     <color name="share_event_item_bg_color">#1F2131</color>
+    <color name="share_event_share_time_color">#FFFFFF</color>
+    <color name="share_event_address_color">#FFFFFF</color>
 
 
 </resources>

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="12px"/>
+    <gradient
+        android:startColor="#1F7EFF"
+        android:endColor="#1E57A4"
+        android:type="linear"
+        android:angle="180"/>
+
+</shape>

skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="module_v2x_bkg_color_light">#FFFFFF</color>
+    <color name="share_event_item_bg_color_light">#DDDDDD</color>
+    <color name="share_event_share_time_color_light">#999999</color>
+    <color name="share_event_address_color_light">#333333</color>
+
 </resources>