From aa751a28596cb8acdce3a05b6b1c77565faef8a2 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 25 Aug 2023 16:06:20 +0800 Subject: [PATCH 1/4] [6.0.0] update map versionn --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d1250c3710..ee0acab809 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.13 MOGO_TELEMATIC_VERSION=1.4.7.13 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.14.3.1 +MAP_SDK_VERSION=2.14.3.4 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 From 4709413ffb75f43e878371587156f662c1a3509f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 25 Aug 2023 17:07:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[6.0.0]=201=E3=80=81=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E4=BA=BA=E6=95=B0=E6=98=BE=E7=A4=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91=202=E3=80=81=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=E6=94=B9=E4=B8=BA=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 3 ++- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 d4f2109e7e..6382d2a2d1 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 @@ -306,7 +306,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), TaskTypeEnum.VirtualTask.code -> { //演练任务 cancelOrder.visibility = View.GONE - orderPhoneAndNum.visibility = View.GONE + orderPhoneAndNum.visibility = if (order != null && + currentStatus == TaskStatusEnum.CompleteTask.code) View.VISIBLE else View.GONE taskClickBtn.visibility = View.GONE naviToStart.visibility = View.GONE diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index ccb58525a6..6d8454a67c 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -279,7 +279,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), } override fun onOrderCancel() { - VoiceNotice.showNotice("乘客已经取消") + VoiceNotice.showNotice("订单已经取消") mCurrentTaskAndOrder = null updateTaskAndOrderUi() } From bf98803896a6095d7c18f30c0af7c9111b1e567a Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 25 Aug 2023 18:21:57 +0800 Subject: [PATCH 3/4] [6.0.0] update aicloud sdk version --- gradle.properties | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index ee0acab809..cab15485b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -61,23 +61,23 @@ bytex.ASM_API=ASM7 LOGLIB_VERSION=1.9.5-SNAPSHOT ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.13 +MOGO_NETWORK_VERSION=1.4.7.16 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.13 +MOGO_PASSPORT_VERSION=1.4.7.16 # 常链接 -MOGO_SOCKET_VERSION=1.4.7.13 +MOGO_SOCKET_VERSION=1.4.7.16 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.13 +MOGO_REALTIME_VERSION=1.4.7.16 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.7.13 +MOGO_TANLU_VERSION=1.4.7.16 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.13 +MOGO_LIVE_VERSION=1.4.7.16 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.13 +MOGO_TRAFFICLIVE_VERSION=1.4.7.16 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.13 +MOGO_LOCATION_VERSION=1.4.7.16 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.13 +MOGO_TELEMATIC_VERSION=1.4.7.16 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.14.3.4 From 5639dc121d9533564de76e87b6ed6e10cbdab9cc Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 25 Aug 2023 18:28:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.0.0][Opt]=E6=9B=B4=E6=96=B0=E4=B8=8B?= =?UTF-8?q?=E5=BC=B1=E7=BD=91=E7=9B=91=E6=B5=8B=E7=9A=84=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index b0c9a398e8..031da09377 100644 --- a/config.gradle +++ b/config.gradle @@ -211,7 +211,7 @@ ext { thread_opt : "com.mogo.thread.opt:lib:10.2.0_mogo", - weak_network : "com.mogo.weak:network:1.0.0", + weak_network : "com.mogo.weak:network:1.0.1", btrace : "com.bytedance.btrace:rhea-core:2.0.0", mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.6",