From 190477962711747ae4c651bfd1b38d3566faacdd Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 2 Aug 2021 17:12:47 +0800 Subject: [PATCH 1/6] envStatus add one item of sn --- .../com/mogo/module/service/status/EnvStatusManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java index cbf9254143..6dae022dd9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java @@ -10,6 +10,7 @@ import android.view.Gravity; import android.view.ViewGroup; import android.widget.TextView; +import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.debug.DebugConfig; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; @@ -78,7 +79,8 @@ public class EnvStatusManager { "纬度", "网络状态", "App版本", - "Map版本" + "Map版本", + "SN" }; StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < sStatusName.length; i++) { @@ -96,6 +98,8 @@ public class EnvStatusManager { if (!TextUtils.isEmpty(mapVersion)) { stringBuilder.append(mapVersion).append("\n"); } + } else if(i == 10){ + stringBuilder.append(MoGoAiCloudClientConfig.getInstance().getSn()).append("\n"); } else { stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n"); } From be4ff51668d7d736a706718369570004c2e19ac5 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 3 Aug 2021 16:00:50 +0800 Subject: [PATCH 2/6] opt --- .../src/main/java/com/mogo/module/v2x/V2XObuManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java index b423f23c4d..6e3bff29d0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java @@ -197,9 +197,9 @@ public class V2XObuManager implements IObuCallback, Handler.Callback { @Override public void onCvxV2vThreatIndInfo(CvxV2vThreatIndInfo info) { //预警信息 - Logger.e("liyz", "onCvxV2vThreatIndInfo ------> " + info.toString()); //预警类型 threat_level 3 if (info != null) { + Logger.e("liyz", "onCvxV2vThreatIndInfo ------> " + info.toString()); if (info.getThreat_info() != null && info.getThreat_info().getThreat_level() == 2 && info.getThreat_info().getThreat_level() == 3) { //看看2的情况 //预警方位 From c63b1b1141c706ab7bd7236ab3b08a0b6b23affe Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 16 Aug 2021 19:01:17 +0800 Subject: [PATCH 3/6] add renderColor type --- .../main/java/com/mogo/module/common/drawer/BaseDrawer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 3af9e6dc0f..c318945280 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -246,6 +246,7 @@ class BaseDrawer { } if (fromType == FROM_ADAS) { switch (drawLevel) { + case 0: case 1: return Car3DModelColor.Normal.color; case 2: @@ -310,7 +311,7 @@ class BaseDrawer { Normal("#D8D8D8FF"), Warming("#FFD53EFF"), Dangerous("#FF3C45FF"), - Error("#00000000"); + Error("#7fb80e"); private final String color; From 31c61369978c4172e54f757be640f0accb41cf03 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 16 Aug 2021 19:14:27 +0800 Subject: [PATCH 4/6] note the speed --- .idea/misc.xml | 18 +++++++++++++++ .../drawer/AdasRecognizedResultDrawer.java | 22 +++++++++---------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index efb2837e12..22e6c5a2dd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,6 +8,24 @@ + + + diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 0e1b862d33..2078100a2d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -284,17 +284,17 @@ class AdasRecognizedResultDrawer extends BaseDrawer { newAdasRecognizedMarkersCaches.put(uniqueKey, marker); - if (shouldShowSpeed(recognizedListResult.type)) { - Message msg = mRenderThreadHandler.obtainMessage(); - msg.obj = new SpeedData(marker - , recognizedListResult.speed - , recognizedListResult.uuid - , recognizedListResult.type - , recognizedListResult.heading - , MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); - msg.what = MSG_DISPLAY_SPEED; - msg.sendToTarget(); - } +// if (shouldShowSpeed(recognizedListResult.type)) { +// Message msg = mRenderThreadHandler.obtainMessage(); +// msg.obj = new SpeedData(marker +// , recognizedListResult.speed +// , recognizedListResult.uuid +// , recognizedListResult.type +// , recognizedListResult.heading +// , MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); +// msg.what = MSG_DISPLAY_SPEED; +// msg.sendToTarget(); +// } Log.d("ADAS数据延时", "render 刷新一台车 cost : " + TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start))); } From 707910ee73f656424e5bb31f93a8015fab8b0c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 17 Aug 2021 19:40:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=B3=E9=97=AD2D?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/map/impl/custom/AMapViewWrapper.java | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java index 31b9cbde57..adac9bd7db 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java @@ -347,33 +347,34 @@ public class AMapViewWrapper implements IMogoMapView, if (ui == null) { return; } + // TODO 这里临时修改关闭2D Logger.d(TAG, "设置的样式 = %s", ui); if (checkAMapView()) { switch (ui) { - case CarUp_2D: - case CarUp_3D: - case NorthUP_2D: - setUIMode(ui); - break; +// case CarUp_2D: +// case CarUp_3D: +// case NorthUP_2D: +// setUIMode(ui); +// break; case Type_VR: if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) { mMapView.getMapAutoViewHelper().setScaleVRMode(true); } mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR); return; - case Type_Light: - mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false); - mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY); - mIsLightStyle = true; - break; - case Type_Night: - mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false); - mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT); - mIsLightStyle = false; - break; - case Type_AUTO_LIGHT_Night: - mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true); - break; +// case Type_Light: +// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false); +// mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_DAY); +// mIsLightStyle = true; +// break; +// case Type_Night: +// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(false); +// mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_NIGHT); +// mIsLightStyle = false; +// break; +// case Type_AUTO_LIGHT_Night: +// mMapView.getMapAutoViewHelper().setAutoSwitchStyle(true); +// break; } } From 67e8a30e916090b1827b3969256871b30e190d81 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 18 Aug 2021 10:16:24 +0800 Subject: [PATCH 6/6] rename funcName --- .../com/mogo/launcher/MogoApplication.java | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 6b89252b99..be6471b201 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -185,43 +185,40 @@ public class MogoApplication extends AbsMogoApplication { // Log.d("TEST-SOCKET","socketTestData cityCode: " + socketTestData.getCityCode()); // return new HttpDnsSimpleLocation(socketTestData.getCityCode(),socketTestData.getLat(),socketTestData.getLon()); //todo 对象唯一实例优化 // }); - clientConfig.setIHttpDnsCurrentLocation(new IHttpDnsCurrentLocation() { - @Override - public HttpDnsSimpleLocation getCurrentLocation() { - MogoLocation mogoLocation = - MogoApisHandler.getInstance() - .getApis().getMapServiceApi() - .getSingletonLocationClient(getApp()) - .getLastKnowLocation(); - HttpDnsSimpleLocation httpDnsSimpleLocation; - if (mogoLocation != null - && mogoLocation.getLatitude() != 0 - && mogoLocation.getLongitude() != 0) { + clientConfig.setIHttpDnsCurrentLocation(() -> { + MogoLocation mogoLocation = + MogoApisHandler.getInstance() + .getApis().getMapServiceApi() + .getSingletonLocationClient(getApp()) + .getLastKnowLocation(); + HttpDnsSimpleLocation httpDnsSimpleLocation; + if (mogoLocation != null + && mogoLocation.getLatitude() != 0 + && mogoLocation.getLongitude() != 0) { + httpDnsSimpleLocation = new HttpDnsSimpleLocation( + mogoLocation.getCityCode(), + mogoLocation.getLatitude(), + mogoLocation.getLongitude()); + Logger.i(TAG, "使用实时GPS信息：" + httpDnsSimpleLocation); + } else { + String ciyCode = SharedPrefsMgr.getInstance(getApp()) + .getString(SharedPrefsConstants.LOCATION_CITY_CODE); + String latitude = SharedPrefsMgr.getInstance(getApp()) + .getString(SharedPrefsConstants.LOCATION_LATITUDE); + String longitude = SharedPrefsMgr.getInstance(getApp()) + .getString(SharedPrefsConstants.LOCATION_LONGITUDE); + try { httpDnsSimpleLocation = new HttpDnsSimpleLocation( - mogoLocation.getCityCode(), - mogoLocation.getLatitude(), - mogoLocation.getLongitude()); - Logger.i(TAG, "使用实时GPS信息：" + httpDnsSimpleLocation); - } else { - String ciyCode = SharedPrefsMgr.getInstance(getApp()) - .getString(SharedPrefsConstants.LOCATION_CITY_CODE); - String latitude = SharedPrefsMgr.getInstance(getApp()) - .getString(SharedPrefsConstants.LOCATION_LATITUDE); - String longitude = SharedPrefsMgr.getInstance(getApp()) - .getString(SharedPrefsConstants.LOCATION_LONGITUDE); - try { - httpDnsSimpleLocation = new HttpDnsSimpleLocation( - ciyCode, - Double.parseDouble(latitude), - Double.parseDouble(longitude)); - } catch (NumberFormatException e) { - e.printStackTrace(); - httpDnsSimpleLocation = new HttpDnsSimpleLocation("010", 1, 1); - } - Logger.i(TAG, "使用缓存GPS信息：" + httpDnsSimpleLocation); + ciyCode, + Double.parseDouble(latitude), + Double.parseDouble(longitude)); + } catch (NumberFormatException e) { + e.printStackTrace(); + httpDnsSimpleLocation = new HttpDnsSimpleLocation("010", 1, 1); } - return httpDnsSimpleLocation; + Logger.i(TAG, "使用缓存GPS信息：" + httpDnsSimpleLocation); } + return httpDnsSimpleLocation; }); // 初始化SDK，可以设置状态回调来监听 @@ -256,7 +253,7 @@ public class MogoApplication extends AbsMogoApplication { } } - private void prepareSocketAndLocationServices() { + private void startSocketService() { IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); // 关闭长链服务 apis.getSocketManagerApi(getApplicationContext()).destroy(); @@ -267,7 +264,7 @@ public class MogoApplication extends AbsMogoApplication { @Override protected void socketTTL() { // 鉴权成功后开启socket长链服务 - prepareSocketAndLocationServices(); + startSocketService(); } private void initModules() {