diff --git a/core/function-impl/mogo-core-function-autopilot/.gitignore b/core/function-impl/mogo-core-function-autopilot/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-autopilot/build.gradle b/core/function-impl/mogo-core-function-autopilot/build.gradle deleted file mode 100644 index 14dac30a17..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/build.gradle +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - // buildToolsVersion rootProject.ext.android.buildToolsVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("AROUTER_MODULE_NAME", project.getName()) - } - } - - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.kotlinstdlibjdk7 - implementation rootProject.ext.dependencies.androidxccorektx - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.arouter - implementation rootProject.ext.dependencies.rxandroid - - kapt rootProject.ext.dependencies.aroutercompiler - - implementation rootProject.ext.dependencies.mogoami - implementation rootProject.ext.dependencies.mogoaicloudtelematic - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_data - implementation rootProject.ext.dependencies.modulecommon - - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_network - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation project(':libraries:mogo-adas') - } else { - 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') - implementation project(':libraries:mogo-adas') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-autopilot/consumer-rules.pro b/core/function-impl/mogo-core-function-autopilot/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/function-impl/mogo-core-function-autopilot/gradle.properties b/core/function-impl/mogo-core-function-autopilot/gradle.properties deleted file mode 100644 index 52ad878f20..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.eagle.core.function.impl -POM_ARTIFACT_ID=autopilot -VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-autopilot/proguard-rules.pro b/core/function-impl/mogo-core-function-autopilot/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-autopilot/src/main/AndroidManifest.xml deleted file mode 100644 index 92e7a183ca..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/src/main/AndroidManifest.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/build.gradle b/core/function-impl/mogo-core-function-datacenter/build.gradle index 6ac5fae0b4..b6e5f51262 100644 --- a/core/function-impl/mogo-core-function-datacenter/build.gradle +++ b/core/function-impl/mogo-core-function-datacenter/build.gradle @@ -54,14 +54,25 @@ dependencies { kapt rootProject.ext.dependencies.androidxroomcompiler implementation rootProject.ext.dependencies.androidxroomktx + implementation rootProject.ext.dependencies.mogoami + implementation rootProject.ext.dependencies.mogoaicloudtelematic + 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') + } 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-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotProvider.kt similarity index 97% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotProvider.kt index cf75ad4dbe..c5e397efaa 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotProvider.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot +package com.mogo.eagle.core.function.datacenter.autopilot import android.Manifest.permission import android.content.Context @@ -23,13 +23,13 @@ import com.mogo.eagle.core.data.trafficlight.toTrafficLightDetail import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotProvider import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider -import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasListenerImpl -import com.mogo.eagle.core.function.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl -import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager -import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer -import com.mogo.eagle.core.function.autopilot.telematic.EventListener -import com.mogo.eagle.core.function.autopilot.telematic.IMsgHandler -import com.mogo.eagle.core.function.autopilot.telematic.TeleMsgHandler +import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl +import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl +import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoHandAdasMsgManager +import com.mogo.eagle.core.function.datacenter.autopilot.server.AsyncDataToAutopilotServer +import com.mogo.eagle.core.function.datacenter.autopilot.telematic.EventListener +import com.mogo.eagle.core.function.datacenter.autopilot.telematic.IMsgHandler +import com.mogo.eagle.core.function.datacenter.autopilot.telematic.TeleMsgHandler import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoTelematicProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoTelematicProvider.kt similarity index 93% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoTelematicProvider.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoTelematicProvider.kt index 45aede39be..b1f0fd6a96 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoTelematicProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoTelematicProvider.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot +package com.mogo.eagle.core.function.datacenter.autopilot import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt similarity index 99% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index e2be4c4680..d327f39797 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.adapter +package com.mogo.eagle.core.function.datacenter.autopilot.adapter import chassis.VehicleStateOuterClass import com.mogo.eagle.core.data.app.AppConfigInfo diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt similarity index 99% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 4b768c122d..cabbebd66d 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.adapter +package com.mogo.eagle.core.function.datacenter.autopilot.adapter import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig.* diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java similarity index 96% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java index aa40c4e56c..d413ed27ca 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.adapter; +package com.mogo.eagle.core.function.datacenter.autopilot.adapter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_DEVA; @@ -6,11 +6,9 @@ import android.content.Context; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarStateListener; @@ -21,7 +19,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListe import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotVehicleStateListenerManager; import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt similarity index 94% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt index 6b152a42b0..07a8cec3e7 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.server +package com.mogo.eagle.core.function.datacenter.autopilot.server import com.mogo.eagle.core.data.trafficlight.TrafficLightResult import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/EventListener.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/EventListener.kt similarity index 52% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/EventListener.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/EventListener.kt index 381a39a613..35b37464be 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/EventListener.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/EventListener.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.telematic +package com.mogo.eagle.core.function.datacenter.autopilot.telematic interface EventListener { fun connectDevice(isSupportMulti: Boolean) diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/IMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/IMsgHandler.kt similarity index 89% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/IMsgHandler.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/IMsgHandler.kt index 2e9c751e2e..188aeeddeb 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/IMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/IMsgHandler.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.telematic +package com.mogo.eagle.core.function.datacenter.autopilot.telematic import com.mogo.telematic.MogoProtocolMsg import io.netty.channel.Channel diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt similarity index 99% rename from core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt rename to core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index e5afd93c6b..2b0763e76f 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.autopilot.telematic +package com.mogo.eagle.core.function.datacenter.autopilot.telematic import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.lifecycleScope diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index fa1641bd1f..07cd4b4835 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -110,7 +110,7 @@ dependencies { api project(':core:mogo-core-data') api project(':core:mogo-core-utils') api project(':core:function-impl:mogo-core-function-obu-mogo') - api project(':core:function-impl:mogo-core-function-autopilot') +// api project(':core:function-impl:mogo-core-function-autopilot') api project(':core:function-impl:mogo-core-function-map') api project(':core:function-impl:mogo-core-function-v2x') api project(':core:function-impl:mogo-core-function-monitoring') diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java deleted file mode 100644 index 9252adcd22..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotCarStateInfo.java +++ /dev/null @@ -1,285 +0,0 @@ -package com.mogo.eagle.core.data.autopilot; - -import java.io.Serializable; - -/** - * @author donghongyu - * @des 自车辆状态 - * @date 2021/10/18 - */ -public class AutopilotCarStateInfo implements Serializable { - - /** - * action : “state” - * values : {"lon":116.8,"lat":39.4,"alt":22.3,"heading":87.5,"acceleration":0.5,"yaw_rate":0.3} - */ - - private String action; - private ValuesBean values; - private float fps; - - public float getFps() { - return fps; - } - - public void setFps(float fps) { - this.fps = fps; - } - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public ValuesBean getValues() { - return values; - } - - public void setValues(ValuesBean values) { - this.values = values; - } - - public static class ValuesBean { - /** - * lon : 116.8 - * lat : 39.4 - * alt : 22.3 - * heading : 87.5 - * acceleration : 0.5 - * yaw_rate : 0.3 - */ - - private double lon; - private double lat; - private double alt; - private double heading; - private double acceleration; - private double yaw_rate; - //惯导车速 m/s - private float gnss_speed; - //车辆车速 m/s - private float vehicle_speed; - //gps时间 - private String satelliteTime; - //UTC时间差 - private long utcTimeDiffer; - //系统时间 - private String systemTime; - //接收到数据的时间 - private String receiverDataTime; - //接收到gps时间 - private String adasSatelliteTime; - //开始接收数据时间 - private String startReceiverDataTime; - //时间延迟 - private long timeDiff=0; - private int turn_light; //转向灯状态 0是正常 1是左转 2是右转 - private int flash_light; //双闪灯状态 - private int brake_light; //刹车灯状态 - private int frame_num;//统计发包个数 - - /** - * 常开 常关 转向灯 - * 0 --关 - * 1 --左转 - * 2 --右转 - */ - private int turnLightOften = 0; - - public int getTurnLightOften() { - return turnLightOften; - } - - public void setTurnLightOften(int turnLightOften) { - this.turnLightOften = turnLightOften; - } - - public int getFrame_num() { - return frame_num; - } - - public void setFrame_num(int frame_num) { - this.frame_num = frame_num; - } - - public long getTimeDiff() { - return timeDiff; - } - - public void setTimeDiff(long timeDiff) { - this.timeDiff = timeDiff; - } - - public String getReceiverDataTime() { - return receiverDataTime; - } - - public void setReceiverDataTime(String receiverDataTime) { - this.receiverDataTime = receiverDataTime; - } - - public String getAdasSatelliteTime() { - return adasSatelliteTime; - } - - public void setAdasSatelliteTime(String adasSatelliteTime) { - this.adasSatelliteTime = adasSatelliteTime; - } - - public String getSystemTime() { - return systemTime; - } - - public void setSystemTime(String systemTime) { - this.systemTime = systemTime; - } - - public float getGnss_speed() { - return gnss_speed; - } - - public void setGnss_speed(float gnss_speed) { - this.gnss_speed = gnss_speed; - } - - public float getVehicle_speed() { - return vehicle_speed; - } - - public void setVehicle_speed(float vehicle_speed) { - this.vehicle_speed = vehicle_speed; - } - - public int getTurn_light() { - return turn_light; - } - - public void setTurn_light(int turn_light) { - this.turn_light = turn_light; - } - - public int getFlash_light() { - return flash_light; - } - - public void setFlash_light(int flash_light) { - this.flash_light = flash_light; - } - - public int getBrake_light() { - return brake_light; - } - - public void setBrake_light(int brake_light) { - this.brake_light = brake_light; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - public double getAlt() { - return alt; - } - - public void setAlt(double alt) { - this.alt = alt; - } - - public double getHeading() { - return heading; - } - - public void setHeading(double heading) { - this.heading = heading; - } - - public double getAcceleration() { - return acceleration; - } - - public void setAcceleration(double acceleration) { - this.acceleration = acceleration; - } - - public double getYaw_rate() { - return yaw_rate; - } - - public void setYaw_rate(double yaw_rate) { - this.yaw_rate = yaw_rate; - } - - public String getSatelliteTime() { - return satelliteTime; - } - - public void setSatelliteTime(String satelliteTime) { - this.satelliteTime = satelliteTime; - } - - public long getUtcTimeDiffer() { - return utcTimeDiffer; - } - - public void setUtcTimeDiffer(long utcTimeDiffer) { - this.utcTimeDiffer = utcTimeDiffer; - } - - public String getStartReceiverDataTime() { - return startReceiverDataTime; - } - - public void setStartReceiverDataTime(String startReceiverDataTime) { - this.startReceiverDataTime = startReceiverDataTime; - } - - - @Override - public String toString() { - return "ValuesBean{" + - "lon=" + lon + - ", lat=" + lat + - ", alt=" + alt + - ", heading=" + heading + - ", acceleration=" + acceleration + - ", yaw_rate=" + yaw_rate + - ", gnss_speed=" + gnss_speed + - ", vehicle_speed=" + vehicle_speed + - ", satelliteTime='" + satelliteTime + '\'' + - ", utcTimeDiffer='" + utcTimeDiffer + '\'' + - ", systemTime='" + systemTime + '\'' + - ", receiverDataTime='" + receiverDataTime + '\'' + - ", startReceiverDataTime='" + startReceiverDataTime + '\'' + - ", timeDiff=" + timeDiff + - ", turn_light=" + turn_light + - ", flash_light=" + flash_light + - ", brake_light=" + brake_light + - ", frame_num=" + frame_num + - '}'; - } - } - - @Override - public String toString() { - return "CarStateInfo{" + - "action='" + action + '\'' + - ", values=" + values + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotGuardianStatusInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotGuardianStatusInfo.java deleted file mode 100644 index ea2baa4ffb..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotGuardianStatusInfo.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.mogo.eagle.core.data.autopilot; - -import com.google.gson.annotations.SerializedName; -import com.mogo.eagle.core.data.autopilot.guardian.AutopilotGuardianModule; - -import java.io.Serializable; - -/** - * @author xiaoyuzhou - * @date 2021/10/18 12:54 下午 - * 工控机节点状态信息 - */ -public class AutopilotGuardianStatusInfo implements Serializable { - //接口名称 - @SerializedName("action") - private String action; - //监控项名称 - @SerializedName("agentName") - private String agentName; - //车牌号 - @SerializedName("carNum") - private String carNum; - //车型 - @SerializedName("carType") - private String carType; - //monitorType - @SerializedName("monitorType") - private String monitorType; - //sn - @SerializedName("sn") - private String sn; - //时间 - @SerializedName("time") - private long time; - @SerializedName("modules") - private AutopilotGuardianModule modules; - - public String getAction() { - return action; - } - - public void setAction(String action) { - this.action = action; - } - - public String getAgentName() { - return agentName; - } - - public void setAgentName(String agentName) { - this.agentName = agentName; - } - - public String getCarNum() { - return carNum; - } - - public void setCarNum(String carNum) { - this.carNum = carNum; - } - - public String getCarType() { - return carType; - } - - public void setCarType(String carType) { - this.carType = carType; - } - - public String getMonitorType() { - return monitorType; - } - - public void setMonitorType(String monitorType) { - this.monitorType = monitorType; - } - - public String getSn() { - return sn; - } - - public void setSn(String sn) { - this.sn = sn; - } - - public long getTime() { - return time; - } - - public void setTime(long time) { - this.time = time; - } - - public AutopilotGuardianModule getModules() { - return modules; - } - - public void setModules(AutopilotGuardianModule modules) { - this.modules = modules; - } - - @Override - public String toString() { - return "AutopilotGuardianInfo{" + - "action='" + action + '\'' + - ", agentName='" + agentName + '\'' + - ", carNum='" + carNum + '\'' + - ", carType='" + carType + '\'' + - ", monitorType='" + monitorType + '\'' + - ", modules=" + modules + - '}'; - } -} \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java deleted file mode 100644 index 2e803bcd48..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotStationInfo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.mogo.eagle.core.data.autopilot; - -/** - * @author congtaowang - * @since 2021/1/18 - *

