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

Merge branch 'dev_robotaxi-d_230809_6.0.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230809_6.0.0

Browse Source
This commit is contained in:
wangmingjun
2023-09-06 17:50:57 +08:00
parent b1a917dc82 551ff2a745
commit ae44057a7b
5 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -96,8 +96,10 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.VISIBLE
if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
romaPView.visibility = View.VISIBLE
romaDistanceView.visibility = View.VISIBLE
} else {
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
}
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
@@ -111,6 +113,7 @@ class TaxiPassengerBaseFragment() :
presenter?.setItineraryVisibility()
ck_setting.visibility = View.VISIBLE
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
@@ -124,6 +127,7 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.GONE
ck_setting.isChecked = false
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.GONE
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()

1
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -82,6 +82,7 @@
app:roma_open="@drawable/taxi_p_roma_checked" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:id="@+id/romaDistanceView"
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"

4
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -95,8 +95,10 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.VISIBLE
if (DeviceUtils.isLenovoModel() || DeviceUtils.isEB5Model()) {
romaPView.visibility = View.VISIBLE
romaDistanceView.visibility = View.VISIBLE
} else {
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
}
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
@@ -110,6 +112,7 @@ class TaxiPassengerBaseFragment() :
presenter?.setItineraryVisibility()
ck_setting.visibility = View.VISIBLE
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.VISIBLE
pcnActionView.visibility = View.VISIBLE
CallerHmiManager.showTrafficLightView()
@@ -123,6 +126,7 @@ class TaxiPassengerBaseFragment() :
ck_setting.visibility = View.GONE
ck_setting.isChecked = false
romaPView.visibility = View.GONE
romaDistanceView.visibility = View.GONE
rv_location_center.visibility = View.GONE
pcnActionView.visibility = View.GONE
CallerHmiManager.hideTrafficLightView()

1
OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -80,6 +80,7 @@
app:roma_open="@drawable/taxi_p_roma_checked" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:id="@+id/romaDistanceView"
android:layout_width="@dimen/dp_334"
android:layout_height="@dimen/dp_120"
android:layout_marginStart="@dimen/dp_50"

2
gradle.properties
View File

@@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.16
MOGO_TELEMATIC_VERSION=1.4.7.16
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.14.3.9
MAP_SDK_VERSION=2.14.3.10
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7