[6.0.0] 合并6.0.0

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

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt

@@ -223,7 +223,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(),
     }
 
     override fun onOrderCancel() {
-        VoiceNotice.showNotice("乘客已经取消")
+        VoiceNotice.showNotice("订单已经取消")
         updateTaskAndOrderUi(null)
     }
 

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",

gradle.properties

@@ -61,26 +61,26 @@ 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.1
+MAP_SDK_VERSION=2.14.3.4
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7