From 79ee956859edde3ceaf1b5a4a75c748fb894a5a8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 8 Feb 2023 17:17:23 +0800 Subject: [PATCH 1/4] [2.13.0-arch-opt] gradle fix --- .../mogo-core-function-biz/build.gradle | 1 - .../mogo-core-function-chat/build.gradle | 2 -- .../build.gradle | 3 --- .../mogo-core-function-devatools/build.gradle | 3 --- .../mogo-core-function-hmi/build.gradle | 2 -- .../mogo-core-function-map/build.gradle | 3 --- .../core/function/impl/MogoMapService.java | 2 +- .../mogo-core-function-startup/build.gradle | 18 +++----------- .../mogo-core-function-v2x/build.gradle | 6 ----- .../impl/MoGoPersonWarnPolylineManager.java | 2 +- .../manager/impl/MoGoStopPolylineManager.java | 2 +- .../manager/impl/MoGoWarnPolylineManager.java | 2 +- .../scenario/scene/airoad/AiRoadMarker.kt | 4 +--- .../scene/road/V2XAiRoadEventMarker.kt | 24 +++++++++---------- .../function/api/map/IMogoMapService.java | 3 +-- core/mogo-core-function-call/build.gradle | 5 ++-- .../call/map/CallerMapUIServiceManager.kt | 4 ++-- .../src/main/proto/message_pad.proto | 12 +++++++++- libraries/mogo-map/build.gradle | 2 -- 19 files changed, 36 insertions(+), 64 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/build.gradle b/core/function-impl/mogo-core-function-biz/build.gradle index 7ca8ee96d9..0e59185cde 100644 --- a/core/function-impl/mogo-core-function-biz/build.gradle +++ b/core/function-impl/mogo-core-function-biz/build.gradle @@ -62,7 +62,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxroomktx implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-network') implementation project(':core:mogo-core-function-call') diff --git a/core/function-impl/mogo-core-function-chat/build.gradle b/core/function-impl/mogo-core-function-chat/build.gradle index c097863b5b..af1385fc7d 100644 --- a/core/function-impl/mogo-core-function-chat/build.gradle +++ b/core/function-impl/mogo-core-function-chat/build.gradle @@ -61,13 +61,11 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.mogo_core_res } else { implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-res') diff --git a/core/function-impl/mogo-core-function-datacenter/build.gradle b/core/function-impl/mogo-core-function-datacenter/build.gradle index 5c5057184b..7b49429b23 100644 --- a/core/function-impl/mogo-core-function-datacenter/build.gradle +++ b/core/function-impl/mogo-core-function-datacenter/build.gradle @@ -60,17 +60,14 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_call implementation project(':libraries:mogo-adas') implementation rootProject.ext.dependencies.mogocommons } else { - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') - implementation project(':libraries:mogo-adas') implementation project(':foudations:mogo-commons') } diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index f442af5c6f..1467c96245 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -88,14 +88,11 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_res }else { - implementation project(':foudations:mogo-aicloud-services-sdk') implementation project(':foudations:mogo-commons') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-res') } } diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 6d4c8edbba..5f9b7787b9 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -82,8 +82,6 @@ dependencies { compileOnly rootProject.ext.dependencies.mogocommons compileOnly rootProject.ext.dependencies.mogo_core_res compileOnly rootProject.ext.dependencies.mogo_core_utils - compileOnly rootProject.ext.dependencies.mogo_core_function_map - compileOnly rootProject.ext.dependencies.mogo_core_function_devatools compileOnly rootProject.ext.dependencies.mogo_core_function_datacenter compileOnly rootProject.ext.dependencies.mogo_core_function_call compileOnly project(':libraries:mogo-adas') diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index 1b1996082c..0cf7bfaf30 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -75,13 +75,10 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.mogomap - implementation rootProject.ext.dependencies.mogomapapi } else { implementation project(':foudations:mogo-commons') implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') - implementation project(':core:function-impl:mogo-core-function-datacenter') implementation project(':core:mogo-core-function-call') implementation project(":libraries:mogo-map") } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java index 472caaf9dd..1516eeddbc 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java @@ -41,7 +41,7 @@ public class MogoMapService implements IMogoMapService { } @Override - public IMogoOverlayManager getOverlayManager(Context context) { + public IMogoOverlayManager getOverlayManager() { return MogoOverlayManager.getInstance(); } diff --git a/core/function-impl/mogo-core-function-startup/build.gradle b/core/function-impl/mogo-core-function-startup/build.gradle index 8dbe709e37..5c5e15f374 100644 --- a/core/function-impl/mogo-core-function-startup/build.gradle +++ b/core/function-impl/mogo-core-function-startup/build.gradle @@ -40,32 +40,20 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.androidxccorektx - implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter - implementation project(path: ':foudations:mogo-commons') kapt rootProject.ext.dependencies.aroutercompiler + implementation rootProject.ext.dependencies.android_start_up - implementation rootProject.ext.dependencies.mogocustommap implementation rootProject.ext.dependencies.thread_opt + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_res - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_api implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.crashreport - implementation rootProject.ext.dependencies.mogomap - implementation rootProject.ext.dependencies.mogomapapi } else { - implementation project(':core:mogo-core-res') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-api') implementation project(':core:mogo-core-function-call') implementation project(":test:crashreport") - implementation project(':libraries:mogo-map') - implementation project(":libraries:mogo-map-api") } + implementation project(':foudations:mogo-commons') } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle index 299bfe9cbf..0548690b35 100644 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ b/core/function-impl/mogo-core-function-v2x/build.gradle @@ -62,7 +62,6 @@ dependencies { implementation rootProject.ext.dependencies.localbroadcastmanager implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.flexbox kapt rootProject.ext.dependencies.aroutercompiler implementation rootProject.ext.dependencies.protobuf_java implementation rootProject.ext.dependencies.protobuf_java_util @@ -71,19 +70,14 @@ dependencies { if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_call implementation rootProject.ext.dependencies.mogo_core_res - compileOnly rootProject.ext.dependencies.mogomap } else { implementation project(":foudations:mogo-commons") - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-call') implementation project(':core:mogo-core-res') - implementation project(':libraries:mogo-adas') - compileOnly project(':libraries:mogo-map') } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java index a5b5aa7c52..3f73403da5 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java @@ -55,7 +55,7 @@ public class MoGoPersonWarnPolylineManager implements IMoGoPersonWarnPolylineMan options.add(locations.get(i)); } // 绘制线的对象 - IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp()); + IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlay != null) { mMogoPolyline = overlay.addPolyline(options); mMogoPolyline.setTransparency(0.5f); diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java index cf2525ce76..287be0c2c7 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java @@ -54,7 +54,7 @@ public class MoGoStopPolylineManager implements IMoGoStopPolylineManager { options.add(locations.get(i)); } // 绘制线的对象 - IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp()); + IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlay != null) { mMogoPolyline = overlay.addPolyline(options); } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java index dc27540743..a5ed5eda32 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java @@ -62,7 +62,7 @@ public class MoGoWarnPolylineManager implements IMoGoWarnPolylineManager { } // 绘制线的对象 - IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(AbsMogoApplication.getApp()); + IMogoOverlayManager overlay = CallerMapUIServiceManager.INSTANCE.getOverlayManager(); if (overlay != null) { mMogoPolyline = overlay.addPolyline(options); } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt index 2568063852..1a1bc8ce6c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt @@ -39,9 +39,7 @@ class AiRoadMarker { private val marker by lazy { AtomicReference() } private val overlayManager by lazy { - CallerMapUIServiceManager.getOverlayManager( - AbsMogoApplication.getApp() - ) + CallerMapUIServiceManager.getOverlayManager() } private val START_COLOR = Color.parseColor("#002ABAD9") diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt index e93bae7523..26dacad912 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -1,18 +1,18 @@ package com.mogo.eagle.core.function.v2x.events.scenario.scene.road -import android.graphics.* +import android.graphics.Color import com.mogo.eagle.core.data.enums.EventTypeEnumNew -import com.mogo.eagle.core.data.map.* +import com.mogo.eagle.core.data.map.MogoLatLng +import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.context import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.v2xMarker import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper -import com.mogo.map.* -import com.mogo.map.marker.* -import com.mogo.map.overlay.* -import java.util.concurrent.atomic.* -import kotlin.Pair -import kotlin.collections.ArrayList +import com.mogo.map.marker.IMogoMarker +import com.mogo.map.overlay.IMogoPolyline +import com.mogo.map.overlay.MogoPolylineOptions +import java.util.concurrent.atomic.AtomicReference class V2XAiRoadEventMarker { @@ -20,7 +20,7 @@ class V2XAiRoadEventMarker { private val v2xLocation = AtomicReference() - private val overlayManager by lazy { MogoOverlayManager.getInstance() } + private val overlayManager by lazy { CallerMapUIServiceManager.getOverlayManager() } fun drawMarkers(entity: V2XRoadEventEntity, wrapper: MarkerWrapper) { val extra = entity.noveltyInfo.extras["polygon"] @@ -68,9 +68,9 @@ class V2XAiRoadEventMarker { options.width(5f) options.zIndex(75000f) options.maxIndex(800000f) - val line = overlayManager.addPolyline(options) - current.set(Pair(line, wrapper.markers)) - if (line != null) { + val line = overlayManager?.addPolyline(options) + line?.let { + current.set(Pair(line, wrapper.markers)) line.isVisible = true wrapper.addLine(line) } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java index 6b173f6006..8c14762e36 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java @@ -40,10 +40,9 @@ public interface IMogoMapService extends IProvider { /** * 覆盖物操作 * - * @param context * @return */ - IMogoOverlayManager getOverlayManager(Context context); + IMogoOverlayManager getOverlayManager(); /** * 获取高德定位服务 diff --git a/core/mogo-core-function-call/build.gradle b/core/mogo-core-function-call/build.gradle index 51aef62a5c..94acda38e5 100644 --- a/core/mogo-core-function-call/build.gradle +++ b/core/mogo-core-function-call/build.gradle @@ -59,11 +59,10 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogocommons } else { + implementation project(':core:mogo-core-utils') + implementation project(':foudations:mogo-commons') implementation project(':libraries:mogo-adas') api project(':libraries:mogo-map-api') - implementation project(':foudations:mogo-commons') - implementation project(':core:mogo-core-data') - implementation project(':core:mogo-core-utils') api project(':core:mogo-core-function-api') } } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt index 7e015c3ec4..cb8288ae15 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt @@ -30,8 +30,8 @@ object CallerMapUIServiceManager { return serviceProvider?.markerService } - fun getOverlayManager(context: Context): IMogoOverlayManager?{ - return serviceProvider?.getOverlayManager(context) + fun getOverlayManager(): IMogoOverlayManager?{ + return serviceProvider?.overlayManager } fun getGDLocationServer(context: Context):IMogoGDLocationClient?{ diff --git a/libraries/mogo-adas-data/src/main/proto/message_pad.proto b/libraries/mogo-adas-data/src/main/proto/message_pad.proto index f96fe6fa96..a024bb74ee 100644 --- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto +++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto @@ -90,6 +90,15 @@ message Trajectory repeated TrajectoryPoint points = 1; } +enum AdditionalAttribute +{ + ATTR_UNKNOWN = 0; + ATTR_ZOMBIE = 1; // 僵尸车 + ATTR_ROAD_CONSTRUCTION = 2; // 道路施工区域 + ATTR_STATIC = 3; // 静止障碍物 + ATTR_ACCIDENT = 4; // 事故车 +} + // message definition for MsgTypeTrackedObjects message SubSource { @@ -125,6 +134,7 @@ message TrackedObject repeated TrackedSource tracked_source = 14; repeated Location polygon = 15; geometry.Point center = 16; + AdditionalAttribute add_attribute = 17; // 事件类型 } message TrackedObjects @@ -178,7 +188,7 @@ message AutopilotState message PlanningObject { uint32 uuid = 1; - uint32 type = 2; //影响自车决策的类型, 和感知的障碍物类型不是一回事 0是leading障碍物，1是避障和择机的障碍物 + uint32 type = 2; //影响自车决策的类型, 和感知的障碍物类型不是一回事 } message PlanningObjects diff --git a/libraries/mogo-map/build.gradle b/libraries/mogo-map/build.gradle index d3adcc32cb..fb7c7dbfa8 100644 --- a/libraries/mogo-map/build.gradle +++ b/libraries/mogo-map/build.gradle @@ -63,8 +63,6 @@ dependencies { implementation project(':core:mogo-core-utils') implementation project(':libraries:mogo-map-api') implementation project(':foudations:mogo-commons') - - implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-function-call') //todo 解除依赖 } } From b9a966bd41600361c39a27ef555804ae8828f232 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 8 Feb 2023 18:01:04 +0800 Subject: [PATCH 2/4] [2.13.0-arch-opt] track obj open loc --- .../function/business/identify/TrackObj.java | 4 ++-- .../core/function/startup/BuildConfig.java | 18 ------------------ .../routes/ARouter$$Group$$start_up.java | 18 ------------------ ...er$$Providers$$mogocorefunctionstartup.java | 18 ------------------ ...ARouter$$Root$$mogocorefunctionstartup.java | 17 ----------------- 5 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-startup/build/generated/source/buildConfig/debug/com/mogo/eagle/core/function/startup/BuildConfig.java delete mode 100644 core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$start_up.java delete mode 100644 core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctionstartup.java delete mode 100644 core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctionstartup.java diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java index e18dc702fb..a5a74dadd5 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java @@ -55,8 +55,8 @@ public class TrackObj { } private void correct() { -// calAverageSpeedAndType(); -// calLoc(); + calAverageSpeedAndType(); + calLoc(); // calHeading(); } diff --git a/core/function-impl/mogo-core-function-startup/build/generated/source/buildConfig/debug/com/mogo/eagle/core/function/startup/BuildConfig.java b/core/function-impl/mogo-core-function-startup/build/generated/source/buildConfig/debug/com/mogo/eagle/core/function/startup/BuildConfig.java deleted file mode 100644 index b59bae600a..0000000000 --- a/core/function-impl/mogo-core-function-startup/build/generated/source/buildConfig/debug/com/mogo/eagle/core/function/startup/BuildConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -/** - * Automatically generated file. DO NOT MODIFY - */ -package com.mogo.eagle.core.function.startup; - -public final class BuildConfig { - public static final boolean DEBUG = Boolean.parseBoolean("true"); - public static final String LIBRARY_PACKAGE_NAME = "com.mogo.eagle.core.function.startup"; - /** - * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME - */ - @Deprecated - public static final String APPLICATION_ID = "com.mogo.eagle.core.function.startup"; - public static final String BUILD_TYPE = "debug"; - public static final String FLAVOR = ""; - public static final int VERSION_CODE = 1; - public static final String VERSION_NAME = ""; -} diff --git a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$start_up.java b/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$start_up.java deleted file mode 100644 index cd6fddf51f..0000000000 --- a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$start_up.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.enums.RouteType; -import com.alibaba.android.arouter.facade.model.RouteMeta; -import com.alibaba.android.arouter.facade.template.IRouteGroup; -import com.mogo.eagle.core.function.startup.MogoStartUpProvider; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Group$$start_up implements IRouteGroup { - @Override - public void loadInto(Map atlas) { - atlas.put("/start_up/api", RouteMeta.build(RouteType.PROVIDER, MogoStartUpProvider.class, "/start_up/api", "start_up", null, -1, -2147483648)); - } -} diff --git a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctionstartup.java b/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctionstartup.java deleted file mode 100644 index d329a88112..0000000000 --- a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctionstartup.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.enums.RouteType; -import com.alibaba.android.arouter.facade.model.RouteMeta; -import com.alibaba.android.arouter.facade.template.IProviderGroup; -import com.mogo.eagle.core.function.startup.MogoStartUpProvider; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Providers$$mogocorefunctionstartup implements IProviderGroup { - @Override - public void loadInto(Map providers) { - providers.put("com.mogo.eagle.core.function.api.startup.IStartUpProvider", RouteMeta.build(RouteType.PROVIDER, MogoStartUpProvider.class, "/start_up/api", "start_up", null, -1, -2147483648)); - } -} diff --git a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctionstartup.java b/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctionstartup.java deleted file mode 100644 index 8f02facf8d..0000000000 --- a/core/function-impl/mogo-core-function-startup/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctionstartup.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.template.IRouteGroup; -import com.alibaba.android.arouter.facade.template.IRouteRoot; -import java.lang.Class; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Root$$mogocorefunctionstartup implements IRouteRoot { - @Override - public void loadInto(Map> routes) { - routes.put("start_up", ARouter$$Group$$start_up.class); - } -} From 89b038054d3b543290a60ecc4e71db632c846a72 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Wed, 8 Feb 2023 20:47:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81=E5=85=B3=E9=97=AD=E4=B8=80=E4=BA=9B=E7=8B=82=E5=88=B7?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=202=E3=80=81=E5=A2=9E=E5=8A=A0EB5?= =?UTF-8?q?=E8=8E=B7=E5=8F=96SN=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E7=B3=BB=E7=BB=9F=E6=9C=89=E9=99=90=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=85=88adb=20root=20;setenforce=200=20?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E7=AD=89=E7=B3=BB=E7=BB=9F=E5=8E=82?= =?UTF-8?q?=E5=95=86=E4=BF=AE=E6=94=B9=E4=B8=8B=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/build.gradle | 6 +++ .../v2x/events/alarm/V2XAlarmServer.java | 14 +++---- .../core/function/v2x/internal/V2XManager.kt | 2 +- .../core/utilcode/mogo/DevicesUtils.java | 20 +++++----- .../core/utilcode/mogo/TelephoneUtil.java | 5 ++- .../eagle/core/utilcode/util/DeviceUtils.java | 2 +- .../utilcode/util/SystemPropertiesUtils.java | 35 ++++++++++++++++++ keystore/EB5/car_launcher.jks | Bin 0 -> 4583 bytes keystore/EB5/key | 28 ++++++++++++++ keystore/EB5/p12 | Bin 0 -> 2894 bytes .../java/com/mogo/map/AMapViewWrapper.java | 16 ++++---- 11 files changed, 100 insertions(+), 28 deletions(-) create mode 100644 core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SystemPropertiesUtils.java create mode 100644 keystore/EB5/car_launcher.jks create mode 100644 keystore/EB5/key create mode 100644 keystore/EB5/p12 diff --git a/app/build.gradle b/app/build.gradle index 33ac1066ae..bd4379bfe4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,6 +158,12 @@ android { storePassword 'ZDauto123456' keyPassword 'ZDauto123456' } + releaseEB5 { + keyAlias = 'android_platform' + storeFile file('../keystore/EB5/car_launcher.jks') + storePassword 'ZDauto123456' + keyPassword 'ZDauto123456' + } } buildTypes { debug { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java index 43acb5bd68..0156f41948 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java @@ -37,7 +37,7 @@ public class V2XAlarmServer { CopyOnWriteArrayList v2XRoadEventEntityList, MogoLocation currentLocation) { try { - Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation ); + //Logger.d(TAG, "getDriveFrontAlarmEvent --- 1 ---" + currentLocation ); if (!showedEvents.isEmpty()) { Iterator iterator = showedEvents.iterator(); while (iterator.hasNext()) { @@ -54,18 +54,18 @@ public class V2XAlarmServer { } } } - Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation); + //Logger.d(TAG, "getDriveFrontAlarmEvent --- 2 ---" + currentLocation); if (currentLocation != null && v2XRoadEventEntityList != null) { // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告 for (V2XRoadEventEntity v2XRoadEventEntity : v2XRoadEventEntityList) { // 0、道路事件必须有朝向，角度>=0; - Logger.d(TAG, "entity:" + v2XRoadEventEntity.getLocation()); + //Logger.d(TAG, "entity:" + v2XRoadEventEntity.getLocation()); if (v2XRoadEventEntity.getLocation().getAngle() >= 0) { // 计算车辆距离指定气泡的距离 MarkerLocation eventLocation = v2XRoadEventEntity.getLocation(); // 1、判断是否到达了触发距离,20 ~ 500, double distance = v2XRoadEventEntity.getDistance(); - Logger.d(TAG, "distance:" + distance); + //Logger.d(TAG, "distance:" + distance); if (distance <= 500) { if (EventTypeEnumNew.GHOST_PROBE.getPoiType().equals(v2XRoadEventEntity.getPoiType())) { if (distance > 25) { @@ -76,7 +76,7 @@ public class V2XAlarmServer { double carBearing = currentLocation.getHeading(); double eventBearing = eventLocation.getAngle(); double diffAngle = DrivingDirectionUtils.getAngleDiff(carBearing, eventBearing); - Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle); + //Logger.d(TAG, "car_bearing:" + carBearing + ",eventBearing:" + eventBearing + ",diffAngle:" + diffAngle); if (diffAngle <= 20) { // 3、计算当前车辆行驶方向与事件位置之间夹角《20度，保证道路事件在车辆前方 double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi( @@ -87,12 +87,12 @@ public class V2XAlarmServer { (int) currentLocation.getHeading() ); - Logger.d(TAG, "eventAngle:" + eventAngle); + //Logger.d(TAG, "eventAngle:" + eventAngle); if (0 <= eventAngle && eventAngle <= 20) { if (showedEvents.contains(v2XRoadEventEntity)) { return null; } - Logger.d(TAG, "showed---"); + //Logger.d(TAG, "showed---"); showedEvents.add(v2XRoadEventEntity); return v2XRoadEventEntity; } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt index d40195909f..1245d6244f 100755 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt @@ -209,7 +209,7 @@ object V2XManager { if (!started.get()) { return } - V2XLogger.d(TAG, "--- onLocationChanged --[longitude: $longitude, latitude: $latitude]") + //V2XLogger.d(TAG, "--- onLocationChanged --[longitude: $longitude, latitude: $latitude]") realLongitude.set(longitude) realLatitude.set(latitude) val oldLon = lastLongitude.get() diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/DevicesUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/DevicesUtils.java index f4c8511ef4..a427435544 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/DevicesUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/DevicesUtils.java @@ -15,26 +15,26 @@ import java.lang.reflect.Method; public class DevicesUtils { private static final String PROPERTIES = "android.os.SystemProperties"; - private static final String GSM_SERIAL = "gsm.serial"; + private static final String GSM_SERIAL = "persist.device.sn"; private static final String GET = "get"; - public static String getSn(){ + public static String getSn() { return getSystemProperties(GSM_SERIAL); } - public static String getSystemProperties(String name ) { + public static String getSystemProperties(String name) { String value = ""; try { - Class< ? > c = Class.forName( PROPERTIES ); - Method get = c.getMethod( GET, String.class ); - value = (String) get.invoke( c, name ); - } catch ( ClassNotFoundException var3 ) { + Class c = Class.forName(PROPERTIES); + Method get = c.getMethod(GET, String.class); + value = (String) get.invoke(c, name); + } catch (ClassNotFoundException var3) { var3.printStackTrace(); - } catch ( NoSuchMethodException var4 ) { + } catch (NoSuchMethodException var4) { var4.printStackTrace(); - } catch ( InvocationTargetException var5 ) { + } catch (InvocationTargetException var5) { var5.printStackTrace(); - } catch ( IllegalAccessException var6 ) { + } catch (IllegalAccessException var6) { var6.printStackTrace(); } return value; diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/TelephoneUtil.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/TelephoneUtil.java index 246934e6bd..56b3e5f101 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/TelephoneUtil.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/TelephoneUtil.java @@ -8,7 +8,6 @@ import android.os.Build; import android.telephony.TelephonyManager; import android.text.TextUtils; - import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import java.lang.reflect.Field; @@ -154,6 +153,10 @@ public class TelephoneUtil { if (TextUtils.isEmpty(serial)) { serial = (String) get.invoke(c, "ro.serialno"); } + if (TextUtils.isEmpty(serial)) { + serial = (String) get.invoke(c, "persist.device.sn"); + } + } catch (Exception e) { e.printStackTrace(); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index fbab2ccd1e..dcc8153dc9 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -554,7 +554,7 @@ public final class DeviceUtils { * @return 当前EB5设备SN */ public static String getEB5DevicesSN() { - ShellUtils.CommandResult result = UtilsBridge.execCmd("getprop persist.device.sn", false); + ShellUtils.CommandResult result = UtilsBridge.execCmd("adb shell getprop persist.device.sn", false); if (result.result == 0) { LogUtils.d("", result.toString()); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SystemPropertiesUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SystemPropertiesUtils.java new file mode 100644 index 0000000000..04e0563543 --- /dev/null +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/SystemPropertiesUtils.java @@ -0,0 +1,35 @@ +package com.mogo.eagle.core.utilcode.util; + +import java.lang.reflect.Method; + +/** + * Android API从21后开始，不再直接支持通过SystemProperties.get/set方式来获取/设置系统属性。 + * 通过反射方式来进行系统属性操作，代码如下： + */ +public final class SystemPropertiesUtils { + private static final String CLASS_NAME = "android.os.SystemProperties"; + + public static String getProperty(String key, String defaultValue) { + String value = defaultValue; + + try { + Class c = Class.forName(CLASS_NAME); + Method get = c.getMethod("get", String.class, String.class); + value = (String) (get.invoke(c, key, defaultValue)); + } catch (Exception e) { + e.printStackTrace(); + } finally { + return value; + } + } + + public static void setProperty(String key, String value) { + try { + Class c = Class.forName(CLASS_NAME); + Method set = c.getMethod("set", String.class, String.class); + set.invoke(c, key, value); + } catch (Exception e) { + e.printStackTrace(); + } + } +} \ No newline at end of file diff --git a/keystore/EB5/car_launcher.jks b/keystore/EB5/car_launcher.jks new file mode 100644 index 0000000000000000000000000000000000000000..69ee89a8261727676586ed67cb025eaaa072c862 GIT binary patch literal 4583 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 literal 0 HcmV?d00001 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 77df0450d2..cdd18809f0 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -189,10 +189,10 @@ public class AMapViewWrapper implements IMogoMapView, public void onRoadIdInfo(@androidx.annotation.Nullable String roadId) { if (roadId != null && !TextUtils.isEmpty(roadId)) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); + // CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::" + roadId); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnRoadIdGet(roadId); } else { - CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::null"); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "onRoadIdInfo::null"); } } @@ -210,27 +210,27 @@ public class AMapViewWrapper implements IMogoMapView, * } */ String provider = carLoc.getProvider(); - CallerLogger.INSTANCE.d(M_MAP + TAG, "car_loc: " + carLoc + ""); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "car_loc: " + carLoc + ""); if (!MapAutoApi.GPS_FLAG.equals(provider)) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "convert before: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "convert before: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); LonLatPoint p = new LonLatPoint(carLoc.getLongitude(), carLoc.getLatitude()); p = MapTools.INSTANCE.switchLonLatWGS84(p); carLoc.setLongitude(p.longitude); carLoc.setLatitude(p.latitude); - CallerLogger.INSTANCE.d(M_MAP + TAG, "convert after: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "convert after: car_loc: {lon: " + carLoc.getLongitude() + ", lat: " + carLoc.getLatitude() + "}"); } - CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo:stop_line" + stopLine + ", car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); MapRoadInfo.StopLine stopInfo = convert(stopLine); LonLatPoint p1 = points.get(0); LonLatPoint p2 = points.get(points.size() - 1); double distanceOfCarToStopLine = MapDataApi.INSTANCE.getNearstFromPointToSegment(carLoc.getLongitude(), carLoc.getLatitude(), p1.longitude, p1.latitude, p2.longitude, p2.latitude) * 10_0000; stopInfo.setDistanceOfCarToStopLine(distanceOfCarToStopLine); - CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo: --- distance: " + distanceOfCarToStopLine); CallerMapRoadListenerManager.INSTANCE.invokeListenersOnStopLineGet(stopInfo); } } else { if (carLoc != null) { - CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); + //CallerLogger.INSTANCE.d(M_MAP + TAG, "onStopLineInfo::null, car_loc:{lon: " + carLoc.getLatitude() + ", lat: " + carLoc.getLongitude() + "}"); } } } From 8cb4374cd0f020338001f59de8e40281303961ee Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 9 Feb 2023 13:56:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[=201?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AF=BB=E5=8F=96getprop=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87sn=E3=80=81=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../location/MoGoLocationDispatcher.kt | 5 +- .../eagle/core/utilcode/util/DeviceUtils.java | 91 +++++++++++++++++-- 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt index 4b5444ccb2..1f8d1db634 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/location/MoGoLocationDispatcher.kt @@ -16,10 +16,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.obu.CallerObuLocationWGS84ListenerManager import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr -import com.mogo.eagle.core.utilcode.util.CoordinateTransform -import com.mogo.eagle.core.utilcode.util.FileUtils -import com.mogo.eagle.core.utilcode.util.TimeUtils -import com.mogo.eagle.core.utilcode.util.Utils +import com.mogo.eagle.core.utilcode.util.* import com.mogo.support.obu.model.MogoObuHvBasicsData import mogo.telematics.pad.MessagePad diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index dcc8153dc9..8cf0c47008 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -17,11 +17,16 @@ import android.os.Build; import android.provider.Settings; import android.telephony.TelephonyManager; import android.text.TextUtils; +import android.util.Log; import androidx.annotation.RequiresApi; import androidx.annotation.RequiresPermission; +import java.io.BufferedReader; import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.lang.reflect.Method; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -547,17 +552,85 @@ public final class DeviceUtils { /** - * 中科创达 EB5获取SN好的方法： - * getprop persist.device.sn - * ZTS46S10009S + * 获取设备SN的方法 * - * @return 当前EB5设备SN + * @return 通过读取 getprop 的方式 */ - public static String getEB5DevicesSN() { - ShellUtils.CommandResult result = UtilsBridge.execCmd("adb shell getprop persist.device.sn", false); - if (result.result == 0) { - LogUtils.d("", result.toString()); + public static String getSerialNumber() { + String serial = ""; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + // 获取序列号，大多数机器在不root情况下获取不到 + serial = (String) get.invoke(c, "ro.serialno"); + if (TextUtils.isEmpty(serial)) { + serial = (String) get.invoke(c, "ro.boot.serialno"); + } + if (TextUtils.isEmpty(serial)) { + // 分体机 SN + serial = (String) get.invoke(c, "gsm.serial"); + } + if (TextUtils.isEmpty(serial)) { + // 中科创达 EB5获取SN + serial = (String) get.invoke(c, "persist.device.sn"); + } + if (TextUtils.isEmpty(serial)) { + // 联想PAD 获取SN + serial = (String) get.invoke(c, "ro.odm.lenovo.gsn"); + } + } catch (Exception e) { + e.printStackTrace(); } - return "02:00:00:00:00:00"; + return serial; + } + + + /** + * 获取 机器型号 + * + * @return 机器型号 + */ + public static String getProductModel() { + String productModel = "null"; + try { + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + // 获取序列号，大多数机器在不root情况下获取不到 + productModel = (String) get.invoke(c, "ro.product.model"); + if (TextUtils.isEmpty(productModel)) { + productModel = (String) get.invoke(c, "ro.product.odm.model"); + } + if (TextUtils.isEmpty(productModel)) { + productModel = (String) get.invoke(c, "ro.product.vendor.model"); + } + } catch (Exception e) { + e.printStackTrace(); + } + return productModel; + } + + private static String getSerialnoNumbers() { + final String serialnoStr = "[ro.boot.serialno]"; + try { + Process p = Runtime.getRuntime().exec("getprop"); + p.waitFor(); + BufferedReader stdInput = new BufferedReader(new InputStreamReader( + p.getInputStream())); + String temp = ""; + while ((temp = stdInput.readLine()) != null) { + Log.i("getSerialnoNumbers", temp); + if (temp.contains(serialnoStr)) { + temp.replaceAll(" ", ""); + int index = temp.indexOf(serialnoStr); + temp = temp.substring(index + 20); + temp = temp.substring(1, temp.length() - 1); + Log.d("getSerialnoNumbers", temp); + return temp; + } + } + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + return serialnoStr; } }