diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 4b101c27e5..67b2f03b53 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/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(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java index 9aac886249..823faa7f2f 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java +++ b/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 { } - } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 48c5eb7ab4..5a277dafae 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -131,17 +131,13 @@ class V2XEventPanelFragment : MvpFragment @@ -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" /> diff --git a/modules/mogo-module-v2x/src/main/res/values/color.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml similarity index 79% rename from modules/mogo-module-v2x/src/main/res/values/color.xml rename to modules/mogo-module-v2x/src/main/res/values/colors.xml index 1b79fae064..448070e539 100644 --- a/modules/mogo-module-v2x/src/main/res/values/color.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -7,6 +7,8 @@ #B3FFFFFF #1F2131 #1F2131 + #FFFFFF + #FFFFFF \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_parking_nav.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_parking_nav.png new file mode 100644 index 0000000000..57abc3ccb6 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_parking_nav.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png new file mode 100644 index 0000000000..1b039bafed Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_warn.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png new file mode 100644 index 0000000000..815dc5b40c Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_accident_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png new file mode 100644 index 0000000000..c77748e661 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_blank_nor.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png new file mode 100644 index 0000000000..33e7d8873e Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_daolushigong_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png new file mode 100644 index 0000000000..28f0db939b Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_fenglu_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png new file mode 100644 index 0000000000..0efac11676 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png new file mode 100644 index 0000000000..37ed59c3b4 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jiebing_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png new file mode 100644 index 0000000000..c93bd218fb Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_jishui_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png new file mode 100644 index 0000000000..698b84ffbc Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_nongwu_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png new file mode 100644 index 0000000000..a247ac6428 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_qiuzhu_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png new file mode 100644 index 0000000000..632d1e5ad3 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_shishilukuang_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png new file mode 100644 index 0000000000..bdba45d7e0 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/mogo_image_yongdu_small.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml new file mode 100644 index 0000000000..95faf8680b --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml index 8166e9eac0..a24e6487fd 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/values/colors.xml @@ -1,4 +1,8 @@ #FFFFFF + #DDDDDD + #999999 + #333333 +