From c81c2ed65fffe272027986a3858542ca4c6e0d9b Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 31 May 2021 20:23:48 +0800 Subject: [PATCH 01/17] =?UTF-8?q?[rm]=20=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=B1=BB=20=E4=B8=8E=E6=96=B0=E9=9D=99=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E8=81=94=E8=B0=83=E8=BD=A6=E8=B7=AF=E4=BA=91=E9=A2=84?= =?UTF-8?q?=E8=AD=A6,=E8=81=94=E8=B0=83=E7=B1=BB=E5=9E=8B=E4=B8=8D?= =?UTF-8?q?=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/V2XMessageEntity.java | 16 ++- .../mogo/module/v2x/V2XModuleProvider.java | 36 +++-- .../com/mogo/module/v2x/V2XSocketManager.java | 8 +- .../com/mogo/module/v2x/V2XWaringManager.java | 132 ------------------ ...01.java => V2XMessageListener_401018.java} | 23 ++- .../v2x/scenario/impl/V2XScenarioManager.java | 5 +- .../raw/scenario_warning_event_data_left.json | 2 +- ...enario_warning_event_data_pedestrians.json | 2 +- .../scenario_warning_event_data_right.json | 2 +- 9 files changed, 44 insertions(+), 182 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/{V2XMessageListener_402001.java => V2XMessageListener_401018.java} (60%) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java index 336e7d5a27..7740e3a18d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java @@ -145,14 +145,16 @@ public class V2XMessageEntity implements Serializable { int ALERT_RECOMMEND_ROUTE = 1_011; // 基于预判目的地违章高发停车场推荐 int ALERT_RECOMMEND_PARKING = 1_012; - // 前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_TOP = 1_0013; - // 左前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 1_0014; - // 右前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 1_0015; + // 弱势交通参与者401018 + int ALERT_THE_FRONT_WEAKNESS = 40_1018; + // 前方行人碰撞预警 + int ALERT_THE_FRONT_CRASH_WARNING_TOP = 0; // 后方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 1_0016; + int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 1; + // 左前方碰撞预警 + int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 2; + // 右前方碰撞预警 + int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 3; // 推送VR消息展示 int ALERT_PUSH_VR_SHOW = 2_000; // 自车求助 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index 340a86bc68..01c4b29e7b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -281,23 +281,23 @@ public class V2XModuleProvider implements V2XServiceManager .getMogoRegisterCenter() .registerMogoMarkerClickListener(V2XConst.MODULE_NAME, new IMogoMarkerClickListener() { - @Override - public boolean onMarkerClicked(IMogoMarker marker) { - try { - MarkerExploreWay markerExploreWay = - (MarkerExploreWay) ((MarkerShowEntity) marker.getObject()).getBindObj(); - Logger.d(V2XConst.MODULE_NAME, - "V2X===违章停车:onMarkerClicked=" + markerExploreWay); + @Override + public boolean onMarkerClicked(IMogoMarker marker) { + try { + MarkerExploreWay markerExploreWay = + (MarkerExploreWay) ((MarkerShowEntity) marker.getObject()).getBindObj(); + Logger.d(V2XConst.MODULE_NAME, + "V2X===违章停车:onMarkerClicked=" + markerExploreWay); - //直接展示弹窗 - V2XIllegalParkWindow parkScenario = new V2XIllegalParkWindow(); - parkScenario.show(markerExploreWay, false); - } catch (Exception e) { - e.printStackTrace(); - } - return true; - } - }); + //直接展示弹窗 + V2XIllegalParkWindow parkScenario = new V2XIllegalParkWindow(); + parkScenario.show(markerExploreWay, false); + } catch (Exception e) { + e.printStackTrace(); + } + return true; + } + }); // 注册V2X场景Socket V2XServiceManager.getV2XSocketManager().registerSocketMessage(); @@ -305,8 +305,6 @@ public class V2XModuleProvider implements V2XServiceManager.getV2XMarkerService().startAutoRefresh(); // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随 V2XServiceManager.getMapUIController().recoverLockMode(); - //注册adas数据通道 - V2XWaringManager.getInstance().registerAdasSocketMessage(mContext); } /** @@ -344,7 +342,7 @@ public class V2XModuleProvider implements } } else if (descriptor == StatusDescriptor.SEEK_HELPING) { refreshMeSeekHelp(isTrue); - }else if (descriptor == StatusDescriptor.TOP_CONTAINER_READY) { + } else if (descriptor == StatusDescriptor.TOP_CONTAINER_READY) { if (isTrue) { V2XServiceManager.getV2XRefreshModel().queryRoadData(MoGoAiCloudClientConfig.getInstance().getSn()); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java index c60b4e390d..0dbad21eb8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XSocketManager.java @@ -10,7 +10,7 @@ import com.mogo.module.v2x.listener.V2XMessageListener_401010; import com.mogo.module.v2x.listener.V2XMessageListener_401011; import com.mogo.module.v2x.listener.V2XMessageListener_401012; import com.mogo.module.v2x.listener.V2XMessageListener_402000; -import com.mogo.module.v2x.listener.V2XMessageListener_402001; +import com.mogo.module.v2x.listener.V2XMessageListener_401018; import com.mogo.utils.logger.Logger; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -35,7 +35,7 @@ public class V2XSocketManager { private V2XMessageListener_401009 v2XMessageListener_401009; private V2XMessageListener_401010 v2XMessageListener_401010; private V2XMessageListener_402000 mV2XMessageListener_402000; - private V2XMessageListener_402001 mV2XMessageListener402001; + private V2XMessageListener_401018 mV2XMessageListener401018; private V2XSocketManager() { } @@ -251,8 +251,8 @@ public class V2XSocketManager { * * 弱势交通参与者 */ public void registerWarningMsg() { - mV2XMessageListener402001 = new V2XMessageListener_402001(); - V2XServiceManager.getMoGoSocketManager().registerOnMessageListener(402001, mV2XMessageListener402001); + mV2XMessageListener401018 = new V2XMessageListener_401018(); + V2XServiceManager.getMoGoSocketManager().registerOnMessageListener(401018, mV2XMessageListener401018); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java deleted file mode 100644 index 126f448d0a..0000000000 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XWaringManager.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.mogo.module.v2x; - -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import com.mogo.module.common.entity.V2XWarningEntity; -import com.mogo.module.v2x.listener.V2XMessageListener_402001; -import com.mogo.module.v2x.utils.V2XUtils; -import com.mogo.utils.logger.Logger; -import com.mogo.utils.network.utils.GsonUtil; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -/** - * desc : V2X报警事件管理，这里进行报警事件的分发处理，包括了adas数据 - */ -public class V2XWaringManager { - - private Context mContext; - - private static V2XWaringManager mV2XWaringManager; - //TODO 需要修改 - private V2XMessageListener_402001 mV2XMessageListener402001; - - - private V2XWaringManager() { - } - - /** - * 获取操作实体 - */ - public static synchronized V2XWaringManager getInstance() { - synchronized (V2XWaringManager.class) { - if (mV2XWaringManager == null) { - mV2XWaringManager = new V2XWaringManager(); - } - } - return mV2XWaringManager; - } - - /** - * 注册长链接消息处理 - */ - public void registerAdasSocketMessage(Context context) { - Logger.d(V2XConst.LOG_NAME_WARN, "开始注册Socket通道...."); - mContext = context; - - //根据云端，绘制自车和交点，以及行人或二轮车与交点的绘制 - registerWarnListener(); - -// handleAdasData(); - - } - - /** - * 测试数据 - */ - private void testData(String adasResult) { - - try { - int id = R.raw.scenario_warning_event_data_right; - switch (adasResult) { - case "left": - id = R.raw.scenario_warning_event_data_left; - break; - case "pedestrians": - id = R.raw.scenario_warning_event_data_pedestrians; - break; - default: - } - InputStream inputStream = V2XUtils.getApp() - .getResources() - .openRawResource(id); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len = -1; - byte[] buffer = new byte[1024]; - while ((len = inputStream.read(buffer)) != -1) { - baos.write(buffer, 0, len); - } - inputStream.close(); - - // 加载数据源 - V2XWarningEntity warningEntity = GsonUtil.objectFromJson(baos.toString(), V2XWarningEntity.class); -// V2XServiceManager.getMoGoV2XCloundDataManager().analysisV2XCloundDataEvent(warningEntity); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 反注册消息通道，不再进行接受 - */ - public void unregisterAdasSocketMessage() { - Logger.w(V2XConst.LOG_NAME_WARN, "反注册Socket通道...."); - if (mV2XMessageListener402001 != null) { - V2XServiceManager - .getMoGoSocketManager() - .unregisterOnMessageListener(401018, mV2XMessageListener402001); - } - } - - /** - * 道路预警 弱势群体事件，行人 TODO type - */ - private void registerWarnListener() { - mV2XMessageListener402001 = new V2XMessageListener_402001(); - V2XServiceManager - .getMoGoSocketManager() - .registerOnMessageListener( - 401018, - mV2XMessageListener402001); - } - - public V2XMessageListener_402001 getV2XMessageListener() { - return mV2XMessageListener402001; - } - - - /** - * 处理adas返回的数据 - */ - public void handleAdasData(Intent intent) { - Log.d(V2XConst.LOG_NAME_WARN, "V2XWaringManager ---- handleAdasData "); - String adasResult = (String) intent.getSerializableExtra(V2XConst.BROADCAST_ADAS_EXTRA_KEY); - //测试数据 - testData(adasResult); - } - - -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402001.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java similarity index 60% rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402001.java rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java index a98755091f..b510fef6f5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_402001.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401018.java @@ -14,27 +14,26 @@ import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.connection.IMogoOnMessageListener; /** - * desc: 下发的云端预警数据 + * desc: 车路云预警-弱势交通参与者 */ -public class V2XMessageListener_402001 implements IMogoOnMessageListener { +public class V2XMessageListener_401018 implements IMogoOnMessageListener { @Override - public Class target() { - return V2XOptimalRouteDataRes.class; + public Class target() { + return V2XWarningEntity.class; } @Override - public void onMsgReceived(V2XOptimalRouteDataRes info) { - Log.d(V2XConst.LOG_NAME_WARN, "V2XWarnMessageListener onMsgReceived ---11---> "); - //Logger.d(MODULE_NAME, "V2XMessageListener_401011==V2X地图气泡数据刷新：\n" + GsonUtil.jsonFromObject(response)); + public void onMsgReceived(V2XWarningEntity info) { + Log.d(V2XConst.MODULE_NAME, "V2XWarnMessageListener onMsgReceived ---11---> "); V2XUtils.runOnBackgroundThread(() -> { // 解析不同的Marker类型，然后对应的进行绘制 if (info != null) { - // 解析存储道路事件 liyz - Log.d(V2XConst.LOG_NAME_WARN, "V2XWarnMessageListener onMsgReceived --22--> "); - V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); + // 解析存储道路事件 + Log.d(V2XConst.MODULE_NAME, "V2XWarnMessageListener onMsgReceived --22--> "); + V2XMessageEntity v2xMessageEntity = new V2XMessageEntity<>(); // 控制类型 - v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW); + v2xMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS); // 设置数据 v2xMessageEntity.setContent(info); Intent intent = new Intent(V2XConst.BROADCAST_SCENE_HANDLER_ACTION); @@ -42,7 +41,5 @@ public class V2XMessageListener_402001 implements IMogoOnMessageListener Date: Mon, 31 May 2021 20:59:22 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/common/entity/V2XMessageEntity.java | 8 ++++---- .../v2x/scenario/scene/warning/V2XWarningMarker.java | 3 ++- .../com/mogo/module/v2x/utils/TestOnLineCarUtils.java | 2 +- .../main/res/raw/scenario_warning_event_data_left.json | 2 +- .../res/raw/scenario_warning_event_data_pedestrians.json | 2 +- .../main/res/raw/scenario_warning_event_data_right.json | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java index 7740e3a18d..36755b20ff 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java @@ -148,13 +148,13 @@ public class V2XMessageEntity implements Serializable { // 弱势交通参与者401018 int ALERT_THE_FRONT_WEAKNESS = 40_1018; // 前方行人碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_TOP = 0; + int ALERT_THE_FRONT_CRASH_WARNING_TOP = 1; // 后方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 1; + int ALERT_THE_FRONT_CRASH_WARNING_BOTTOM = 2; // 左前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 2; + int ALERT_THE_FRONT_CRASH_WARNING_LEFT = 3; // 右前方碰撞预警 - int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 3; + int ALERT_THE_FRONT_CRASH_WARNING_RIGHT = 4; // 推送VR消息展示 int ALERT_PUSH_VR_SHOW = 2_000; // 自车求助 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java index 78d610c64e..ae1cd29416 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java @@ -124,7 +124,8 @@ public class V2XWarningMarker implements IV2XMarker { //二轮车和行人的渲染和移动 V2XServiceManager.getMarkerManager().removeMarkers(TYPE_MARKER_CLOUD_WARN_DATA); V2XWarnDataDrawer.getInstance().renderWarnData(mCloundWarningInfo); - + //添加停止线marker + handleStopLine(); //车辆静止的时候 drawSelfCarLine(carLocation.lon, carLocation.lat, bearing); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java index 381d9d460f..19a0e03e70 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/TestOnLineCarUtils.java @@ -189,7 +189,7 @@ public class TestOnLineCarUtils { // 加载数据源 V2XWarningEntity warningEntity = GsonUtil.objectFromJson(baos.toString(), V2XWarningEntity.class); V2XMessageEntity messageEntity = new V2XMessageEntity(); - messageEntity.setType(warningEntity.getDirection()); + messageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS); messageEntity.setContent(warningEntity); return messageEntity; } catch (Exception e) { diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index ee432bbd59..3208f594ac 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -17,7 +17,7 @@ ], "from": 1, "angle": 220, - "direction": 2, + "direction": 3, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json index 13f6b9853e..c93a6ec99c 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json @@ -18,7 +18,7 @@ ], "from": 1, "angle": 240, - "direction": 0, + "direction": 1, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index bbc74917d5..5d7ca4b80f 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -17,7 +17,7 @@ ], "from": 1, "angle": 260, - "direction": 3, + "direction": 4, "speed": 11.108121, "targetColor": "#FF4040", "stopLineDistance": 60, From 8efe96a8bc1326ed6059d7338069406b0edeb46c Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 31 May 2021 21:06:47 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/raw/scenario_warning_event_data_left.json | 9 +++++---- .../main/res/raw/scenario_warning_event_data_right.json | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json index 3208f594ac..fe0eeaac20 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json @@ -7,12 +7,13 @@ "collisionLon": 112.56896496, "stopLines": [ { - "lat": 26.88008312, - "lon": 112.57147295 + "lat": 26.8791769, + "lon": 112.56896496 + }, { - "lat": 26.88008302, - "lon": 112.57147295 + "lat": 26.879153, + "lon": 112.568997 } ], "from": 1, diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json index 5d7ca4b80f..10f78b7063 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_right.json @@ -7,12 +7,13 @@ "collisionLon": 112.56896496, "stopLines": [ { - "lat": 26.88241239, - "lon": 112.5631241 + "lat": 26.8791769, + "lon": 112.56896496 + }, { - "lat": 26.88241239, - "lon": 112.5631241 + "lat": 26.879153, + "lon": 112.568997 } ], "from": 1, From 773561f78e5b69f9b28ad7d0a60ac2611169e0af Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Jun 2021 10:14:13 +0800 Subject: [PATCH 04/17] changed the config --- app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 97d4dd9b17..f3e22def1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -195,6 +195,12 @@ android { } // f系列-分体机 f80x { + android{ + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + } + } // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" From 7445a58526cdfe5ca72a6688e401b1ae9c4dd074 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Jun 2021 10:54:08 +0800 Subject: [PATCH 05/17] update map version to 8.5.35 --- libraries/map-custom/build.gradle | 2 +- libraries/map-custom/map-version-update | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index a0fb142fb5..30c0064173 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.35' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update index 052f9da95c..543b243607 100644 --- a/libraries/map-custom/map-version-update +++ b/libraries/map-custom/map-version-update @@ -59,4 +59,12 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5 解决崩溃问题 8.5.33 -更新顺义衡阳数 \ No newline at end of file +更新顺义衡阳数 + +8.5.34 +高精数据放到redis + +8.5.35 +修改绿化带显示问题 +暂时对sdk去掉混淆，方便crash定位 + From cbb710962304de7bfe47c5ba3d22b7cd6e167991 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Jun 2021 10:59:54 +0800 Subject: [PATCH 06/17] add note of map updatw --- libraries/map-custom/map-version-update | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update index 543b243607..d0be4e1b6a 100644 --- a/libraries/map-custom/map-version-update +++ b/libraries/map-custom/map-version-update @@ -67,4 +67,5 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5 8.5.35 修改绿化带显示问题 暂时对sdk去掉混淆，方便crash定位 +解决bugly #304037 问题 From 21ba6c93315b5d6ca2b86f4b4b871a720a90eac1 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 1 Jun 2021 11:11:47 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E8=BD=A6?= =?UTF-8?q?=E8=B7=AF=E4=BA=91-=E5=BC=B1=E5=8A=BF=E4=BA=A4=E9=80=9A?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E8=80=85=E4=B8=9A=E5=8A=A1=E5=85=A5=E5=8F=A3?= =?UTF-8?q?,=E9=81=BF=E5=85=8D=E6=BC=94=E7=A4=BA=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=AF=AF=E8=A7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/scenario/impl/V2XScenarioManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 53149d3aaf..b3d8aa1170 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 @@ -110,11 +110,11 @@ public class V2XScenarioManager implements IV2XScenarioManager { mV2XScenario = new V2XOptimalRouteVREventScenario(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS: - mV2XScenario = new V2XFrontWarningScenario(); - if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { - } else { - mV2XScenario = null; - } +// mV2XScenario = new V2XFrontWarningScenario(); +// if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { +// } else { +// mV2XScenario = null; +// } break; default: mV2XScenario = null; From e8860fb165525d13db784044ab42ef1917e23f64 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Jun 2021 11:12:18 +0800 Subject: [PATCH 08/17] fix bug of move to close sight --- .../module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java index 044edf41e7..74ce706ab8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java @@ -101,8 +101,6 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener { } //拉近地图视角为近景 V2XServiceManager.getMapService().getMapUIController().changeMapVisualAngle(VisualAngleMode.MODE_CLOSE_SIGHT, marker.getPosition()); - //移动地图中心点至marker位置 - V2XServiceManager.getMapService().getMapUIController().moveToCenter(marker.getPosition(), true); String assInfo = marker.getMarkerAssInfo(); Log.d(REGISTER_LIFECYCLE_TAG, "onStaticMarkerClicked marker assInfo : " + assInfo); if (TextUtils.isEmpty(assInfo) || !assInfo.contains(MAP_STATIC_TRAFFIC)) { From 28610669f4d089a0197ba9b2c8a8bf0051c6fce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 1 Jun 2021 11:19:16 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=89=E8=B5=B7?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E7=A8=8B=E5=BA=8F=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/commons/mvp/MvpActivity.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java index 2b8f50d889..1f4c7d2885 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java @@ -1,6 +1,8 @@ package com.mogo.commons.mvp; +import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.view.MotionEvent; @@ -46,6 +48,24 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > > protected void onResume() { super.onResume(); hideBottomUIMenu(); + startVoicePad(); + } + + /** + * 在Pad上拉起语音 + */ + private void startVoicePad() { + try { + if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) { + Intent intent = new Intent(); + intent.setComponent(new ComponentName("com.zhidao.speech.voice.pad", + "com.zhidao.speech.MainActivity")); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + } catch (Exception e) { + e.printStackTrace(); + } } //隐藏导航栏 From edd1d12634b502fcd05be0e5d6ad3d6aa4b63adf Mon Sep 17 00:00:00 2001 From: lianglihui Date: Tue, 1 Jun 2021 11:25:14 +0800 Subject: [PATCH 10/17] =?UTF-8?q?fix=20bug=20leakcanary=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index ab491ba2ee..77aaf7f766 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -40,6 +40,7 @@ import com.mogo.utils.logger.LogLevel; import com.mogo.utils.logger.Logger; import com.mogo.utils.storage.SharedPrefsMgr; import com.squareup.leakcanary.LeakCanary; +import com.squareup.leakcanary.RefWatcher; import com.zhidao.boot.persistent.lib.PersistentManager; import com.zhidao.mogo.module.left.panel.LeftPanelConst; @@ -54,7 +55,7 @@ public class MogoApplication extends AbsMogoApplication { private static final String TAG = "MogoApplication"; private long start; - + private volatile static RefWatcher refWatcher; @Override public void onCreate() { initDebugConfig(); @@ -281,7 +282,9 @@ public class MogoApplication extends AbsMogoApplication { startService(intent); } - LeakCanary.install(this); + if (refWatcher != null){ + refWatcher = LeakCanary.install(this); + } // 初始化 bugly 升级 ARouter.getInstance().navigation(UpgradeReportProvider.class); From 4711d50f436f2a576e1d65a4bcf58c8acdf76fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 1 Jun 2021 11:44:04 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/app/README.md b/app/README.md index bbf8c992fb..fb3b7736f9 100644 --- a/app/README.md +++ b/app/README.md @@ -25,6 +25,7 @@ 6. d8xx: D系列(2+32) - independent 7. d82x: D系列(1+16) - independent 8. byd: 比亚迪应用市场 - independent +9. PadLenovo: 联想pad适配 - launcher ### env 维度 From 7f56c5482fde1d2d897a104e25edc7bdf5e48cbe Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 1 Jun 2021 15:49:08 +0800 Subject: [PATCH 12/17] fix bug --- app/build.gradle | 59 +++++++++++-------- .../res/layout/module_ext_layout_entrance.xml | 3 +- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f3e22def1b..0208e47f03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,6 +108,8 @@ android { } // f系列-网约车-出租车 fochtaxi { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -137,6 +139,8 @@ android { } // f系列-网约车-小巴车 fochbus { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -166,6 +170,8 @@ android { } // f系列-分体机全系列，未细分 f8xx { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -195,12 +201,8 @@ android { } // f系列-分体机 f80x { - android{ - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - } - } + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -230,15 +232,10 @@ android { } // 衡阳-联想Pad fPadLenovo { - android{ - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - } - } + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 @@ -266,12 +263,8 @@ android { } // f系列-网约车-出租车 fPadLenovoOchTaxi { - android{ - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - } - } + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -301,12 +294,8 @@ android { } // f系列-网约车-小巴车 fPadLenovoOchBus { - android{ - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo - targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo - } - } + minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo + targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -365,6 +354,8 @@ android { } // f系列-分体机-高德 f8Amap { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" @@ -394,6 +385,8 @@ android { } // e系列，采用Launcher方案 e8xx { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.launcherApplicationId dimension "product" @@ -423,6 +416,8 @@ android { } // 同上 em4 { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.launcherApplicationId dimension "product" @@ -452,6 +447,8 @@ android { } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -481,6 +478,8 @@ android { } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -510,6 +509,8 @@ android { } // e系列-1+16，对标D系列1+16，采用独立app形式 em2 { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -539,6 +540,8 @@ android { } // d系列 d8xx { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -568,6 +571,8 @@ android { } // d系列 2 + 32 d80x { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -597,6 +602,8 @@ android { } // d系列 1+16 版本 d82x { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.independentApplicationId dimension "product" @@ -626,6 +633,8 @@ android { } // 比亚迪 bydauto { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion // 应用包名 applicationId rootProject.ext.android.bydautoIndependentApplicationId dimension "product" diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 6e2af4a54a..611d65ddbd 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -245,8 +245,7 @@ android:layout_height="wrap_content" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:visibility="visible" /> + app:layout_constraintTop_toTopOf="parent" /> Date: Tue, 1 Jun 2021 20:28:52 +0800 Subject: [PATCH 13/17] =?UTF-8?q?Fix=20bug=20=E4=BF=AE=E5=A4=8D=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=B7=AF=E5=8F=A3=E3=80=81=E5=89=8D=E6=96=B9=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E7=9B=B4=E6=92=AD=E5=BC=B9=E7=AA=97=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20=E5=85=B3=E9=97=AD=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84bug=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BA=86=E6=B5=8B=E8=AF=95=E9=9D=A2=E6=9D=BF=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BE=E7=89=88=E6=9C=AC1.0.0-vr-?= =?UTF-8?q?8.5.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/runConfigurations.xml | 1 + .../com/mogo/launcher/MogoApplication.java | 4 +- config.gradle | 2 +- libraries/map-custom/build.gradle | 2 +- .../common/map/MapCenterPointStrategy.java | 2 +- .../extensions/utils/TopViewManager.java | 9 - .../utils/TopViewNoLinkageAnimHelper.java | 131 +----- modules/mogo-module-v2x/consumer-rules.pro | 1 - .../mogo/module/v2x/V2XModuleProvider.java | 4 + .../com/mogo/module/v2x/V2XObuManager.java | 4 +- .../v2x/alarm/V2XEarlyWarningServer.java | 26 +- .../v2x/scenario/impl/V2XScenarioManager.java | 1 + .../v2x/scenario/scene/V2XBasWindow.java | 1 - .../scene/livecar/V2XPushLiveCarScenario.java | 4 - .../scene/livecar/V2XVoiceCallLiveBiz.java | 20 +- .../livecar/V2XVoiceCallLiveScenario.java | 1 + .../scene/test/V2XTestConsoleWindow.java | 415 ------------------ .../mogo/module/v2x/utils/EventTypeUtils.java | 2 +- .../module/v2x/view/V2XLiveGSYVideoView.java | 13 +- .../windowview/IMogoTopViewManager.java | 7 - 20 files changed, 68 insertions(+), 582 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index 7f68460d8b..e497da9998 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -3,6 +3,7 @@