From c6bdcc0eee6ae8cc51de99906c48b9f8d58be06d Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 10:33:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[add]=20=E8=B5=84=E6=BA=90=E5=90=8C?= =?UTF-8?q?=E6=AD=A5,=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E6=BA=90:=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E5=92=8C?= =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E5=A5=BD=E5=8F=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80=E8=B5=84=E6=BA=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawable-xhdpi/selector_call_btn_normal.png} | Bin .../selector_call_btn_pressed.png} | Bin .../res/drawable/module_common_selector_call.xml | 6 ++++++ .../res/drawable/selector_call_btn_normal.png | Bin 0 -> 4524 bytes .../drawable/selector_service_car_panel_call.xml | 6 ------ .../module_services_online_car_panel_item.xml | 2 +- .../src/main/res/drawable/selector_call_btn.xml | 6 ------ .../item_v2x_scennario_history_other_help.xml | 2 +- .../drawable-xhdpi/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../module_common_selector_call_light.xml | 6 ++++++ .../drawable/selector_call_btn_light.png} | Bin .../selector_call_btn_pressed_light.png} | Bin .../selector_service_car_panel_call_light.xml | 6 ------ 14 files changed, 14 insertions(+), 20 deletions(-) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png} (100%) rename modules/{mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png => mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png} (100%) create mode 100644 modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml create mode 100644 modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml delete mode 100644 modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png => module-common-res/drawable-xhdpi/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png => module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png} (100%) create mode 100644 skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_normal_light.png => module-common-res/drawable/selector_call_btn_light.png} (100%) rename skin/mogo-skin-light/src/main/{module-services-res/drawable/service_car_panel_call_pressed_light.png => module-common-res/drawable/selector_call_btn_pressed_light.png} (100%) delete mode 100644 skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..361ea198656c7bc05a67f3e808c0ab557646313e GIT binary patch literal 4524 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 KMNUMnLSTZg^Sjaj literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index e11c589602..13915be41a 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -62,7 +62,7 @@ android:layout_width="@dimen/modle_car_panel_call" android:layout_height="@dimen/modle_car_panel_call" android:layout_marginEnd="@dimen/modle_car_panel_call_margin" - android:background="@drawable/selector_service_car_panel_call" + android:background="@drawable/module_common_selector_call" android:padding="@dimen/module_services_panel_item_detail_padding" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml deleted file mode 100644 index bae6d6289a..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..bb00ca4b09 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -112,7 +112,7 @@ android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" - android:src="@drawable/selector_call_btn" + android:src="@drawable/module_common_selector_call" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml new file mode 100644 index 0000000000..44b5570c79 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml deleted file mode 100644 index a0367b590f..0000000000 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From c9af523a75131c877a8173da65431c0b0f16f97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 30 Nov 2020 12:13:12 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AF=B9=E4=BA=8B=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E8=A1=8C=E5=BC=82=E5=B8=B8=E5=8C=85?= =?UTF-8?q?=E8=A3=B9=EF=BC=8C=E4=BF=9D=E8=AF=81=E7=A8=8B=E5=BA=8F=E4=B8=8D?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=B4=A9=E6=BA=83=20appName=3D=E8=98=91?= =?UTF-8?q?=E8=8F=87=E5=87=BA=E8=A1=8C=20versionCode=3D8001873=20sn=3DZD80?= =?UTF-8?q?2B1932L00622=20versionName=3D8.0.7.1173=20DISPLAY=3DK2101=5FZD?= =?UTF-8?q?=5FS112101.20200521.21553235=20appPackageName=3Dcom.mogo.launch?= =?UTF-8?q?er.app=20TIME=3D1606470575675=20fileName=3Ddebug-app-crash-com.?= =?UTF-8?q?mogo.launcher.app-2020-11-27-17-49-35.log=20java.lang.ClassCast?= =?UTF-8?q?Exception:=20java.lang.String=20cannot=20be=20cast=20to=20java.?= =?UTF-8?q?lang.Object[]=20=09at=20android.util.ArrayMap.allocArrays(Array?= =?UTF-8?q?Map.java:185)=20=09at=20android.util.ArrayMap.put(ArrayMap.java?= =?UTF-8?q?:444)=20=09at=20android.os.Bundle.putSerializable(Bundle.java:6?= =?UTF-8?q?43)=20=09at=20android.content.Intent.putExtra(Intent.java:5866)?= =?UTF-8?q?=20=09at=20com.mogo.module.v2x.scenario.impl.V2XScenarioManager?= =?UTF-8?q?.lambda$handlerMessage$0$V2XScenarioManager(V2XScenarioManager.?= =?UTF-8?q?java:68)=20=09at=20com.mogo.module.v2x.scenario.impl.-$$Lambda$?= =?UTF-8?q?V2XScenarioManager$7EW5DB57RlPpJUn77fU606mlAJk.run(lambda)=20?= =?UTF-8?q?=09at=20com.mogo.module.v2x.utils.V2XUtils.runOnUiThread(V2XUti?= =?UTF-8?q?ls.java:164)=20=09at=20com.mogo.module.v2x.scenario.impl.V2XSce?= =?UTF-8?q?narioManager.handlerMessage(V2XScenarioManager.java:61)=20=09at?= =?UTF-8?q?=20com.mogo.module.v2x.listener.V2XMessageListener=5F401005.lam?= =?UTF-8?q?bda$handleSeekHelp$1(V2XMessageListener=5F401005.java:89)=20=09?= =?UTF-8?q?at=20com.mogo.module.v2x.listener.-$$Lambda$V2XMessageListener?= =?UTF-8?q?=5F401005$7Frk0OhryomEqYMaU1gKqg=5Fo7N4.run(lambda)=20=09at=20a?= =?UTF-8?q?ndroid.os.Handler.handleCallback(Handler.java:733)=20=09at=20an?= =?UTF-8?q?droid.os.Handler.dispatchMessage(Handler.java:95)=20=09at=20and?= =?UTF-8?q?roid.os.Looper.loop(Looper.java:136)=20=09at=20android.app.Acti?= =?UTF-8?q?vityThread.main(ActivityThread.java:5057)=20=09at=20java.lang.r?= =?UTF-8?q?eflect.Method.invokeNative(Native=20Method)=20=09at=20java.lang?= =?UTF-8?q?.reflect.Method.invoke(Method.java:515)=20=09at=20com.android.i?= =?UTF-8?q?nternal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:8?= =?UTF-8?q?60)=20=09at=20com.android.internal.os.ZygoteInit.main(ZygoteIni?= =?UTF-8?q?t.java:676)=20=09at=20dalvik.system.NativeStart.main(Native=20M?= =?UTF-8?q?ethod)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/V2XMessageListener_401005.java | 18 +-- .../v2x/scenario/impl/V2XScenarioManager.java | 114 +++++++++--------- 2 files changed, 63 insertions(+), 69 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java index 0a790863af..aaf099bf30 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401005.java @@ -1,11 +1,11 @@ package com.mogo.module.v2x.listener; -import com.mogo.module.v2x.V2XConst; -import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity; -import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XPoiTypeEnum; +import com.mogo.module.v2x.V2XConst; +import com.mogo.module.v2x.V2XServiceManager; +import com.mogo.module.v2x.entity.net.V2XSpecialCarRes; +import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity; import com.mogo.module.v2x.scenario.impl.V2XScenarioManager; import com.mogo.module.v2x.utils.MarkerUtils; import com.mogo.module.v2x.utils.V2XUtils; @@ -64,24 +64,14 @@ public class V2XMessageListener_401005 implements IMogoOnMessageListener coordinates = message.getCoordinates(); List entityList = new ArrayList<>(); - // 移除上一次的数据 - //Context context = V2XServiceManager.getContext(); for (V2XMarkerEntity coordinate : coordinates) { //故障车机 if (coordinate.getTargetId() == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) { - //V2XMarkerEntity.UserInfoBean userInfoBean = coordinate.getUserInfo(); - //if (userInfoBean != null) { entityList.add(coordinate); - //} - //绘制 - //V2XServiceManager - // .getMoGoV2XMarkerManager() - // .drawableSpecialCarPOI(context, coordinate, V2XMarkerClickListener.getInstance()); } } if (!entityList.isEmpty()) { - //V2XUtils.runOnUiThread(() -> V2XServiceManager.getMoGoV2XScenarioManager().showOtherSeekHelpWindow(entityList)); V2XUtils.runOnUiThread(() -> { V2XMessageEntity> v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index a81d3afe76..5c9bfbafe2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -56,66 +56,70 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { //Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); - synchronized (V2XScenarioManager.class) { - // 展示 - V2XUtils.runOnUiThread(() -> { - // 提取之前存储的场景 - if (v2XMessageEntity != null) { + try { + synchronized (V2XScenarioManager.class) { + // 展示 + V2XUtils.runOnUiThread(() -> { + // 提取之前存储的场景 + if (v2XMessageEntity != null) { - // 广播给应用内部其它模块 - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + // 广播给应用内部其它模块 + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); - mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); - // 如果没有拿到之前的，根据类型分发 - if (mV2XScenario == null) { - switch (v2XMessageEntity.getType()) { - case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: - mV2XScenario = V2XRoadEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: - mV2XScenario = V2XSeekHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: - mV2XScenario = V2XFatigueDrivingScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: - mV2XScenario = V2XPushEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: - mV2XScenario = V2XPushLiveCarScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: - mV2XScenario = V2XAnimationScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: - mV2XScenario = V2XCarForHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: - mV2XScenario = V2XIllegalParkScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: - mV2XScenario = V2XEventUgcScenario.getInstance(); - break; - default: - Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); - TipToast.tip("当前V2X消息类型未定义"); - return; + mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); + // 如果没有拿到之前的，根据类型分发 + if (mV2XScenario == null) { + switch (v2XMessageEntity.getType()) { + case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: + mV2XScenario = V2XRoadEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: + mV2XScenario = V2XSeekHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: + mV2XScenario = V2XFatigueDrivingScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: + mV2XScenario = V2XPushEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: + mV2XScenario = V2XPushLiveCarScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: + mV2XScenario = V2XAnimationScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: + mV2XScenario = V2XCarForHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: + mV2XScenario = V2XIllegalParkScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: + mV2XScenario = V2XEventUgcScenario.getInstance(); + break; + default: + Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); + TipToast.tip("当前V2X消息类型未定义"); + return; + } + } + + // 展示最新的消息 + if (mV2XScenario != null) { + if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { + hidOtherPanel(); + } + mV2XScenario.init(v2XMessageEntity); + mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); } } - - // 展示最新的消息 - if (mV2XScenario != null) { - if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { - hidOtherPanel(); - } - mV2XScenario.init(v2XMessageEntity); - mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); - } - } - }); + }); + } + } catch (Exception e) { + e.printStackTrace(); } } From ad39b0da192287d5b5c437a7988b27cddf7bd8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 30 Nov 2020 12:26:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20http://jira.zhidaohuli?= =?UTF-8?q?an.com/browse/D80XCD-1608?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/V2XEventPanelModuleProvider.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 1ef623aac8..d7e2dd62a7 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 @@ -15,7 +15,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; import com.mogo.utils.logger.Logger; @@ -35,6 +34,7 @@ public class V2XEventPanelModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { + Logger.e(MODULE_NAME, "事件模版 createFragment。。。。"); V2XServiceManager.init(context); return V2XEventPanelFragment.Companion.getInstance(); } @@ -92,21 +92,28 @@ public class V2XEventPanelModuleProvider implements @Override public void init(Context context) { + V2XServiceManager.init(context); Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。"); } @Override public void showPanelWithSelectedItem(int item) { - V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + } } @Override public void showPanel() { - V2XEventPanelFragment.Companion.getInstance().showPanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanel(); + } } @Override public void hidePanel() { - V2XEventPanelFragment.Companion.getInstance().hidePanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().hidePanel(); + } } } From 7fa0ebdcf22a3088048ec326983869455b7ac21b Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 14:47:21 +0800 Subject: [PATCH 4/9] no message --- .../v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index 834de905b1..214c4a0764 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder Date: Mon, 30 Nov 2020 14:49:44 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E8=BD=A6?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/gradle.xml | 1 + .../entrance/EntrancePresenter.java | 37 ---------- .../net/UserInfoNetApiServices.java | 3 - .../impl/adas/CarModelInfoNetApiServices.java | 34 ++++++++++ .../service/impl/adas/CarModelListInfo.java | 47 +++++++++++++ .../impl/adas/CarModelListResponse.java | 29 ++++++++ .../service/impl/adas/MogoADASController.java | 68 +++++++++++++++++-- 7 files changed, 175 insertions(+), 44 deletions(-) create mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java create mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java create mode 100644 services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 6249850d4f..1f3d18c759 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -74,6 +74,7 @@ diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index fb6d339554..78aa40001d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -120,9 +120,6 @@ public class EntrancePresenter extends Presenter implements Weathe // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } - if(DebugConfig.isMapBased()) { - requestCarModelList(); - } getCommonConfig(); } @@ -242,38 +239,4 @@ public class EntrancePresenter extends Presenter implements Weathe return ""; } } - - private void requestCarModelList() { - Map 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(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); - } - }); - - } - } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java index ef6b3bd04c..e8afa9f17b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java +++ b/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 requestUserInfo(@QueryMap Map params); - - @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") - Observable requestCarModelList(@QueryMap Map params); } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java new file mode 100644 index 0000000000..a23e8553bc --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelInfoNetApiServices.java @@ -0,0 +1,34 @@ +package com.mogo.service.impl.adas; + +import com.mogo.commons.debug.DebugConfig; + +import java.util.Map; + +import io.reactivex.Observable; +import retrofit2.http.GET; +import retrofit2.http.QueryMap; + +interface CarModelInfoNetApiServices { + String HOST_DEV = "http://dzt-test.zhidaozhixing.com"; + String HOST_TEST = "http://dzt-test.zhidaozhixing.com"; + String HOST_DEMO = "http://dzt-show.zhidaozhixing.com"; + String HOST_PRODUCT = "http://dzt.zhidaozhixing.com"; + + static String getBaseUrl(){ + switch ( DebugConfig.getNetMode() ) { + case DebugConfig.NET_MODE_DEV: + return HOST_DEV; + case DebugConfig.NET_MODE_QA: + return HOST_TEST; + case DebugConfig.NET_MODE_DEMO: + return HOST_DEMO; + default: + return HOST_PRODUCT; + } + } + + @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") + Observable requestCarModelList(@QueryMap Map params); + + +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java new file mode 100644 index 0000000000..f30cc75145 --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListInfo.java @@ -0,0 +1,47 @@ +package com.mogo.service.impl.adas; + +import com.mogo.module.common.entity.OwnCarModelEntity; + +import java.util.List; + +public class CarModelListInfo { + private String sn; + /** + * 热心指数 eg: 1 1.5 2 2.5 + */ + private float enthusiasmIndex; + private List imageData; + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public float getEnthusiasmIndex() { + return enthusiasmIndex; + } + + public void setEnthusiasmIndex(float enthusiasmIndex) { + this.enthusiasmIndex = enthusiasmIndex; + } + + public List getImageData() { + return imageData; + } + + public void setImageData(List imageData) { + this.imageData = imageData; + } + + @Override + public String toString() { + return "CarModelListInfo{" + + "sn='" + sn + '\'' + + ", enthusiasmIndex=" + enthusiasmIndex + + ", imageData=" + imageData + + '}'; + } +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java new file mode 100644 index 0000000000..8775e4bbd5 --- /dev/null +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/CarModelListResponse.java @@ -0,0 +1,29 @@ +package com.mogo.service.impl.adas; + +import com.mogo.commons.data.BaseData; + +/** + * 请求根据热心指数获取自车图标列表的响应类 + * + * @author tongchenfei + */ +public class CarModelListResponse extends BaseData { + private CarModelListInfo result; + + public CarModelListInfo getResult() { + return result; + } + + public void setResult(CarModelListInfo result) { + this.result = result; + } + + @Override + public String toString() { + return "CarModelListResponse{" + + "result=" + result + + ", code=" + code + + ", msg='" + msg + '\'' + + '}'; + } +} diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index a82f54b337..277461c9d8 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -8,6 +8,8 @@ import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.context.ContextHolderUtil; import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.MogoModule; @@ -22,6 +24,8 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.TipToast; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; import com.zhidao.adasconfig.api.AdasConfigApiController; import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; @@ -34,7 +38,11 @@ import com.zhidao.autopilot.support.api.IAutopolitDataCallBack; import org.json.JSONObject; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import io.reactivex.schedulers.Schedulers; import static com.mogo.module.common.utils.SPConst.getSpGuide; @@ -132,10 +140,17 @@ public class MogoADASController implements IMogoADASController { @Override public void requestGetCarModelListInfo() { - Logger.d( TAG, "requestGetCarModelListInfo" ); - // 向adas发送车模list - AutopilotServiceManage.getInstance().settingCarModelListInfo( SharedPrefsMgr.getInstance( context ).getString( - "CAR_MODEL_LIST", "default-value" ) ); + if (DebugConfig.isMapBased()) { + Logger.d(TAG, "requestGetCarModelListInfo"); + // 向adas发送车模list + String carModelList = SharedPrefsMgr.getInstance(context).getString( + "CAR_MODEL_LIST", ""); + if (carModelList != null && !carModelList.isEmpty()) { + AutopilotServiceManage.getInstance().settingCarModelListInfo(carModelList); + } + // 此处进行网络请求，请求成功后再通知一次adas + requestCarModelList(); + } } @Override @@ -144,6 +159,8 @@ public class MogoADASController implements IMogoADASController { MyLocationUtil.emphasizeMyLocation(); } needEmphasizeMyLocation = false; + + useTestSn = !useTestSn; } @Override @@ -155,6 +172,8 @@ public class MogoADASController implements IMogoADASController { } } + private boolean useTestSn = false; + private void invokeShowADASOperation() { int delay = CarSeries.isF8xxSeries() ? 0 : 100; @@ -303,6 +322,47 @@ public class MogoADASController implements IMogoADASController { adasDataCallbackList.remove(callback); } + private static final String TEST_SN = "ZD802B1932L00617"; + private String currentSn = TEST_SN; + + private void requestCarModelList() { + Map params = new HashMap<>(8); + params.put("sn", Utils.getSn()); +// currentSn = useTestSn ? TEST_SN : Utils.getSn(); +// params.put("sn", currentSn); + MogoApisHandler.getInstance().getApis().getNetworkApi().create(CarModelInfoNetApiServices.class, CarModelInfoNetApiServices.getBaseUrl()). + requestCarModelList(params). + subscribeOn(Schedulers.io()). + observeOn(Schedulers.io()). + subscribe(new SubscribeImpl(RequestOptions.create(context)) { + @Override + public void onSuccess(CarModelListResponse o) { + super.onSuccess(o); + Logger.d(TAG, "请求车模列表成功: " + o); + // 保存到sp中 + String value = GsonUtil.jsonFromObject(o.getResult()); + SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", + value); + if(value != null && !value.isEmpty()){ + AutopilotServiceManage.getInstance().settingCarModelListInfo(value); + } + } + + @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); + } + }); + + } + @Override public void release() { AutopilotServiceManage.getInstance().release(); From aacd6fa37e0d1b516e52e7f6d2635974b08e4a3d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 30 Nov 2020 14:54:42 +0800 Subject: [PATCH 6/9] update callchat and remove the IMDemo from list --- gradle.properties | 2 +- .../main/java/com/mogo/module/apps/model/NavigatorApps.java | 6 +++--- modules/mogo-module-apps/src/main/res/values/strings.xml | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index d7b7805fa1..777b379662 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.8.8 +CARCHATTING_VERSION=1.8.9 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java index 12c4c92d54..49528d899f 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java +++ b/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, 2 ); - private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im, 6 ); +// private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im, 6 ); private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist, 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; } diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index 6ab6da70d9..60781ed8b7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ com.android.messaging com.android.contacts com.android.dialer + com.zhidao.imdemo com.mogo.launcher @@ -44,5 +45,6 @@ com.iflytek.inputmethod.pad com.nwd.tools.reboot com.android.car.setting + com.zhidao.imdemo From f9f87f262eea39760a1efa6bb21ce9042fd02986 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:11:03 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[add]=20=E5=9B=BE=E7=89=87=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/layout/item_v2x_scennario_history.xml | 2 +- .../item_v2x_scennario_history_other_help.xml | 5 ++--- .../drawable-xhdpi/icon_heart_unlike_light.png | Bin 0 -> 2540 bytes .../drawable/icon_heart_unlike_light.png | Bin 0 -> 1137 bytes 4 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/icon_heart_unlike_light.png create mode 100644 skin/mogo-skin-light/src/main/module-v2x-res/drawable/icon_heart_unlike_light.png diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 43783d6c62..a1722dc529 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -97,7 +97,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="26px" + android:layout_marginRight="30px" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index bb00ca4b09..8fd4be0d32 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -14,18 +14,17 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_21" android:layout_marginEnd="@dimen/dp_31" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_borderColor="#4cffffff" + app:miv_borderColor="#3381A4DC" app:miv_failureHolder="@drawable/icon_default_user_head" app:miv_overlayImageId="@drawable/icon_default_user_head" app:miv_placeHolder="@drawable/icon_default_user_head" app:miv_shape="circle" - app:miv_shapeBorderWidth="@dimen/dp_4" /> + app:miv_shapeBorderWidth="@dimen/dp_5" /> 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 DNj4>e literal 0 HcmV?d00001 From 45c308582059b0d0a897d73ba8b26ca005259666 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:18:07 +0800 Subject: [PATCH 8/9] no message --- .../main/res/layout/module_event_panel_fragment_surrounding.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index d335682a1c..57fd474a50 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -25,7 +25,7 @@ android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left" android:gravity="center_vertical" android:text="周围5公里，共15条交通信息" - android:textColor="@color/v2x_white" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> From 147dd85986fc525410102ef18206f747acf52add Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 30 Nov 2020 15:39:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?UI=20-=E5=9C=86=E8=A7=92=20=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/bg_v2x_event_description.xml | 2 +- .../src/main/res/layout/item_v2x_scennario_history.xml | 6 +++--- .../drawable/bg_v2x_event_description_light.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index dd1f94d092..88fd3e48c6 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + 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 index 79c69fb8a2..1de71f2b72 100644 --- 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 @@ -1,7 +1,7 @@ - +