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

[taxi -d 280, taxi -p 130] 1、taxi 司机端订单详情页增加上车人数和乘客电话

Browse Source
This commit is contained in:
wangmingjun
2022-06-13 21:00:35 +08:00
parent 2583333174
commit 348233dbe6
6 changed files with 81 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -92,6 +92,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
private TextView mGoAheadStationTitleTv31;
private TextView mCatchStationTitleTv31;
private ImageView mNaviIcon;
private TextView mPassengerNum;
private TextView mPassengerPhone;
private ConstraintLayout mPassengerInfoLayout;
private TextView mNoDatasTv;
@@ -125,6 +128,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mCatchStationTitleTv31 = view.findViewById(R.id.go_ahead_station_catch_31);
mGoAheadStationTitleTv31 = view.findViewById(R.id.go_ahead_station_31);
mArrivedStationTitleTv32 = view.findViewById(R.id.arrive_station_32);
mPassengerInfoLayout = view.findViewById(R.id.module_och_taxi_order_passenger_data);
mPassengerNum = view.findViewById(R.id.taxi_passenger_num);
mPassengerPhone = view.findViewById(R.id.taxi_passenger_phone);
mNoDatasTv = view.findViewById(R.id.no_order_data_tv);
mNoDataView = view.findViewById(R.id.being_no_data_view);
mOrderCancel.setOnClickListener(this);
@@ -173,15 +181,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
background.setColor(Color.parseColor("#FF1D5EF3"));
mOrderServerStatus.setClickable(true);
// String strHtml3 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "<big></font></b>";
mTitleTV2.setText("送乘客至");
mStationTv2.setText(order.endSiteAddr);
// String strHtml2 = "<font color=\"#CAD6FF\">距离 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 公里，</font>"
// + "<font color=\"#CAD6FF\">用时 </font>" + "<b><font color=\"#FFFFFF\">- -</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>";
// mDistanceAndTime.setText(Html.fromHtml(strHtml2));
} else if (TaxiOrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点");
mContentModule3.setVisibility(View.GONE);
mContentModule2.setVisibility(View.VISIBLE);
mOrderStatus.setText(R.string.module_och_taxi_on_the_way_2_end_station);
@@ -228,6 +232,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus){
CallerLogger.INSTANCE.d(M_TAXI + TAG, "车辆已经达到起点");
mPassengerInfoLayout.setVisibility(View.VISIBLE);
mPassengerNum.setText(order.passengerNum + "人");
mPassengerPhone.setText(order.passengerPhone);
mOrderStatus.setText(R.string.module_och_taxi_waiting);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start_wait_check);
mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -236,6 +243,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(false);
}else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus ){
CallerLogger.INSTANCE.d(M_TAXI + TAG, "乘客已上车验证成功");
mPassengerInfoLayout.setVisibility(View.GONE);
mOrderStatus.setText(R.string.module_och_taxi_user_check_success);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
@@ -244,44 +253,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(true);
}
}else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) {
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
mArrivedStartTimeTv32.setVisibility(View.VISIBLE);
mContentModule32.setVisibility(View.VISIBLE);
mContentModule31.setVisibility(View.GONE);
mOrderOtherContent3.setVisibility(View.GONE);
mOrderStatus.setText(R.string.module_och_taxi_waiting);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类
background.setColor(Color.parseColor("#FF1D5EF3"));
mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF"));
mOrderServerStatus.setClickable(true);
Calendar currentCale = DateTimeUtils.getCurrentDateTime();
String currentHM = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm);
String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
String strHtml11 = "<font color=\"#CAD6FF\">已于</font><br>"
+ "<b><font color=\"#FFFFFF\"><big><big>" + currentHM + "</big></big></font></b>"
+ "<font color=\"#CAD6FF\">" + " " + "到达乘客上车地点</font>";
mArrivedStartTimeTv32.setLineHeight(60);
mArrivedStartTimeTv32.setText(Html.fromHtml(strHtml11));
// String strHtml12 = "<font color=\"#CAD6FF\">送乘客至</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.endSiteAddr + "</big</font></b>";
mArrivedStationTitleTv32.setText("送乘客至");
mStationTv32.setText(order.endSiteAddr);
currentCale.add(Calendar.MINUTE, 10);
String strHtml13 = "";
if (currentDay.equals(DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd))) {
strHtml13 = "<font color=\"#CAD6FF\">免费等待至 </font>"
+ "<b><font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm) + "</big></b></font>";
} else {
strHtml13 = "<font color=\"#CAD6FF\">免费等待至</font>"
+ "<font color=\"#FFFFFF\"><big>" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_MM_dd_HH_mm) + "</big></font>";
}
mDistanceAndTime3.setText(Html.fromHtml(strHtml13));
} else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
}else if (TaxiModel.getInstance().checkCurrentOCHOrder()) {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "前往乘客上车地点");
mContentModule2.setVisibility(View.GONE);
mContentModule3.setVisibility(View.VISIBLE);
@@ -290,6 +262,9 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mContentModule32.setVisibility(View.GONE);
mOrderOtherContent3.setVisibility(View.VISIBLE);
mDistanceAndTime3.setVisibility(View.VISIBLE);
mPassengerInfoLayout.setVisibility(View.VISIBLE);
mPassengerNum.setText(order.passengerNum + "人");
mPassengerPhone.setText(order.passengerPhone);
mOrderStatus.setText(R.string.module_och_taxi_new_order);
mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start);
mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF"));
@@ -298,10 +273,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mOrderServerStatus.setClickable(false);
mGoAheadStationTitleTv31.setText("前往");
mCatchStationTitleTv31.setText("接乘客");
// String strHtml0 = "<font color=\"#CAD6FF\">前往</font><br>"
// + "<b><font color=\"#FFFFFF\"><big>" + order.startSiteAddr + "</big></font></b><br>"
// + "<font color=\"#CAD6FF\">接乘客</font>";
mStationTv31.setText(order.startSiteAddr);
Calendar currentCale = DateTimeUtils.getCurrentDateTime();
Calendar startCale = DateTimeUtil.formatLongToCalendar(order.bookingTime);
String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd);
@@ -472,7 +445,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker);
break;
case ArriveAtEnd:
mCurrentOrder = null;
mTtsLessThan200Tip = 0;
mOrderCancel.setVisibility(View.GONE);
showNotice(mActivity.getString(R.string.module_och_taxi_order_auto_arrive_end_tip));

