yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Update]升级socket，增加了日志输出

Browse Source 
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2021-11-19 15:32:16 +08:00
parent bb1c075225
commit 35a5f2f23c
6 changed files with 91 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/gradle.xml generated
View File

@@ -4,7 +4,7 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.8" />
@@ -82,7 +82,6 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings>
</option>
</component>

3
.idea/misc.xml generated
View File

@@ -62,8 +62,9 @@
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_left.xml" value="0.359375" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_right.xml" value="0.359375" />
<entry key="modules/mogo-module-main/src/main/res/drawable-xhdpi/module_main_warning_bkg_top.xml" value="0.33" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3125" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml" value="0.3072916666666667" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml" value="0.33645833333333336" />
<entry key="modules/mogo-module-main/src/main/res/layout/module_main_fragement_placeholder.xml" value="0.40572916666666664" />
<entry key="modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml" value="0.17864583333333334" />
<entry key="modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml" value="0.315625" />
<entry key="modules/mogo-module-service/src/main/res/drawable/bg_adas_dispatch.xml" value="0.184" />

BIN
core/mogo-core-res/src/main/res/raw/zixingche.nt3d
View File

Binary file not shown.

176
gradle.properties
View File

@@ -37,7 +37,7 @@ kapt.include.compile.classpath=false
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.jetifier.blacklist=module-service-2.0.80.aar
android.jetifier.blacklist=module-service-2.0.81.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -62,21 +62,21 @@ SERVICE_CHAIN_VERSION=1.0.22
LOGLIB_VERSION=1.0.4
######## MogoAiCloudSDK Version ########
# 网络请求
MOGO_NETWORK_VERSION=1.3.2
MOGO_NETWORK_VERSION=1.3.3
# 鉴权
MOGO_PASSPORT_VERSION=1.3.2
MOGO_PASSPORT_VERSION=1.3.3
# 常链接
MOGO_SOCKET_VERSION=1.3.2
MOGO_SOCKET_VERSION=1.3.3
# 数据采集
MOGO_REALTIME_VERSION=1.3.2
MOGO_REALTIME_VERSION=1.3.3
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.3.2
MOGO_TANLU_VERSION=1.3.3
# 直播推流
MOGO_LIVE_VERSION=1.3.2
MOGO_LIVE_VERSION=1.3.3
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.3.2
MOGO_TRAFFICLIVE_VERSION=1.3.3
# 定位服务
MOGO_LOCATION_VERSION=1.3.2
MOGO_LOCATION_VERSION=1.3.3
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=V2.0.0.4
@@ -88,102 +88,102 @@ applicationName=IntelligentPilot
versionCode=80007
versionName=8.0.14
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.22
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.22
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.22
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.22
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.22
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.22
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.22
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.22
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.22
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.22
MOGO_CORE_DATA_VERSION=0.0.22
MOGO_CORE_FUNCTION_API_VERSION=0.0.22
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.22
MOGO_CORE_RES_VERSION=0.0.22
MOGO_CORE_UTILS_VERSION=0.0.22
MOGO_CORE_NETWORK_VERSION=0.0.22
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.23
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.23
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.23
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.23
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.23
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.23
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.23
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.23
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.23
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.23
MOGO_CORE_DATA_VERSION=0.0.23
MOGO_CORE_FUNCTION_API_VERSION=0.0.23
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.23
MOGO_CORE_RES_VERSION=0.0.23
MOGO_CORE_UTILS_VERSION=0.0.23
MOGO_CORE_NETWORK_VERSION=0.0.23
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.0.80
MOGO_UTILS_VERSION=2.0.80
MAP_AMAP_VERSION=2.0.80
MAP_AUTONAVI_VERSION=2.0.80
MOGO_MAP_VERSION=2.0.80
MOGO_MAP_API_VERSION=2.0.80
MOGO_SERVICE_VERSION=2.0.80
MOGO_SERVICE_API_VERSION=2.0.80
MOGO_CONNECTION_VERSION=2.0.80
MOGO_MODULE_APPS_VERSION=2.0.80
MOGO_MODULE_NAVI_VERSION=2.0.80
MOGO_MODULE_SHARE_VERSION=2.0.80
MOGO_MODULE_COMMON_VERSION=2.0.80
MOGO_MODULE_MAIN_VERSION=2.0.80
MOGO_MODULE_MAP_VERSION=2.0.80
MOGO_MODULE_SERVICE_VERSION=2.0.80
MOGO_MODULE_EXTENSIONS_VERSION=2.0.80
MOGO_MODULE_SEARCH_VERSION=2.0.80
MOGO_MODULE_BACK_VERSION=2.0.80
MOGO_MODULE_V2X_VERSION=2.0.80
MOGO_COMMONS_VERSION=2.0.81
MOGO_UTILS_VERSION=2.0.81
MAP_AMAP_VERSION=2.0.81
MAP_AUTONAVI_VERSION=2.0.81
MOGO_MAP_VERSION=2.0.81
MOGO_MAP_API_VERSION=2.0.81
MOGO_SERVICE_VERSION=2.0.81
MOGO_SERVICE_API_VERSION=2.0.81
MOGO_CONNECTION_VERSION=2.0.81
MOGO_MODULE_APPS_VERSION=2.0.81
MOGO_MODULE_NAVI_VERSION=2.0.81
MOGO_MODULE_SHARE_VERSION=2.0.81
MOGO_MODULE_COMMON_VERSION=2.0.81
MOGO_MODULE_MAIN_VERSION=2.0.81
MOGO_MODULE_MAP_VERSION=2.0.81
MOGO_MODULE_SERVICE_VERSION=2.0.81
MOGO_MODULE_EXTENSIONS_VERSION=2.0.81
MOGO_MODULE_SEARCH_VERSION=2.0.81
MOGO_MODULE_BACK_VERSION=2.0.81
MOGO_MODULE_V2X_VERSION=2.0.81
# 探路
MOGO_MODULE_TANLU_VERSION=2.0.80
MOGO_MODULE_TANLU_VERSION=2.0.81
# 推送
MOGO_MODULE_PUSH_VERSION=2.0.80
MOGO_MODULE_PUSH_BASE_VERSION=2.0.80
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.80
MOGO_MODULE_PUSH_VERSION=2.0.81
MOGO_MODULE_PUSH_BASE_VERSION=2.0.81
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.81
# 探路上报和分享模块
TANLULIB_VERSION=2.0.80
MOGO_TANLU_API_VERSION=2.0.80
TANLULIB_VERSION=2.0.81
MOGO_TANLU_API_VERSION=2.0.81
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.80
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.80
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.81
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.81
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.0.80
MOGO_MODULE_WIDGETS_VERSION=2.0.81
# obu
MOGO_MODULE_OBU_VERSION=2.0.80
MOGO_MODULE_OBU_MOGO_VERSION=2.0.80
MOGO_MODULE_OBU_VERSION=2.0.81
MOGO_MODULE_OBU_MOGO_VERSION=2.0.81
# monitor
MOGO_MODULE_MONITOR_VERSION=2.0.80
MOGO_MODULE_MONITOR_VERSION=2.0.81
# bugly
CRASHREPORT_VERSION=2.0.80
CRASHREPORT_BUGLY_VERSION=2.0.80
CRASHREPORT_NOOP_VERSION=2.0.80
CRASHREPORT_UPGRADE_VERSION=2.0.80
CRASHREPORT_VERSION=2.0.81
CRASHREPORT_BUGLY_VERSION=2.0.81
CRASHREPORT_NOOP_VERSION=2.0.81
CRASHREPORT_UPGRADE_VERSION=2.0.81
## tts
TTS_BASE_VERSION=2.0.80
TTS_DI_VERSION=2.0.80
TTS_ZHI_VERSION=2.0.80
TTS_PAD_VERSION=2.0.80
TTS_NOOP_VERSION=2.0.80
TTS_BASE_VERSION=2.0.81
TTS_DI_VERSION=2.0.81
TTS_ZHI_VERSION=2.0.81
TTS_PAD_VERSION=2.0.81
TTS_NOOP_VERSION=2.0.81
# 自研地图
MAP_CUSTOM_VERSION=2.0.80
MOGO_MODULE_ADAS_VERSION=2.0.80
MAP_CUSTOM_VERSION=2.0.81
MOGO_MODULE_ADAS_VERSION=2.0.81
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.80
MOGO_BASE_SERVICES_APK_VERSION=2.0.80
MOGO_BASE_SERVICES_SDK_VERSION=2.0.80
MOGO_MODULE_CHAT_VERSION=2.0.80
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.0.81
MOGO_BASE_SERVICES_APK_VERSION=2.0.81
MOGO_BASE_SERVICES_SDK_VERSION=2.0.81
MOGO_MODULE_CHAT_VERSION=2.0.81
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.0.80
MOGO_MODULE_CARCHATTING_VERSION=2.0.81
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.80
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.0.81
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.0.80
MOGO_SKIN_LIGHT_VERSION=2.0.80
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.80
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.80
SKIN_SUPPORT_VERSION=2.0.80
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.80
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.80
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.80
SKIN_SUPPORT_DESIGN_VERSION=2.0.80
MOGO_SKIN_SUPPORT_VERSION=2.0.81
MOGO_SKIN_LIGHT_VERSION=2.0.81
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.81
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.81
SKIN_SUPPORT_VERSION=2.0.81
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.81
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.81
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.81
SKIN_SUPPORT_DESIGN_VERSION=2.0.81
# OCH
MOGO_OCH_VERSION=2.0.80-test
MOGO_OCH_BUS_VERSION=2.0.80-test
MOGO_OCH_NOOP_VERSION=2.0.80-test
MOGO_OCH_TAXI_VERSION=2.0.80-test
MOGO_OCH_VERSION=2.0.81-test
MOGO_OCH_BUS_VERSION=2.0.81-test
MOGO_OCH_NOOP_VERSION=2.0.81-test
MOGO_OCH_TAXI_VERSION=2.0.81-test
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.80
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.0.81
################# 旧版本架构模块版本 #################

6
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -174,10 +174,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<!--第一次启动引导页-->
<FrameLayout
android:id="@+id/module_main_id_splash_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>

6
modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml
View File

@@ -80,11 +80,5 @@
android:background="@drawable/main_bitmap_splash_bg"
android:visibility="visible" />
<!-- 比亚迪启动图 -->
<FrameLayout
android:id="@+id/module_main_id_splash_container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>