[fea]
[T1T2]
[运营面板UI优化]
This commit is contained in:
yangyakun
2025-06-12 18:31:49 +08:00
parent 5c9d49a92a
commit cc20063e50
18 changed files with 113 additions and 101 deletions

View File

@@ -49,6 +49,10 @@
<color name="common_3B3D44">#3B3D44</color>
<color name="common_2E323A">#2E323A</color>
<color name="common_ffffffff">#ffffffff</color>
<color name="common_10ffffff">#1Affffff</color>
<color name="common_50ffffff">#80000000</color>
<color name="common_2eacff">#2EACFF</color>
<color name="common_d4d4d4">#D4D4D4</color>
<color name="common_ff852e">#FF852E</color>
</resources>

View File

@@ -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
}

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 895 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

View File

@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="44dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="44dp">
<path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

View File

@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.8" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z"/>
</vector>

View File

@@ -3,5 +3,5 @@
android:shape="rectangle">
<corners
android:radius="@dimen/dp_20"/>
<solid android:color="#000E2A"/>
<solid android:color="@color/common_10ffffff"/>
</shape>

View File

@@ -2,9 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="24dp" />
<gradient
android:angle="0"
android:startColor="#304378"
android:endColor="#28345E"
android:type="linear" />
<solid android:color="@color/common_10ffffff"/>
</shape>

View File

@@ -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 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/stationCircleIv"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_38"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:scaleType="fitXY"
android:src="@drawable/taxi_driver_circle_blue_big"
android:src="@drawable/circle_blue_end_station"
app:layout_constraintTop_toTopOf="@+id/taskStationNameTv"
app:layout_constraintBottom_toBottomOf="@+id/taskStationNameTv"
app:layout_constraintRight_toLeftOf="@+id/taskStationNameTv"

View File

@@ -2,8 +2,10 @@
<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/dp_800"
android:layout_height="@dimen/dp_224"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_223"
tools:background="@color/common_203555"
android:background="@drawable/taxi_operation_data_item_bg">
<TextView
@@ -15,7 +17,7 @@
android:textSize="@dimen/dp_76"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textColor="#FFFFFF"
android:textColor="@color/common_ffffffff"
android:textStyle="bold"
android:text="0"/>
@@ -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="今日服务总时长"/>
<TextView
android:id="@+id/operationalDataView"
android:layout_width="@dimen/dp_224"
android:layout_height="@dimen/dp_80"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_open_details"
android:src="@drawable/order_detail"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginRight="@dimen/dp_40"
android:textSize="@dimen/dp_32"
android:textColor="#FFFFFF"
android:textStyle="bold"
android:gravity="center"
android:text="@string/view_data"
android:background="@drawable/view_data_click_btn_bg"/>
app:layout_constraintEnd_toEndOf="parent"
android:padding="@dimen/dp_30"
android:layout_width="@dimen/dp_75"
android:layout_height="@dimen/dp_87"/>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -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">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/operationDataTitle"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_86"
android:layout_marginLeft="@dimen/dp_114"
android:layout_marginTop="@dimen/dp_144"
android:gravity="center"
android:text="网约车运营数据"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_42"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:background="@drawable/operation_bg">
<View
android:id="@+id/line"
@@ -24,26 +11,42 @@
android:layout_height="@dimen/dp_50"
android:layout_marginRight="@dimen/dp_20"
android:background="#2966EC"
app:layout_constraintBottom_toBottomOf="@+id/operationDataTitle"
app:layout_constraintRight_toLeftOf="@+id/operationDataTitle"
app:layout_constraintTop_toTopOf="@+id/operationDataTitle" />
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_61"
android:layout_marginTop="@dimen/dp_131"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/operationDataTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="网约车运营数据"
app:layout_constraintTop_toTopOf="@+id/line"
app:layout_constraintBottom_toBottomOf="@+id/line"
app:layout_constraintStart_toEndOf="@+id/line"
android:layout_marginStart="@dimen/dp_19"
android:textColor="@color/common_ffffffff"
android:textSize="@dimen/dp_45" />
<ImageView
android:id="@+id/operationalDataCloseIv"
android:layout_width="@dimen/dp_106"
android:layout_height="@dimen/dp_106"
android:layout_marginRight="@dimen/dp_40"
android:src="@drawable/taxi_order_cancel_close1"
app:layout_constraintBottom_toBottomOf="@+id/operationDataTitle"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/operationDataTitle" />
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" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/operationalDataView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="@+id/line"
app:layout_constraintTop_toBottomOf="@+id/operationDataTitle">
android:layout_marginTop="@dimen/dp_77"
app:layout_constraintTop_toBottomOf="@+id/line"
app:layout_constraintStart_toStartOf="@+id/line">
<com.mogo.och.unmanned.taxi.ui.operational.OperationalDataItemView
android:id="@+id/servingDurationView"
@@ -82,20 +85,22 @@
android:id="@+id/itemDayTv"
android:layout_width="match_parent"
android:layout_height="@dimen/taxi_order_list_item_height"
android:layout_marginTop="@dimen/dp_60"
android:background="#80203076"
android:layout_marginTop="@dimen/dp_69"
android:layout_marginStart="@dimen/dp_60"
android:layout_marginEnd="@dimen/dp_146"
android:background="@color/common_50ffffff"
android:gravity="center"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_32"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/operationDataTitle" />
app:layout_constraintTop_toBottomOf="@+id/line" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/operationItemRecyclerView"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="@dimen/dp_56"
android:layout_marginRight="@dimen/dp_56"
android:layout_marginLeft="@dimen/dp_60"
android:layout_marginRight="@dimen/dp_102"
android:layout_marginBottom="@dimen/dp_10"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"

