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

[6.2.6]

Browse Source 
[shuttle-jl]
[rename]
This commit is contained in:
yangyakun
2023-12-06 14:19:59 +08:00
parent d6ed5d59cb
commit 331e95de0d
14 changed files with 124 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -56,14 +56,14 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
Log.d("onBindViewHolder" , "position0 = "+position);
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_bg_start_tag_bg);
if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_clock_17417B));
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_1F82FB));
}else {
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_clock_992D3E5F));
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_A9B6CA));
}
}else{
viewHolder.curArrowBg.setVisibility(View.VISIBLE);
@@ -71,16 +71,16 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
BusStationBean preStation = mStations.get(position -1);
if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
(station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving())){ //过站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_clock_992D3E5F));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_A9B6CA));
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_point_gray);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
Log.d("onBindViewHolder" , "position 1 = "+position);
} else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_clock_17417B));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_arrive_line_green);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_bg_end_tag_bg);
@@ -90,9 +90,9 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_arrive_line_blue);
Log.d("onBindViewHolder" , "position3 = "+position);
@@ -103,9 +103,9 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
(preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
|| preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.shuttle_p_jl_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_1F82FB));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.shuttle_p_jl_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.shuttle_p_jl_point_blue);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);

26
OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -81,8 +81,8 @@ public class BusPassengerRouteFragment extends
mSpeedTv = findViewById(R.id.bus_p_speed_tv);
mSpeedTv.setVertrial(true);
mSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.bus_p_speed_color_start),
getResources().getColor(R.color.bus_p_speed_color_end)});
mSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.shuttle_p_jl_speed_color_start),
getResources().getColor(R.color.shuttle_p_jl_speed_color_end)});
mNoLineInfoView =findViewById(R.id.bus_p_no_order_data_view);
emptyTv = findViewById(R.id.no_order_data_tv);
@@ -165,10 +165,10 @@ public class BusPassengerRouteFragment extends
public void changeOperationStatus(boolean status) {
if (!status) {
emptyTv.setText(getString(R.string.bus_p_no_out));
emptyTv.setText(getString(R.string.shuttle_p_jl_no_out));
mNoLineInfoView.setVisibility(View.VISIBLE);
mRouteInfoView.setVisibility(View.GONE);
mLineName.setText(getContext().getString(R.string.bus_p_no_line));
mLineName.setText(getContext().getString(R.string.shuttle_p_jl_no_line));
updateArrivedStation(null,0,true);
clearMapView();
clearMapMarkers();
@@ -179,12 +179,12 @@ public class BusPassengerRouteFragment extends
if (mNoLineInfoView.getVisibility() == View.GONE){
mNoLineInfoView.setVisibility(View.VISIBLE);
mRouteInfoView.setVisibility(View.GONE);
mLineName.setText(getContext().getString(R.string.bus_p_no_line));
mLineName.setText(getContext().getString(R.string.shuttle_p_jl_no_line));
updateArrivedStation(null,0,true);
clearMapView();
clearMapMarkers();
}
emptyTv.setText(getString(R.string.bus_p_no_task));
emptyTv.setText(getString(R.string.shuttle_p_jl_no_task));
}
public void hideNoTaskView(){
@@ -281,26 +281,26 @@ public class BusPassengerRouteFragment extends
public void updateArrivedStation(String station,int currentIndex,boolean isArrived){
if (null == station){
mCurrentArriveStation.setText("----");
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
}else {
mCurrentArriveStation.setText(station);
if (currentIndex == 0){
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
return;
}
if (isArrived){
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.shuttle_p_jl_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
handleArrivedSpeakIconDrawable();
}else {
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_next_station_title));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.shuttle_p_jl_cur_next_station_title));
mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_un_arrived_bg);
handleArrivingSpeakIconDrawable();
}

6
OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerTrafficLightView.kt
View File

