From 326bc44a34ec8a3da9a5a8ad2dd422b18b979538 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 21 May 2021 15:34:47 +0800 Subject: [PATCH 01/10] change the tomeDelay upload data --- .../com/mogo/launcher/MogoApplication.java | 2 +- .../network/bean/MockSocketSendData.java | 37 +++++++++++++++++++ .../timedelay/TimeDelayUploadManager.java | 11 ++++-- 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 2f10de66a7..3459874a0f 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -225,7 +225,7 @@ public class MogoApplication extends AbsMogoApplication { // 设置是否是第三APP登录 clientConfig.setThirdLogin(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE); // 设置是否输出日志 - clientConfig.setShowDebugLog(false); + clientConfig.setShowDebugLog(true); // 设置是否是直播推流的主播 clientConfig.setAnchor(false); // 设置从蘑菇AI开放平台获取的APPKey diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java new file mode 100644 index 0000000000..262b7b2d54 --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/MockSocketSendData.java @@ -0,0 +1,37 @@ +package com.mogo.module.service.network.bean; + +public class MockSocketSendData { + private long systemTime; + private String uuid; + private long satelliteTime; + + public MockSocketSendData(long systemTime, String uuid, long satelliteTime) { + this.systemTime = systemTime; + this.uuid = uuid; + this.satelliteTime = satelliteTime; + } + + public long getSystemTime() { + return systemTime; + } + + public void setSystemTime(long systemTime) { + this.systemTime = systemTime; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public long getSatelliteTime() { + return satelliteTime; + } + + public void setSatelliteTime(long satelliteTime) { + this.satelliteTime = satelliteTime; + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index dc377b0d73..a2ad0b14db 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -9,11 +9,13 @@ import androidx.annotation.RequiresApi; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.uploadintime.SnapshotLocationController; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.network.TimeDelayApiService; import com.mogo.module.service.network.bean.MockSocketReceiverData; +import com.mogo.module.service.network.bean.MockSocketSendData; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.entity.CloudRoadData; import com.mogo.realtime.entity.MogoSnapshotSetData; @@ -22,6 +24,7 @@ import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; +import com.mogo.utils.network.utils.GsonUtil; import org.json.JSONException; import org.json.JSONObject; @@ -145,13 +148,13 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); - map.put("systemTime", System.currentTimeMillis()); - map.put("uuid", result.getUuid()); - map.put("satelliteTime", result.getSatelliteTime()); + map.put("sn", Utils.getSn()); + map.put("data", GsonUtil.jsonFromObject(mockSocketSendData)); timeDelayApiService.uploadDelayData(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) From 26468c90fd32b0039f73a51f122e3f90226b7e27 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 21 May 2021 16:06:02 +0800 Subject: [PATCH 02/10] opt ui --- .../module_switch_map_angle.png | Bin .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../res/values-xhdpi-2560x1600/dimens.xml | 167 ------------------ 3 files changed, 1 insertion(+), 167 deletions(-) rename modules/mogo-module-extensions/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_switch_map_angle.png (100%) delete mode 100644 modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png similarity index 100% rename from modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1600/module_switch_map_angle.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi-2560x1440/module_switch_map_angle.png diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml index 703c97c9a2..c317778eb9 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -8,4 +8,5 @@ 15px 110px 40px + 145px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml deleted file mode 100644 index 027820a732..0000000000 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1600/dimens.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - 90px - 32px - 2px - 16px - 26px - 26px - 32px - - 90px - 32px - 2px - 100px - 90px - 2px - 54px - 100px - 90px - 8px - - 180px - 180px - 2px - 60px - 60px - 28px - - 32px - 2px - - 140px - 32px - 60px - 92px - 24px - 48px - 2px - 140px - 140px - 120px - 20px - 30px - 32px - 32px - - 120px - 120px - 32px - 60px - 32px - 60px - 32px - 30px - 20px - - - 120px - 60px - 60px - 32px - 48px - 80px - 28px - 26px - 44px - 44px - 18px - 34px - 26px - 28px - 30px - 30px - 30px - 20px - - 103px - 103px - - - 1058px - 210px - 144px - 159px - 159px - 70px - 70px - 56px - 83px - 24px - 40px - 60px - 50px - 12px - 10px - 40px - 30px - 34px - 24px - 28px - 23px - 17px - 17px - 36px - 36px - -2px - 95px - - 30px - 40px - 40px - 15px - 15px - 5px - 50px - 56px - 30px - 56px - 30px - 56px - 30px - 15px - 15px - - - 1000px - 390px - 200px - 200px - 240px - 30px - 120px - 120px - 10px - 22px - 28px - 28px - 30px - 90px - 90px - 6dp - 15px - 4px - 10px - 20px - - 40px - 45px - 100px - 134px - 30px - 20px - 20px - 8px - 21px - 31px - 1920px - - -1 - 0px - - 36px - 393px - 700px - 145px - \ No newline at end of file From 05db4d630765363f437fb86cd421fdd1896988d1 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 21 May 2021 17:02:55 +0800 Subject: [PATCH 03/10] add log --- .../mogo/module/service/timedelay/TimeDelayUploadManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index a2ad0b14db..d712ba535e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -92,9 +92,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); map.put("sn", Utils.getSn()); map.put("data", GsonUtil.jsonFromObject(mockSocketSendData)); + Logger.d(TAG,"mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData)); timeDelayApiService.uploadDelayData(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) From 62ee66b629ba646db8b86aa070d9b2c0abc63ee3 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 24 May 2021 12:06:38 +0800 Subject: [PATCH 04/10] add log --- .../mogo/module/service/timedelay/TimeDelayUploadManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index d712ba535e..891d6bd9a6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -153,7 +153,8 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); map.put("sn", Utils.getSn()); map.put("data", GsonUtil.jsonFromObject(mockSocketSendData)); - Logger.d(TAG,"mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData)); + Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData)); + Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime())); timeDelayApiService.uploadDelayData(map) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) From 575a64889f77b8b00dba77eecaa08ac803747732 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 24 May 2021 16:29:06 +0800 Subject: [PATCH 05/10] add loc upload assert --- .../module/common/uploadintime/SnapshotLocationController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java index 14b64b223a..d5a03ce8ce 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java @@ -140,6 +140,9 @@ public class SnapshotLocationController { mLastLocationInfo = null; } } + if (list.size() == 0) { + return null; + } //Logger.d( TAG, "upload loc size = %s", list == null ? 0 : list.size() ); return list; } From 3d234961e8d3561f6a89c7fa55e18620c9ba56dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 24 May 2021 18:18:44 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3pad=E5=B0=8F=E6=99=BA?= =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=8B=89=E8=B5=B7bug=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/mogo/launcher/MogoApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3459874a0f..c8fddfdc81 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -128,6 +128,7 @@ public class MogoApplication extends AbsMogoApplication { 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) { From 0d52efb39ef94652e3593fc78d1f20fc18b53e41 Mon Sep 17 00:00:00 2001 From: wujifei Date: Tue, 25 May 2021 15:39:13 +0800 Subject: [PATCH 07/10] =?UTF-8?q?new#vr=E6=A8=A1=E5=BC=8F=E4=B8=8B?= =?UTF-8?q?=E5=8E=BB=E9=99=A42d=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index 0986ac3deb..0ff47b0d6e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -570,8 +570,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { } if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, clickListener); - mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); - mAlarmInfoMarker.showInfoWindow(); +// mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); +// mAlarmInfoMarker.showInfoWindow(); } else { optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); From d3d72dec2879658cd05dd07a6380b7b83f0ed2e5 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 25 May 2021 16:12:25 +0800 Subject: [PATCH 08/10] hide 2d mode --- .../extensions/entrance/EntranceFragment.java | 24 ++++++++++++++++--- .../com/mogo/module/service/MogoServices.java | 4 ++-- .../small/map/SmallMapDirectionView.java | 21 +++++++++------- .../layout/view_event_panel_history_count.xml | 1 + 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index d9ef4ba560..3aac00d62d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -181,6 +181,7 @@ public class EntranceFragment extends MvpFragment { - MogoApisHandler.getInstance().getApis() - .getMapServiceApi() - .getMapUIController() - .changeMapMode( - MogoApisHandler.getInstance() - .getApis() - .getAdasControllerApi() - .getCurrentSkinMode() - ); + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) { + MogoApisHandler.getInstance().getApis() + .getMapServiceApi() + .getMapUIController() + .changeMapMode( + MogoApisHandler.getInstance() + .getApis() + .getAdasControllerApi() + .getCurrentSkinMode() + ); + } }); } diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml index 52b241ea7d..5d49257034 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml @@ -5,6 +5,7 @@ android:id="@+id/llEventMore" android:layout_width="@dimen/module_v2x_panel_width" android:layout_height="@dimen/module_v2x_panel_width" + android:visibility="gone" android:background="@drawable/module_ext_drawable_shadow_bg" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> From 50b4d956245fa984911d8cc8c4aebc483c47ae1f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 26 May 2021 10:08:36 +0800 Subject: [PATCH 09/10] opt --- .../module/extensions/entrance/EntranceFragment.java | 10 +++++++--- .../java/com/mogo/module/service/MogoServices.java | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 3aac00d62d..4e44318695 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -379,7 +379,9 @@ public class EntranceFragment extends MvpFragment Date: Wed, 26 May 2021 11:23:00 +0800 Subject: [PATCH 10/10] =?UTF-8?q?1.0.0-vr-8.5.29=201.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=863D=E9=94=9A=E7=82=B9=E5=8A=A8=E7=94=BB=202.=E8=BF=91?= =?UTF-8?q?=E8=BF=9C=E6=99=AF=E5=88=87=E6=8D=A2=EF=BC=8C=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=BD=A6=E9=81=93=E7=BA=BF=E6=B8=B2=E6=9F=93=E4=B8=8D?= =?UTF-8?q?=E5=85=A8=203.=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9B=BE=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-custom/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index f9adb43a4e..d91b1cb832 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.28' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.29' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' }