- * 自动驾驶网约车回调数据 - * - */ -public class AutopilotStationInfo { - - private int type; - private double lon; - private double lat; - - public AutopilotStationInfo(int type, double lon, double lat) { - this.type = type; - this.lon = lon; - this.lat = lat; - } - - public int getType() { - return type; - } - - public void setType(int type) { - this.type = type; - } - - public double getLon() { - return lon; - } - - public void setLon(double lon) { - this.lon = lon; - } - - public double getLat() { - return lat; - } - - public void setLat(double lat) { - this.lat = lat; - } - - @Override - public String toString() { - return "AutoPilotStationInfo{" + - "type=" + type + - ", lon=" + lon + - ", lat=" + lat + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java deleted file mode 100644 index 3231199a58..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotWarnMessage.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mogo.eagle.core.data.autopilot; - - -/** - * @author congtaowang - * @since 2020/10/25 - *

- * 描述 - */ -public class AutopilotWarnMessage { - - public String content; - public String level; - - /** - * 警告消息类型 - *

- * {@link MogoADASWarnType} - */ - public int type; - public String value; - - @Override - public String toString() { - return "ADASWarnMessage{" + - "content='" + content + '\'' + - ", level='" + level + '\'' + - ", type=" + type + - ", value='" + value + '\'' + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/MogoADASWarnType.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/MogoADASWarnType.java deleted file mode 100644 index f0d5fe26e0..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/MogoADASWarnType.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.mogo.eagle.core.data.autopilot; - - -/** - * @author congtaowang - * @since 2020/10/25 - *

- * 描述 - */ -public interface MogoADASWarnType { - - /** - * 行人报警 - */ - int ADAS_WARNING_PERSON = 16; - /** - * 前车起步 - */ - int ADAS_WARNING_FRONT_CAR_GO = 17; - /** - * ldw 类型 左侧车道线 - */ - int ADAS_WARNING_SENCE_LANE_LEFT_LOST = 18; - /** - * 右侧车道线 - */ - int ADAS_WARNING_SENCE_LANE_RIGHT_LOST = 19; - /** - * fcw 类型 - */ - int ADAS_WARNING_FRONT_CAR = 20; - /** - * 摩托车碰撞 - */ - int ADAS_WARNING_MOTORCYCLE = 23; - /** - * 急刹车 - */ - int ADAS_WARNING_QUICK_BRAKE = 30; - /** - * 禁止掉头 - */ - int ADAS_WARNING_NOT_U_TURN = 40; - /** - * 禁止左转 - */ - int ADAS_WARNING_NOT_LEFT_TURN = 41; - /** - * 禁止右转 - */ - int ADAS_WARNING_NOT_RIGHT_TURN = 42; - /** - * 禁止鸣喇叭 - */ - int ADAS_WARNING_NOT_VOICE = 43; - /** - * 禁止通行 - */ - int ADAS_WARNING_DO_NOT_ENTER = 44; - /** - * 限速 - */ - int ADAS_WARNING_LIMIT_SPEED = 45; -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItem.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItem.java deleted file mode 100644 index e8bba07a39..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItem.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.mogo.eagle.core.data.autopilot.guardian; - -import com.google.gson.annotations.SerializedName; - -/** - * @author song kenan - * @des - * @date 2021/12/10 - */ -public class AutopilotGuardianItem { - @SerializedName("name") - private String name; - @SerializedName("value") - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - @Override - public String toString() { - return "GuardianItem{" + - "name='" + name + '\'' + - ", value='" + value + '\'' + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItemsName.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItemsName.java deleted file mode 100644 index f15f632bd3..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianItemsName.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mogo.eagle.core.data.autopilot.guardian; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -/** - * @author song kenan - * @des - * @date 2021/12/10 - */ -public class AutopilotGuardianItemsName { - @SerializedName("name") - private String name; - @SerializedName("items") - private List items; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public List getItems() { - return items; - } - - public void setItems(List items) { - this.items = items; - } - - @Override - public String toString() { - return "GuardianItemsName{" + - "name='" + name + '\'' + - ", items=" + items + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianModule.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianModule.java deleted file mode 100644 index 3eeaaca642..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianModule.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.mogo.eagle.core.data.autopilot.guardian; - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -/** - * @author song kenan - * @des - * @date 2021/12/10 - */ -public class AutopilotGuardianModule { - @SerializedName("itemsname") - private List itemsname; - @SerializedName("submodules") - private List submodules; - - public List getItemsname() { - return itemsname; - } - - public void setItemsname(List itemsname) { - this.itemsname = itemsname; - } - - public List getSubmodules() { - return submodules; - } - - public void setSubmodules(List submodules) { - this.submodules = submodules; - } - - @Override - public String toString() { - return "GuardianModule{" + - "itemsname=" + itemsname + - ", submodules=" + submodules + - '}'; - } -} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianSubmodule.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianSubmodule.java deleted file mode 100644 index a3e192ff02..0000000000 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/guardian/AutopilotGuardianSubmodule.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.mogo.eagle.core.data.autopilot.guardian; - - -import com.google.gson.annotations.SerializedName; - -import java.util.List; - -/** - * @author song kenan - * @des - * @date 2021/12/10 - */ -public class AutopilotGuardianSubmodule { - @SerializedName("modulename") - private String modulename; - @SerializedName("subnodes") - private List subnodes; - - public String getModulename() { - return modulename; - } - - public void setModulename(String modulename) { - this.modulename = modulename; - } - - public List getSubnodes() { - return subnodes; - } - - public void setSubnodes(List subnodes) { - this.subnodes = subnodes; - } - - public static class Subnode { - @SerializedName("nodename") - private String nodename; - @SerializedName("nodeitems") - private List nodeitems; - @SerializedName("topicitems") - private List topicitems; - - public String getNodename() { - return nodename; - } - - public void setNodename(String nodename) { - this.nodename = nodename; - } - - public List getNodeitems() { - return nodeitems; - } - - public void setNodeitems(List nodeitems) { - this.nodeitems = nodeitems; - } - - public List getTopicitems() { - return topicitems; - } - - public void setTopicitems(List topicitems) { - this.topicitems = topicitems; - } - - @Override - public String toString() { - return "Subnode{" + - "nodename='" + nodename + '\'' + - ", nodeitems=" + nodeitems + - ", topicitems=" + topicitems + - '}'; - } - } - - @Override - public String toString() { - return "GuardianSubmodule{" + - "modulename='" + modulename + '\'' + - ", subnodes=" + subnodes + - '}'; - } -} diff --git a/gradle.properties b/gradle.properties index b22b688959..8ffa0876ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.27 MOGO_TELEMATIC_VERSION=1.4.3.27 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.8.0.10_gamap +MAP_SDK_VERSION=2.8.0.11_gamap MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 diff --git a/modules.txt b/modules.txt index bd3a5cde00..9fe63fedd4 100644 --- a/modules.txt +++ b/modules.txt @@ -19,7 +19,6 @@ :test:crashreport-noop :test:crashreport-upgrade :core:function-impl:mogo-core-function-obu-mogo -:core:function-impl:mogo-core-function-autopilot :core:function-impl:mogo-core-function-hmi :core:function-impl:mogo-core-function-map :core:function-impl:mogo-core-function-monitoring diff --git a/settings.gradle b/settings.gradle index 3243b2b3e9..01523eaa89 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,7 +31,7 @@ include ':core:function-impl:mogo-core-function-v2x' // 自研OBU业务 include ':core:function-impl:mogo-core-function-obu-mogo' // 自动驾驶相关能力，控制自动驾驶，获取自动驾驶识别信息，自车感知预警等 -include ':core:function-impl:mogo-core-function-autopilot' +//include ':core:function-impl:mogo-core-function-autopilot' // 行车超视距服务，路测摄像头、前车摄像头 include ':core:function-impl:mogo-core-function-monitoring' // 调度业务