diff --git a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt index a59f2c0fd7..1dc67cae43 100644 --- a/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt +++ b/OCH/sweeper/sweeper-cloud/src/main/java/com/mogo/och/sweepercloud/fragment/SweeperFragment.kt @@ -22,6 +22,7 @@ import com.mogo.och.sweepercloud.ui.dialog.SweeperCloudLoadingDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createConfirmStartSubTaskDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createReceivedTaskInfoDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskEndDialog +import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskExceptionEndDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.createSweeperTaskNormalEndDialog import com.mogo.och.sweepercloud.util.SweeperCloudTaskUtils.printMessage import com.mogo.och.sweepercloud.view.SweeperCurrentTaskInfoView @@ -338,6 +339,32 @@ class SweeperFragment : BaseSweeperTabFragment builder.build(it1) } } + /** + * 任务异常结束弹窗 (异常 / 取消) + */ + @JvmStatic + fun createSweeperTaskExceptionEndDialog( + context: Context?, + listener: SweeperCloudDialogClickListener?, + isCancel: Boolean + ): SweeperCloudDialog? { + var builder: SweeperCloudDialog.Builder = SweeperCloudDialog.Builder() + builder.titleStr = "任务结束" + builder.contentStr = if (isCancel) "任务已取消!" else "任务已异常结束!" + builder.tipStr = "" + builder.leftStr = "确认" + builder.middleStr = "" + builder.rightStr = "" + builder.countDownTime = 10 + builder.listener = listener + return context?.let { it1 -> builder.build(it1) } + } + @JvmStatic fun printMessage(message: MessageOrBuilder): String { return "\n"+TextFormat.printer().escapingNonAscii(false).printToString(message) diff --git a/gradle.properties b/gradle.properties index a2d250794e..419c2c2f3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -171,6 +171,6 @@ CHARTER_DRIVER_VERSION=3.1.0 # 包车模式乘客端端版本号 CHARTER_PASSENGER_VERSION=2.2.0 # 支持云控清扫车模式司机端版本号 -SWEEPERCLOUD_DRIVER_VERSION=3.1.0 +SWEEPERCLOUD_DRIVER_VERSION=3.1.2 # 清扫车模式司机端版本号 SWEEPEROPERATE_DRIVER_VERSION=3.1.0