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

[3.2.0] bus/shuttle 乘客屏UI调整

Browse Source
This commit is contained in:
wangmingjun
2023-05-11 16:50:57 +08:00
parent d8eb1cd8b8
commit 9dbf45c41a
11 changed files with 37 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -20,6 +20,7 @@ import com.mogo.och.bus.passenger.R;
import com.mogo.och.bus.passenger.bean.BusPassengerStation;
import com.mogo.och.common.module.utils.BlinkAnimationUtil;
import com.mogo.och.common.module.wigets.MarqueeTextView;
import com.mogo.och.data.bean.BusStationBean;
import java.util.List;
@@ -52,9 +53,6 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.stationName.setText(station.getName());
BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
if (position == 0){ //第一个 起点
viewHolder.stationTagTxt.setText("起");
viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_start_tag_bg));
viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
viewHolder.curArrowBg.setVisibility(View.GONE);
if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
@@ -63,17 +61,10 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
}else {
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
}
}else{
if (position == mStations.size() - 1){
viewHolder.stationTagTxt.setText("终");
viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_end_tag_bg));
viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
}else {
viewHolder.groupStationTagPanel.setVisibility(View.GONE);
}
viewHolder.curArrowBg.setVisibility(View.VISIBLE);
BusPassengerStation preStation = mStations.get(position -1);
if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
@@ -92,8 +83,7 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
// BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
// viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
(preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
|| preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
@@ -101,6 +91,11 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
}
}
}
}
@@ -115,17 +110,11 @@ class StationViewHolder extends RecyclerView.ViewHolder{
public MarqueeTextView stationName;
public ImageView stationCircle;
public ImageView curArrowBg;
public ImageView stationStationTag;
public TextView stationTagTxt;
public Group groupStationTagPanel;
public StationViewHolder(@NonNull View itemView) {
super(itemView);
stationName = itemView.findViewById(R.id.bus_p_station);
stationCircle = itemView.findViewById(R.id.bus_p_circle);
curArrowBg = itemView.findViewById(R.id.bus_p_cur_arrow_bg);
stationStationTag = itemView.findViewById(R.id.bus_p_tag);
stationTagTxt = itemView.findViewById(R.id.bus_p_tag_txt);
groupStationTagPanel = itemView.findViewById(R.id.group_station_tag_panel);
}
}

7
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
View File

@@ -190,9 +190,10 @@ public class BusPassengerModel {
routesResult = null;
mNextStationIndex = 0;
startOrStopCalculateRouteInfo(false);
if (mRouteLineInfoCallback != null){
mRouteLineInfoCallback.showNoTaskView();
}
}
if (mRouteLineInfoCallback != null){
mRouteLineInfoCallback.showNoTaskView();
}
return;

6
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -387,15 +387,15 @@ 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_init));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
}else {
mCurrentArriveStation.setText(station);
if (currentIndex == 0){
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip_init));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
return;

5
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
View File

@@ -155,7 +155,8 @@
android:id="@+id/bus_p_cur_station_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/split_line_iv"
android:layout_marginTop="@dimen/dp_104"
app:layout_constraintTop_toBottomOf="@+id/dividing_line_1"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
android:text="@string/bus_p_cur_station_title"
android:textStyle="bold"
@@ -213,7 +214,7 @@
android:id="@+id/bus_p_line_stations_rl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_76"
android:layout_marginTop="@dimen/dp_64"
android:paddingBottom="@dimen/dp_20"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/bus_p_route_info_margin_right"

42
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
View File

@@ -21,18 +21,9 @@
app:customGap="0.5"
app:useCustomGap="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/bus_p_tag"
app:layout_constraintRight_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_arrow_bg"/>
<ImageView
android:layout_width="62dp"
android:layout_height="62dp"
android:src="@drawable/bus_p_point_gray"
app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_circle"
android:layout_width="62dp"
@@ -44,40 +35,11 @@
<ImageView
android:id="@+id/bus_p_cur_arrow_bg"
android:layout_width="@dimen/dp_12"
android:layout_height="@dimen/dp_61"
android:layout_height="@dimen/dp_88"
android:scaleType="fitXY"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/bus_p_tag"
android:layout_width="@dimen/bus_p_station_tag_width_height"
android:layout_height="@dimen/bus_p_station_tag_width_height"
android:background="@drawable/bg_bus_p_end_tag_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<TextView
android:id="@+id/bus_p_tag_txt"
android:layout_width="@dimen/bus_p_station_tag_width_height"
android:layout_height="@dimen/bus_p_station_tag_width_height"
android:textSize="@dimen/bus_p_station_tag_txt_size"
android:textColor="@color/bus_p_end_tag_txt_color"
android:text="@string/bus_p_end_station_txt_tag"
android:includeFontPadding="false"
android:gravity="center"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_tag"
app:layout_constraintRight_toRightOf="@+id/bus_p_tag"
app:layout_constraintTop_toTopOf="@+id/bus_p_tag"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_tag"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/group_station_tag_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="bus_p_tag,bus_p_tag_txt"/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/strings.xml
View File

@@ -8,7 +8,7 @@
<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_title_init">始发站：</string>-->
<string name="bus_p_cur_station_arrived_tip">请按秩序下车</string>
<string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>
<!-- <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>-->
</resources>

