diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index 73e11fa666..80f2ebb605 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -49,6 +49,10 @@ #3B3D44 #2E323A #ffffffff + #1Affffff + #80000000 #2EACFF + #D4D4D4 + #FF852E \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt index 0c981f1eba..33f7fcc754 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt @@ -6,12 +6,12 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.unmanned.taxi.R +import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.aciv_open_details import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataContent1Tv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataContentTv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataUnit1Tv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataUnitTv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationalDataTagTv -import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationalDataView /** * @author: wangmingjun @@ -30,7 +30,7 @@ class OperationalDataItemView @JvmOverloads constructor( } private fun initViewClick() { - operationalDataView.onClick { + aciv_open_details.onClick { mClickListener?.onClick() } } @@ -52,7 +52,7 @@ class OperationalDataItemView @JvmOverloads constructor( } fun setOperationalDataViewClick(isVisible: Int,clickListener: DataViewClickListener?){ - operationalDataView.visibility = isVisible + aciv_open_details.visibility = isVisible mClickListener = clickListener } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt index 81864cf942..ef1c8e52b6 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt @@ -45,8 +45,7 @@ class TaskListAdapter(val context: Context, override fun onBindViewHolder(holder: TaskItemViewHolder, position: Int) { dataList?.also { val taskInfo = dataList[holder.bindingAdapterPosition] - holder.taskTimeTv.text = "下单时间 " + DateTimeUtil.formatLongToString(taskInfo.startTime, - DateTimeUtil.HH_mm) + holder.taskTimeTv.text = "下单时间 " + DateTimeUtil.formatLongToString(taskInfo.startTime, DateTimeUtil.HH_mm) holder.taskTypeBt.text = "演练单" holder.taskStartSiteTv.text = taskInfo.startSiteName holder.taskEndSiteTv.text = taskInfo.endSiteName @@ -111,10 +110,8 @@ class OrderListAdapter(val context: Context, private fun initViewDetailBtn(holder: OrderItemViewHolder) { dataList?.also { val orderInfo = it[holder.bindingAdapterPosition] - holder.orderViewDetailBt.text = "详情" + holder.orderViewDetailBt.text = "展开" holder.orderViewDetailBt.tag = true - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - context.getDrawable(R.drawable.view_detail_arrow),null) when(orderInfo.status){ OperationalOrderStatusEnum.Refunded.code,OperationalOrderStatusEnum.Unpaid.code, OperationalOrderStatusEnum.JourneyCompleted.code, @@ -135,14 +132,10 @@ class OrderListAdapter(val context: Context, if (holder.orderViewDetailBt.tag as Boolean){ holder.orderViewDetailBt.text = "收起" holder.orderViewDetailBt.tag = false - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - ContextCompat.getDrawable(context,R.drawable.close_detail_arrow),null) clickViewDetailListener?.clickViewOrderDetail(dataList[holder.bindingAdapterPosition].orderNo) }else{ - holder.orderViewDetailBt.text = "详情" + holder.orderViewDetailBt.text = "展开" holder.orderViewDetailBt.tag = true - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - ContextCompat.getDrawable(context,R.drawable.view_detail_arrow),null) holder.orderTaskStationView.visibility = View.GONE taskDetailListAdapter = null mOrderTaskStationList = null @@ -265,15 +258,15 @@ class OrderTaskDetailListAdapter(val context: Context, when (taskDetail.stationType){ StationTypeEnum.PathwayStation.code -> { holder.taskStationTagTv.text = "途经:" - holder.stationCircleIv.setImageResource(R.drawable.waypoint_circle) + holder.stationCircleIv.setImageResource(R.drawable.circle_blue_waypoint) } StationTypeEnum.OrderStartStation.code -> { holder.taskStationTagTv.text = "上车:" - holder.stationCircleIv.setImageResource(R.drawable.taxi_driver_circle_green_big) + holder.stationCircleIv.setImageResource(R.drawable.circle_green_start_station) } StationTypeEnum.OrderEndStation.code -> { holder.taskStationTagTv.text = "下车:" - holder.stationCircleIv.setImageResource(R.drawable.taxi_driver_circle_blue_big) + holder.stationCircleIv.setImageResource(R.drawable.circle_blue_end_station) } } holder.taskStationNameTv.text = taskDetail.stationName diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png new file mode 100644 index 0000000000..ce2b50bafe Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png new file mode 100644 index 0000000000..4340fdf097 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png new file mode 100644 index 0000000000..d04a119837 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png new file mode 100644 index 0000000000..29d0e145a6 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png new file mode 100644 index 0000000000..184c6a0775 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png new file mode 100644 index 0000000000..59f7f52fd5 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml new file mode 100644 index 0000000000..a6dd61b2f1 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml new file mode 100644 index 0000000000..1b410feb4f --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml index f53d9c9a1d..5ffa9e4ea7 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml index d81e0cd834..9600d6d355 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml @@ -2,9 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml index 87533758a3..be1928c233 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml @@ -9,7 +9,7 @@ android:id="@+id/taskStationTagTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_76" + android:layout_marginLeft="@dimen/dp_73" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" android:textSize="@dimen/dp_28" @@ -48,10 +48,10 @@ @@ -26,6 +28,7 @@ android:layout_marginTop="@dimen/dp_20" android:layout_marginLeft="@dimen/dp_8" android:textSize="@dimen/dp_76" + tools:text="0" app:layout_constraintLeft_toRightOf="@+id/operationDataUnitTv" app:layout_constraintTop_toTopOf="parent" android:textStyle="bold" @@ -34,8 +37,9 @@ android:id="@+id/operationDataUnitTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/dp_12" android:layout_marginLeft="@dimen/dp_8" + tools:text="时" + app:layout_constraintBaseline_toBaselineOf="@+id/operationDataContent1Tv" android:textSize="@dimen/dp_36" app:layout_constraintLeft_toRightOf="@+id/operationDataContentTv" app:layout_constraintBottom_toBottomOf="@+id/operationDataContentTv" @@ -46,8 +50,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_8" - android:layout_marginBottom="@dimen/dp_12" + app:layout_constraintBaseline_toBaselineOf="@+id/operationDataContent1Tv" android:textSize="@dimen/dp_36" + tools:text="分" app:layout_constraintLeft_toRightOf="@+id/operationDataContent1Tv" app:layout_constraintBottom_toBottomOf="@+id/operationDataContent1Tv" android:textColor="#FFFFFF"/> @@ -55,25 +60,20 @@ android:id="@+id/operationalDataTagTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#A7B6F0" + android:textColor="@color/common_cccccc" android:layout_marginTop="@dimen/dp_10" android:textSize="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="@+id/operationDataContentTv" app:layout_constraintTop_toBottomOf="@+id/operationDataContentTv" - android:text="今日量"/> + android:text="今日服务总时长"/> - + app:layout_constraintEnd_toEndOf="parent" + android:padding="@dimen/dp_30" + android:layout_width="@dimen/dp_75" + android:layout_height="@dimen/dp_87"/> \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml index 1ad75457e7..a685c69c75 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml @@ -3,20 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#F0151D41"> - - + android:background="@drawable/operation_bg"> + app:layout_constraintStart_toStartOf="parent" + android:layout_marginStart="@dimen/dp_61" + android:layout_marginTop="@dimen/dp_131" + app:layout_constraintTop_toTopOf="parent" /> + + + android:src="@drawable/baseline_close_44" + android:layout_marginEnd="@dimen/dp_106" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@+id/line" + app:layout_constraintTop_toTopOf="@+id/line" /> + android:layout_marginTop="@dimen/dp_77" + app:layout_constraintTop_toBottomOf="@+id/line" + app:layout_constraintStart_toStartOf="@+id/line"> + app:layout_constraintTop_toBottomOf="@+id/line" /> + tools:background="@color/common_cccccc" + android:paddingTop="@dimen/dp_50"> @@ -20,9 +21,9 @@ android:id="@+id/orderNumTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#8E9DD4" - android:textSize="@dimen/dp_38" - android:layout_marginTop="@dimen/dp_54" + android:textColor="@color/common_d4d4d4" + android:textSize="@dimen/dp_30" + android:layout_marginTop="@dimen/dp_44" app:layout_constraintTop_toBottomOf="@+id/orderTimeTv" app:layout_constraintLeft_toLeftOf="@+id/orderTimeTv" tools:text="订单编号111111" /> @@ -32,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/dp_4" - android:textColor="#FFFFFF" + android:textColor="@color/common_ff852e" android:textSize="@dimen/dp_38" app:layout_constraintRight_toLeftOf="@+id/orderPriceUnitTv" app:layout_constraintBottom_toBottomOf="@+id/orderTimeTv" @@ -45,20 +46,19 @@ android:textColor="#FFFFFF" android:textSize="@dimen/dp_22" android:layout_marginBottom="@dimen/dp_8" + app:layout_constraintBaseline_toBaselineOf="@+id/orderPriceTv" app:layout_constraintBottom_toBottomOf="@+id/orderTimeTv" app:layout_constraintRight_toRightOf="parent" android:text="元"/> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml index a43559bc91..497e86035d 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + tools:background="@color/common_cccccc" android:paddingTop="@dimen/dp_64" android:paddingRight="@dimen/dp_54"> @@ -12,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="下单时间 9:01" - android:textColor="#8E9DD4" + android:textColor="@color/common_ffffffff" android:textSize="@dimen/dp_38" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -57,29 +58,31 @@