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

Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
yangyakun
2023-05-18 16:51:25 +08:00
parent 22b281cf80 106d12b96a
commit f02999eea5
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

2
OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="bus_p_route_info_panel_width">750dp</dimen>
<dimen name="bus_p_route_bg_width">886dp</dimen>
<dimen name="bus_p_route_bg_width">804dp</dimen>
<dimen name="bus_p_auto_icon_margin_top">40dp</dimen>
<dimen name="bus_p_route_info_margin_right">40dp</dimen>
<dimen name="bus_p_route_info_margin_left">48dp</dimen>

BIN
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_right_route_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

1
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
View File

@@ -41,6 +41,7 @@
android:background="@drawable/roma_bus_p_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:visibility="gone"
app:roma_close="@drawable/roma_bus_p_bg_selector"
app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />

2
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="bus_p_route_info_panel_width">750dp</dimen>
<dimen name="bus_p_route_bg_width">886dp</dimen>
<dimen name="bus_p_route_bg_width">804dp</dimen>
<dimen name="bus_p_auto_icon_margin_top">40dp</dimen>
<dimen name="bus_p_route_info_margin_right">40dp</dimen>
<dimen name="bus_p_route_info_margin_left">48dp</dimen>

21
gradle.properties
View File

@@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4
LOGLIB_VERSION=1.5.27
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.7.2
MOGO_NETWORK_VERSION=1.4.7.3
# 鉴权
MOGO_PASSPORT_VERSION=1.4.7.2
MOGO_PASSPORT_VERSION=1.4.7.3
# 常链接
MOGO_SOCKET_VERSION=1.4.7.2
MOGO_SOCKET_VERSION=1.4.7.3
# 数据采集
MOGO_REALTIME_VERSION=1.4.7.2
MOGO_REALTIME_VERSION=1.4.7.3
# 探路，道路事件发布，获取
MOGO_TANLU_VERSION=1.4.7.2
MOGO_TANLU_VERSION=1.4.7.3
# 直播推流
MOGO_LIVE_VERSION=1.4.7.2
MOGO_LIVE_VERSION=1.4.7.3
# 直播拉流
MOGO_TRAFFICLIVE_VERSION=1.4.7.2
MOGO_TRAFFICLIVE_VERSION=1.4.7.3
# 定位服务
MOGO_LOCATION_VERSION=1.4.7.2
MOGO_LOCATION_VERSION=1.4.7.3
# 远程通讯模块
MOGO_TELEMATIC_VERSION=1.4.7.2
MOGO_TELEMATIC_VERSION=1.4.7.3
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.12.1.1
@@ -146,7 +146,10 @@ ADAS_DATA_LIB_CHILD_VERSION=.4
# 是否支持patch升级
PATCH_UPGRADE_SUPPORT=true
MOGO_PLUGIN_VERSION=1.0.0.31
# 线程优化版本
THREAD_OPT_VERSION=4.0.1
# matrix版本
MATRIX_VERSION=2.0.8