diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt index 674c1b53e6..2ce91eb17b 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt @@ -40,37 +40,29 @@ class OrderDebugView @JvmOverloads constructor( fun toggleOrderDebugView() { val data = TaxiModel.getCurTaskAndOrder() - if (data == null) { - orderDebugContainer?.visibility = View.GONE - return - - } - orderDebugContainer.visibility = - if (orderDebugContainer?.visibility == View.VISIBLE) + visibility = + if (visibility == View.VISIBLE) View.GONE else View.VISIBLE - data.also { - test_bar_current_order_id.text = "orderNo: ${it?.order?.orderNo}" - test_bar_current_line_id!!.text = "当前任务lineId: ${it?.lineId}" - taskType2.text = "当前任务类型: ${it.taskType}" - taskStatus2.text = "任务状态: ${it.currentStatus}" - taskStartSite.text = - "任务开始站点: ${data.startSite?.siteName} , siteId: ${data.startSite?.siteId}" - taskEndSite.text = - "任务结束站点: ${data.endSite?.siteName}, siteId: ${data?.endSite?.siteId}" - orderInfo.text = - "订单信息: 开始: ${it.order?.orderStartSite?.siteName}, 结束: ${it.order?.orderEndSite?.siteName}, orderStatus: ${it.order?.orderStatus}" - orderToStartLines.text = - "接驾任务的lineId集合: " + GsonUtil.jsonFromObject(it.order?.planningLines) + test_bar_current_order_id.text = "orderNo: ${data?.order?.orderNo}" + test_bar_current_line_id!!.text = "当前任务lineId: ${data?.lineId}" + taskType2.text = "当前任务类型: ${data?.taskType}" + taskStatus2.text = "任务状态: ${data?.currentStatus}" + taskStartSite.text = + "任务开始站点: ${data?.startSite?.siteName} , siteId: ${data?.startSite?.siteId}" + taskEndSite.text = + "任务结束站点: ${data?.endSite?.siteName}, siteId: ${data?.endSite?.siteId}" + orderInfo.text = + "订单信息: 开始: ${data?.order?.orderStartSite?.siteName}, 结束: ${data?.order?.orderEndSite?.siteName}, " + + "orderStatus: ${data?.order?.orderStatus}" + orderToStartLines.text = + "接驾任务的lineId集合: " + GsonUtil.jsonFromObject(data?.order?.planningLines) - val curContrail = TaxiModel.getCurTaskContrail() - curContrail?.also { - test_bar_current_traj_md5.text = "TrajMd5: ${curContrail?.csvFileMd5}" - test_bar_current_stop_md5.text = "StopMd5: ${curContrail?.txtFileMd5}" - test_bar_current_traj_md5_dpqp.text = "TrajMd5DPQP: ${curContrail?.csvFileMd5DPQP}" - test_bar_current_stop_md5_dpqp.text = "StopMd5DPQP: ${curContrail?.txtFileMd5DPQP}" - } - } + val curContrail = TaxiModel.getCurTaskContrail() + test_bar_current_traj_md5.text = "TrajMd5: ${curContrail?.csvFileMd5}" + test_bar_current_stop_md5.text = "StopMd5: ${curContrail?.txtFileMd5}" + test_bar_current_traj_md5_dpqp.text = "TrajMd5DPQP: ${curContrail?.csvFileMd5DPQP}" + test_bar_current_stop_md5_dpqp.text = "StopMd5DPQP: ${curContrail?.txtFileMd5DPQP}" } } \ No newline at end of file diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_debug_order.xml b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_debug_order.xml index cd75e6d17f..3bdc24bc81 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_debug_order.xml +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_debug_order.xml @@ -3,8 +3,7 @@ android:id="@+id/orderDebugContainer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone"> + android:orientation="vertical">