70
OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
View File

@@ -101,18 +101,55 @@
android:paddingRight="40px"
android:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/module_och_taxi_order_server_status_tv">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/module_och_taxi_order_passenger_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="130px">
<TextView
android:id="@+id/taxi_passenger_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="--"
android:textColor="@android:color/white"
android:textSize="@dimen/taxi_passenger_txt_size"/>
<TextView
android:id="@+id/taxi_passenger_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toRightOf="@+id/taxi_passenger_num"
app:layout_constraintTop_toTopOf="@+id/taxi_passenger_num"
android:layout_marginLeft="@dimen/dp_30"
android:text="--"
android:textColor="@android:color/white"
android:textSize="@dimen/taxi_passenger_txt_size"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_2"
app:layout_constraintTop_toBottomOf="@+id/taxi_passenger_phone"
app:layout_constraintLeft_toLeftOf="@+id/taxi_passenger_num"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginTop="@dimen/dp_30"
android:background="@color/taxi_passenger_line_color"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/module_och_taxi_order_had_arrived_time_32"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="150px"
android:layout_marginTop="@dimen/dp_30"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginTop="50px"
app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data"
app:layout_goneMarginTop="@dimen/dp_150"
tools:text="已于 - - 到达乘客上车点" />
<LinearLayout
android:id="@+id/module_och_taxi_order_go_ahead_station_31"
@@ -120,15 +157,15 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="visible"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_passenger_data">
<TextView
android:id="@+id/go_ahead_station_31"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="#CAD6FF"
android:layout_marginTop="150px"
android:textSize="17sp"
android:textSize="30px"
android:text="前往"/>
<TextView
android:id="@+id/module_och_taxi_order_start_station_31"
@@ -141,21 +178,22 @@
android:ellipsize="end"
android:lineSpacingExtra="10px"
android:textColor="#FFFFFF"
android:textSize="23sp"
android:textSize="42px"
tools:text="- -" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8px"
android:layout_gravity="center_vertical">
<TextView
android:id="@+id/go_ahead_station_catch_31"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:gravity="center_horizontal"
android:text="接乘客"/>
android:text="接乘客"
android:textColor="#CAD6FF"
android:textSize="28px" />
<ImageView
android:id="@+id/module_och_taxi_navi_iv"
android:layout_width="wrap_content"
@@ -183,7 +221,7 @@
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
tools:text="送乘客至" />
<TextView
android:id="@+id/module_och_taxi_order_end_station_32"
@@ -195,7 +233,7 @@
android:ellipsize="end"
android:lineSpacingExtra="16px"
android:textColor="#FFFFFF"
android:textSize="23sp"
android:textSize="42px"
tools:text="- -" />
</LinearLayout>
@@ -207,7 +245,7 @@
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="17sp"
android:textSize="30px"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_arrive_station_32"
tools:text="乘客将于 - - 用车" />
@@ -219,9 +257,9 @@
android:layout_marginBottom="180px"
android:inputType="textMultiLine"
android:lineSpacingExtra="16px"
android:text="距离 - - 公里，用时 - - 分钟"
android:text="距离 -- 公里，用时 -- 分钟"
android:textColor="#CAD6FF"
android:textSize="16sp"
android:textSize="32px"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_go_ahead_station_31"/>

2
OCH/mogo-och-taxi/src/main/res/values-sw320dp/dimens.xml
View File

@@ -101,4 +101,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -101,4 +101,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values/colors.xml
View File

@@ -22,4 +22,6 @@
<color name="taxi_traffic_light_green_color_down">#FF006D43</color>
<color name="taxi_traffic_light_yellow_color_up">#FFFFE198</color>
<color name="taxi_traffic_light_yellow_color_down">#FFFF9B00</color>
<color name="taxi_passenger_line_color">#657EE2</color>
</resources>

2
OCH/mogo-och-taxi/src/main/res/values/dimens.xml
View File

@@ -99,4 +99,6 @@
<dimen name="taxi_traffic_light_icon_size">154px</dimen>
<dimen name="taxi_traffic_light_time_view_width">130px</dimen>
<dimen name="taxi_traffic_light_time_size">60px</dimen>
<dimen name="taxi_passenger_txt_size">34px</dimen>
</resources>