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

[shuttle_p]

Browse Source 
[B2 样式修改]
This commit is contained in:
yangyakun
2023-11-08 10:21:23 +08:00
parent 4f9b11c340
commit 91eef5c45c
4 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
View File

@@ -13,7 +13,7 @@ import android.os.Message;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.amap.api.maps.model.LatLng;
import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.module.intent.IMogoIntentListener;

2
OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/m2_button_un_auto_bg_color" />
<corners android:radius="@dimen/dp_18" />
<corners android:radius="@dimen/dp_25" />
</shape>

32
OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
View File

@@ -75,7 +75,7 @@
android:maxWidth="@dimen/dp_600"
android:singleLine="true"
android:textColor="@color/m2_line_name_tv_color"
android:textSize="@dimen/dp_26"
android:textSize="@dimen/dp_30"
android:textStyle="bold"
app:customGap="0.2"
app:layout_constraintEnd_toEndOf="@+id/iv_line_name_container"
@@ -130,7 +130,7 @@
android:layout_marginTop="@dimen/dp_96"
android:text="@string/shuttle_p_next_station_title"
android:textColor="@color/shuttle_color_203555"
android:textSize="@dimen/dp_24"
android:textSize="@dimen/dp_30"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -156,7 +156,7 @@
android:singleLine="true"
android:text="@string/m2_p_empty_tv"
android:textColor="@color/shuttle_color_17417B"
android:textSize="@dimen/dp_34"
android:textSize="@dimen/dp_46"
android:textStyle="bold"
app:customGap="0.2"
app:layout_constraintStart_toStartOf="@+id/tv_next_station_title"
@@ -170,7 +170,6 @@
android:id="@+id/clg_distance_left_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="bg_distance_lefttime,bg_distance_lefttime_split,tv_distance,tv_left_time" />
<View
@@ -198,7 +197,7 @@
android:layout_height="wrap_content"
android:text="--"
android:textColor="@color/shuttle_color_2d3e5f"
android:textSize="@dimen/dp_20"
android:textSize="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime"
app:layout_constraintEnd_toStartOf="@+id/bg_distance_lefttime_split"
app:layout_constraintStart_toStartOf="@+id/bg_distance_lefttime"
@@ -210,7 +209,7 @@
android:layout_height="wrap_content"
android:text="--"
android:textColor="@color/shuttle_color_2d3e5f"
android:textSize="@dimen/dp_20"
android:textSize="@dimen/dp_26"
app:layout_constraintBottom_toBottomOf="@+id/bg_distance_lefttime"
app:layout_constraintEnd_toEndOf="@+id/bg_distance_lefttime"
app:layout_constraintStart_toEndOf="@+id/bg_distance_lefttime_split"
@@ -255,7 +254,7 @@
android:layout_marginStart="@dimen/dp_50"
android:text="0"
android:textColor="@color/m2_p_speed_tv_color"
android:textSize="@dimen/dp_60"
android:textSize="@dimen/dp_70"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/aciv_speed_time_bg"
app:layout_constraintTop_toTopOf="@+id/viewTextClockHouerMin"
@@ -275,27 +274,28 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/auto_tv"
android:layout_width="@dimen/dp_66"
android:layout_height="@dimen/dp_38"
android:layout_width="@dimen/dp_83"
android:layout_height="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_21"
android:background="@drawable/bg_p_m2_auto"
android:gravity="center"
android:text="@string/m2_p_auto_tv"
android:textColor="@color/shuttle_color_7094ad"
android:layout_marginBottom="@dimen/dp_34"
android:textSize="@dimen/dp_18"
android:textSize="@dimen/dp_24"
app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 转向灯 IMoGoChassisLamplightListener-->
<com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
android:id="@+id/turn_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_86"
android:layout_height="@dimen/dp_47"
android:layout_marginLeft="@dimen/dp_12"
app:day_light_mode="true"
app:layout_constraintLeft_toRightOf="@+id/auto_tv"
app:layout_constraintTop_toTopOf="@+id/auto_tv"
app:layout_constraintBottom_toBottomOf="@+id/auto_tv"
app:visible="false" />
<!-- 红绿灯-->
@@ -344,7 +344,7 @@
android:layout_marginEnd="@dimen/dp_90"
android:textColor="@color/shuttle_color_17417B"
android:includeFontPadding="false"
android:textSize="@dimen/dp_46" />
android:textSize="@dimen/dp_52" />
<TextClock
android:layout_marginStart="@dimen/dp_21"
@@ -354,12 +354,12 @@
android:format12Hour="yyyy年MM月dd日"
android:format24Hour="yyyy年MM月dd日"
android:gravity="center"
android:layout_marginBottom="-3dp"
app:layout_constraintBottom_toTopOf="@+id/viewTextClockWeek"
app:layout_constraintStart_toEndOf="@+id/view_split"
android:textColor="@color/shuttle_color_17417B"
android:layout_marginBottom="@dimen/dp_5"
android:includeFontPadding="false"
android:textSize="@dimen/dp_18" />
android:textSize="@dimen/dp_26" />
<TextClock
@@ -375,6 +375,6 @@
android:layout_marginEnd="@dimen/dp_90"
android:textColor="@color/shuttle_color_17417B"
android:includeFontPadding="false"
android:textSize="@dimen/dp_18" />
android:textSize="@dimen/dp_26" />
</androidx.constraintlayout.widget.ConstraintLayout>

32
OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_66"
android:layout_height="@dimen/dp_38"
android:layout_width="@dimen/dp_86"
android:layout_height="@dimen/dp_47"
android:visibility="visible">
<FrameLayout
@@ -18,37 +18,35 @@
<ImageView
android:id="@+id/left_nor_image"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_26"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="left|center_vertical"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginLeft="@dimen/dp_12"
android:src="@drawable/m2_zuozhuan_un_open" />
<ImageView
android:id="@+id/right_nor_image"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_26"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="right|center_vertical"
android:layout_marginRight="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_12"
android:src="@drawable/m2_youzhuan_un_open" />
<ImageView
android:id="@+id/left_select_image"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_26"
android:layout_gravity="left|top"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="2dp"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="left|center_vertical"
android:layout_marginLeft="@dimen/dp_12"
android:src="@drawable/m2_zuozhuan_open"
android:visibility="gone" />
<ImageView
android:id="@+id/right_select_image"
android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_26"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
android:layout_gravity="right|center_vertical"
android:layout_marginTop="2dp"
android:layout_marginRight="5dp"
android:layout_marginRight="@dimen/dp_12"
android:src="@drawable/m2_youzhuan_open"
android:visibility="gone" />
</FrameLayout>