View File

@@ -4,14 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_64">
tools:background="@color/common_cccccc"
android:paddingTop="@dimen/dp_50">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/orderTimeTv"
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"/>
@@ -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="元"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/orderViewDetailBt"
android:layout_width="@dimen/dp_162"
android:layout_height="@dimen/dp_64"
android:background="@drawable/taxi_order_button_status_bg"
android:paddingRight="@dimen/dp_28"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="详情"
android:textColor="#FFFFFF"
android:textSize="@dimen/dp_24"
android:text="展开"
android:textColor="@color/common_2eacff"
android:textSize="@dimen/dp_30"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="@+id/orderNumTv"
app:layout_constraintRight_toRightOf="parent"
@@ -96,11 +96,12 @@
android:id="@+id/orderTaskStationView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_50"
android:padding="@dimen/dp_40"
android:layout_marginTop="@dimen/dp_38"
android:paddingTop="@dimen/dp_45"
android:paddingBottom="@dimen/dp_45"
app:layout_constraintLeft_toLeftOf="@+id/orderNumTv"
app:layout_constraintRight_toRightOf="@+id/orderViewDetailBt"
app:layout_constraintTop_toBottomOf="@+id/orderNumTv"
app:layout_constraintTop_toBottomOf="@+id/orderViewDetailBt"
android:background="@drawable/order_task_list_bg"
android:visibility="visible"/>

View File

@@ -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 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/taskCircleTag1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/taxi_driver_circle_green_big"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:src="@drawable/circle_green_start_station"
app:layout_constraintLeft_toLeftOf="@+id/taskTimeTv"
app:layout_constraintTop_toTopOf="@+id/taskStartSiteTv"
app:layout_constraintBottom_toBottomOf="@+id/taskStartSiteTv"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/taskCircleTag2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/taxi_driver_circle_blue_big"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:src="@drawable/circle_blue_end_station"
app:layout_constraintLeft_toLeftOf="@+id/taskCircleTag1"
app:layout_constraintRight_toRightOf="@+id/taskCircleTag1"
app:layout_constraintTop_toTopOf="@+id/taskEndSiteTv"
app:layout_constraintBottom_toBottomOf="@+id/taskEndSiteTv"/>
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/taxi_dot_line"
app:layout_constraintTop_toTopOf="@+id/taskStartSiteTv"
app:layout_constraintBottom_toBottomOf="@+id/taskEndSiteTv"
android:layout_width="@dimen/dp_4"
android:layout_height="0dp"
android:src="@drawable/line_start_to_end"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintTop_toTopOf="@+id/taskCircleTag1"
app:layout_constraintBottom_toBottomOf="@+id/taskCircleTag2"
app:layout_constraintLeft_toLeftOf="@+id/taskCircleTag1"
app:layout_constraintRight_toRightOf="@+id/taskCircleTag1"/>