From d0aca2ea8568c025767a5619157373680a38eea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 2 Jul 2021 11:52:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8D=95=E8=8E=B7adas=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/adas/AdasEventManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java index 226287e8f5..c248d7a868 100644 --- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java +++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java @@ -141,10 +141,14 @@ public class AdasEventManager implements OnAdasListener, OnAdasMsgConnectStatusL @Override public void onRectData(RectInfo rectInfo) { Logger.d(TAG, "onRectData " + rectInfo); - for (IAdasDataListener listener : iAdasEventListeners) { - if (listener != null) { - listener.cameraEyeDetectResult(gson.toJson(rectInfo)); + try { + for (IAdasDataListener listener : iAdasEventListeners) { + if (listener != null) { + listener.cameraEyeDetectResult(gson.toJson(rectInfo)); + } } + } catch (Exception e) { + e.printStackTrace(); } } From 6e57c642f35bb745f3ff4d505613965f22c49715 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Fri, 2 Jul 2021 15:25:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?custommap=20=E7=BC=93=E8=A7=A3=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/common/drawer/AdasRecognizedResultDrawer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c33434ba53..2a786024fd 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 @@ -313,9 +313,9 @@ class AdasRecognizedResultDrawer extends BaseDrawer { newAdasRecognizedMarkersCaches.put(uniqueKey, marker); - if (shouldShowSpeed(recognizedListResult.type)) { - showSelfSpeed(marker, recognizedListResult.speed, recognizedListResult.uuid, recognizedListResult.type, recognizedListResult.heading, MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); - } +// if (shouldShowSpeed(recognizedListResult.type)) { +// showSelfSpeed(marker, recognizedListResult.speed, recognizedListResult.uuid, recognizedListResult.type, recognizedListResult.heading, MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); +// } } /** From ee37b0a129bea3409177ecdbc66e0951901b257c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 2 Jul 2021 16:02:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=86=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E4=BF=AE=E6=AD=A3marker=E8=A7=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java index f8ac053168..c8edc04618 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/marker/AMapMarkerWrapper.java @@ -568,7 +568,7 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { @Override public void addDynamicAnchorPosition( MogoLatLng latLng, float angle, long duration ) { try { - mMarker.addDynamicAnchorPostion( new LonLatPoint( latLng.lon, latLng.lat, angle ), System.currentTimeMillis(), ( int ) duration ,true , true); + mMarker.addDynamicAnchorPostion( new LonLatPoint( latLng.lon, latLng.lat, angle ), System.currentTimeMillis(), ( int ) duration ,false , true); } catch ( Exception e ) { e.printStackTrace(); } From ec8f3c7d7552d991ca843803a882020db8dba83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 2 Jul 2021 18:00:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=81=94=E6=83=B3pad=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Android=2011=20=E5=AF=BC=E8=87=B4=E6=B5=AE?= =?UTF-8?q?=E7=AA=97=E6=9D=83=E9=99=90=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/AndroidManifest.xml | 1 + .../com/mogo/module/main/MainActivity.java | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-back/src/main/AndroidManifest.xml b/modules/mogo-module-back/src/main/AndroidManifest.xml index a0a69cfe71..13527da152 100644 --- a/modules/mogo-module-back/src/main/AndroidManifest.xml +++ b/modules/mogo-module-back/src/main/AndroidManifest.xml @@ -3,4 +3,5 @@ + diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index ac9d56cce8..bdac502fa0 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -8,6 +8,7 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.provider.Settings; +import android.text.TextUtils; import android.util.Log; import android.view.View; import android.widget.FrameLayout; @@ -143,11 +144,13 @@ public class MainActivity extends MvpActivity implement } //申请悬浮窗权限 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if(Settings.canDrawOverlays(this)){ + // 检查是否有悬浮窗权限 + if (Settings.canDrawOverlays(this)) { return; } - Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION); - startActivityForResult(intent, REQUEST_CODE_DIALOG); +// Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION); +// startActivityForResult(intent, REQUEST_CODE_DIALOG); + openAppDetails("显示悬浮窗"); } } @@ -465,7 +468,7 @@ public class MainActivity extends MvpActivity implement } else { // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮 if (!isFirst) { - openAppDetails(); + openAppDetails(null); isFirst = true; } } @@ -475,9 +478,13 @@ public class MainActivity extends MvpActivity implement /** * 打开APP的详情设置 */ - private void openAppDetails() { + private void openAppDetails(String msg) { AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage("请在 “应用信息 -> 权限” 中授予权限"); + if (TextUtils.isEmpty(msg)) { + builder.setMessage("请在 “应用信息 -> 权限” 中授予权限"); + } else { + builder.setMessage("请在 “应用信息 -> 权限” 中授予【" + msg + "】权限"); + } builder.setPositiveButton("手动授权", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) {