diff --git a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 52838d931b..28f8a23303 100644 --- a/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/shuttle/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -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; diff --git a/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml b/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml index b6cbdbd569..1fe46ae5ff 100644 --- a/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml +++ b/OCH/shuttle/passenger/src/m2/res/drawable/brakelight_background_daytime.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml index 25732e03b3..05d0d58637 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml @@ -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" /> @@ -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" /> + android:textSize="@dimen/dp_26" /> + android:textSize="@dimen/dp_26" /> \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml b/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml index 3ba54be149..b782ef1f60 100644 --- a/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml +++ b/OCH/shuttle/passenger/src/m2/res/layout/view_turn_light_status_daytime.xml @@ -1,8 +1,8 @@