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

[3.0.0]

Browse Source 
[m2]
[ui修改、视频变更 b2视频和b1视频]
This commit is contained in:
yangyakun
2023-04-11 19:48:36 +08:00
parent f0f5e49078
commit 0b3f264837
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
View File

@@ -177,7 +177,7 @@ class PM2DrivingInfoFragment :
context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_p_white_color)) }
context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.auto_button_bg) }
}else{
context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.m2_button_auto_tv_color)) }
context?.let { auto_tv.setTextColor(ContextCompat.getColor(it,R.color.shuttle_color_7094ad)) }
context?.let { auto_tv.background = ContextCompat.getDrawable(it,R.drawable.bg_p_m2_auto) }
}
}

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 50 KiB

9
OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
View File

@@ -250,13 +250,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_50"
android:layout_marginTop="@dimen/dp_27"
android:text="0"
android:textColor="@color/m2_p_speed_tv_color"
android:textSize="@dimen/dp_60"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg"
app:layout_constraintTop_toTopOf="@+id/aciv_speed_time_bg" />
app:layout_constraintTop_toTopOf="@+id/viewTextClockHouerMin"
app:layout_constraintBottom_toBottomOf="@+id/viewTextClockHouerMin"/>
<TextView
android:id="@+id/tv_speed_unit"
@@ -278,7 +278,7 @@
android:background="@drawable/bg_p_m2_auto"
android:gravity="center"
android:text="@string/m2_p_auto_tv"
android:textColor="@color/m2_button_auto_tv_color"
android:textColor="@color/shuttle_color_7094ad"
android:layout_marginBottom="@dimen/dp_34"
android:textSize="@dimen/dp_18"
app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
@@ -353,9 +353,8 @@
android:gravity="center"
app:layout_constraintBottom_toTopOf="@+id/viewTextClockWeek"
app:layout_constraintStart_toEndOf="@+id/view_split"
android:layout_marginEnd="@dimen/dp_90"
android:textColor="@color/shuttle_color_17417B"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_5"
android:includeFontPadding="false"
android:textSize="@dimen/dp_18" />

1
OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
View File

@@ -35,4 +35,5 @@
<color name="shuttle_color_b9e7c0">#B9E7C0</color>
<color name="shuttle_color_43cefe">#43CEFE</color>
<color name="shuttle_color_1466fb">#1466FB</color>
<color name="shuttle_color_7094ad">#7094AD</color>
</resources>

8
app/config/tempConfig.json
View File

@@ -67,7 +67,7 @@
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"
@@ -143,7 +143,7 @@
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"
@@ -155,7 +155,7 @@
"shuttlepassenger": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774847276/yangmadao_video.mp4",
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "1"
@@ -165,7 +165,7 @@
"shuttlepassengerm2": {
"ads": [
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1678946244305/dalim2.mp4",
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210902933/erhaim2.mp4",
"type": 1,
"cacheImgPath": "",
"title": "1"