diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7f9f262a61..22d04a33fd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -30,6 +30,7 @@
+
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java
index be3839aaa8..fa7ae2b59f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusOperationStatusResponse.java
@@ -1,6 +1,6 @@
package com.mogo.och.bus.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
public
/**
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java
index 86083944b6..5ba1f6fd06 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/OchBusRoutesResponse.java
@@ -1,6 +1,6 @@
package com.mogo.och.bus.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
/**
* 网约车小巴路线接口请求响应结果
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java
index 8b5ad352c2..2b371aa57d 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/bean/QueryLeaveAwayPassengersResponse.java
@@ -1,6 +1,6 @@
package com.mogo.och.bus.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java
index 8223dff916..66755df49f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java
@@ -1,6 +1,6 @@
package com.mogo.och.bus.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.och.bus.bean.OchBusOperationStatusRequest;
import com.mogo.och.bus.bean.OchBusOperationStatusResponse;
import com.mogo.och.bus.bean.OchBusRoutesResponse;
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
index 3da432fb7f..c197e01b4f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.mvp.Presenter;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 16d4174cb6..9ea49264c6 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -7,7 +7,7 @@ import android.net.ConnectivityManager;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.map.MogoLatLng;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java
index 761fa03877..b3744a6063 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatus.java
@@ -1,6 +1,6 @@
package com.mogo.och.taxi;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
public
/**
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java
index 62c76e6233..3a497cabc0 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHCarStatusResponse.java
@@ -1,6 +1,6 @@
package com.mogo.och.taxi;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
public
/**
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java
index cd2b9d22fd..fc1ecb4437 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiOrderResponse2.java
@@ -1,6 +1,6 @@
package com.mogo.och.taxi;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java
index d1fed854ac..b8c437336a 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/OCHTaxiServiceApi.java
@@ -1,6 +1,6 @@
package com.mogo.och.taxi;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import io.reactivex.Observable;
import retrofit2.http.Body;
diff --git a/config.gradle b/config.gradle
index 3973c3617b..0445462b3e 100644
--- a/config.gradle
+++ b/config.gradle
@@ -19,234 +19,252 @@ ext {
]
dependencies = [
// androidx
- androidxappcompat : "androidx.appcompat:appcompat:1.3.1",
- androidxccorektx : "androidx.core:core-ktx:1.5.0",
- androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0",
- boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1",
- androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0",
- androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0",
- androidxcardview : "androidx.cardview:cardview:1.0.0",
- localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
+ androidxappcompat : "androidx.appcompat:appcompat:1.3.1",
+ androidxccorektx : "androidx.core:core-ktx:1.5.0",
+ androidxconstraintlayout : "androidx.constraintlayout:constraintlayout:2.1.0",
+ boostmultidex : "com.bytedance.boost_multidex:boost_multidex:1.0.1",
+ androidxviewpager2 : "androidx.viewpager2:viewpager2:1.0.0",
+ androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0",
+ androidxcardview : "androidx.cardview:cardview:1.0.0",
+ localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
// flexbox
- flexbox : 'com.google.android:flexbox:2.0.1',
+ flexbox : 'com.google.android:flexbox:2.0.1',
// 测试
- junit : "junit:junit:4.12",
- androidxjunit : "androidx.test.ext:junit:1.1.2",
- androidxespressocore : "androidx.test.espresso:espresso-core:3.3.0",
+ junit : "junit:junit:4.12",
+ androidxjunit : "androidx.test.ext:junit:1.1.2",
+ androidxespressocore : "androidx.test.espresso:espresso-core:3.3.0",
// 地图
// amapnavi3dmap : "com.amap.api:navi-3dmap:8.0.1_3dmap8.0.1",
// amapsearch : "com.amap.api:search:7.9.0",
// amaplocation : "com.amap.api:location:5.5.0",
- amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0",
- amapsearch : "com.amap.api:search:7.1.0",
- amaplocation : "com.amap.api:location:5.3.1",
+ amapnavi3dmap : "com.amap.api:navi-3dmap:7.2.0_3dmap7.2.0",
+ amapsearch : "com.amap.api:search:7.1.0",
+ amaplocation : "com.amap.api:location:5.3.1",
// json 转换
- gson : "com.google.code.gson:gson:2.8.4",
+ gson : "com.google.code.gson:gson:2.8.4",
// 内存泄漏检测
- debugleakcanary : "com.squareup.leakcanary:leakcanary-android:2.7",
- releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
- testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
+ debugleakcanary : "com.squareup.leakcanary:leakcanary-android:2.7",
+ releaseleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
+ testleakcanary : "com.squareup.leakcanary:leakcanary-android-no-op:2.7",
//rxJava
- rxjava : "io.reactivex.rxjava2:rxjava:2.2.2",
- rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1",
+ rxjava : "io.reactivex.rxjava2:rxjava:2.2.2",
+ rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1",
// arouter
- arouter : "com.alibaba:arouter-api:1.5.2",
- aroutercompiler : "com.alibaba:arouter-compiler:1.5.2",
+ arouter : "com.alibaba:arouter-api:1.5.2",
+ aroutercompiler : "com.alibaba:arouter-compiler:1.5.2",
// glide
- glide : 'com.github.bumptech.glide:glide:4.8.0',
- glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0',
- glideanno : 'com.github.bumptech.glide:annotations:4.8.0',
- glidecompiler : 'com.github.bumptech.glide:compiler:4.8.0',
- androidxannotation : "androidx.annotation:annotation:1.2.0",
- okhttpinterceptor : "com.squareup.okhttp3:logging-interceptor:3.12.0",
+ glide : 'com.github.bumptech.glide:glide:4.8.0',
+ glideokhttp3 : 'com.github.bumptech.glide:okhttp3-integration:4.8.0',
+ glideanno : 'com.github.bumptech.glide:annotations:4.8.0',
+ glidecompiler : 'com.github.bumptech.glide:compiler:4.8.0',
+ androidxannotation : "androidx.annotation:annotation:1.2.0",
+ okhttpinterceptor : "com.squareup.okhttp3:logging-interceptor:3.12.0",
// fresco
- fresco : 'com.facebook.fresco:fresco:1.9.0',
+ fresco : 'com.facebook.fresco:fresco:1.9.0',
// 公司服务 - 语音
- aiassist : "com.zhidaoauto.common:service:1.0.8.4",
+ aiassist : "com.zhidaoauto.common:service:1.0.8.4",
// 语音替换方案 暂时只用TTS 解决焦点问题
- aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5",
+ aiassistReplace : "com.zhidao.mogoVoicesdk:voice:1.0.5",
// 公司服务 - 埋点
- analytics : "com.elegant.analytics:analytics:1.1.28",
+ analytics : "com.elegant.analytics:analytics:1.1.28",
- retrofit : "com.squareup.retrofit2:retrofit:2.6.0",
- retrofitadapter : "com.squareup.retrofit2:adapter-rxjava2:2.6.0",
- retrofitconvertergson : "com.squareup.retrofit2:converter-gson:2.6.0",
- retrofitconverterscalars : "com.squareup.retrofit2:converter-scalars:2.1.0",
+ retrofit : "com.squareup.retrofit2:retrofit:2.6.0",
+ retrofitadapter : "com.squareup.retrofit2:adapter-rxjava2:2.6.0",
+ retrofitconvertergson : "com.squareup.retrofit2:converter-gson:2.6.0",
+ retrofitconverterscalars : "com.squareup.retrofit2:converter-scalars:2.1.0",
// leakcanary
- leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4',
- leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4',
+ leakcanary : 'com.squareup.leakcanary:leakcanary-android:1.5.4',
+ leakcanarynoop : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4',
// material
- material : 'com.google.android.material:material:1.4.0',
+ material : 'com.google.android.material:material:1.4.0',
- indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4',
- strategy : 'com.zhidaoauto.mic:strategy:1.0.6',
+ indicator : 'com.github.zhpanvip:viewpagerindicator:1.0.4',
+ strategy : 'com.zhidaoauto.mic:strategy:1.0.6',
// modules
- moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}",
- moduleshare : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}",
- mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}",
- mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}",
- mapamap : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}",
- mapautomap : "com.mogo.map:map-autonavi:${MAP_AUTONAVI_VERSION}",
- mapcustom : "com.mogo.map:map-custom:${MAP_CUSTOM_VERSION}",
- mogomap : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}",
- mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}",
- mogocustommap : "com.zhidaoauto.machine:map:${MAP_SDK_VERSION}",
+ moduletanlu : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}",
+ moduleshare : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}",
+ mogocommons : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}",
+ mogoutils : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}",
+ mapamap : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}",
+ mapautomap : "com.mogo.map:map-autonavi:${MAP_AUTONAVI_VERSION}",
+ mapcustom : "com.mogo.map:map-custom:${MAP_CUSTOM_VERSION}",
+ mogomap : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}",
+ mogomapapi : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}",
+ mogocustommap : "com.zhidaoauto.machine:map:${MAP_SDK_VERSION}",
- modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}",
- modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}",
- modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}",
- modulemainindependent : "com.mogo.module:module-main-independent:${MOGO_MODULE_MAIN_INDEPENDENT_VERSION}",
- modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}",
- moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}",
- moduledata : "com.mogo.module:module-data:${MOGO_MODULE_DATA_VERSION}",
- mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}",
- mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}",
- moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}",
- moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
- chat : "com.mogo.module.carchatout:module-chat:${CHAT_VERSION}",
- callchat : "com.mogo.module.carchatout:module-carchatting:${CARCHATTING_VERSION}",
- callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
+ modulecommon : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}",
+ modulemain : "com.mogo.module:module-main:${MOGO_MODULE_MAIN_VERSION}",
+ modulemainlauncher : "com.mogo.module:module-main-launcher:${MOGO_MODULE_MAIN_LAUNCHER_VERSION}",
+ modulemainindependent : "com.mogo.module:module-main-independent:${MOGO_MODULE_MAIN_INDEPENDENT_VERSION}",
+ modulemap : "com.mogo.module:module-map:${MOGO_MODULE_MAP_VERSION}",
+ moduleservice : "com.mogo.module:module-service:${MOGO_MODULE_SERVICE_VERSION}",
+ moduledata : "com.mogo.module:module-data:${MOGO_MODULE_DATA_VERSION}",
+ mogoservice : "com.mogo.service:mogo-service:${MOGO_SERVICE_VERSION}",
+ mogoserviceapi : "com.mogo.service:mogo-service-api:${MOGO_SERVICE_API_VERSION}",
+ moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}",
+ moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
+ chat : "com.mogo.module.carchatout:module-chat:${CHAT_VERSION}",
+ callchat : "com.mogo.module.carchatout:module-carchatting:${CARCHATTING_VERSION}",
+ callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
- guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
- mogomodulecheck : "com.mogo.module:mogo-module-check:${MOGO_MODULE_CHECK_VERSION}",
+ guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
+ mogomodulecheck : "com.mogo.module:mogo-module-check:${MOGO_MODULE_CHECK_VERSION}",
// V2X
- moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}",
- moduleSmallMap : "com.mogo.module:module-small-map:${MOGO_MODULE_SMP_VERSION}",
- moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULE_ADAS_VERSION}",
- moduleHmi : "com.mogo.module:module-hmi:${MOGO_MODULE_HMI_VERSION}",
- modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
- modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
+ moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}",
+ moduleSmallMap : "com.mogo.module:module-small-map:${MOGO_MODULE_SMP_VERSION}",
+ moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULE_ADAS_VERSION}",
+ moduleHmi : "com.mogo.module:module-hmi:${MOGO_MODULE_HMI_VERSION}",
+ modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
+ modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
// push
- modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}",
- modulepushbase : "com.mogo.module:module-push-base:${MOGO_MODULE_PUSH_BASE_VERSION}",
- modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}",
+ modulepush : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}",
+ modulepushbase : "com.mogo.module:module-push-base:${MOGO_MODULE_PUSH_BASE_VERSION}",
+ modulepushnoop : "com.mogo.module:module-push-noop:${MOGO_MODULE_PUSH_NOOP_VERSION}",
//统一返回键
- mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}",
- mogomoduleauth : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}",
- mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}",
+ mogomoduleback : "com.mogo.module:module-back:${MOGO_MODULE_BACK_VERSION}",
+ mogomoduleauth : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}",
+ mogomoduleguide : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}",
// OBU
- moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}",
- moduleobumogo : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_MOGO_VERSION}",
- carmanager : "com.zhidao.carmanager:common:1.0.30@aar",
+ moduleobu : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_VERSION}",
+ moduleobumogo : "com.mogo.module:module-obu:${MOGO_MODULE_OBU_MOGO_VERSION}",
+ carmanager : "com.zhidao.carmanager:common:1.0.30@aar",
//
- jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0",
+ jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0",
// crash
- crashSdk : "com.zhidaoauto.crash.log:library:1.0.5",
- kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
+ crashSdk : "com.zhidaoauto.crash.log:library:1.0.5",
+ kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}",
//探路使用的直播组件
- videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
- videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
- videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2",
- eventbus : "org.greenrobot:eventbus:3.1.1",
- videoprocessor : "com.zhidao.video:video-processor:1.0.2.1",
- livesdk : "com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211",
+ videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
+ videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
+ videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2",
+ eventbus : "org.greenrobot:eventbus:3.1.1",
+ videoprocessor : "com.zhidao.video:video-processor:1.0.2.1",
+ livesdk : "com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211",
- coroutinescore : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3",
- coroutinesandroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3",
+ coroutinescore : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3",
+ coroutinesandroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3",
- aspectj : "org.aspectj:aspectjrt:1.8.9",
+ aspectj : "org.aspectj:aspectjrt:1.8.9",
// gps 模拟
- gpssimulator : "com.mogo.module:module-gps-simulator:${MOGO_MODULE_GPS_SIMULATOR_VERSION}",
- gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}",
- gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
+ gpssimulator : "com.mogo.module:module-gps-simulator:${MOGO_MODULE_GPS_SIMULATOR_VERSION}",
+ gpssimulatordebug : "com.mogo.module:module-gps-simulator-debug:${MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION}",
+ gpssimulatornoop : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
- adasapi : "com.zhidao.autopilot.support:adas:1.0.6.15",
- adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5.2",
+ adasapi : "com.zhidao.autopilot.support:adas:1.0.6.15",
+ adasconfigapi : "com.zhidao.adasconfig:adasconfig:1.1.5.2",
// 个人中心的SDK
- personalsdk : "com.zhidaoauto.person.info:data:1.0.1",
- tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}",
+ personalsdk : "com.zhidaoauto.person.info:data:1.0.1",
+ tanluupload : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}",
// obu sdk
- obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
- mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.17',
- mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.4',
- adasHigh : 'com.zhidao.support.adas:high:1.2.0.10',
+ obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
+ mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.17',
+ mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.4',
+ adasHigh : 'com.zhidao.support.adas:high:1.2.0.10',
// 左侧面板
- moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}",
+ moduleleftpanel : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}",
// 左侧面板空实现
- moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}",
+ moduleleftpanelnoop : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}",
// 闪屏页
- modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}",
+ modulesplash : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}",
// 基础服务实现
- mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}",
- mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}",
- mogobasewebsocketsdk : "com.mogo.base:websocket-sdk:${MOGO_BASE_WEBSOCKET_SDK_VERSION}",
- mogowebsocket : "com.mogo.module.carchatting:module-carchatt-socket:${WEBSOCKET_VERSION}",
+ mogobaseservicesdk : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}",
+ mogobaseserviceapk : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}",
+ mogobasewebsocketsdk : "com.mogo.base:websocket-sdk:${MOGO_BASE_WEBSOCKET_SDK_VERSION}",
+ mogowebsocket : "com.mogo.module.carchatting:module-carchatt-socket:${WEBSOCKET_VERSION}",
// loglib
- mogologlib : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
+ mogologlib : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
// monitor
- mogomonitor : "com.mogo.module:module-monitor:${MOGO_MODULE_MONITOR_VERSION}",
+ mogomonitor : "com.mogo.module:module-monitor:${MOGO_MODULE_MONITOR_VERSION}",
// google
- googlezxing : "com.google.zxing:core:3.3.3",
- litezxing : "com.google.zxing:litezxing:1.0.29.8",
+ googlezxing : "com.google.zxing:core:3.3.3",
+ litezxing : "com.google.zxing:litezxing:1.0.29.8",
// android - room
- androidxroomruntime : "androidx.room:room-runtime:2.2.3",
- androidxroomcompiler : "androidx.room:room-compiler:2.2.3",
- androidxroomktx : "androidx.room:room-ktx:2.2.3",
+ androidxroomruntime : "androidx.room:room-runtime:2.2.3",
+ androidxroomcompiler : "androidx.room:room-compiler:2.2.3",
+ androidxroomktx : "androidx.room:room-ktx:2.2.3",
// rxjava2 with room
- roomRxjava : 'androidx.room:room-rxjava2:2.2.3',
- circleimageview : "de.hdodenhof:circleimageview:3.0.1",
+ roomRxjava : 'androidx.room:room-rxjava2:2.2.3',
+ circleimageview : "de.hdodenhof:circleimageview:3.0.1",
//
- mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
+ mogomodulewidgets : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
- kotlingradleplugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
+ kotlingradleplugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}",
- skinsupport : "com.mogo.skin:skin-support:${MOGO_SKIN_SUPPORT_VERSION}",
- skinsupportimpl : "com.mogo.skin:skin-support-impl:${MOGO_SKIN_SUPPORT_IMPL_VERSION}",
- skinsupportnoop : "com.mogo.skin:skin-support-noop:${MOGO_SKIN_SUPPORT_NOOP_VERSION}",
- skinsupportlight : "com.mogo.skin:skin-light:${MOGO_SKIN_LIGHT_VERSION}",
+ skinsupport : "com.mogo.skin:skin-support:${MOGO_SKIN_SUPPORT_VERSION}",
+ skinsupportimpl : "com.mogo.skin:skin-support-impl:${MOGO_SKIN_SUPPORT_IMPL_VERSION}",
+ skinsupportnoop : "com.mogo.skin:skin-support-noop:${MOGO_SKIN_SUPPORT_NOOP_VERSION}",
+ skinsupportlight : "com.mogo.skin:skin-light:${MOGO_SKIN_LIGHT_VERSION}",
- crashreport : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}",
- crashreportbugly : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}",
- crashreportnoop : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",
- crashreportupgrade : "com.mogo.test:crashreport-upgrade:${CRASHREPORT_UPGRADE_VERSION}",
+ crashreport : "com.mogo.test:crashreport:${CRASHREPORT_VERSION}",
+ crashreportbugly : "com.mogo.test:crashreport-bugly:${CRASHREPORT_BUGLY_VERSION}",
+ crashreportnoop : "com.mogo.test:crashreport-noop:${CRASHREPORT_NOOP_VERSION}",
+ crashreportupgrade : "com.mogo.test:crashreport-upgrade:${CRASHREPORT_UPGRADE_VERSION}",
- skinsupportbase : "com.mogo.skin:skin-support-base:${SKIN_SUPPORT_VERSION}",
- skinsupportappcompat : "com.mogo.skin:skin-support-appcompat:${SKIN_SUPPORT_APPCOMPAT_VERSION}",
- skinsupportcardview : "com.mogo.skin:skin-support-cardview:${SKIN_SUPPORT_CARDVIEW_VERSION}",
- skinsupportconstraintlayout: "com.mogo.skin:skin-support-constraint-layout:${SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION}",
- skinsupportdesign : "com.mogo.skin:skin-support-design:${SKIN_SUPPORT_DESIGN_VERSION}",
+ skinsupportbase : "com.mogo.skin:skin-support-base:${SKIN_SUPPORT_VERSION}",
+ skinsupportappcompat : "com.mogo.skin:skin-support-appcompat:${SKIN_SUPPORT_APPCOMPAT_VERSION}",
+ skinsupportcardview : "com.mogo.skin:skin-support-cardview:${SKIN_SUPPORT_CARDVIEW_VERSION}",
+ skinsupportconstraintlayout : "com.mogo.skin:skin-support-constraint-layout:${SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION}",
+ skinsupportdesign : "com.mogo.skin:skin-support-design:${SKIN_SUPPORT_DESIGN_VERSION}",
- ttsbase : "com.mogo.tts:tts-base:${TTS_BASE_VERSION}",
- ttsdi : "com.mogo.tts:tts-di:${TTS_DI_VERSION}",
- ttszhi : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}",
- ttspad : "com.mogo.tts:tts-pad:${TTS_ZHI_VERSION}",
- ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}",
+ ttsbase : "com.mogo.tts:tts-base:${TTS_BASE_VERSION}",
+ ttsdi : "com.mogo.tts:tts-di:${TTS_DI_VERSION}",
+ ttszhi : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}",
+ ttspad : "com.mogo.tts:tts-pad:${TTS_ZHI_VERSION}",
+ ttsnoop : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}",
- mogooch : "com.mogo.och:och:${MOGO_OCH_VERSION}",
- mogoochbus : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}",
- mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}",
- mogoochnoop : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}",
+ mogooch : "com.mogo.och:och:${MOGO_OCH_VERSION}",
+ mogoochbus : "com.mogo.och:och-bus:${MOGO_OCH_BUS_VERSION}",
+ mogoochtaxi : "com.mogo.och:och-taxi:${MOGO_OCH_TAXI_VERSION}",
+ mogoochnoop : "com.mogo.och:och-noop:${MOGO_OCH_NOOP_VERSION}",
- mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}",
+ mogoaicloudservicesdk : "com.mogo.aicloud.services:services-sdk:${MOGO_AICLOUD_SERVICES_SDK_VERSION}",
- mogoaicloudsocket : "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}",
- mogoaicloudpassport : "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}",
- mogoaicloudnetwork : "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}",
- mogoaicloudlive : "com.mogo.cloud:live:${MOGO_LIVE_VERSION}",
- mogoaicloudrealtime : "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}",
- mogoaicloudtanlu : "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}",
- mogoaicloudtrafficlive : "com.mogo.cloud:trafficlive:${MOGO_TRAFFICLIVE_VERSION}",
- mogoaicloudlocation : "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}",
+ mogoaicloudsocket : "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}",
+ mogoaicloudpassport : "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}",
+ mogoaicloudnetwork : "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}",
+ mogoaicloudlive : "com.mogo.cloud:live:${MOGO_LIVE_VERSION}",
+ mogoaicloudrealtime : "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}",
+ mogoaicloudtanlu : "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}",
+ mogoaicloudtrafficlive : "com.mogo.cloud:trafficlive:${MOGO_TRAFFICLIVE_VERSION}",
+ mogoaicloudlocation : "com.mogo.cloud:location:${MOGO_LOCATION_VERSION}",
//plugin
- mogochainbase : "com.mogo.cloud:service-chain:${SERVICE_CHAIN_VERSION}",
- mogochainplugin : "com.mogo.cloud:hook:${HOOK_LOG_VERSION}",
+ mogochainbase : "com.mogo.cloud:service-chain:${SERVICE_CHAIN_VERSION}",
+ mogochainplugin : "com.mogo.cloud:hook:${HOOK_LOG_VERSION}",
+
+
+ // 新架构的 Maven 版本管理
+ mogo_core_function_autopilot : "mogo.core.function:autopilot:${MOGO_CORE_FUNCTION_AUTOPILOT}",
+ mogo_core_function_check : "mogo.core.function:check:${MOGO_CORE_FUNCTION_CHECK}",
+ mogo_core_function_hmi : "mogo.core.function:hmi:${MOGO_CORE_FUNCTION_HMI}",
+ mogo_core_function_map : "mogo.core.function:map:${MOGO_CORE_FUNCTION_MAP}",
+ mogo_core_function_monitoring: "mogo.core.function:monitoring:${MOGO_CORE_FUNCTION_MONITORING}",
+ mogo_core_function_notice : "mogo.core.function:notice:${MOGO_CORE_FUNCTION_NOTICE}",
+ mogo_core_function_obu_mogo : "mogo.core.function:obu.mogo:${MOGO_CORE_FUNCTION_OBU_MOGO}",
+ mogo_core_function_smp : "mogo.core.function:smp:${MOGO_CORE_FUNCTION_SMP}",
+ mogo_core_function_v2x : "mogo.core.function:v2x:${MOGO_CORE_FUNCTION_V2X}",
+ mogo_core_function_api : "mogo.core.function:api:${MOGO_CORE_FUNCTION_API}",
+ mogo_core_function_call : "mogo.core.function:call:${MOGO_CORE_FUNCTION_CALL}",
+ mogo_core_data : "mogo.core:data:${MOGO_CORE_DATA}",
+ mogo_core_res : "mogo.core:res:${MOGO_CORE_RES}",
+ mogo_core_utils : "mogo.core:utils:${MOGO_CORE_UTILS}",
+
]
}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-check/build.gradle b/core/function-impl/mogo-core-function-check/build.gradle
index 9e514cfcb5..1ea04bd867 100644
--- a/core/function-impl/mogo-core-function-check/build.gradle
+++ b/core/function-impl/mogo-core-function-check/build.gradle
@@ -65,6 +65,7 @@ dependencies {
implementation project(':modules:mogo-module-service')
implementation project(':modules:mogo-module-carchattingprovider')
+ implementation project(':core:mogo-core-network')
implementation project(':core:mogo-core-utils')
implementation project(':core:mogo-core-data')
implementation project(':core:mogo-core-function-call')
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt
index 9646124349..80699fad92 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckNetWork.kt
@@ -1,12 +1,10 @@
package com.mogo.eagle.core.function.check.net
import android.content.Context
-import android.util.Log
import com.elegant.network.ParamsBuilder
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.network.SubscribeImpl
import com.mogo.eagle.core.function.check.api.ICheckResultCallBack
-import com.mogo.eagle.core.function.check.view.CheckActivity
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.utils.network.RequestOptions
import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java
index f2a6234a5a..cee2344af1 100644
--- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java
+++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java
@@ -1,9 +1,8 @@
package com.mogo.eagle.core.function.check.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
/**
diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle
index e8c776714b..6a98988a2b 100644
--- a/core/function-impl/mogo-core-function-notice/build.gradle
+++ b/core/function-impl/mogo-core-function-notice/build.gradle
@@ -53,17 +53,19 @@ dependencies {
kapt rootProject.ext.dependencies.aroutercompiler
if (Boolean.valueOf(RELEASE)) {
- api rootProject.ext.dependencies.mogocommons
- api rootProject.ext.dependencies.mogoserviceapi
+ implementation rootProject.ext.dependencies.mogocommons
+ implementation rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
} else {
- api project(":foudations:mogo-commons")
- api project(':services:mogo-service-api')
- implementation project(':core:mogo-core-utils')
+ implementation project(":foudations:mogo-commons")
+ implementation project(':services:mogo-service-api')
implementation project(':modules:mogo-module-common')
+
+ implementation project(':core:mogo-core-utils')
implementation project(':core:mogo-core-function-call')
implementation project(':core:mogo-core-res')
implementation project(':core:mogo-core-data')
+ implementation project(':core:mogo-core-network')
}
}
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java
index 719ea6b94f..5aad2103e8 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java
@@ -10,10 +10,6 @@ import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.data.notice.NoticePushData;
import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider;
-import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
-import com.mogo.eagle.core.function.notice.receiver.NoticeMessageListener;
-import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.cloud.socket.IMogoLifecycleListener;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java
index e41325071b..97cb3363f0 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeSocketManager.java
@@ -3,10 +3,8 @@ package com.mogo.eagle.core.function.notice;
import android.content.Context;
import android.util.Log;
-import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.eagle.core.function.notice.receiver.NoticeMessageListener;
import com.mogo.module.common.MogoApisHandler;
-import com.mogo.service.IMogoServiceApis;
/**
* @author Jing
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java
index e36b280715..7aabec9d66 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java
@@ -1,6 +1,6 @@
package com.mogo.eagle.core.function.notice.network;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java
index 8b45dacc0e..5017a5634b 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeNetWorkManager.java
@@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.notice.network;
import com.mogo.cloud.network.NetConstants;
import com.mogo.cloud.network.RetrofitFactory;
import com.mogo.cloud.passport.MoGoAiCloudClient;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/receiver/NoticeMessageListener.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/receiver/NoticeMessageListener.java
index da3bc2570d..d4bb9cc532 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/receiver/NoticeMessageListener.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/receiver/NoticeMessageListener.java
@@ -1,8 +1,6 @@
package com.mogo.eagle.core.function.notice.receiver;
-import android.content.BroadcastReceiver;
import android.content.Context;
-import android.content.Intent;
import android.util.Log;
import com.mogo.service.cloud.socket.IMogoOnMessageListener;
diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java
index 204382c0ff..109299995f 100644
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java
@@ -5,8 +5,7 @@ import android.content.Context;
import android.content.Intent;
import com.mogo.eagle.core.data.notice.NoticePushData;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
-import com.mogo.utils.logger.Logger;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
/**
* @author Jing
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/data/BaseData.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/BaseData.java
similarity index 84%
rename from foudations/mogo-commons/src/main/java/com/mogo/commons/data/BaseData.java
rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/BaseData.java
index 82693e807d..3cf6c2be93 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/data/BaseData.java
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/BaseData.java
@@ -1,4 +1,4 @@
-package com.mogo.commons.data;
+package com.mogo.eagle.core.data;
import java.io.Serializable;
diff --git a/core/mogo-core-network/.gitignore b/core/mogo-core-network/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/mogo-core-network/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/mogo-core-network/build.gradle b/core/mogo-core-network/build.gradle
new file mode 100644
index 0000000000..5f0c8bbc48
--- /dev/null
+++ b/core/mogo-core-network/build.gradle
@@ -0,0 +1,65 @@
+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.kotlinstdlibjdk7
+ implementation rootProject.ext.dependencies.androidxccorektx
+ implementation rootProject.ext.dependencies.androidxappcompat
+ implementation rootProject.ext.dependencies.androidxrecyclerview
+ implementation rootProject.ext.dependencies.androidxconstraintlayout
+
+ implementation rootProject.ext.dependencies.videoarmv7
+ implementation rootProject.ext.dependencies.videoarm64
+ implementation rootProject.ext.dependencies.videojava
+ implementation rootProject.ext.dependencies.livesdk
+
+ if (Boolean.valueOf(RELEASE)) {
+
+ } else {
+ implementation project(':core:mogo-core-utils')
+ }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/core/mogo-core-network/consumer-rules.pro b/core/mogo-core-network/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/mogo-core-network/gradle.properties b/core/mogo-core-network/gradle.properties
new file mode 100644
index 0000000000..c2c0c8afca
--- /dev/null
+++ b/core/mogo-core-network/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.eagle.core
+POM_ARTIFACT_ID=mogo-core-network
+VERSION_CODE=1
diff --git a/core/mogo-core-network/proguard-rules.pro b/core/mogo-core-network/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/core/mogo-core-network/proguard-rules.pro
@@ -0,0 +1,21 @@
+# 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/mogo-core-network/src/main/AndroidManifest.xml b/core/mogo-core-network/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..22bb3e7388
--- /dev/null
+++ b/core/mogo-core-network/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-network/src/main/res/drawable-mdpi/placeholder.png b/core/mogo-core-network/src/main/res/drawable-mdpi/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-network/src/main/res/drawable-mdpi/placeholder.png differ
diff --git a/core/mogo-core-network/src/main/res/drawable-xhdpi/placeholder.png b/core/mogo-core-network/src/main/res/drawable-xhdpi/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-network/src/main/res/drawable-xhdpi/placeholder.png differ
diff --git a/core/mogo-core-network/src/main/res/drawable/dark_clore_close.png b/core/mogo-core-network/src/main/res/drawable/dark_clore_close.png
new file mode 100644
index 0000000000..ba03e033d8
Binary files /dev/null and b/core/mogo-core-network/src/main/res/drawable/dark_clore_close.png differ
diff --git a/core/mogo-core-network/src/main/res/drawable/placeholder.png b/core/mogo-core-network/src/main/res/drawable/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-network/src/main/res/drawable/placeholder.png differ
diff --git a/core/mogo-core-network/src/main/res/layout/item_v2x_crossroad_live_video.xml b/core/mogo-core-network/src/main/res/layout/item_v2x_crossroad_live_video.xml
new file mode 100644
index 0000000000..938a27fd1b
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/layout/item_v2x_crossroad_live_video.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
diff --git a/core/mogo-core-network/src/main/res/raw/daba.nt3d b/core/mogo-core-network/src/main/res/raw/daba.nt3d
new file mode 100644
index 0000000000..4b2eafe50d
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/daba.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/kache.nt3d b/core/mogo-core-network/src/main/res/raw/kache.nt3d
new file mode 100644
index 0000000000..3e822240b5
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/kache.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/motuoche.nt3d b/core/mogo-core-network/src/main/res/raw/motuoche.nt3d
new file mode 100644
index 0000000000..da9492887c
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/motuoche.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/people.nt3d b/core/mogo-core-network/src/main/res/raw/people.nt3d
new file mode 100644
index 0000000000..5866095c00
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/people.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/qfpz.n3d b/core/mogo-core-network/src/main/res/raw/qfpz.n3d
new file mode 100644
index 0000000000..3abf28fa94
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/qfpz.n3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/selfbus.n3d b/core/mogo-core-network/src/main/res/raw/selfbus.n3d
new file mode 100644
index 0000000000..d897618b04
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/selfbus.n3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/shexiangtou.nt3d b/core/mogo-core-network/src/main/res/raw/shexiangtou.nt3d
new file mode 100644
index 0000000000..58520fd3d9
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/shexiangtou.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/special_vehicle.nt3d b/core/mogo-core-network/src/main/res/raw/special_vehicle.nt3d
new file mode 100644
index 0000000000..7ba4844ec4
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/special_vehicle.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/stopline.nt3d b/core/mogo-core-network/src/main/res/raw/stopline.nt3d
new file mode 100644
index 0000000000..5d28ae1f5f
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/stopline.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/tachexiaoche.nt3d b/core/mogo-core-network/src/main/res/raw/tachexiaoche.nt3d
new file mode 100644
index 0000000000..7ba4844ec4
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/tachexiaoche.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_daolujiebing.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_daolujiebing.nt3d
new file mode 100644
index 0000000000..2e560d1169
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_daolujiebing.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_daolujishui.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_daolujishui.nt3d
new file mode 100644
index 0000000000..9d35863567
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_daolujishui.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_daolushigong.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_daolushigong.nt3d
new file mode 100644
index 0000000000..f56cd6334f
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_daolushigong.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_guzhangqiuzhu.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_guzhangqiuzhu.nt3d
new file mode 100644
index 0000000000..a7eb5f45f1
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_guzhangqiuzhu.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_jiaotongjiancha.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_jiaotongjiancha.nt3d
new file mode 100644
index 0000000000..fd583da02f
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_jiaotongjiancha.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_nongwu.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_nongwu.nt3d
new file mode 100644
index 0000000000..c238a2d106
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_nongwu.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_shigong_warning.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_shigong_warning.nt3d
new file mode 100644
index 0000000000..5df0d7a047
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_shigong_warning.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_shigu.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_shigu.nt3d
new file mode 100644
index 0000000000..59889f955e
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_shigu.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_shishilukuang.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_shishilukuang.nt3d
new file mode 100644
index 0000000000..7485fe445e
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_shishilukuang.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/v2x_yongdu.nt3d b/core/mogo-core-network/src/main/res/raw/v2x_yongdu.nt3d
new file mode 100644
index 0000000000..b237c05a85
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/v2x_yongdu.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/ziche.nt3d b/core/mogo-core-network/src/main/res/raw/ziche.nt3d
new file mode 100644
index 0000000000..2020d08b91
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/ziche.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/raw/zixingche.nt3d b/core/mogo-core-network/src/main/res/raw/zixingche.nt3d
new file mode 100644
index 0000000000..0cc50358f1
Binary files /dev/null and b/core/mogo-core-network/src/main/res/raw/zixingche.nt3d differ
diff --git a/core/mogo-core-network/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/mogo-core-network/src/main/res/values-xhdpi-2560x1440/dimens.xml
new file mode 100644
index 0000000000..0b095cc6d1
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -0,0 +1,44 @@
+
+
+ 460px
+ 460px
+
+ 30px
+ 130px
+
+ 40px
+ 320px
+ 320px
+ 20px
+ 110px
+ 40px
+
+ 74px
+ 92px
+
+ 460px
+ 140px
+ 40px
+ 30px
+ 92px
+ 44px
+ 28px
+
+ 30px
+ 70px
+
+ 138px
+ 368px
+ 60px
+ 44px
+
+
+ 280px
+ 120px
+ 20px
+ 38px
+ 50px
+ 60px
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-network/src/main/res/values/color.xml b/core/mogo-core-network/src/main/res/values/color.xml
new file mode 100644
index 0000000000..b2c628bf52
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/values/color.xml
@@ -0,0 +1,10 @@
+
+
+ #FFFFFF
+ #4DFFFFFF
+
+ #323C6F
+
+ #FFFFFF
+
+
\ No newline at end of file
diff --git a/core/mogo-core-network/src/main/res/values/dimens.xml b/core/mogo-core-network/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..cc92f49987
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/values/dimens.xml
@@ -0,0 +1,45 @@
+
+
+ 300px
+ 300px
+
+ 20px
+ 110px
+
+ 40px
+ 200px
+ 200px
+ 10px
+ 80px
+ 28px
+
+ 46px
+ 60px
+
+ 300px
+ 100px
+ 40px
+ 30px
+ 20px
+ 30px
+ 18px
+
+ 20px
+ 50px
+
+ 138px
+ 368px
+ 38px
+ 33px
+
+
+ 190px
+ 76px
+ 16px
+ 24px
+ 35px
+ 38px
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-network/src/main/res/values/string.xml b/core/mogo-core-network/src/main/res/values/string.xml
new file mode 100644
index 0000000000..e618039a94
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/values/string.xml
@@ -0,0 +1,10 @@
+
+
+
+ "不支持该视频。"
+ 此文件不支持播放
+
+
+ 近距视角
+ 远距视角
+
\ No newline at end of file
diff --git a/core/mogo-core-network/src/main/res/values/styles.xml b/core/mogo-core-network/src/main/res/values/styles.xml
new file mode 100644
index 0000000000..d983a865a0
--- /dev/null
+++ b/core/mogo-core-network/src/main/res/values/styles.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle
index 57fc5e5aaa..48edf00cd5 100644
--- a/foudations/mogo-commons/build.gradle
+++ b/foudations/mogo-commons/build.gradle
@@ -53,8 +53,9 @@ dependencies {
implementation project(":foudations:mogo-utils")
api project(":foudations:mogo-aicloud-services-sdk")
api project(":tts:tts-base")
-// implementation project(":skin:mogo-skin-support")
+
implementation project(':core:mogo-core-utils')
+ implementation project(':core:mogo-core-data')
}
api 'org.greenrobot:eventbus:3.1.1'
}
diff --git a/foudations/mogo-commons/consumer-rules.pro b/foudations/mogo-commons/consumer-rules.pro
index 932c009231..6c42ffca11 100644
--- a/foudations/mogo-commons/consumer-rules.pro
+++ b/foudations/mogo-commons/consumer-rules.pro
@@ -1,4 +1,4 @@
#-----Foundation-Commons-----
--keep class com.mogo.commons.data.BaseData{*;}
+-keep class com.mogo.eagle.core.data.BaseData{*;}
-keep class com.mogo.commons.voice.*{*;}
-keep interface * implements com.mogo.commons.mvp.*{*;}
\ No newline at end of file
diff --git a/foudations/mogo-commons/proguard-rules.pro b/foudations/mogo-commons/proguard-rules.pro
index c47b3c8771..155df701c9 100644
--- a/foudations/mogo-commons/proguard-rules.pro
+++ b/foudations/mogo-commons/proguard-rules.pro
@@ -21,7 +21,7 @@
#-renamesourcefileattribute SourceFile
#-----Foundation-Commons-----
--keep class com.mogo.commons.data.BaseData.*{*;}
+-keep class com.mogo.eagle.core.data.BaseData.*{*;}
-keep class com.mogo.commons.voice.VoiceIntentTrack
-keep class com.mogo.commons.voice.VoiceTrack
-keep class com.mogo.commons.voice.VoicePreemptType
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
index d673a53dbe..d15907641f 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
@@ -1,7 +1,6 @@
package com.mogo.commons.network;
-import com.mogo.commons.data.BaseData;
-import com.mogo.commons.storage.SpStorage;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.Util;
@@ -13,7 +12,7 @@ import io.reactivex.disposables.Disposable;
/**
* Created by congtaowang on 2018/10/14.
*/
-public abstract class SubscribeImpl< T extends BaseData > implements Observer< T > {
+public abstract class SubscribeImpl< T extends BaseData> implements Observer< T > {
protected final RequestOptions mRequestOptions;
diff --git a/gradle.properties b/gradle.properties
index 0a4c89cc78..2ae6805379 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -45,7 +45,6 @@ USERNAME=xintai
PASSWORD=xintai2018
# 编译模式: false - 依赖本地版本, true - 依赖 maven 版本
RELEASE=false
-
##plugin 插件
#android.enableR8.libraries=false
#android.enableR8=false
@@ -56,11 +55,8 @@ RELEASE=false
#bytex.forbidUseLenientMutationDuringGetArtifact=true
#bytex.verifyProguardConfigurationChanged=false
#bytex.ASM_API=ASM7
-
HOOK_LOG_VERSION=1.4.63
SERVICE_CHAIN_VERSION=1.0.22
-
-
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=2.0.58
@@ -190,4 +186,19 @@ MOGO_CORE_FUNCTION_HMI_VERSION=1.0.0
applicationId=com.mogo.launcer
applicationName=IntelligentPilot
versionCode=80007
-versionName=8.0.14
\ No newline at end of file
+versionName=8.0.14
+#################新架构Maven版本管理
+MOGO_CORE_FUNCTION_AUTOPILOT=0.0.1
+MOGO_CORE_FUNCTION_CHECK=0.0.1
+MOGO_CORE_FUNCTION_HMI=0.0.1
+MOGO_CORE_FUNCTION_MAP=0.0.1
+MOGO_CORE_FUNCTION_MONITORING=0.0.1
+MOGO_CORE_FUNCTION_NOTICE=0.0.1
+MOGO_CORE_FUNCTION_OBU_MOGO=0.0.1
+MOGO_CORE_FUNCTION_SMP=0.0.1
+MOGO_CORE_FUNCTION_V2X=0.0.1
+MOGO_CORE_DATA=0.0.1
+MOGO_CORE_FUNCTION_API=0.0.1
+MOGO_CORE_FUNCTION_CALL=0.0.1
+MOGO_CORE_RES=0.0.1
+MOGO_CORE_UTILS=0.0.1
\ No newline at end of file
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
index b5d733503d..93fdaea4a3 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/model/AdasServiceModel.java
@@ -1,7 +1,7 @@
package com.mogo.module.adas.model;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
import com.mogo.module.adas.entity.AutonomousDriveStatusBean;
diff --git a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java
index a99daa340f..b2e356c978 100644
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/network/IAdasApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.adas.network;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
index 61e425aaba..86a14edad5 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java
@@ -1,9 +1,8 @@
package com.mogo.module.common.entity;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
-import java.io.Serializable;
import java.util.List;
@SuppressWarnings("unused")
diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java
index 3b62289a92..c0217288e6 100644
--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java
@@ -2,7 +2,7 @@
package com.mogo.module.common.entity;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
index 36e5ca7a48..68a8a05755 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfig.java
@@ -1,7 +1,5 @@
package com.mogo.module.extensions.bean;
-import com.mogo.commons.data.BaseData;
-
/**
* @author lixiaopeng
* @description
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java
index e4e640d788..fac985bffd 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/bean/CommonConfigResponse.java
@@ -1,6 +1,6 @@
package com.mogo.module.extensions.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
/**
* @author lixiaopeng
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckApiServices.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckApiServices.java
index 5a1050edf3..5f0d8f438b 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckApiServices.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckApiServices.java
@@ -1,14 +1,10 @@
package com.mogo.module.main.delaycheck;
-import com.mogo.commons.data.BaseData;
-
-import java.util.Map;
+import com.mogo.eagle.core.data.BaseData;
import io.reactivex.Observable;
import okhttp3.RequestBody;
import retrofit2.http.Body;
-import retrofit2.http.FieldMap;
-import retrofit2.http.FormUrlEncoded;
import retrofit2.http.GET;
import retrofit2.http.Headers;
import retrofit2.http.POST;
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckResponse.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckResponse.java
index e88d95bdbb..05223313f1 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckResponse.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckResponse.java
@@ -1,6 +1,6 @@
package com.mogo.module.main.delaycheck;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
/**
* 延迟检测response
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
index 3d6056f5c3..280c7ced2a 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/delaycheck/DelayCheckUtil.java
@@ -6,9 +6,8 @@ import android.os.Message;
import android.os.SystemClock;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.utils.NetworkUtils;
@@ -16,9 +15,6 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
-import java.util.HashMap;
-import java.util.Map;
-
import io.reactivex.schedulers.Schedulers;
import okhttp3.MediaType;
import okhttp3.RequestBody;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
index 2616f8beff..e00be820ac 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/DispatchServiceModel.java
@@ -4,7 +4,7 @@ import static com.mogo.commons.context.ContextHolderUtil.getContext;
import static com.mogo.module.common.constants.HostConst.DATA_SERVICE_HOST;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.eagle.core.data.autopilot.AutopilotStatus;
import com.mogo.module.common.MogoApisHandler;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/IDispatchAdasApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/IDispatchAdasApiService.java
index 5941c18b9c..5520d0e556 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/IDispatchAdasApiService.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/dispatch/model/IDispatchAdasApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.dispatch.model;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java
index 5e193cf211..479a5fcb9e 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.network;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.service.network.bean.DemoUserInfoEntity;
import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
index a4c4298fa7..c55470cb4a 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/TimeDelayApiService.java
@@ -1,7 +1,6 @@
package com.mogo.module.service.network;
-import com.mogo.commons.data.BaseData;
-import com.mogo.module.common.entity.MarkerResponse;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/DemoUserInfoEntity.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/DemoUserInfoEntity.java
index 5926ab8f0a..d9074c4849 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/DemoUserInfoEntity.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/DemoUserInfoEntity.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.network.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/HomeCompanyDistanceForPushResponse.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/HomeCompanyDistanceForPushResponse.java
index c825712ef7..dbeaa277bc 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/HomeCompanyDistanceForPushResponse.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/HomeCompanyDistanceForPushResponse.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.network.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
public
/**
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/LauncherCardAdvertisementData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/LauncherCardAdvertisementData.java
index 5edeb7193f..b09d1c8f79 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/LauncherCardAdvertisementData.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/LauncherCardAdvertisementData.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.network.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java
index 2c055df068..2db9946215 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigData.java
@@ -1,7 +1,7 @@
package com.mogo.module.service.network.bean;
import com.google.gson.annotations.SerializedName;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java
index 7d79407bb7..48db2d8b84 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/bean/TtsConfigEntity.java
@@ -1,6 +1,6 @@
package com.mogo.module.service.network.bean;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
/**
* @author :zhuangyan
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
index 0475da2b94..93341880b7 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java
@@ -10,7 +10,7 @@ import androidx.annotation.RequiresApi;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.cloud.socket.entity.SocketDownData;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.datacenter.SnapshotLocationDataCenter;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
index bb747b4a14..72801a6515 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
@@ -1,6 +1,7 @@
package com.mogo.module.share.bean
-import com.mogo.commons.data.BaseData
+import com.mogo.eagle.core.data.BaseData
-data class AverateSpeedResponse(var result:Result):BaseData()
+data class AverateSpeedResponse(var result:Result):
+ BaseData()
data class Result(var upload:Boolean,var poiType:String)
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/BaseDataComapt.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/BaseDataComapt.kt
index c6f859c599..b64bb56ffc 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/BaseDataComapt.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/BaseDataComapt.kt
@@ -1,5 +1,5 @@
package com.mogo.module.share.bean
-import com.mogo.commons.data.BaseData
+import com.mogo.eagle.core.data.BaseData
-data class BaseDataCompat(var result:T?):BaseData()
\ No newline at end of file
+data class BaseDataCompat(var result:T?): BaseData()
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt
index f68896177a..6e55833ed0 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/FixableButton.kt
@@ -1,6 +1,6 @@
package com.mogo.module.share.bean
-import com.mogo.commons.data.BaseData
+import com.mogo.eagle.core.data.BaseData
import com.mogo.module.share.R
import com.mogo.service.share.IMogoTanluProvider.*
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/RoadInfos.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/RoadInfos.kt
index c785131e11..171424d77a 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/RoadInfos.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/RoadInfos.kt
@@ -1,6 +1,6 @@
package com.mogo.module.share.bean
-import com.mogo.commons.data.BaseData
+import com.mogo.eagle.core.data.BaseData
import com.mogo.module.common.entity.MarkerExploreWay
data class RoadInfos(var data:List) : BaseData()
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
index a467151890..5b3abcb486 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/SeekHelpManager.kt
@@ -6,16 +6,14 @@ import android.os.SystemClock
import android.util.ArrayMap
import com.mogo.cloud.passport.MoGoAiCloudClientConfig
import com.mogo.commons.analytics.AnalyticsUtils
-import com.mogo.commons.data.BaseData
+import com.mogo.eagle.core.data.BaseData
import com.mogo.commons.network.SubscribeImpl
-import com.mogo.commons.network.Utils
import com.mogo.commons.voice.AIAssist
import com.mogo.commons.voice.IMogoVoiceCmdCallBack
import com.mogo.module.common.constants.HostConst
import com.mogo.module.share.bean.SeekRecord
import com.mogo.module.share.bean.SeekRequest
import com.mogo.module.share.bean.getJson
-import com.mogo.module.share.constant.HttpConstant
import com.mogo.module.share.net.ShareRtlApiService
import com.mogo.utils.TipToast
import com.mogo.utils.logger.Logger
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java
index bf43b3f1ea..38b04706b7 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareRtlApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.share.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficApiService.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficApiService.java
index 5fb607a299..2fa1951d1c 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficApiService.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.share.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.Map;
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
index fca9278fc9..f550ae76df 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/TrafficModelData.java
@@ -2,7 +2,7 @@ package com.mogo.module.share.net;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.module.common.constants.HostConst;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XAlarmEventRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XAlarmEventRes.java
index 2e2b2a1a3f..46aab8fa9b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XAlarmEventRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XAlarmEventRes.java
@@ -5,7 +5,7 @@ import android.text.TextUtils;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.MarkerOnlineCar;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XDemoUserInfoRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XDemoUserInfoRes.java
index 6413f75f40..15c08e3f50 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XDemoUserInfoRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XDemoUserInfoRes.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCarRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCarRes.java
index 14fe86261e..6416092fd0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCarRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCarRes.java
@@ -1,7 +1,7 @@
package com.mogo.module.v2x.entity.net;
import com.google.gson.annotations.Expose;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCrossRoad.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCrossRoad.java
index d99dec5ce4..db8824f7cd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCrossRoad.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLiveCrossRoad.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLivePushVoRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLivePushVoRes.java
index d0bc3fa292..ee9fa53609 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLivePushVoRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XLivePushVoRes.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRoadDataRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRoadDataRes.java
index b6c7e214a5..dfdec2fc47 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRoadDataRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XRoadDataRes.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XSeekHelpRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XSeekHelpRes.java
index 705615b72b..fca7c2061d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XSeekHelpRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XSeekHelpRes.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XStrategyPushRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XStrategyPushRes.java
index 250c4131b7..119b296b59 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XStrategyPushRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XStrategyPushRes.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.net;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XUserInfoRes.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XUserInfoRes.java
index bc5a567ec6..f1c9f22123 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XUserInfoRes.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/net/V2XUserInfoRes.java
@@ -2,7 +2,7 @@
package com.mogo.module.v2x.entity.net;
import com.google.gson.annotations.Expose;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingResponse.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingResponse.java
index 17b38e95e8..d2b4c6bf94 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingResponse.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/SurroundingResponse.java
@@ -1,7 +1,6 @@
package com.mogo.module.v2x.entity.panel;
-import com.google.gson.annotations.SerializedName;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.module.common.entity.MarkerExploreWay;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
index fa7f4201bb..4937a3e120 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventDescription.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.panel;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
index c6760db819..41819a5ec6 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventItem.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.panel;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
import java.util.List;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventLoadMoreItem.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventLoadMoreItem.java
index a6ddc288dd..7153024a84 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventLoadMoreItem.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/entity/panel/V2XShareEventLoadMoreItem.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.entity.panel;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import java.io.Serializable;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
index 1d4c8a72da..6821ea9bc0 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XApiService.java
@@ -1,6 +1,6 @@
package com.mogo.module.v2x.network;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.v2x.entity.net.V2XDemoUserInfoRes;
import com.mogo.module.v2x.entity.net.V2XLiveCarRes;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
index 153cc0895c..273b3e0c69 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XRefreshModel.java
@@ -8,7 +8,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
import com.mogo.commons.voice.AIAssist;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
index 8484cedaca..072a01cbca 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/network/V2XShareNetworkModel.java
@@ -3,10 +3,9 @@ package com.mogo.module.v2x.network;
import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.network.ParamsProvider;
import com.mogo.commons.network.SubscribeImpl;
-import com.mogo.commons.network.Utils;
import com.mogo.utils.network.RequestOptions;
import com.mogo.utils.network.utils.GsonUtil;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
index 52e4fae828..1c0b9ef22a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/help/V2XSeekHelpButton.java
@@ -5,7 +5,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import com.mogo.commons.data.BaseData;
+import com.mogo.eagle.core.data.BaseData;
import com.mogo.commons.voice.AIAssist;
import com.mogo.eagle.core.utilcode.util.Utils;
import com.mogo.module.v2x.R;
diff --git a/settings.gradle b/settings.gradle
index 4f28ea579d..57bf0f71d4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,6 +12,8 @@ include ':core:mogo-core-data'
include ':core:mogo-core-res'
// 公用工具类
include ':core:mogo-core-utils'
+// 网络请求
+include ':core:mogo-core-network'
// 功能定义接口
include ':core:mogo-core-function-api'
// 模块对外暴露等调用接口