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

解决了一些发布maven的版本依赖，但是卡在了mogo-module-share

Browse Source
This commit is contained in:
董宏宇
2021-09-03 20:01:05 +08:00
parent 98f6fe9422
commit 5139a2f6e1
9 changed files with 90 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/misc.xml generated
View File

@@ -51,6 +51,9 @@
<entry key="modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml" value="0.28919677734374993" />
<entry key="modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml" value="0.25416666666666665" />
<entry key="modules/mogo-module-smp/src/main/res/layout/module_small_map_view.xml" value="0.3338541666666667" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml" value="0.2484375" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml" value="0.2484375" />
<entry key="modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml" value="0.2484375" />
<entry key="modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml" value="0.2838541666666667" />
</map>
</option>

2
OCH/mogo-och-taxi/build.gradle
View File

@@ -46,7 +46,7 @@ dependencies {
implementation rootProject.ext.dependencies.mogooch
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogocommons
implementation rootProject.ext.dependencies.mogomodulecommon
implementation rootProject.ext.dependencies.modulecommon
} else {
implementation project(":OCH:mogo-och")
implementation project(":foudations:mogo-utils")

10
config.gradle
View File

@@ -19,12 +19,12 @@ ext {
]
dependencies = [
// androidx
androidxappcompat : "androidx.appcompat:appcompat:1.1.0",
androidxappcompat : "androidx.appcompat:appcompat:1.3.1",
androidxccorektx : "androidx.core:core-ktx:1.6.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.2.0",
androidxrecyclerview : "androidx.recyclerview:recyclerview:1.1.0",
androidxcardview : "androidx.cardview:cardview:1.0.0",
localbroadcastmanager : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
// flexbox
@@ -54,7 +54,7 @@ ext {
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',
supportannos : "com.android.support:support-annotations:28.0.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',
@@ -116,8 +116,8 @@ ext {
guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
// V2X
moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}",
moduleSmallMap : "com.mogo.module:module-small-map:${MOGO_MODULES_SMALL_MAP}",
moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULES_ADAS}",
moduleSmallMap : "com.mogo.module:module-small-map:${MOGO_MODULE_SMP_VERSION}",
moduleADAS : "com.mogo.module:mogo-module-adas:${MOGO_MODULE_ADAS_VERSION}",
modulemedia : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
modulesearch : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
// push

4
foudations/mogo-utils/build.gradle
View File

@@ -34,8 +34,8 @@ dependencies {
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
implementation rootProject.ext.dependencies.glideanno
implementation rootProject.ext.dependencies.glideokhttp3
implementation rootProject.ext.dependencies.supportannos
annotationProcessor rootProject.ext.dependencies.supportannos
implementation rootProject.ext.dependencies.androidxannotation
annotationProcessor rootProject.ext.dependencies.androidxannotation
annotationProcessor rootProject.ext.dependencies.glidecompiler
implementation rootProject.ext.dependencies.androidxappcompat
api 'ch.hsr:geohash:1.4.0'

142
gradle.properties
View File

@@ -52,93 +52,93 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=2.0.24
MOGO_UTILS_VERSION=2.0.24
MAP_AMAP_VERSION=2.0.24
MAP_AUTONAVI_VERSION=2.0.24
MOGO_MAP_VERSION=2.0.24
MOGO_MAP_API_VERSION=2.0.24
MOGO_SERVICE_VERSION=2.0.24
MOGO_SERVICE_API_VERSION=2.0.24
MOGO_CONNECTION_VERSION=2.0.24
MOGO_MODULE_APPS_VERSION=2.0.24
MOGO_MODULE_NAVI_VERSION=2.0.24
MOGO_MODULE_SHARE_VERSION=2.0.24
MOGO_MODULE_COMMON_VERSION=2.0.24
MOGO_MODULE_MAIN_VERSION=2.0.24
MOGO_MODULE_MAP_VERSION=2.0.24
MOGO_MODULE_SERVICE_VERSION=2.0.24
MOGO_MODULE_EXTENSIONS_VERSION=2.0.24
MOGO_MODULE_SEARCH_VERSION=2.0.24
MOGO_MODULE_BACK_VERSION=2.0.24
MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.24
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.24
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.24
MOGO_MODULE_AUTHORIZE_VERSION=2.0.24
MOGO_MODULE_GUIDE_VERSION=2.0.24
MOGO_MODULE_MEDIA_VERSION=2.0.24
MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.24
MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.24
MOGO_MODULE_V2X_VERSION=2.0.24
MOGO_COMMONS_VERSION=2.0.34
MOGO_UTILS_VERSION=2.0.34
MAP_AMAP_VERSION=2.0.34
MAP_AUTONAVI_VERSION=2.0.34
MOGO_MAP_VERSION=2.0.34
MOGO_MAP_API_VERSION=2.0.34
MOGO_SERVICE_VERSION=2.0.34
MOGO_SERVICE_API_VERSION=2.0.34
MOGO_CONNECTION_VERSION=2.0.34
MOGO_MODULE_APPS_VERSION=2.0.34
MOGO_MODULE_NAVI_VERSION=2.0.34
MOGO_MODULE_SHARE_VERSION=2.0.34
MOGO_MODULE_COMMON_VERSION=2.0.34
MOGO_MODULE_MAIN_VERSION=2.0.34
MOGO_MODULE_MAP_VERSION=2.0.34
MOGO_MODULE_SERVICE_VERSION=2.0.34
MOGO_MODULE_EXTENSIONS_VERSION=2.0.34
MOGO_MODULE_SEARCH_VERSION=2.0.34
MOGO_MODULE_BACK_VERSION=2.0.34
MOGO_MODULE_GPS_SIMULATOR_VERSION=2.0.34
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=2.0.34
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=2.0.34
MOGO_MODULE_AUTHORIZE_VERSION=2.0.34
MOGO_MODULE_GUIDE_VERSION=2.0.34
MOGO_MODULE_MEDIA_VERSION=2.0.34
MOGO_MODULE_MAIN_LAUNCHER_VERSION=2.0.34
MOGO_MODULE_MAIN_INDEPENDENT_VERSION=2.0.34
MOGO_MODULE_V2X_VERSION=2.0.34
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.24
MOGO_BASE_SERVICES_APK_VERSION=2.0.24
MOGO_BASE_SERVICES_SDK_VERSION=2.0.24
MOGO_BASE_WEBSOCKET_SDK_VERSION = 2.0.34
MOGO_BASE_SERVICES_APK_VERSION=2.0.34
MOGO_BASE_SERVICES_SDK_VERSION=2.0.34
## 工程外部模块
# 探路
MOGO_MODULE_TANLU_VERSION=2.0.24
MOGO_MODULE_TANLU_VERSION=2.0.34
# 视频引导
MOGO_MODULE_GUIDESHOW_VERSION=2.0.24
MOGO_MODULE_GUIDESHOW_VERSION=2.0.34
# 推送
MOGO_MODULE_PUSH_VERSION=2.0.24
MOGO_MODULE_PUSH_BASE_VERSION=2.0.24
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.24
MOGO_MODULE_PUSH_VERSION=2.0.34
MOGO_MODULE_PUSH_BASE_VERSION=2.0.34
MOGO_MODULE_PUSH_NOOP_VERSION=2.0.34
# 探路上报和分享模块
TANLULIB_VERSION=2.0.24
MOGO_TANLU_API_VERSION=2.0.24
TANLULIB_VERSION=2.0.34
MOGO_TANLU_API_VERSION=2.0.34
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.24
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.24
MOGO_MODULE_LEFT_PANEL_VERSION=2.0.34
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.0.34
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.0.24
MOGO_MODULE_WIDGETS_VERSION=2.0.34
# obu
MOGO_MODULE_OBU_VERSION=2.0.24
MOGO_MODULE_OBU_MOGO_VERSION=2.0.24
MOGO_MODULE_OBU_VERSION=2.0.34
MOGO_MODULE_OBU_MOGO_VERSION=2.0.34
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.0.24
MOGO_SKIN_LIGHT_VERSION=2.0.24
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.24
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.24
SKIN_SUPPORT_VERSION=2.0.24
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.24
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.24
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.24
SKIN_SUPPORT_DESIGN_VERSION=2.0.24
MOGO_SKIN_SUPPORT_VERSION=2.0.34
MOGO_SKIN_LIGHT_VERSION=2.0.34
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.0.34
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.0.34
SKIN_SUPPORT_VERSION=2.0.34
SKIN_SUPPORT_APPCOMPAT_VERSION=2.0.34
SKIN_SUPPORT_CARDVIEW_VERSION=2.0.34
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.0.34
SKIN_SUPPORT_DESIGN_VERSION=2.0.34
# 闪屏页
MOGO_MODULE_SPLASH_VERSION=2.0.24
MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.24
MOGO_MODULE_SPLASH_VERSION=2.0.34
MOGO_MODULE_SPLASH_NOOP_VERSION=2.0.34
# monitor
MOGO_MODULE_MONITOR_VERSION=2.0.24
MOGO_MODULE_MONITOR_VERSION=2.0.34
# bugly
CRASHREPORT_VERSION=2.0.24
CRASHREPORT_BUGLY_VERSION=2.0.24
CRASHREPORT_NOOP_VERSION=2.0.24
CRASHREPORT_UPGRADE_VERSION=2.0.24
CRASHREPORT_VERSION=2.0.34
CRASHREPORT_BUGLY_VERSION=2.0.34
CRASHREPORT_NOOP_VERSION=2.0.34
CRASHREPORT_UPGRADE_VERSION=2.0.34
## tts
TTS_BASE_VERSION=2.0.24
TTS_DI_VERSION=2.0.24
TTS_ZHI_VERSION=2.0.24
TTS_PAD_VERSION=2.0.24
TTS_NOOP_VERSION=2.0.24
TTS_BASE_VERSION=2.0.34
TTS_DI_VERSION=2.0.34
TTS_ZHI_VERSION=2.0.34
TTS_PAD_VERSION=2.0.34
TTS_NOOP_VERSION=2.0.34
# 自研地图
MAP_CUSTOM_VERSION=2.0.24
MOGO_MODULES_SMALL_MAP=2.0.24
MOGO_MODULES_ADAS=2.0.24
MAP_CUSTOM_VERSION=2.0.34
MOGO_MODULE_SMP_VERSION=2.0.34
MOGO_MODULE_ADAS_VERSION=2.0.34
# OCH
MOGO_OCH_VERSION=2.0.24
MOGO_OCH_BUS_VERSION=2.0.24
MOGO_OCH_NOOP_VERSION=2.0.24
MOGO_OCH_TAXI_VERSION=2.0.24
MOGO_OCH_VERSION=2.0.34
MOGO_OCH_BUS_VERSION=2.0.34
MOGO_OCH_NOOP_VERSION=2.0.34
MOGO_OCH_TAXI_VERSION=2.0.34
######## 外部依赖引用
# 车聊聊

36
modules.txt
View File

@@ -1,39 +1,3 @@
:foudations:mogo-utils
:skin:mogo-skin-support
:tts:tts-base
:tts:tts-zhi
:tts:tts-pad
:libraries:mogo-map-api
:services:mogo-service-api
:foudations:mogo-aicloud-services-sdk
:foudations:mogo-commons
:tts:tts-di
:tts:tts-noop
:skin:skin-support
:skin:skin-support-appcompat
:skin:skin-support-cardview
:skin:skin-support-constraint-layout
:skin:skin-support-design
:libraries:map-amap
:libraries:map-autonavi
:libraries:map-custom
:libraries:mogo-map
:modules:mogo-module-common
:skin:mogo-skin-support-impl
:skin:mogo-skin-support-noop
:test:crashreport
:test:crashreport-bugly
:test:crashreport-noop
:skin:mogo-skin-light
:modules:mogo-module-obu
:modules:mogo-module-obu-mogo
:services:mogo-service
:modules:mogo-module-adas
:modules:mogo-module-map
:modules:mogo-module-smp
:modules:mogo-module-apps
:modules:mogo-module-service
:modules:mogo-module-authorize
:modules:mogo-module-share
:modules:mogo-module-extensions
:modules:mogo-module-search

5
modules/mogo-module-adas/build.gradle
View File

@@ -52,7 +52,7 @@ dependencies {
if (Boolean.valueOf(RELEASE)) {
api rootProject.ext.dependencies.mogoutils
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapapi
api rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
} else {
api project(":foudations:mogo-utils")
@@ -61,5 +61,4 @@ dependencies {
implementation project(':modules:mogo-module-common')
}
}
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

5
modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/obu/HualiObu.kt
View File

@@ -4,19 +4,14 @@ import android.content.Context
import android.os.Handler
import android.os.SystemClock
import android.util.ArrayMap
import com.google.gson.JsonObject
import com.mogo.commons.debug.DebugConfig
import com.mogo.utils.logger.Logger
import com.zhidao.mogo.module.obu.ObuConstant
import com.zhidao.mogo.module.obu.obu.bean.MogoObuEventInfo
import com.zhidao.mogo.module.obu.socket.IUdpSocketCallback
import com.zhidao.mogo.module.obu.socket.SimpleSocketManager
import com.zhidao.mogo.module.obu.socket.UdpSocketManager
import org.json.JSONException
import org.json.JSONObject
import java.lang.StringBuilder
import kotlin.concurrent.thread
import kotlin.experimental.and
import kotlin.experimental.xor
/**

12
skin/skin-support-appcompat/src/main/java/skin/support/content/res/SkinCompatDrawableManager.java
View File

@@ -110,12 +110,12 @@ final class SkinCompatDrawableManager {
R.drawable.abc_textfield_search_activated_mtrl_alpha,
R.drawable.abc_cab_background_top_mtrl_alpha,
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_select_handle_left_mtrl_dark,
R.drawable.abc_text_select_handle_middle_mtrl_dark,
R.drawable.abc_text_select_handle_right_mtrl_dark,
R.drawable.abc_text_select_handle_left_mtrl_light,
R.drawable.abc_text_select_handle_middle_mtrl_light,
R.drawable.abc_text_select_handle_right_mtrl_light
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_cursor_material,
R.drawable.abc_text_cursor_material
};
/**