@@ -158,7 +158,7 @@ class BusPassengerTrafficLightView @JvmOverloads constructor(
val layoutParams = layoutParams
if (layoutParams is MarginLayoutParams) {
val lp = layoutParams
lp.width = resources.getDimension(R.dimen.bus_p_traffic_light_icon_size).toInt()
lp.width = resources.getDimension(R.dimen.shuttle_p_jl_traffic_light_icon_size).toInt()
setLayoutParams(lp)
bus_p_traffic_light_time_tv.visibility = GONE
bus_p_traffic_light_bg.layoutParams.width =
@@ -171,11 +171,11 @@ class BusPassengerTrafficLightView @JvmOverloads constructor(
val layoutParams = layoutParams
if (layoutParams is MarginLayoutParams) {
val lp = layoutParams
lp.width = resources.getDimension(R.dimen.bus_p_route_traffic_light_view_width).toInt()
lp.width = resources.getDimension(R.dimen.shuttle_p_jl_route_traffic_light_view_width).toInt()
setLayoutParams(lp)
bus_p_traffic_light_time_tv.visibility = VISIBLE
bus_p_traffic_light_bg.layoutParams.width =
resources.getDimension(R.dimen.bus_p_traffic_light_bg_width).toInt()
resources.getDimension(R.dimen.shuttle_p_jl_traffic_light_bg_width).toInt()
}
}
}

4
OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bus_p_end_station_circle_borner_color" />
<corners android:radius="@dimen/bus_p_station_circle_radius_size" />
<solid android:color="@color/shuttle_p_jl_end_station_circle_borner_color" />
<corners android:radius="@dimen/shuttle_p_jl_station_circle_radius_size" />
</shape>

4
OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bus_p_tag_line_color" />
<corners android:radius="@dimen/bus_p_station_circle_radius_size" />
<solid android:color="@color/shuttle_p_jl_tag_line_color" />
<corners android:radius="@dimen/shuttle_p_jl_station_circle_radius_size" />
</shape>

4
OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bus_p_start_station_circle_borner_color" />
<corners android:radius="@dimen/bus_p_station_circle_radius_size" />
<solid android:color="@color/shuttle_p_jl_start_station_circle_borner_color" />
<corners android:radius="@dimen/shuttle_p_jl_station_circle_radius_size" />
</shape>

8
OCH/shuttle/passenger/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml
View File

@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/bus_p_traffic_light_bg_color"/>
<corners android:radius="@dimen/bus_p_route_traffic_light_view_corner"/>
<stroke android:color="@color/bus_p_traffic_light_bg_stroke"
android:width="@dimen/bus_p_traffic_light_bg_stroke_width"/>
<solid android:color="@color/shuttle_p_jl_traffic_light_bg_color"/>
<corners android:radius="@dimen/shuttle_p_jl_route_traffic_light_view_corner"/>
<stroke android:color="@color/shuttle_p_jl_traffic_light_bg_stroke"
android:width="@dimen/shuttle_p_jl_traffic_light_bg_stroke_width"/>
</shape>

6
OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_no_data_common_view.xml
View File

@@ -24,12 +24,12 @@
android:id="@+id/no_order_data_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/bus_p_speed_txt_color"
android:textSize="@dimen/bus_p_no_data_size"
android:textColor="@color/shuttle_p_jl_speed_txt_color"
android:textSize="@dimen/shuttle_p_jl_no_data_size"
android:layout_marginTop="50dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/no_order_data_iv"
android:text="@string/bus_p_no_out"/>
android:text="@string/shuttle_p_jl_no_out"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

48
OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_route_fragment.xml
View File

@@ -1,7 +1,7 @@
<?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/bus_p_route_bg_width"
android:layout_width="@dimen/shuttle_p_jl_route_bg_width"
android:layout_height="match_parent"
android:background="@drawable/shuttle_p_jl_right_route_bg">
@@ -21,7 +21,7 @@
app:yOffset="0dp"/>
<com.mogo.och.common.module.wigets.OCHRoundConstraintLayout
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_width="@dimen/shuttle_p_jl_route_info_panel_width"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_40"
android:layout_marginRight="@dimen/dp_40"
@@ -30,14 +30,14 @@
app:roundLayoutRadius="@dimen/dp_40">
<View
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_width="@dimen/shuttle_p_jl_route_info_panel_width"
android:layout_height="match_parent"
android:background="@drawable/shuttle_p_jl_route_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_width="@dimen/shuttle_p_jl_route_info_panel_width"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/bus_p_line_map_view"
app:layout_constraintRight_toRightOf="parent"
@@ -52,9 +52,9 @@
android:marqueeRepeatLimit="marquee_forever"
android:maxWidth="@dimen/dp_340"
android:singleLine="true"
android:text="@string/bus_p_no_line"
android:textColor="@color/bus_p_line_name_color"
android:textSize="@dimen/bus_p_driver_number_plate_size"
android:text="@string/shuttle_p_jl_no_line"
android:textColor="@color/shuttle_p_jl_line_name_color"
android:textSize="@dimen/shuttle_p_jl_driver_number_plate_size"
android:textStyle="bold"
app:customGap="0.5"
app:layout_constraintLeft_toLeftOf="parent"
@@ -76,12 +76,12 @@
android:id="@+id/bus_p_speed_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/bus_p_route_info_margin_left"
android:layout_marginLeft="@dimen/shuttle_p_jl_route_info_margin_left"
android:layout_marginTop="@dimen/dp_90"
android:includeFontPadding="false"
android:letterSpacing="-0.05"
android:text="0"
android:textSize="@dimen/bus_p_speed_txt_size"
android:textSize="@dimen/shuttle_p_jl_speed_txt_size"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -91,12 +91,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/bus_p_route_info_margin_right"
android:layout_marginRight="@dimen/shuttle_p_jl_route_info_margin_right"
android:layout_marginBottom="@dimen/dp_20"
android:includeFontPadding="false"
android:text="@string/bus_p_speed_unit_txt"
android:textColor="@color/bus_p_speed_txt_color"
android:textSize="@dimen/bus_p_speed_unit_txt_size"
android:text="@string/shuttle_p_jl_speed_unit_txt"
android:textColor="@color/shuttle_p_jl_speed_txt_color"
android:textSize="@dimen/shuttle_p_jl_speed_unit_txt_size"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv"
app:layout_constraintLeft_toRightOf="@+id/bus_p_speed_tv" />
@@ -123,7 +123,7 @@
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_156"
android:layout_marginTop="@dimen/dp_110"
android:background="@color/bus_p_clock_6617417B"
android:background="@color/shuttle_p_jl_clock_6617417B"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -137,7 +137,7 @@
android:format24Hour="HH:mm"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/bus_p_clock_17417B"
android:textColor="@color/shuttle_p_jl_clock_17417B"
android:textSize="@dimen/dp_66"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv"
app:layout_constraintLeft_toRightOf="@+id/dividing_line_1"
@@ -152,7 +152,7 @@
android:format24Hour="yyyy年MM月dd日"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/bus_p_clock_17417B"
android:textColor="@color/shuttle_p_jl_clock_17417B"
android:textSize="@dimen/dp_26"
app:layout_constraintLeft_toLeftOf="@+id/textClockHourMin"
app:layout_constraintTop_toBottomOf="@+id/textClockHourMin" />
@@ -167,7 +167,7 @@
android:format24Hour="EEEE"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/bus_p_clock_17417B"
android:textColor="@color/shuttle_p_jl_clock_17417B"
android:textSize="@dimen/dp_26"
app:layout_constraintLeft_toLeftOf="@+id/textClockDate"
app:layout_constraintTop_toBottomOf="@+id/textClockDate" />
@@ -188,8 +188,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_104"
android:text="@string/bus_p_cur_station_title"
android:textColor="@color/bus_p_line_name_color"
android:text="@string/shuttle_p_jl_cur_station_title"
android:textColor="@color/shuttle_p_jl_line_name_color"
android:textSize="@dimen/dp_38"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
@@ -213,7 +213,7 @@
android:gravity="center"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/dp_30"
android:text="@string/bus_p_cur_station_arrived_tip"
android:text="@string/shuttle_p_jl_cur_station_arrived_tip"
android:textColor="@android:color/white"
android:textSize="@dimen/dp_30"
android:textStyle="bold"
@@ -227,7 +227,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_36"
android:text="-- --"
android:textColor="@color/bus_p_clock_17417B"
android:textColor="@color/shuttle_p_jl_clock_17417B"
android:textSize="@dimen/dp_56"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"
@@ -247,7 +247,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/bus_p_route_info_margin_right"
android:paddingRight="@dimen/shuttle_p_jl_route_info_margin_right"
android:paddingBottom="@dimen/dp_20"
android:requiresFadingEdge="vertical"
app:layout_constraintBottom_toBottomOf="parent"
@@ -267,8 +267,8 @@
<com.mogo.och.shuttle.passenger.ui.mapdirectionview.BusPassengerMapDirectionView
android:id="@+id/bus_p_line_map_view"
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="@dimen/bus_p_route_line_map_view_height"
android:layout_width="@dimen/shuttle_p_jl_route_info_panel_width"
android:layout_height="@dimen/shuttle_p_jl_route_line_map_view_height"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />

4
OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_stations_common_item.xml
View File

@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="--"
android:textSize="@dimen/bus_p_station_txt_size"
android:textSize="@dimen/shuttle_p_jl_station_txt_size"
android:includeFontPadding = "false"
android:singleLine="true"
android:ellipsize="marquee"
@@ -17,7 +17,7 @@
android:layout_marginRight="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_68"
android:textStyle="bold"
android:textColor="@color/bus_p_station_txt_color"
android:textColor="@color/shuttle_p_jl_station_txt_color"
android:layout_marginLeft="@dimen/dp_90"
app:customGap="0.5"
app:useCustomGap="true"

18
OCH/shuttle/passenger/src/main/res/jinlv/layout/shuttle_p_jl_traffic_light_view.xml
View File

@@ -2,22 +2,22 @@
<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/bus_p_route_traffic_light_view_width"
android:layout_height="@dimen/bus_p_route_traffic_light_view_height"
android:layout_width="@dimen/shuttle_p_jl_route_traffic_light_view_width"
android:layout_height="@dimen/shuttle_p_jl_route_traffic_light_view_height"
android:visibility="visible">
<ImageView
android:id="@+id/bus_p_traffic_light_bg"
android:layout_width="@dimen/bus_p_traffic_light_bg_width"
android:layout_height="@dimen/bus_p_traffic_light_bg_height"
android:layout_width="@dimen/shuttle_p_jl_traffic_light_bg_width"
android:layout_height="@dimen/shuttle_p_jl_traffic_light_bg_height"
android:background="@drawable/shuttle_p_jl_bg_traffic_light_background"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/bus_p_traffic_light_iv"
android:layout_width="@dimen/bus_p_traffic_light_icon_size"
android:layout_height="@dimen/bus_p_traffic_light_icon_size"
android:layout_width="@dimen/shuttle_p_jl_traffic_light_icon_size"
android:layout_height="@dimen/shuttle_p_jl_traffic_light_icon_size"
android:layout_marginTop="@dimen/dp_8"
android:scaleType="fitXY"
app:layout_constraintLeft_toLeftOf="parent"
@@ -25,11 +25,11 @@
<TextView
android:id="@+id/bus_p_traffic_light_time_tv"
android:layout_width="@dimen/bus_p_traffic_light_time_view_width"
android:layout_width="@dimen/shuttle_p_jl_traffic_light_time_view_width"
android:layout_height="match_parent"
android:textSize="@dimen/bus_p_traffic_light_time_size"
android:textSize="@dimen/shuttle_p_jl_traffic_light_time_size"
android:textStyle="bold"
android:textColor="@color/bus_p_traffic_txt_color"
android:textColor="@color/shuttle_p_jl_traffic_txt_color"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:gravity="center" />

51
OCH/shuttle/passenger/src/main/res/jinlv/values/colors.xml
View File

@@ -1,41 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="bus_p_speed_txt_color">#5D7199</color>
<color name="bus_p_traffic_light_bg_color">#CCE9EFFC</color>
<color name="bus_p_traffic_light_bg_stroke">#C7D2E1</color>
<color name="bus_p_driver_number_plate_color">#2D3E5F</color>
<color name="bus_p_line_name_color">#203555</color>
<color name="bus_p_line_operation_time_color">#2D3E5F</color>
<color name="bus_p_no_data_color">#596A8A</color>
<color name="bus_p_station_circle_color">#D8E5F8</color>
<color name="bus_p_start_station_circle_borner_color">#FFB327</color>
<color name="bus_p_station_txt_color">#2D3E5F</color>
<color name="bus_p_current_station_txt_color">#0043FF</color>
<color name="bus_p_middle_station_circle_color2">#276AFE</color>
<color name="bus_p_middle_station_circle_color1">#0043FF</color>
<color name="bus_p_end_station_circle_borner_color">#276AFE</color>
<color name="bus_p_start_tag_bg_color1">#FFC125</color>
<color name="bus_p_start_tag_bg_color2">#FF8131</color>
<color name="bus_p_end_tag_bg_color1">#31BFF2</color>
<color name="bus_p_end_tag_bg_color2">#3257E9</color>
<color name="bus_p_end_tag_txt_color">#FFFFFF</color>
<color name="bus_p_tag_line_color">#CDDBF6</color>
<color name="bus_p_panel_cur_txt_color">#2D3E5F</color>
<color name="bus_p_panel_cur_station_txt_color">#0043FF</color>
<color name="bus_p_panel_cur_station_tips_color">#2D3E5F</color>
<color name="bus_p_panel_cur_station_panel_color">#E6E9EFFC</color>
<color name="bus_p_route_view_left_edge_shadow">#33394C63</color>
<color name="bus_p_traffic_txt_color">#2D3E5F</color>
<color name="bus_p_panel_edge_shadow">#33394C63</color>
<color name="shuttle_p_jl_speed_txt_color">#5D7199</color>
<color name="shuttle_p_jl_traffic_light_bg_color">#CCE9EFFC</color>
<color name="shuttle_p_jl_traffic_light_bg_stroke">#C7D2E1</color>
<color name="shuttle_p_jl_line_name_color">#203555</color>
<color name="shuttle_p_jl_start_station_circle_borner_color">#FFB327</color>
<color name="shuttle_p_jl_station_txt_color">#2D3E5F</color>
<color name="shuttle_p_jl_end_station_circle_borner_color">#276AFE</color>
<color name="shuttle_p_jl_tag_line_color">#CDDBF6</color>
<color name="shuttle_p_jl_panel_cur_station_tips_color">#2D3E5F</color>
<color name="shuttle_p_jl_traffic_txt_color">#2D3E5F</color>
<color name="bus_p_speed_color_start">#43CEFE</color>
<color name="bus_p_speed_color_end">#1466FB</color>
<color name="shuttle_p_jl_speed_color_start">#43CEFE</color>
<color name="shuttle_p_jl_speed_color_end">#1466FB</color>
<color name="bus_p_clock_17417B">#17417B</color>
<color name="bus_p_clock_6617417B">#6617417B</color>
<color name="bus_p_clock_A9B6CA">#A9B6CA</color>
<color name="bus_p_clock_1F82FB">#1F82FB</color>
<color name="shuttle_p_jl_clock_17417B">#17417B</color>
<color name="shuttle_p_jl_clock_6617417B">#6617417B</color>
<color name="shuttle_p_jl_clock_A9B6CA">#A9B6CA</color>
<color name="shuttle_p_jl_clock_1F82FB">#1F82FB</color>
<color name="bus_p_clock_992D3E5F">#992D3E5F</color>
<color name="shuttle_p_jl_clock_992D3E5F">#992D3E5F</color>
</resources>

76
OCH/shuttle/passenger/src/main/res/jinlv/values/dimens.xml
View File

@@ -1,65 +1,29 @@
<?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">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>
<dimen name="bus_p_route_info_margin_bottom">40dp</dimen>
<dimen name="bus_p_route_info_margin_top">110dp</dimen>
<dimen name="bus_p_route_line_info_height">224dp</dimen>
<dimen name="bus_p_route_line_map_view_height">422dp</dimen>
<dimen name="bus_p_route_line_dividing_view_height">3dp</dimen>
<dimen name="shuttle_p_jl_route_info_panel_width">750dp</dimen>
<dimen name="shuttle_p_jl_route_bg_width">804dp</dimen>
<dimen name="shuttle_p_jl_route_info_margin_right">40dp</dimen>
<dimen name="shuttle_p_jl_route_info_margin_left">48dp</dimen>
<dimen name="shuttle_p_jl_route_line_map_view_height">422dp</dimen>
<dimen name="bus_p_route_traffic_light_view_width">158dp</dimen>
<dimen name="bus_p_route_traffic_light_view_height">90dp</dimen>
<dimen name="bus_p_route_traffic_light_view_corner">45dp</dimen>
<dimen name="bus_p_traffic_light_bg_width">158dp</dimen>
<dimen name="bus_p_traffic_light_bg_height">90dp</dimen>
<dimen name="bus_p_traffic_light_time_size">45dp</dimen>
<dimen name="bus_p_traffic_light_time_view_width">90dp</dimen>
<dimen name="bus_p_traffic_light_icon_size">90dp</dimen>
<dimen name="bus_p_traffic_light_bg_stroke_width">3dp</dimen>
<dimen name="shuttle_p_jl_route_traffic_light_view_width">158dp</dimen>
<dimen name="shuttle_p_jl_route_traffic_light_view_height">90dp</dimen>
<dimen name="shuttle_p_jl_route_traffic_light_view_corner">45dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_bg_width">158dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_bg_height">90dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_time_size">45dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_time_view_width">90dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_icon_size">90dp</dimen>
<dimen name="shuttle_p_jl_traffic_light_bg_stroke_width">3dp</dimen>
<dimen name="bus_p_route_dividing_line2_margin_top">224dp</dimen>
<dimen name="bus_p_driver_number_plate_margin_top">50dp</dimen>
<dimen name="bus_p_driver_number_plate_margin_bottom">50dp</dimen>
<dimen name="bus_p_driver_number_plate_size">34dp</dimen>
<dimen name="bus_p_line_operation_time_margin_top">130dp</dimen>
<dimen name="bus_p_line_operation_time_size">38dp</dimen>
<dimen name="shuttle_p_jl_driver_number_plate_size">34dp</dimen>
<dimen name="bus_p_no_data_size">38dp</dimen>
<dimen name="shuttle_p_jl_no_data_size">38dp</dimen>
<dimen name="bus_p_speed_txt_size">90dp</dimen>
<dimen name="bus_p_speed_unit_txt_size">27dp</dimen>
<dimen name="shuttle_p_jl_speed_txt_size">90dp</dimen>
<dimen name="shuttle_p_jl_speed_unit_txt_size">27dp</dimen>
<dimen name="bus_p_station_circle_borner_size">4dp</dimen>
<dimen name="bus_p_station_circle_radius_size">10dp</dimen>
<dimen name="bus_p_station_circle_width_height">20dp</dimen>
<dimen name="bus_p_station_tag_width_height">60dp</dimen>
<dimen name="bus_p_station_tag_radius_size">30dp</dimen>
<dimen name="bus_p_cur_station_circle_width">20dp</dimen>
<dimen name="bus_p_cur_station_circle_height">50dp</dimen>
<dimen name="bus_p_mid_station_circle_cor">6dp</dimen>
<dimen name="bus_p_station_txt_size">38dp</dimen>
<dimen name="bus_p_station_tag_txt_size">36dp</dimen>
<dimen name="bus_p_station_item_height">80dp</dimen>
<dimen name="bus_p_station_item_middle_height">100dp</dimen>
<dimen name="bus_p_station_tag_line_height">80dp</dimen>
<dimen name="bus_p_station_tag_line_height1">60dp</dimen>
<dimen name="bus_p_station_tag_line_width">6dp</dimen>
<dimen name="shuttle_p_jl_station_circle_radius_size">10dp</dimen>
<dimen name="shuttle_p_jl_station_txt_size">38dp</dimen>
<dimen name="bus_p_curent_station_panel_width">685dp</dimen>
<dimen name="bus_p_curent_station_panel_height">309dp</dimen>
<dimen name="bus_p_curent_station_panel_margin">50dp</dimen>
<dimen name="bus_p_curent_station_panel_margin_left">10dp</dimen>
<dimen name="bus_p_curent_station_txt_size">44dp</dimen>
<dimen name="bus_p_curent_station_txt_size1">55dp</dimen>
<dimen name="bus_p_curent_station_tip_size1">40dp</dimen>
<dimen name="bus_p_live_station_panel_width">495dp</dimen>
<dimen name="bus_p_live_station_panel_height">309dp</dimen>
<dimen name="bus_p_curent_station_txt_width">584dp</dimen>
<dimen name="bus_p_station_txt_width">550dp</dimen>
</resources>

18
OCH/shuttle/passenger/src/main/res/jinlv/values/strings.xml
View File

@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="bus_p_speed_unit_txt">KM/H</string>
<string name="bus_p_no_out">您已收车</string>
<string name="bus_p_no_task">暂无班次</string>
<string name="bus_p_no_line">暂无线路</string>
<string name="bus_p_start_station_txt_tag">起</string>
<string name="bus_p_end_station_txt_tag">终</string>
<string name="bus_p_cur_station_title">已到站：</string>
<string name="bus_p_cur_next_station_title">前方到站：</string>
<!-- <string name="bus_p_cur_station_title_init">始发站：</string>-->
<string name="bus_p_cur_station_arrived_tip">请按秩序下车</string>
<!-- <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>-->
<string name="shuttle_p_jl_speed_unit_txt">KM/H</string>
<string name="shuttle_p_jl_no_out">您已收车</string>
<string name="shuttle_p_jl_no_task">暂无班次</string>
<string name="shuttle_p_jl_no_line">暂无线路</string>
<string name="shuttle_p_jl_cur_station_title">已到站：</string>
<string name="shuttle_p_jl_cur_next_station_title">前方到站：</string>
<string name="shuttle_p_jl_cur_station_arrived_tip">请按秩序下车</string>
</resources>