22
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -52,9 +52,6 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.stationName.setText(station.getName());
BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
if (position == 0){ //第一个 起点
viewHolder.stationTagTxt.setText("起");
viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_start_tag_bg));
viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
viewHolder.curArrowBg.setVisibility(View.GONE);
if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
@@ -63,17 +60,10 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
}else {
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
}
}else{
if (position == mStations.size() - 1){
viewHolder.stationTagTxt.setText("终");
viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_end_tag_bg));
viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
}else {
viewHolder.groupStationTagPanel.setVisibility(View.GONE);
}
viewHolder.curArrowBg.setVisibility(View.VISIBLE);
BusStationBean preStation = mStations.get(position -1);
if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
@@ -101,6 +91,10 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
}
}
}
}
@@ -114,17 +108,11 @@ class StationViewHolder extends RecyclerView.ViewHolder{
public MarqueeTextView stationName;
public ImageView stationCircle;
public ImageView curArrowBg;
public ImageView stationStationTag;
public TextView stationTagTxt;
public Group groupStationTagPanel;
public StationViewHolder(@NonNull View itemView) {
super(itemView);
stationName = itemView.findViewById(R.id.bus_p_station);
stationCircle = itemView.findViewById(R.id.bus_p_circle);
curArrowBg = itemView.findViewById(R.id.bus_p_cur_arrow_bg);
stationStationTag = itemView.findViewById(R.id.bus_p_tag);
stationTagTxt = itemView.findViewById(R.id.bus_p_tag_txt);
groupStationTagPanel = itemView.findViewById(R.id.group_station_tag_panel);
}
}

9
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -58,9 +58,6 @@ public class BusPassengerRouteFragment extends
private Group mRouteInfoView;
private RecyclerView mStationsListRv;
private BusPassengerMapDirectionView mMapDirectionView;
// private ImageView mMapArrowIcon;
// private RotateAnimation rotateAnimation;
// private float lastBearing = 0;
private BusPassengerLineStationsAdapter mAdapter;
private TextView emptyTv;
private AppCompatImageView mAutopilotIv;
@@ -341,15 +338,15 @@ 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_init));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
}else {
mCurrentArriveStation.setText(station);
if (currentIndex == 0){
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip_init));
mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg);
handleArrivingSpeakIconDrawable();
return;

28
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
View File

@@ -6,22 +6,6 @@
android:padding="@dimen/dp_40"
android:background="@android:color/transparent">
<!-- <com.mogo.och.common.module.wigets.OCHBorderShadowLayout-->
<!-- android:id="@+id/edge_view"-->
<!-- android:layout_width="725dp"-->
<!-- android:layout_height="match_parent"-->
<!-- app:shadowColor="@color/bus_p_route_view_left_edge_shadow"-->
<!-- app:xOffset="0dp"-->
<!-- app:yOffset="0dp"-->
<!-- app:bgColor="@android:color/transparent"-->
<!-- 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_height="match_parent"-->
<!-- android:background="@android:color/transparent" />-->
<!-- </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>-->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="@dimen/bus_p_route_info_panel_width"
android:layout_height="1120dp"
@@ -94,13 +78,6 @@
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv"/>
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
android:id="@+id/bus_p_traffic_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/auto_close"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv"/>
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
@@ -179,7 +156,8 @@
android:id="@+id/bus_p_cur_station_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/split_line_iv"
android:layout_marginTop="@dimen/dp_104"
app:layout_constraintTop_toBottomOf="@+id/dividing_line_1"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
android:text="@string/bus_p_cur_station_title"
android:textStyle="bold"
@@ -237,7 +215,7 @@
android:id="@+id/bus_p_line_stations_rl"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_76"
android:layout_marginTop="@dimen/dp_64"
android:paddingBottom="@dimen/dp_20"
android:paddingLeft="@dimen/dp_30"
android:paddingRight="@dimen/bus_p_route_info_margin_right"

42
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
View File

@@ -21,18 +21,9 @@
app:customGap="0.5"
app:useCustomGap="true"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/bus_p_tag"
app:layout_constraintRight_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_arrow_bg"/>
<ImageView
android:layout_width="62dp"
android:layout_height="62dp"
android:src="@drawable/bus_p_point_gray"
app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_circle"
android:layout_width="62dp"
@@ -44,40 +35,11 @@
<ImageView
android:id="@+id/bus_p_cur_arrow_bg"
android:layout_width="@dimen/dp_12"
android:layout_height="@dimen/dp_61"
android:layout_height="@dimen/dp_88"
android:scaleType="fitXY"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/bus_p_tag"
android:layout_width="@dimen/bus_p_station_tag_width_height"
android:layout_height="@dimen/bus_p_station_tag_width_height"
android:background="@drawable/bg_bus_p_end_tag_bg"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<TextView
android:id="@+id/bus_p_tag_txt"
android:layout_width="@dimen/bus_p_station_tag_width_height"
android:layout_height="@dimen/bus_p_station_tag_width_height"
android:textSize="@dimen/bus_p_station_tag_txt_size"
android:textColor="@color/bus_p_end_tag_txt_color"
android:text="@string/bus_p_end_station_txt_tag"
android:includeFontPadding="false"
android:gravity="center"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_tag"
app:layout_constraintRight_toRightOf="@+id/bus_p_tag"
app:layout_constraintTop_toTopOf="@+id/bus_p_tag"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_tag"/>
<androidx.constraintlayout.widget.Group
android:id="@+id/group_station_tag_panel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:constraint_referenced_ids="bus_p_tag,bus_p_tag_txt"/>
</androidx.constraintlayout.widget.ConstraintLayout>

4
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/strings.xml
View File

@@ -8,7 +8,7 @@
<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_title_init">始发站：</string>-->
<string name="bus_p_cur_station_arrived_tip">请按秩序下车</string>
<string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>
<!-- <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联自动驾驶车。</string>-->
</resources>