From 575a64889f77b8b00dba77eecaa08ac803747732 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 24 May 2021 16:29:06 +0800 Subject: [PATCH 1/7] 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 2/7] =?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 3/7] =?UTF-8?q?new#vr=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=8E=BB?= =?UTF-8?q?=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 4/7] 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 5/7] 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 6/7] =?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' } From d2ee15f0d716efbe6053a76a1346a384b2aff080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 26 May 2021 16:57:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/runConfigurations.xml | 1 + .../res/raw/test_data_v2x_zuiyouluxian.json | 72 ++++++++++--------- 2 files changed, 41 insertions(+), 32 deletions(-) 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 @@