From ce1b5b3b6ece1abc420388f91a8d0ed34a468237 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 16 Oct 2024 18:20:31 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]=20[fea]=20[=E6=89=93=E7=82=B9=E5=BC=B9?= =?UTF-8?q?=E7=AA=97UI]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wigets/dialog/CommonFeedbackDialog.kt | 86 ++++++++++++ .../wigets/media/MediaPlayerCustomView.kt | 2 +- .../drawable-nodpi/common_feedback_fail.png | Bin 0 -> 6108 bytes .../common_feedback_success.png | Bin 0 -> 6308 bytes .../res/layout/common_feedback_dialog.xml | 23 ++++ .../ui/switchline/SwitchLineAdapter.kt | 2 + .../ui/switchtask/SwitchLineTaskAdapter.kt | 2 + .../weaknet/ui/switchtask/SwitchTaskView.kt | 6 +- .../errorpoint/ErrorPointItemAdapter.kt | 26 ++-- .../errorpoint/ReportErrorPointView.kt | 35 +++-- .../routingselect/RoutingItemAdapter.kt | 2 + .../res/drawable-nodpi/taxi_routing_check.png | Bin 0 -> 3466 bytes .../drawable-nodpi/taxi_routing_uncheck.png | Bin 0 -> 2455 bytes .../layout/taxt_report_error_point_item.xml | 42 +++--- .../layout/taxt_report_error_point_panel.xml | 123 ++++++++---------- 15 files changed, 237 insertions(+), 112 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_feedback_fail.png create mode 100755 OCH/common/common/src/main/res/drawable-nodpi/common_feedback_success.png create mode 100644 OCH/common/common/src/main/res/layout/common_feedback_dialog.xml create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_routing_check.png create mode 100644 OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_routing_uncheck.png diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt new file mode 100644 index 0000000000..8ff026fbd6 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt @@ -0,0 +1,86 @@ +package com.mogo.och.common.module.wigets.dialog + +import android.content.Context +import android.view.View +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView +import androidx.lifecycle.LifecycleObserver +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.common.module.R +import com.mogo.och.common.module.utils.RxUtils + +/** + * loading + */ +class CommonFeedbackDialog : BaseFloatDialog, LifecycleObserver { + + private var status: Status = Status.success + + private val ivFeedbackStatus:AppCompatImageView by lazy { findViewById(R.id.iv_feedback_status) } + private val tvFeedbackStatusDescribe:AppCompatTextView by lazy { findViewById(R.id.tv_feedback_status_describe) } + + private var listener:Listener?=null + + private var mRunnable:Runnable= Runnable { + ToastUtils.showLong("超时未响应，请求失败") + } + + constructor(builder: Builder, context: Context) : super(context) { + tvFeedbackStatusDescribe.text = builder.titleStr + status = builder.statusEnum + listener = builder.listener + when (status) { + Status.success -> { + ivFeedbackStatus.setImageResource(R.drawable.common_feedback_success) + } + Status.fail -> { + ivFeedbackStatus.setImageResource(R.drawable.common_feedback_fail) + } + } + RxUtils.createSubscribe(1_000) { + hide() + this.listener?.cancel() + } + } + + init { + setContentView(R.layout.common_feedback_dialog) + setCanceledOnTouchOutside(false) + } + + + class Builder{ + var statusEnum: Status = Status.success + var titleStr:String = "" + var listener:Listener?=null + + fun title(title: String) : Builder{ + this.titleStr = title + return this + } + + fun listener(listener: Listener) : Builder{ + this.listener = listener + return this + } + + fun build(context: Context): CommonFeedbackDialog { + return CommonFeedbackDialog(this,context) + } + + fun status(ask: Status): Builder { + this.statusEnum = ask + return this + } + } + + enum class Status{ + success,fail,loading + } + + interface Listener{ + fun cancel() + } + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt index 21170abe0d..419fc4b515 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerCustomView.kt @@ -209,7 +209,7 @@ class AdvanceVideoView @JvmOverloads constructor( Logger.d(MediaLoopPlayView.TAG, "startPlay") gsyVideoPlayerOptionBuilder = GSYVideoOptionBuilder() gsyVideoPlayerOptionBuilder - ?.setUrl(localVideoPath) // "/data/user/0/com.mogo.launcher.f/files/video/" + ?.setUrl(localVideoPath) // "/sdcard/mogo/media" ?.setPlayTag(MediaFileCacheManager.getCacheFileName(videoUrl)) ?.setCacheWithPlay(false) ?.setThumbPlay(false) diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_feedback_fail.png b/OCH/common/common/src/main/res/drawable-nodpi/common_feedback_fail.png new file mode 100755 index 0000000000000000000000000000000000000000..e25e6c9007e1a168fea048f10bf4675c9d39f6eb GIT binary patch literal 6108 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 literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/drawable-nodpi/common_feedback_success.png b/OCH/common/common/src/main/res/drawable-nodpi/common_feedback_success.png new file mode 100755 index 0000000000000000000000000000000000000000..ed9494988ab0ce06a4e19a0c2f9e663cbb2c31d2 GIT binary patch literal 6308 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 OLsXHPN~H>BLH`HV=8H`L literal 0 HcmV?d00001 diff --git a/OCH/common/common/src/main/res/layout/common_feedback_dialog.xml b/OCH/common/common/src/main/res/layout/common_feedback_dialog.xml new file mode 100644 index 0000000000..a64669654d --- /dev/null +++ b/OCH/common/common/src/main/res/layout/common_feedback_dialog.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt index f385ba5736..d1b340a761 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchline/SwitchLineAdapter.kt @@ -12,6 +12,7 @@ import com.mogo.och.weaknet.ui.switchline.SwitchLineAdapter.SwitchLineViewHolder import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import me.jessyan.autosize.AutoSizeCompat /** * 路线列表adapter @@ -50,6 +51,7 @@ class SwitchLineAdapter( override fun onBindViewHolder(holder: SwitchLineViewHolder, position: Int) { val currentPosition = holder.bindingAdapterPosition + AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) val line = mData[currentPosition] holder.lineName.text = line.lineName diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt index 2df1e1db99..c591caa1e6 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchLineTaskAdapter.kt @@ -13,6 +13,7 @@ import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.weaknet.ui.switchtask.SwitchLineTaskAdapter.SwitchLineTaskViewHolder import com.mogo.och.shuttle.weaknet.R import com.mogo.och.weaknet.repository.db.bean.TaskDataBean +import me.jessyan.autosize.AutoSizeCompat /** * 路线列表adapter @@ -49,6 +50,7 @@ class SwitchLineTaskAdapter( override fun onBindViewHolder(holder: SwitchLineTaskViewHolder, position: Int) { val currentPosition = holder.bindingAdapterPosition + AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) val task = mData[currentPosition] val taskStartTime = TimeUtils.millis2String(task.taskStartTime?:System.currentTimeMillis(), "HH:mm") holder.taskTime.text = taskStartTime diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt index b4e01f4b66..618795c1ed 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/switchtask/SwitchTaskView.kt @@ -6,9 +6,7 @@ import android.view.LayoutInflater import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.loop.BizLoopManager @@ -52,7 +50,7 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba private lateinit var mAdapter: SwitchLineTaskAdapter - private lateinit var linearLayoutManager:LinearLayoutManager + private lateinit var linearLayoutManager:GridLayoutManager init { LayoutInflater.from(context).inflate(R.layout.shuttle_weak_switch_task, this, true) @@ -60,7 +58,7 @@ class SwitchTaskView: WindowRelativeLayout, SwtichTaskModel.SwtichLineViewCallba } private fun initView(){ - linearLayoutManager = GridLayoutManager(context, 3) + linearLayoutManager = GridLayoutManager(context, 3) rv_switch_task.setLayoutManager(linearLayoutManager) mAdapter = SwitchLineTaskAdapter(context,null, mutableListOf()) rv_switch_task.setAdapter(mAdapter) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt index adc5ef1fc0..8246fef006 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ErrorPointItemAdapter.kt @@ -5,9 +5,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.CheckBox +import androidx.appcompat.widget.AppCompatImageView +import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.bean.PointError +import me.jessyan.autosize.AutoSizeCompat /** * Created by yangyakun on 06/06/17. @@ -42,12 +46,16 @@ class ErrorPointItemAdapter( override fun onBindViewHolder(holder: TextVH, position: Int) { val errorInfo = dataList[holder.bindingAdapterPosition] - holder.cbErrorInfo.text = errorInfo.name - holder.cbErrorInfo.isChecked = errorInfo.isCheck - holder.cbErrorInfo.setOnCheckedChangeListener { buttonView, isChecked -> - if(buttonView==holder.cbErrorInfo){ - errorInfo.isCheck = isChecked - } + AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) + if (errorInfo.isCheck) { + holder.cbErrorInfo.setImageResource(R.drawable.taxi_routing_check) + }else{ + holder.cbErrorInfo.setImageResource(R.drawable.taxi_routing_uncheck) + } + holder.cbErrorResong.text = errorInfo.name + holder.itemView.onClick { + errorInfo.isCheck = !errorInfo.isCheck + notifyItemChanged(holder.bindingAdapterPosition) } } @@ -56,9 +64,7 @@ class ErrorPointItemAdapter( } inner class TextVH(itemView: View) : RecyclerView.ViewHolder(itemView) { - var cbErrorInfo: CheckBox - init { - cbErrorInfo = itemView.findViewById(R.id.cb_error_info) - } + var cbErrorInfo: AppCompatImageView = itemView.findViewById(R.id.aciv_show_check_status) + var cbErrorResong: AppCompatTextView = itemView.findViewById(R.id.actv_error_resong) } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt index bdf995e721..bdbbb74ab2 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/errorpoint/ReportErrorPointView.kt @@ -4,6 +4,7 @@ import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.GridLayoutManager import com.google.android.flexbox.AlignItems import com.google.android.flexbox.FlexDirection import com.google.android.flexbox.FlexWrap @@ -14,9 +15,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.wigets.WindowRelativeLayout +import com.mogo.och.common.module.wigets.dialog.CommonFeedbackDialog import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.bean.PointError import com.mogo.och.unmanned.taxi.ui.routing.TaxiRoutingLoadingDialog +import kotlinx.android.synthetic.main.taxt_report_error_point_panel.view.lvs_loding import kotlinx.android.synthetic.main.taxt_report_error_point_panel.view.rvErrorPointReason import kotlinx.android.synthetic.main.taxt_report_error_point_panel.view.tv_report_error_point_reason import kotlinx.android.synthetic.main.taxt_report_error_point_panel.view.tv_report_error_point_reason_cancel @@ -58,12 +61,6 @@ class ReportErrorPointView : WindowRelativeLayout, private var occurrenceTime:Long = System.currentTimeMillis() - private val mLoadingDialog: TaxiRoutingLoadingDialog by lazy { - TaxiRoutingLoadingDialog( - context - ) - } - private fun initView() { d(SceneConstant.M_TAXI_P + TAG, "initView") LayoutInflater.from(context).inflate(R.layout.taxt_report_error_point_panel, this, true) @@ -73,7 +70,7 @@ class ReportErrorPointView : WindowRelativeLayout, flexboxLayoutManager.alignItems = AlignItems.CENTER flexboxLayoutManager.flexWrap = FlexWrap.WRAP - rvErrorPointReason?.layoutManager = flexboxLayoutManager + rvErrorPointReason?.layoutManager = GridLayoutManager(context, 2) rvErrorPointReason?.setHasFixedSize(true) errorPointItemAdapter = ErrorPointItemAdapter( context, mutableListOf( @@ -91,7 +88,8 @@ class ReportErrorPointView : WindowRelativeLayout, ToastUtils.showShort("请选择问题类型") return@onClick } - mLoadingDialog.showLoading() + tv_report_error_point_reason_cancel.isEnabled = false + lvs_loding.visibility = VISIBLE this.viewModel?.submitErrorPointReasons(checkDataList,occurrenceTime) } } @@ -101,9 +99,8 @@ class ReportErrorPointView : WindowRelativeLayout, d(SceneConstant.M_TAXI_P + TAG, "展示---:${isVisible}") if (isVisible) { occurrenceTime = System.currentTimeMillis() - tv_work_order_time.text = "时间:${TimeUtils.millis2String(occurrenceTime, TimeUtils.getHourMinSecondFormat())}" + tv_work_order_time.text = TimeUtils.millis2String(occurrenceTime, TimeUtils.getHourMinSecondFormat()) viewModel?.getPointErrorReasons() - mLoadingDialog.showLoading() } else { } @@ -130,7 +127,6 @@ class ReportErrorPointView : WindowRelativeLayout, } override fun addViewData(it: MutableList) { - mLoadingDialog.hideLoading() errorPointItemAdapter.setDataList(it) } @@ -138,12 +134,23 @@ class ReportErrorPointView : WindowRelativeLayout, msg?.let { ToastUtils.showLong(msg) } - mLoadingDialog.hideLoading() + lvs_loding.visibility = GONE + CommonFeedbackDialog + .Builder() + .title("请重试") + .status(CommonFeedbackDialog.Status.success) + .build(context).show() } override fun submitErrorReasons() { - mLoadingDialog.hideLoading() - this.closeCallback?.close() + tv_report_error_point_reason_cancel.isEnabled = true + lvs_loding.visibility = GONE + closeCallback?.close() + CommonFeedbackDialog + .Builder() + .title("打点成功") + .status(CommonFeedbackDialog.Status.success) + .build(context).show() } fun setDismiss(listener: CloseCallback) { diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingselect/RoutingItemAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingselect/RoutingItemAdapter.kt index 7624eafd9e..a00ac183ae 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingselect/RoutingItemAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingselect/RoutingItemAdapter.kt @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.DiffUtil.Callback import androidx.recyclerview.widget.RecyclerView import com.mogo.och.unmanned.taxi.R import com.mogo.och.unmanned.taxi.bean.GrayLineBean +import me.jessyan.autosize.AutoSizeCompat /** * 路线列表adapter @@ -49,6 +50,7 @@ class RoutingItemAdapter( override fun onBindViewHolder(holder: RoutingItemViewHolder, position: Int) { val currentPosition = holder.bindingAdapterPosition val routing = mData[currentPosition] + AutoSizeCompat.autoConvertDensityOfGlobal(holder.itemView.resources) holder.routingName.text = routing.lineName holder.todayVerifyNum.text = "今日验证：${routing.carVerificationCount}次" diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_routing_check.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/taxi_routing_check.png new file mode 100644 index 0000000000000000000000000000000000000000..803e26195408cbc7046f29bbba76ffaa15585c58 GIT binary patch literal 3466 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 - - + + - \ No newline at end of file + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/taxt_report_error_point_panel.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/taxt_report_error_point_panel.xml index 5b928cbc03..445d98f3a8 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/taxt_report_error_point_panel.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/taxt_report_error_point_panel.xml @@ -1,105 +1,92 @@ - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="@dimen/dp_900" + android:layout_height="@dimen/dp_730" + android:background="@drawable/common_qr_dialog" + app:roundLayoutRadius="@dimen/dp_50"> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginTop="@dimen/dp_51" + /> - - - - + app:layout_constraintTop_toTopOf="@+id/tv_report_title" + app:layout_constraintBottom_toBottomOf="@+id/tv_report_title" + app:layout_constraintEnd_toEndOf="parent" + /> + android:layout_height="@dimen/dp_0" + android:layout_marginStart="@dimen/dp_65" + android:layout_marginTop="@dimen/dp_56" + android:layout_marginEnd="@dimen/dp_65" + android:layout_marginBottom="@dimen/dp_10" + app:layout_constraintBottom_toTopOf="@+id/tv_report_error_point_reason" + app:layout_constraintTop_toBottomOf="@+id/tv_report_title" /> + app:layout_constraintStart_toStartOf="parent" + android:layout_marginStart="@dimen/dp_65" + /> + + + app:layout_constraintEnd_toEndOf="parent" + /> - \ No newline at end of file + \ No newline at end of file