yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.1.2优化] 1、版本号升级为6.1.2 2、拉取任务重试闪烁问题修复

Browse Source
This commit is contained in:
wangmingjun
2023-10-25 15:37:07 +08:00
parent e2f3d39b1d
commit 4d0526753a
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt
View File

@@ -206,12 +206,12 @@ class TaxiCurrentTaskFragment : BaseFragment(),
}
/**
* 更新120s倒计时
* 更新拉取任务倒计时
*/
private fun updatePrepareTaskDelayUI(millisInFuture: Long, isStart: Boolean) {
if (!isStart) {
prepareTaskCountdownTv.visibility = View.GONE
prepareTaskCountdownTv.visibility = View.INVISIBLE
mPrepareTasCountDownTimer?.cancel()
mPrepareTasCountDownTimer = null
return
@@ -237,7 +237,7 @@ class TaxiCurrentTaskFragment : BaseFragment(),
override fun onFinish() {
//倒计时结束了...
UiThreadHandler.post {
prepareTaskCountdownTv.visibility = View.GONE
prepareTaskCountdownTv.visibility = View.INVISIBLE
}
mPrepareTasCountDownTimer?.cancel()
}

8
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -891,6 +891,8 @@ object TaxiTaskModel {
startAutoPilot() //自驾开启
}
d(TAG, "startTask onSuccess: data=${GsonUtil.jsonFromObject(data)}")
//开始服务成功后, 如果还有正在拉取的任务请求(可能发生在一直报错重试时候), 需停止掉
// TaxiTaskWithOrderServiceManager.cancelPrepareTask()
}
override fun onError() {
@@ -939,7 +941,8 @@ object TaxiTaskModel {
DebugView.printErrorMsg("[PrepareNextTask] 请求fail, code=$code ,msg=$msg")
d(TAG, "prepareNextTask onFail: code=$code ,msg=$msg")
isPrepareingNextTask = false
if (LoginStatusManager.isLogin() && TaxiCarServingStatusManager.isCarServingStatus()) {
if (LoginStatusManager.isLogin() && TaxiCarServingStatusManager.isCarServingStatus()
&& QueryCurrentTaskRespBean.isTaskCompleteTaskType(mCurrentTaskWithOrder)) {
mCurrentTaskWithOrder?.endSite?.siteId?.also {
startPrepareTaskDelay(TaxiUnmannedConst.START_PREPARE_TASK_RETRY_INTERVAL,it)
}
@@ -952,7 +955,8 @@ object TaxiTaskModel {
"net = ${NetworkUtils.isConnected(mContext)}")
d(TAG, "prepareNextTask onError, , net = ${NetworkUtils.isConnected(mContext)}")
isPrepareingNextTask = false
if (LoginStatusManager.isLogin() && TaxiCarServingStatusManager.isCarServingStatus()) {
if (LoginStatusManager.isLogin() && TaxiCarServingStatusManager.isCarServingStatus()
&& QueryCurrentTaskRespBean.isTaskCompleteTaskType(mCurrentTaskWithOrder)) {
mCurrentTaskWithOrder?.endSite?.siteId?.also {
startPrepareTaskDelay(TaxiUnmannedConst.START_PREPARE_TASK_RETRY_INTERVAL,it)
}

2
OCH/taxi/unmanned-driver/src/main/res/layout/taxi_no_data_common_view.xml
View File

@@ -35,6 +35,6 @@
android:layout_marginTop="50dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:visibility="gone"
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@+id/noOrderDataTv" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
gradle.properties
View File

@@ -90,7 +90,7 @@ applicationId=com.mogo.launcer
applicationName=IntelligentPilot
# RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
versionCode=6001000
versionName=6.1.0
versionName=6.1.2
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10
@@ -151,25 +151,25 @@ MATRIX_VERSION=2.0.8
# 测试模式司机端版本号
NOOP_DRIVER_VERSION=3.2.0
# 公交模式司机端版本号
BUS_DRIVER_VERSION=6.1.0
BUS_DRIVER_VERSION=6.1.2
# 公交模式乘客端端版本号
BUS_PASSENGER_VERSION=5.1.0
# 接驳模式司机端版本号
SHUTTLE_DRIVER_VERSION=6.1.0
SHUTTLE_DRIVER_VERSION=6.1.2
# 接驳模式乘客端端版本号
SHUTTLE_PASSENGER_VERSION=5.1.0
# 出租车模式司机端版本号
TAXI_DRIVER_VERSION=6.1.0
TAXI_DRIVER_VERSION=6.1.2
# 出租车模式乘客端端版本号
TAXI_PASSENGER_VERSION=5.1.0
# 出租车模式司机端版本号
TAXIUNMANNED_DRIVER_VERSION=6.1.0
TAXIUNMANNED_DRIVER_VERSION=6.1.2
# 出租车模式乘客端端版本号
TAXIUNMANNED_PASSENGER_VERSION=5.1.0
# 包车模式司机端版本号
CHARTER_DRIVER_VERSION=6.1.0
CHARTER_DRIVER_VERSION=6.1.2
# 包车模式乘客端端版本号
CHARTER_PASSENGER_VERSION=5.1.0
# 支持云控清扫车模式司机端版本号