From 00c2239bdadd54de38c2adfa27b1d8e8f2365f98 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 6 Dec 2023 17:24:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=20feat:?= =?UTF-8?q?=E6=B8=85=E6=89=AB=E8=BD=A6=20V6.2.4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c911518c2c..d26edcef58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -172,6 +172,6 @@ CHARTER_DRIVER_VERSION=6.2.0 # 包车模式乘客端端版本号 CHARTER_PASSENGER_VERSION=5.2.0 # 支持云控清扫车模式司机端版本号 -SWEEPERCLOUD_DRIVER_VERSION=6.2.0 +SWEEPERCLOUD_DRIVER_VERSION=6.2.4 # 清扫车模式司机端版本号 -SWEEPEROPERATE_DRIVER_VERSION=6.2.0 +SWEEPEROPERATE_DRIVER_VERSION=6.2.4 From 8ff2beb82433f506d533337e42c2161b25567328 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 18 Dec 2023 16:15:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91]=20fi?= =?UTF-8?q?x:=20=E5=8A=A8=E7=94=BB=E4=B8=ADNPE=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/sweeper/common/view/TurnSignalView.kt | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt index 8c43d614a7..2a5d592cb6 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt @@ -54,22 +54,26 @@ class TurnSignalView : LinearLayout { //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 when (directionLight) { Chassis.LightSwitch.LIGHT_LEFT -> { //左转向 - leftSelectImage.visibility = View.VISIBLE - rightSelectImage.visibility = View.GONE - rightSelectImage.clearAnimation() - setAnimation(leftSelectImage) + leftSelectImage?.visibility = View.VISIBLE + rightSelectImage?.visibility = View.GONE + rightSelectImage?.clearAnimation() + leftSelectImage?.also { + setAnimation(it) + } } Chassis.LightSwitch.LIGHT_RIGHT -> { //右转向 - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.VISIBLE - leftSelectImage.clearAnimation() - setAnimation(rightSelectImage) + leftSelectImage?.visibility = View.GONE + rightSelectImage?.visibility = View.VISIBLE + leftSelectImage?.clearAnimation() + rightSelectImage?.also { + setAnimation(it) + } } else -> { //消失 - leftSelectImage.clearAnimation() - rightSelectImage.clearAnimation() - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.GONE + leftSelectImage?.clearAnimation() + rightSelectImage?.clearAnimation() + leftSelectImage?.visibility = View.GONE + rightSelectImage?.visibility = View.GONE } } } @@ -77,14 +81,18 @@ class TurnSignalView : LinearLayout { //实现图片闪烁效果 private fun setAnimation(imageView: ImageView) { - val animationSet = AnimatorSet() - val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) - val valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) - valueAnimator.duration = 1000 - valueAnimatorDisappare.duration = 800 - valueAnimator.repeatCount = -1 - valueAnimatorDisappare.repeatCount = -1 - animationSet.playTogether(valueAnimatorDisappare, valueAnimator) - animationSet.start() + try { + val animationSet = AnimatorSet() + val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) + val valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) + valueAnimator.duration = 1000 + valueAnimatorDisappare.duration = 800 + valueAnimator.repeatCount = -1 + valueAnimatorDisappare.repeatCount = -1 + animationSet.playTogether(valueAnimatorDisappare, valueAnimator) + animationSet.start() + } catch (e: Exception) { + e.printStackTrace() + } } } \ No newline at end of file From 8e130899a48d60888356e7b204623cb8eaa0e097 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 18 Dec 2023 19:56:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Sweeper]=20fix:=20=E4=BF=AE=E5=A4=8DSonar?= =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/SweeperProvider.java | 8 ++++---- .../och/sweeper/cloud/model/SweeperCloudTaskModel.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index 17529023d4..2ccf94dc3b 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -57,14 +57,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperOperateFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperOperateFragment.TAG); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperOperateFragment.TAG); if (fragmentByTag instanceof SweeperOperateFragment) { sweeperOperateFragment = (SweeperOperateFragment) fragmentByTag; } else { sweeperOperateFragment = new SweeperOperateFragment(); } if (!sweeperOperateFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, sweeperOperateFragment.TAG).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, SweeperOperateFragment.TAG).commitAllowingStateLoss(); } return; } @@ -76,14 +76,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperCloudFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperCloudFragment.TAG); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperCloudFragment.TAG); if (fragmentByTag instanceof SweeperCloudFragment) { sweeperCloudFragment = (SweeperCloudFragment) fragmentByTag; } else { sweeperCloudFragment = new SweeperCloudFragment(); } if (!sweeperCloudFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, sweeperCloudFragment.TAG).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, SweeperCloudFragment.TAG).commitAllowingStateLoss(); } return; } diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java index 0c58b0d95a..e359f8d97f 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java @@ -458,7 +458,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene public void onSweeperFutianCloudTaskCloudSuspendResume(@NonNull AiCloudTask.MessageType messageType, @Nullable String reqNo, long sysTime, @Nullable SweeperTaskCloudSuspendResume.BigTaskActionPush bigTaskActionPush) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskCloudSuspendResume：" + SweeperCloudTaskUtils.printMessage(bigTaskActionPush)); + "onSweeperFutianCloudTaskCloudSuspendResume：" + bigTaskActionPush == null ? "null" : SweeperCloudTaskUtils.printMessage(bigTaskActionPush)); DebugView.Companion.printInfoMsg("[云控]云端下发暂停/恢复指令，messageType=" + messageType.getNumber() + ", sysTime=" + sysTime + ", reqNo=" + reqNo