diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
index 5cdd69b6bc..4d26024b3d 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
@@ -16,25 +16,20 @@ import com.mogo.commons.mvp.BaseFragment
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager
+import com.mogo.eagle.core.network.utils.GsonUtil
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI
import com.mogo.eagle.core.utilcode.util.DateTimeUtils
import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.map.overlay.core.Level
-import com.mogo.map.overlay.point.Point
import com.mogo.och.common.module.map.AmapNaviToDestinationModel
import com.mogo.och.common.module.map.ICommonNaviChangedCallback
import com.mogo.och.common.module.utils.DateTimeUtil
import com.mogo.och.common.module.utils.NumberFormatUtil
-import com.mogo.och.common.module.utils.OCHThreadPoolManager
-import com.mogo.och.common.module.voice.VoiceNotice.showNotice
import com.mogo.och.common.module.wigets.OCHCommitDialog
import com.mogo.och.taxi.R
import com.mogo.och.taxi.bean.OrderDetail
-import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean
import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean
import com.mogo.och.taxi.bean.StartServiceRespBean
import com.mogo.och.taxi.constant.TaskStatusEnum
@@ -44,26 +39,26 @@ import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_END_MAP_MAKER
import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TAXI_START_MAP_MAKER
import com.mogo.och.taxi.constant.TaxiUnmannedConst.Companion.TYPE_MARKER_TAXI_ORDER
import com.mogo.och.taxi.model.TaxiModel
-import com.mogo.och.taxi.model.TaxiUnmannedViewModel
import com.mogo.och.taxi.ui.base.TaxiFragment
+import com.mogo.och.taxi.ui.task.TaxiCurrentTaskViewModel
import com.mogo.och.taxi.ui.unmanned.TaskAndOrderUiState
import com.mogo.och.taxi.ui.unmanned.UnmannedIntent
import com.mogo.och.taxi.utils.MapMakerManager
+import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder
+import kotlinx.android.synthetic.main.task_fragment_current.endPoint
+import kotlinx.android.synthetic.main.task_fragment_current.endStationName
+import kotlinx.android.synthetic.main.task_fragment_current.mBeingOrderLayout
+import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd
+import kotlinx.android.synthetic.main.task_fragment_current.naviToStart
+import kotlinx.android.synthetic.main.task_fragment_current.noTaskData
+import kotlinx.android.synthetic.main.task_fragment_current.orderPhoneAndNum
+import kotlinx.android.synthetic.main.task_fragment_current.startPoint
+import kotlinx.android.synthetic.main.task_fragment_current.startStationName
+import kotlinx.android.synthetic.main.task_fragment_current.taskClickBtn
+import kotlinx.android.synthetic.main.task_fragment_current.taskOtherInfo
+import kotlinx.android.synthetic.main.task_fragment_current.taskStatus
+import kotlinx.android.synthetic.main.task_fragment_current.taskTypeTv
import kotlinx.android.synthetic.main.taxi_no_data_common_view.noOrderDataTv
-import kotlinx.android.synthetic.main.unmanned_being_order.cancelOrder
-import kotlinx.android.synthetic.main.unmanned_being_order.endPoint
-import kotlinx.android.synthetic.main.unmanned_being_order.endStationName
-import kotlinx.android.synthetic.main.unmanned_being_order.mBeingOrderLayout
-import kotlinx.android.synthetic.main.unmanned_being_order.naviToEnd
-import kotlinx.android.synthetic.main.unmanned_being_order.naviToStart
-import kotlinx.android.synthetic.main.unmanned_being_order.noTaskData
-import kotlinx.android.synthetic.main.unmanned_being_order.orderPhoneAndNum
-import kotlinx.android.synthetic.main.unmanned_being_order.startPoint
-import kotlinx.android.synthetic.main.unmanned_being_order.startStationName
-import kotlinx.android.synthetic.main.unmanned_being_order.taskClickBtn
-import kotlinx.android.synthetic.main.unmanned_being_order.taskOtherInfo
-import kotlinx.android.synthetic.main.unmanned_being_order.taskStatus
-import kotlinx.android.synthetic.main.unmanned_being_order.taskTypeTv
import kotlinx.coroutines.flow.map
import java.util.Calendar
import kotlin.math.ceil
@@ -73,155 +68,141 @@ import kotlin.math.roundToInt
* @author: wangmingjun
* @date: 2023/7/24
*/
-class TaxiBeingTaskFragment : BaseFragment(),
+class TaxiCurrentTaskFragment : BaseFragment(),
View.OnClickListener, ICommonNaviChangedCallback {
- private lateinit var mViewModel : TaxiUnmannedViewModel
+ private lateinit var mViewModel: TaxiCurrentTaskViewModel
+ private var mCurrentTaskWithOrder: QueryCurrentTaskRespBean.Result? = null
- @Volatile
- private var mTtsLessThan200Tip = 0 //离终点200米提示播报
- private var mCurrentTaskAndOrder: QueryCurrentTaskRespBean.Result? = null
- private var mCurrentUntruthTask: StartServiceRespBean.Result? = null
+ // 开始接单后 需要将车开到最近的一个站点就位，然后才能开启 无人化 流程
+ private var mDriveToNearestStationTask: StartServiceRespBean.Result? = null
companion object {
- const val TAG = "TaxiBeingTaskFragment"
- @SuppressLint("StaticFieldLeak")
- private var mActivity: Activity? = null
- @SuppressLint("StaticFieldLeak")
+ const val TAG = "TaxiCurrentTaskFragment"
+
private var mTaxiFragment: TaxiFragment? = null
- fun newInstance(
- activity: Activity?,
- taxiFragment: TaxiFragment?
- ): TaxiBeingTaskFragment {
- mActivity = activity
+ fun newInstance(taxiFragment: TaxiFragment?): TaxiCurrentTaskFragment {
mTaxiFragment = taxiFragment
val args = Bundle()
- val fragment = TaxiBeingTaskFragment()
+ val fragment = TaxiCurrentTaskFragment()
fragment.arguments = args
return fragment
}
}
override fun getLayoutId(): Int {
- return R.layout.unmanned_being_order
+ return R.layout.task_fragment_current
}
override fun getTagName(): String {
- return "TaxiBeingTaskFragment"
+ return "TaxiCurrentTaskFragment"
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- d("viewModel ==", "TaxiBeingTaskFragment onCreate")
- mViewModel = ViewModelProvider(this, ViewModelProvider.NewInstanceFactory())[TaxiUnmannedViewModel::class.java]
+ mViewModel = ViewModelProvider(
+ this,
+ ViewModelProvider.NewInstanceFactory()
+ )[TaxiCurrentTaskViewModel::class.java]
}
- @RequiresApi(Build.VERSION_CODES.N)
override fun initViews() {
- initNaviView()
- isHaveBeingOrder(false)
initOnClickListener()
- //任意模式下调试信息都打开
- initOrderTestBar()
-
- initData()
+ initContainerView(false)
+ initTaskDebugViewListener()
+ initViewModelObserver()
}
- @RequiresApi(Build.VERSION_CODES.N)
- private fun initData() {
+ /**
+ * 是否有正在进行的订单，进行UI显示
+ *
+ * @param being
+ */
+ private fun initContainerView(hasCurrentTask: Boolean) {
+ d(
+ M_TAXI + TAG,
+ "hasCurrentTask = $hasCurrentTask"
+ )
+ try {
+ if (hasCurrentTask) {
+ noTaskData.visibility = View.GONE
+ mBeingOrderLayout.visibility = View.VISIBLE
+ } else {
+ noTaskData.visibility = View.VISIBLE
+ noOrderDataTv.text = "暂无进行中订单"
+ mBeingOrderLayout.visibility = View.GONE
+ }
+ } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况
+ TaxiModel.clearCurrentOCHOrder()
+ }
+ }
+ private fun initOnClickListener() {
+ naviToStart.setOnClickListener(this)
+ naviToEnd.setOnClickListener(this)
+
+ cancelOrder.setOnClickListener(this)
+ taskStatus.setOnClickListener(this)
+ taskClickBtn.setOnClickListener(this)
+ }
+
+ private fun initTaskDebugViewListener() {
+ taskStatus.setOnLongClickListener {
+ mTaxiFragment?.clickOrderDebugView()
+ false
+ }
+ }
+
+ private fun initViewModelObserver() {
mViewModel.sendUiIntent(UnmannedIntent.StartTaskOrOrderLooper)
//监听返回的数据状态
lifecycleScope.launchWhenStarted {
- mViewModel.uiStateFlow.map {it.taskAndOrderUiState}.collect {taskAndOrderUiState ->
- d(TAG,"uiStateFlow-taskAndOrderUiState: $taskAndOrderUiState")
- when(taskAndOrderUiState){
- is TaskAndOrderUiState.INIT -> {
+ mViewModel.uiStateFlow.map { it.taskAndOrderUiState }.collect { taskAndOrderUiState ->
+ d(TAG, "uiStateFlow-initViewModelObserver: $taskAndOrderUiState")
+ when (taskAndOrderUiState) {
+ is TaskAndOrderUiState.INIT -> {
+ }
+ is TaskAndOrderUiState.TASKANDORDER -> {
+ mDriveToNearestStationTask = taskAndOrderUiState.untruthTask
+ mCurrentTaskWithOrder = taskAndOrderUiState.taskAndOrder
+
+ if ((taskAndOrderUiState.untruthTask == null
+ && mCurrentTaskWithOrder != null
+ && mCurrentTaskWithOrder!!.endSite == null)
+ || mCurrentTaskWithOrder == null
+ ) {
+ initContainerView(false)
+ removeAllMapMarker()
+ return@collect
}
- is TaskAndOrderUiState.TASKANDORDER -> {
-
- mCurrentUntruthTask = taskAndOrderUiState.untruthTask
- mCurrentTaskAndOrder = taskAndOrderUiState.taskAndOrder
-
- if ((taskAndOrderUiState.untruthTask == null && mCurrentTaskAndOrder != null
- && mCurrentTaskAndOrder!!.endSite == null) || mCurrentTaskAndOrder == null){
- isHaveBeingOrder(false)
- removeAllMapMarker()
- return@collect
- }
-
- if (taskAndOrderUiState.untruthTask != null){
- updateUntruthTask(taskAndOrderUiState.untruthTask)
- }else{
- updateReserveOrderChanged(taskAndOrderUiState.taskAndOrder)
- updateCurrentOrderStatusChanged(taskAndOrderUiState.taskAndOrder)
- }
- }
-
- is TaskAndOrderUiState.UPDATEORDERMILEANDDUR -> {
- updateOrderTotalMilAndDur(taskAndOrderUiState.mileage,taskAndOrderUiState.duration)
+ if (taskAndOrderUiState.untruthTask != null) {
+ updateDriveToNearestStationTaskView(taskAndOrderUiState.untruthTask)
+ } else {
+ updateNextTaskFragment(taskAndOrderUiState.taskAndOrder)
+ updateCurrentTaskAndOrderStatusChanged(taskAndOrderUiState.taskAndOrder)
}
}
+
+ is TaskAndOrderUiState.UPDATEORDERMILEANDDUR -> {
+ taskOtherInfo.text =
+ QueryCurrentTaskRespBean.Result.getCurrentTaskTotalAndDurationHtml(
+ taskAndOrderUiState.mileage,
+ taskAndOrderUiState.duration
+ )
+ }
}
+ }
}
}
- @RequiresApi(Build.VERSION_CODES.N)
- private fun updateOrderTotalMilAndDur(mileage: Float, duration: Int) {
- val strHtml2 =
- ("总里程 " + " $mileage " + " 公里 "
- + "，总用时 " + " $duration " + " 分钟")
- taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
- }
-
- @RequiresApi(Build.VERSION_CODES.N)
- private fun updateReserveOrderChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
- mTaxiFragment?.let {
- it.updateReserveOrderChanged(taskAndOrder)
- }
- }
-
- fun onChangeOperationStatus(){
- mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseReceivingOrder)
- }
-
- private fun updateUntruthTask(untruthTask: StartServiceRespBean.Result?) {
- if (untruthTask == null) return
- isHaveBeingOrder(true)
- updateUntruthTaskView()
- updateUntruthTaskUIData(untruthTask.siteName)
- updateUntruthTaskOtherInfo()
- }
-
- private fun updateUntruthTaskOtherInfo() {
- if (mCurrentUntruthTask != null){
- startNaviToStation(false, mCurrentUntruthTask!!.gcjLat,
- mCurrentUntruthTask!!.gcjLon)
- }
- }
-
- private fun updateUntruthTaskUIData(siteName: String) {
- taskStatus.text = resources.getString(R.string.task_start_to_virtual_site)
- startStationName.text = resources.getString(R.string.task_current_loc)
- endStationName.text = siteName
- setPointBlueGreen()
- }
-
- private fun setPointBlueGreen(){
- startPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big)
- endPoint.setImageResource(R.drawable.taxi_driver_circle_green_big)
- }
-
- private fun setPointGreenBlue(){
- startPoint.setImageResource(R.drawable.taxi_driver_circle_green_big)
- endPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big)
- }
-
- private fun updateUntruthTaskView() {
- taskStatus.visibility = View.VISIBLE
+ private fun updateDriveToNearestStationTaskView(driveToNearestStationTask: StartServiceRespBean.Result?) {
+ if (driveToNearestStationTask == null) return
+ initContainerView(true)
+ // DriverToNearestStationTask 更新
+ taskStatus.visibility = View.VISIBLE
taskTypeTv.visibility = View.GONE
cancelOrder.visibility = View.GONE
orderPhoneAndNum.visibility = View.GONE
@@ -230,55 +211,81 @@ class TaxiBeingTaskFragment : BaseFragment(),
taskClickBtn.visibility = View.GONE
naviToStart.visibility = View.GONE
naviToEnd.visibility = View.VISIBLE
- taskOtherInfo.visibility = View.VISIBLE
+ taskOtherInfo.visibility = View.VISIBLE
+
+ // 更新任务状态，起点，终点
+ taskStatus.text = resources.getString(R.string.task_start_to_virtual_site)
+ startStationName.text = resources.getString(R.string.task_current_loc)
+ endStationName.text = driveToNearestStationTask.siteName
+ updateStartAndEndStationPointByStatus(true)
+
+ // 使用高德获取导航数据
+ if (mDriveToNearestStationTask != null) {
+ startNaviToStation(
+ false, mDriveToNearestStationTask!!.gcjLat,
+ mDriveToNearestStationTask!!.gcjLon
+ )
+ }
}
- private fun initOnClickListener() {
- cancelOrder.setOnClickListener(this)
- taskStatus.setOnClickListener(this)
- taskClickBtn.setOnClickListener(this)
+ private fun updateStartAndEndStationPointByStatus(isGoingToStation: Boolean) {
+ if (isGoingToStation) {// 即将到达的站点
+ startPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big)
+ endPoint.setImageResource(R.drawable.taxi_driver_circle_green_big)
+ } else {// 到达站点 或 已经经过的站点
+ startPoint.setImageResource(R.drawable.taxi_driver_circle_green_big)
+ endPoint.setImageResource(R.drawable.taxi_driver_circle_blue_big)
+ }
}
- private fun initNaviView() {
- naviToStart.setOnClickListener(this)
- naviToEnd.setOnClickListener(this)
+ private fun updateNextTaskFragment(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
+ mTaxiFragment?.let {
+ it.updateNextTaskFragment(taskAndOrder)
+ }
}
- private fun updateRemainDistanceAndTime(isVoicePlay: Boolean){
+ fun onOperationStatusChanged() {
+ mViewModel.sendUiIntent(UnmannedIntent.StartOrPauseReceivingOrder)
+ }
+
+ private fun updateRemainDistanceAndTime(isVoicePlay: Boolean) {
//根据任务状态计算剩余历程和时间
- if (mCurrentTaskAndOrder == null) return
-
- if (mCurrentTaskAndOrder!!.endSite != null
- && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code){
-
- startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.endSite!!.gcjLat,
- mCurrentTaskAndOrder!!.endSite!!.gcjLon)
+ if (mCurrentTaskWithOrder == null) return
+ if (mCurrentTaskWithOrder!!.endSite != null
+ && mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code
+ ) {
+ startNaviToStation(
+ isVoicePlay, mCurrentTaskWithOrder!!.endSite!!.gcjLat,
+ mCurrentTaskWithOrder!!.endSite!!.gcjLon
+ )
return
}
- if (mCurrentTaskAndOrder!!.startSite != null
- && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code){ //演练任务和送驾任务
-
- startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.startSite!!.gcjLat,
- mCurrentTaskAndOrder!!.startSite!!.gcjLon)
+ if (mCurrentTaskWithOrder!!.startSite != null
+ && mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code
+ ) { //演练任务和送驾任务
+ startNaviToStation(
+ isVoicePlay, mCurrentTaskWithOrder!!.startSite!!.gcjLat,
+ mCurrentTaskWithOrder!!.startSite!!.gcjLon
+ )
}
}
/**
* 任务和订单信息
*/
- @RequiresApi(Build.VERSION_CODES.N)
@SuppressLint("SetTextI18n", "UseCompatLoadingForDrawables")
- fun updateCurrentOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
+ fun updateCurrentTaskAndOrderStatusChanged(taskAndOrder: QueryCurrentTaskRespBean.Result?) {
if (taskAndOrder == null) return
if ((taskAndOrder.endSite == null || taskAndOrder.currentStatus == TaskStatusEnum.CompleteTask.code)
- && taskAndOrder.order == null){
- isHaveBeingOrder(false)
+ && taskAndOrder.order == null
+ ) {
+ initContainerView(false)
removeAllMapMarker()
return
}
- isHaveBeingOrder(true)
+ initContainerView(true)
/**
* 根据任务类型判断任务显示,
* 虚拟单, 显示在进行中 前往上车点
@@ -291,196 +298,176 @@ class TaxiBeingTaskFragment : BaseFragment(),
val endSite = taskAndOrder.endSite //进行的任务
val currentStatus = taskAndOrder.currentStatus // 任务的状态
- updateUIShowStatus(taskType,currentStatus,order)
+ updateUIShowStatus(taskType, currentStatus, order)
when (taskType) {
+
TaskTypeEnum.VirtualTask.code -> {// 演练任务
- if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code){
+ if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
updateOrderUI(order)
return
}
if (startSite == null || endSite == null) return
taskStatus.text = resources.getString(R.string.task_start_end_site)
- taskTypeTv.background = resources.getDrawable(R.drawable.task_unreal_type_btn_bg,null)
+ taskTypeTv.background =
+ resources.getDrawable(R.drawable.task_unreal_type_btn_bg, null)
taskTypeTv.text = resources.getString(R.string.task_exercise)
startStationName.text = startSite.siteName
endStationName.text = endSite.siteName
- setPointBlueGreen()
+ updateStartAndEndStationPointByStatus(true)
}
- TaskTypeEnum.ToOrderEndTask.code,TaskTypeEnum.ToOrderStartTask.code -> {// 送驾/接驾任务任务
+
+ TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 送驾/接驾任务任务
if (order == null) return
updateOrderUI(order)
}
+
TaskTypeEnum.None.code -> {
- if (order != null){
+ if (order != null) {
updateOrderUI(order)
}
}
}
+ updateMapMarkers()
+
updateRemainDistanceAndTime(false)
}
- @RequiresApi(Build.VERSION_CODES.N)
- private fun updateOrderUI(order: OrderDetail) {
+ private fun updateMapMarkers() {
+ if (mCurrentTaskWithOrder != null && mCurrentTaskWithOrder!!.startSite != null
+ && mCurrentTaskWithOrder!!.endSite != null
+ ) {
+ when (mCurrentTaskWithOrder!!.currentStatus) {
+ TaskStatusEnum.GetTask.code -> {
+ setOrRemoveMapMaker(
+ true,
+ TAXI_START_MAP_MAKER,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lon,
+ R.raw.star_marker
+ )
+ setOrRemoveMapMaker(
+ true,
+ TAXI_END_MAP_MAKER,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lon,
+ R.raw.end_marker
+ )
+ }
+ TaskStatusEnum.StartTask.code -> {
+ setOrRemoveMapMaker(
+ false,
+ TAXI_START_MAP_MAKER,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lon,
+ R.raw.star_marker
+ )
+ setOrRemoveMapMaker(
+ true,
+ TAXI_END_MAP_MAKER,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lon,
+ R.raw.end_marker
+ )
+ }
+
+ TaskStatusEnum.CompleteTask.code -> {
+ setOrRemoveMapMaker(
+ false,
+ TAXI_START_MAP_MAKER,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.startSite!!.wgs84Lon,
+ R.raw.star_marker
+ )
+ setOrRemoveMapMaker(
+ false,
+ TAXI_END_MAP_MAKER,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lat,
+ mCurrentTaskWithOrder!!.endSite!!.wgs84Lon,
+ R.raw.end_marker
+ )
+ }
+ }
+ } else {
+ d(
+ M_TAXI + TAG,
+ "CurrentTaskAndOrder == " + GsonUtil.jsonFromObject(mCurrentTaskWithOrder)
+ )
+ }
+ }
+
+ private fun updateOrderUI(order: OrderDetail) {
taskTypeTv.text = resources.getString(R.string.task_order)
- taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg,null)
- orderPhoneAndNum.text = Html.fromHtml(" " + order.bookingUserPhone + "" +
- " | " +
- "" + order.passengerSize + "人" + "",Html.FROM_HTML_MODE_LEGACY)
+ taskTypeTv.background = resources.getDrawable(R.drawable.task_order_type_btn_bg, null)
+ orderPhoneAndNum.text = HtmlCompat.fromHtml(
+ " " + order.bookingUserPhone + "" +
+ " | " +
+ "" + order.passengerSize + "人" + "",
+ HtmlCompat.FROM_HTML_MODE_LEGACY
+ )
startStationName.text = order.orderStartSite?.siteName
endStationName.text = order.orderEndSite?.siteName
- when(order.orderStatus){
-
+ when (order.orderStatus) {
TaxiOrderStatusEnum.None.code -> { //无
- isHaveBeingOrder(false)
- }
-
- TaxiOrderStatusEnum.Cancel.code -> { //取消
- updateOrderBottomBtn(
- taskClickBtn.text.toString(),
- Color.parseColor("#4DFFFFFF"),
- Color.parseColor("#4D1D5EF3"),
- false
- )
- taskTypeTv.background = resources.getDrawable(R.drawable.task_cancel_type_btn_bg,null)
- taskTypeTv.text = resources.getString(R.string.passenger_cancel_order)
- onCurrentOrderCancelDone()
- hideNavi()
+ initContainerView(false)
}
TaxiOrderStatusEnum.ArriveAtEnd.code -> { //到达目的地
taskStatus.text = resources.getString(R.string.task_start_end_site)
- setPointBlueGreen()
+ updateStartAndEndStationPointByStatus(true)
updateOrderBottomBtn(
getString(R.string.module_och_taxi_order_server_end),
Color.parseColor("#FFFFFF"),
Color.parseColor("#FF1D5EF3"),
true
)
-
- order.orderStartSite?.let {
- setOrRemoveMapMaker(
- false,
- TAXI_START_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.star_marker
- )
- }
- order.orderEndSite?.let {
- setOrRemoveMapMaker(
- false,
- TAXI_END_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.end_marker
- )
- }
hideNavi()
}
+
TaxiOrderStatusEnum.OnTheWayToEnd.code -> { //送驾中
taskStatus.text = resources.getString(R.string.task_start_end_site)
- setPointBlueGreen()
+ updateStartAndEndStationPointByStatus(true)
updateOrderBottomBtn(
getString(R.string.module_och_taxi_order_close),
Color.parseColor("#FFFFFF"),
Color.parseColor("#FF1D5EF3"),
true
)
-
- order.orderStartSite?.let {
- setOrRemoveMapMaker(
- false,
- TAXI_START_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.star_marker
- )
- }
- order.orderEndSite?.let {
- setOrRemoveMapMaker(
- true,
- TAXI_END_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.end_marker
- )
- }
-
}
- TaxiOrderStatusEnum.UserArriveAtStart.code,TaxiOrderStatusEnum.ArriveAtStart.code -> {
+
+ TaxiOrderStatusEnum.UserArriveAtStart.code, TaxiOrderStatusEnum.ArriveAtStart.code -> {
//乘客到达上车点,验证成功 ; 到达乘客上车点
- setPointGreenBlue()
+ updateStartAndEndStationPointByStatus(false)
taskStatus.text = resources.getString(R.string.arrived_start_site)
updateOrderBottomBtn(
- if (order.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code)
- getString(R.string.module_och_taxi_order_server_start)
- else getString(R.string.module_och_taxi_order_server_start_wait_check),
- Color.parseColor("#FFFFFF"),
- Color.parseColor("#FF1D5EF3"),
- true
- )
-
+ if (order.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code)
+ getString(R.string.module_och_taxi_order_server_start)
+ else getString(R.string.module_och_taxi_order_server_start_wait_check),
+ Color.parseColor("#FFFFFF"),
+ Color.parseColor("#FF1D5EF3"),
+ true
+ )
updateOtherInfo()
-
- order.orderStartSite?.let {
- setOrRemoveMapMaker(
- true,
- TAXI_START_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.star_marker
- )
- }
- order.orderEndSite?.let {
- setOrRemoveMapMaker(
- true,
- TAXI_END_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.end_marker
- )
- }
hideNavi()
}
TaxiOrderStatusEnum.OnTheWayToStart.code -> { //前往上车地点
taskStatus.text = resources.getString(R.string.task_start_start_site)
- setPointGreenBlue()
+ updateStartAndEndStationPointByStatus(false)
updateOrderBottomBtn(
getString(R.string.module_och_taxi_order_server_start),
Color.parseColor("#4DFFFFFF"),
Color.parseColor("#4D1D5EF3"),
false
)
- order.orderStartSite?.let {
- setOrRemoveMapMaker(
- true,
- TAXI_START_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.star_marker
- )
- }
- order.orderEndSite?.let {
- setOrRemoveMapMaker(
- true,
- TAXI_END_MAP_MAKER,
- it.gcjLat,
- it.gcjLon,
- R.raw.end_marker
- )
- }
}
-
}
}
- @RequiresApi(Build.VERSION_CODES.N)
private fun updateOtherInfo() {
val currentCale = DateTimeUtils.getCurrentDateTime()
val currentDay =
@@ -504,16 +491,17 @@ class TaxiBeingTaskFragment : BaseFragment(),
DateTimeUtil.MM_dd_HH_mm
) + "")
}
- taskOtherInfo.text = Html.fromHtml(strHtml13,Html.FROM_HTML_MODE_LEGACY)
+ taskOtherInfo.text = HtmlCompat.fromHtml(strHtml13, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
private fun updateUIShowStatus(taskType: Int, currentStatus: Int, order: OrderDetail?) {
when (taskType) {
- TaskTypeEnum.None.code ->{
- if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code){
+ TaskTypeEnum.None.code -> {
+ if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) {
handleOrderView(order)
}
}
+
TaskTypeEnum.VirtualTask.code -> { //演练任务
cancelOrder.visibility = View.GONE
orderPhoneAndNum.visibility = View.GONE
@@ -521,10 +509,13 @@ class TaxiBeingTaskFragment : BaseFragment(),
// currentStatus 0：空闲 1:获取任务 2:开始任务 3:到达目的地
naviToStart.visibility = View.GONE
taskTypeTv.visibility = View.VISIBLE
- naviToEnd.visibility = if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE
- taskOtherInfo.visibility = if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE
+ naviToEnd.visibility =
+ if (currentStatus >= TaskStatusEnum.StartTask.code) View.VISIBLE else View.GONE
+ taskOtherInfo.visibility =
+ if (currentStatus == TaskStatusEnum.GetTask.code) View.GONE else View.VISIBLE
}
- TaskTypeEnum.ToOrderEndTask.code,TaskTypeEnum.ToOrderStartTask.code -> {// 运营单(接驾任务、送驾任务)
+
+ TaskTypeEnum.ToOrderEndTask.code, TaskTypeEnum.ToOrderStartTask.code -> {// 运营单(接驾任务、送驾任务)
if (order == null) return
handleOrderView(order)
}
@@ -540,10 +531,12 @@ class TaxiBeingTaskFragment : BaseFragment(),
// orderStatus: 0 订单创建（为派单）, 10 已派上司机（司机去往上车点）, 20 司机到达上车点,
// 30 乘客到达上车点, 40 服务中（去往目的地）, 50 到达目的地, 60 已完成, 70 已取消
naviToStart.visibility = if (order.orderStatus
- == TaxiOrderStatusEnum.OnTheWayToStart.code) View.VISIBLE else View.GONE
+ == TaxiOrderStatusEnum.OnTheWayToStart.code
+ ) View.VISIBLE else View.GONE
naviToEnd.visibility = if (order.orderStatus
- == TaxiOrderStatusEnum.OnTheWayToEnd.code) View.VISIBLE else View.GONE
+ == TaxiOrderStatusEnum.OnTheWayToEnd.code
+ ) View.VISIBLE else View.GONE
taskOtherInfo.visibility = View.VISIBLE
}
@@ -555,6 +548,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
mTaxiFragment?.showAmapNaviToStationFragment(false)
mTaxiFragment?.showRoutingToStationFragment(false)
+ requireParentFragment()
}
private fun startNaviToStation(isVoicePlay: Boolean, stationLat: Double, stationLng: Double) {
@@ -572,14 +566,6 @@ class TaxiBeingTaskFragment : BaseFragment(),
AmapNaviToDestinationModel.getInstance(context).setOCHTaciNaviChangedCallback(this)
}
- private fun showOrHideNavi() {
- naviToStart.visibility = View.GONE
- naviToEnd.visibility = View.GONE
- AmapNaviToDestinationModel.getInstance(context).destroyAmaNavi()
- mTaxiFragment?.showAmapNaviToStationFragment(false)
- mTaxiFragment?.showRoutingToStationFragment(false)
- }
-
/**
* 剩余里程和剩余时间
* @param meters m
@@ -587,7 +573,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
*/
fun updateDistanceAndTime(meters: Long, timeInSecond: Long) {
// CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond);
- if (mCurrentTaskAndOrder!!.endSite == null && mCurrentUntruthTask == null) return
+ if (mCurrentTaskWithOrder == null) return
+ if (mCurrentTaskWithOrder!!.endSite == null && mDriveToNearestStationTask == null) return
var dis = "0"
var disUnit = "公里"
@@ -608,29 +595,9 @@ class TaxiBeingTaskFragment : BaseFragment(),
taskOtherInfo.text = HtmlCompat.fromHtml(strHtml2, HtmlCompat.FROM_HTML_MODE_LEGACY)
}
- private fun speekVoice200mTipsOnce() {
- mTtsLessThan200Tip = 1
- showNotice(resources.getString(R.string.module_och_taxi_order_arrive_end_200m_tip))
- }
-
- @RequiresApi(Build.VERSION_CODES.N)
- fun onCurrentOrderRouteInfoGot(routeInfo: OrderQueryRouteInfoRespBean.Result?) { // 单位 米， 秒
- if (routeInfo == null) return
- d(SceneConstant.M_TAXI + TAG, "durationToEnd = " + routeInfo.durationToEnd)
- var dis = "0"
- val distance = routeInfo.distanceToEnd
- val duration = routeInfo.durationToEnd
- if (routeInfo.distanceToEnd > 0) {
- dis = NumberFormatUtil.formatLong(distance.toDouble() / 1000)
- }
- val strHtml2 =
- ("全程 " + "" + dis + "" + " 公里"
- + "，总用时 " + "" + ceil(
- duration.toDouble() / 60
- ).toInt() + "" + " 分钟")
-
- taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
- }
+// private fun speekVoice200mTipsOnce() {
+// showNotice(resources.getString(R.string.module_och_taxi_order_arrive_end_200m_tip))
+// }
override fun onDestroyView() {
super.onDestroyView()
@@ -638,13 +605,13 @@ class TaxiBeingTaskFragment : BaseFragment(),
}
private fun startOrEndService() {
- if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.order == null) return
- val order = mCurrentTaskAndOrder!!.order
+ if (mCurrentTaskWithOrder == null || mCurrentTaskWithOrder!!.order == null) return
+ val order = mCurrentTaskWithOrder!!.order
if (TaxiOrderStatusEnum.ArriveAtStart.code == order!!.orderStatus) { //到达乘客上车点，司机可跳过乘客屏认证
mViewModel.sendUiIntent(UnmannedIntent.JumpPassengerCheckDone)
- } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus){
+ } else if (TaxiOrderStatusEnum.UserArriveAtStart.code == order.orderStatus) {
mViewModel.sendUiIntent(UnmannedIntent.StartTask)
- }else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息
+ } else if (TaxiOrderStatusEnum.ArriveAtEnd.code == order.orderStatus) { //点击了完成服务，结束订单并更新订单信息
mViewModel.sendUiIntent(UnmannedIntent.JourneyCompleted)
} else if (TaxiOrderStatusEnum.OnTheWayToEnd.code == order.orderStatus) { //前往目的地过程中可提前结束行程
//自驾中提示，接管后才能结束
@@ -678,45 +645,20 @@ class TaxiBeingTaskFragment : BaseFragment(),
closeOrderDialog.show()
}
- private fun clearOrderTag() {
- taskOtherInfo.text = "距离 - - 公里，用时 - - 分"
- }
-
- /**
- * 是否有正在进行的订单，进行UI显示
- *
- * @param being
- */
- private fun isHaveBeingOrder(being: Boolean) {
- d(
- M_TAXI + TAG,
- "isHaveBeingOrder = $being"
- )
- try {
- if (being) {
- noTaskData.visibility = View.GONE
- mBeingOrderLayout.visibility = View.VISIBLE
- } else {
- noTaskData.visibility = View.VISIBLE
- noOrderDataTv.text = "暂无进行中订单"
- mBeingOrderLayout.visibility = View.GONE
- }
- } catch (e: NullPointerException) { //可能会出现订单信息已经轮询回来，但进行中页面控件还未初始化完成的情况
- TaxiModel.clearCurrentOCHOrder()
- }
- }
override fun onClick(v: View) {
if (v.id == taskClickBtn.id) {
d(M_TAXI + TAG, taskStatus.text.toString())
startOrEndService()
} else if (v.id == cancelOrder.id) {
- if (mCurrentTaskAndOrder!!.order != null){
- TaxiOrderCancelDialog(mActivity,mCurrentTaskAndOrder!!.order!!.orderStatus
- ) {
- mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it))
+ if (mCurrentTaskWithOrder!!.order != null) {
+ activity?.also {
+ TaxiOrderCancelDialog(
+ it, mCurrentTaskWithOrder!!.order!!.orderStatus
+ ) {
+ mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it))
+ }.show()
}
- .show()
}
} else if (v.id == naviToStart.id || v.id == naviToEnd.id) {
showNaviToEndStationFragment(true)
@@ -732,42 +674,6 @@ class TaxiBeingTaskFragment : BaseFragment(),
mTaxiFragment?.startNaviToEndStation(isShow)
}
- private fun onCurrentOrderCancelDone() {
- //去除起终点
- if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.startSite != null
- && mCurrentTaskAndOrder!!.endSite != null) {
- setOrRemoveMapMaker(
- false,
- TAXI_START_MAP_MAKER,
- mCurrentTaskAndOrder!!.startSite!!.gcjLat,
- mCurrentTaskAndOrder!!.startSite!!.gcjLon,
- R.raw.star_marker
- )
- setOrRemoveMapMaker(
- false,
- TAXI_END_MAP_MAKER,
- mCurrentTaskAndOrder!!.endSite!!.gcjLat,
- mCurrentTaskAndOrder!!.endSite!!.gcjLon,
- R.raw.end_marker
- )
- }
- //提交取消订单后的回调
-// ToastUtils.showShort("订单取消成功")
- //更新界面
- isHaveBeingOrder(false)
- showOrHideNavi()
- clearOrderTag()
- }
-
- /**
- * 订单流转debug START
- */
- private fun initOrderTestBar() {
- taskStatus.setOnLongClickListener {
- mTaxiFragment?.clickOrderDebugView()
- false
- }
- }
@RequiresApi(Build.VERSION_CODES.N)
override fun onCurrentNaviDistAndTimeChanged(meters: Int, timeInSecond: Long) {
@@ -787,15 +693,15 @@ class TaxiBeingTaskFragment : BaseFragment(),
updateRemainDistanceAndTime(false)
}, 2000)
UiThreadHandler.postDelayed({
- if (mCurrentTaskAndOrder != null &&
- mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code
+ if (mCurrentTaskWithOrder != null &&
+ mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.GetTask.code
) {
if (naviToStart.visibility == View.GONE) {
naviToStart.visibility = View.VISIBLE
}
}
- if (mCurrentTaskAndOrder != null &&
- mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code
+ if (mCurrentTaskWithOrder != null &&
+ mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code
) {
if (naviToEnd.visibility == View.GONE) {
naviToEnd.visibility = View.VISIBLE
@@ -805,15 +711,15 @@ class TaxiBeingTaskFragment : BaseFragment(),
}
fun onNaviToEndAmap(isShow: Boolean) {
- if (mCurrentTaskAndOrder == null) return
+ if (mCurrentTaskWithOrder == null) return
mTaxiFragment?.showAmapNaviToStationFragment(
- if (mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code)
+ if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code)
isShow else true
)
updateRemainDistanceAndTime(
- if (mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code)
+ if (mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code)
isShow else true
)
}
@@ -824,12 +730,14 @@ class TaxiBeingTaskFragment : BaseFragment(),
* @param uuid
* @param station
*/
- private fun setOrRemoveMapMaker(isAdd: Boolean, uuid: String,
- lat: Double, lon: Double, resourceId: Int) {
+ private fun setOrRemoveMapMaker(
+ isAdd: Boolean, uuid: String,
+ lat: Double, lon: Double, resourceId: Int
+ ) {
if (isAdd) {
- MapMakerManager.addMapMaker(TYPE_MARKER_TAXI_ORDER,uuid,lat, lon, resourceId)
+ MapMakerManager.addMapMaker(TYPE_MARKER_TAXI_ORDER, uuid, lat, lon, resourceId)
} else {
- MapMakerManager.removeMapMaker(uuid,lat,lon)
+ MapMakerManager.removeMapMaker(uuid, lat, lon)
}
}
@@ -837,7 +745,12 @@ class TaxiBeingTaskFragment : BaseFragment(),
MapMakerManager.removeAllMapMarkerByOwner(TYPE_MARKER_TAXI_ORDER)
}
- private fun updateOrderBottomBtn(txt: String?, txtColorId: Int, bgColorId: Int, isClickable: Boolean) {
+ private fun updateOrderBottomBtn(
+ txt: String?,
+ txtColorId: Int,
+ bgColorId: Int,
+ isClickable: Boolean
+ ) {
taskClickBtn.text = txt
taskClickBtn.setTextColor(txtColorId)
val background =