From 322228d906f38c9240cf4923c05850d7fed56dc8 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 20 Jul 2021 13:21:30 +0800 Subject: [PATCH 1/2] add testpanel of mock --- .../com/mogo/map/impl/amap/AMapWrapper.java | 5 ++ .../com/mogo/map/impl/custom/AMapWrapper.java | 5 ++ .../src/main/java/com/mogo/map/IMogoMap.java | 6 ++ .../mogo/module/common/drawer/BaseDrawer.java | 5 +- .../common/drawer/SnapshotSetDataDrawer.java | 2 +- .../extensions/entrance/EntranceFragment.java | 86 +++++++++++-------- .../service/marker/MapMarkerManager.java | 2 +- .../service/status/EnvStatusManager.java | 9 +- .../com/mogo/service/map/IMogoMapService.java | 6 ++ .../service/impl/intent/IntentManager.java | 2 +- .../mogo/service/impl/map/MogoMapService.java | 6 ++ 11 files changed, 91 insertions(+), 43 deletions(-) diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java index a0bcb0467b..b85f792310 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapWrapper.java @@ -245,6 +245,11 @@ public class AMapWrapper implements IMogoMap { return null; } + @Override + public String getMapVersion() { + return null; + } + private boolean checkAMap() { if ( mAMap == null ) { Logger.e( TAG, "高德map实例为空，请检查" ); diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java index f1e03b51d2..60e5f87475 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java @@ -263,6 +263,11 @@ public class AMapWrapper implements IMogoMap { return null; } + @Override + public String getMapVersion() { + return MapAutoApi.INSTANCE.getSDKVersion(); + } + private boolean checkAMap() { mAMap = mMapView.getMapAutoViewHelper(); sAMap = mAMap; diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java index 0cf8a64ecc..d75cd7c672 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java @@ -142,4 +142,10 @@ public interface IMogoMap { * @return */ IMogoPolyline addPolyline( MogoPolylineOptions options ); + + /** + * 获取地图版本号 + * @return + */ + String getMapVersion(); } 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 5b57f23f17..6bfb2e1f62 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 @@ -194,8 +194,9 @@ class BaseDrawer { * @return showSpeed */ public boolean shouldShowSpeed(int type) { - AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); - return recognizedType != AdasRecognizedType.classIdPerson; + return true; //todo 验证行人预警,对行人和自行车不做infoWindow过滤 +// AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); +// return recognizedType != AdasRecognizedType.classIdPerson; // &&recognizedType != AdasRecognizedType.classIdBicycle //todo Bicycle显示 // && recognizedType != AdasRecognizedType.classIdMoto //todo moto显示 } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 4c219b8bf5..51a1030014 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -166,8 +166,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic Map newMarkersCaches = new ConcurrentHashMap<>(allDatumsList.size()); List newDiffSet = new ArrayList<>(); - for (SocketDownData.CloudRoadDataProto cloudRoadData : allDatumsList) { + if (isUselessValue(cloudRoadData)) { continue; } 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 e9240cbd8a..4a0be1e3cb 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 @@ -69,6 +69,7 @@ import com.mogo.module.extensions.utils.NoMapTopViewShaderHelper; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.extensions.utils.TopViewNoLinkageAnimHelper; import com.mogo.module.extensions.view.ArcView; +import com.mogo.module.service.receiver.MogoReceiver; import com.mogo.module.share.manager.ServiceApisManager; import com.mogo.service.IMogoServiceApis; import com.mogo.service.analytics.IMogoAnalytics; @@ -98,6 +99,7 @@ import java.util.Locale; import java.util.Map; import java.util.Random; +import static android.content.Intent.ACTION_VIEW; import static com.mogo.module.common.utils.SPConst.getSPGuideRecord; import static com.mogo.module.common.utils.SPConst.getSpGuide; import static com.mogo.module.extensions.ExtensionsModuleConst.TYPE_ENTRANCE; @@ -368,6 +370,16 @@ public class EntranceFragment extends MvpFragment { + Log.d(TAG,"长安显示状态工具栏"); + Intent intent = new Intent(); + intent.putExtra("oper", 52); + MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent); + return true; + }); + } clTrafficLight = (ConstraintLayout) findViewById(R.id.cl_traffic_light); tvYellow = (TextView) findViewById(R.id.tv_yellow); tvRed = (TextView) findViewById(R.id.tv_red); @@ -392,53 +404,53 @@ public class EntranceFragment extends MvpFragment > mListeners = new ConcurrentHashMap<>(); + private final Map< String, CopyOnWriteArrayList< IMogoIntentListener > > mListeners = new ConcurrentHashMap<>(); @Override public void registerIntentListener( String intent, IMogoIntentListener listener ) { diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java index 6bf52684a8..b3aeb3065a 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/map/MogoMapService.java @@ -10,6 +10,7 @@ import com.mogo.map.MogoCoordinatesTransformer; import com.mogo.map.MogoGeoSearch; import com.mogo.map.MogoInputtipsSearch; import com.mogo.map.MogoLocationClient; +import com.mogo.map.MogoMap; import com.mogo.map.MogoMapUIController; import com.mogo.map.MogoMapViewInstanceHandler; import com.mogo.map.MogoMarkerManager; @@ -120,6 +121,11 @@ public class MogoMapService implements IMogoMapService { return MogoCoordinatesTransformer.getInstance(); } + @Override + public String getMapVersion() { + return MogoMap.getInstance().getMogoMap().getMapVersion(); + } + @Override public void init( Context context ) { } From 29877bd2d4fe03652a5dee42a19450d01c30e4c7 Mon Sep 17 00:00:00 2001 From: liujing Date: Tue, 20 Jul 2021 17:06:58 +0800 Subject: [PATCH 2/2] fix bug of branch problem --- .../extensions/entrance/EntranceFragment.java | 2 +- .../service/status/EnvStatusManager.java | 31 ++++++------------- 2 files changed, 10 insertions(+), 23 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 4a0be1e3cb..4b78c46ace 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 @@ -373,7 +373,7 @@ public class EntranceFragment extends MvpFragment { - Log.d(TAG,"长安显示状态工具栏"); + Log.d(TAG,"长按显示状态工具栏"); Intent intent = new Intent(); intent.putExtra("oper", 52); MogoApisHandler.getInstance().getApis().getIntentManagerApi().invoke(MogoReceiver.ACTION_MOCK, intent); 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 69eba7b7f5..cbf9254143 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 @@ -15,7 +15,6 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.wm.WindowManagerView; import com.mogo.module.service.R; -import com.mogo.utils.AppUtils; import com.mogo.utils.NetworkUtils; import static com.mogo.utils.CommonUtils.getVersionName; @@ -70,20 +69,16 @@ public class EnvStatusManager { private void renderStatus() { String[] sStatusName = { - "定位", - "近景", - "下发", - "AUTO", - "长链", + "工控机定位", + "ADAS近景感知", + "云端远景感知", + "自动驾驶状态", + "socket长链", "经度", "纬度", -<<<<<<< HEAD - "MapVersion" -======= "网络状态", "App版本", "Map版本" ->>>>>>> c475544d3ea71424fa7d0826b54156ae420293a6 }; StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < sStatusName.length; i++) { @@ -93,18 +88,14 @@ public class EnvStatusManager { } else if (i == 5 || i == 6) { stringBuilder.append(DebugConfig.getStatusData(i)).append("\n"); } else if (i == 7) { -<<<<<<< HEAD - String mapVersion = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapVersion(); - if (!TextUtils.isEmpty(mapVersion)) { - stringBuilder.append(mapVersion).append("\n"); - } -======= stringBuilder.append(NetworkUtils.isConnected(mContext)).append("\n"); } else if (i == 8) { stringBuilder.append(getVersionName(mContext, "com.mogo.launcher.f")).append("\n"); } else if (i == 9) { - stringBuilder.append(AppUtils.getCustomMapSDKVersion(mContext)).append("\n"); ->>>>>>> c475544d3ea71424fa7d0826b54156ae420293a6 + String mapVersion = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapVersion(); + if (!TextUtils.isEmpty(mapVersion)) { + stringBuilder.append(mapVersion).append("\n"); + } } else { stringBuilder.append("true".equals(DebugConfig.getStatus(i, true)) ? "正常" : "异常").append("\n"); } @@ -120,10 +111,6 @@ public class EnvStatusManager { mStatusTv.setTextColor(Color.WHITE); } } - - //添加网络状态 - - // } private Context mContext;