From 7298caf43fc51655266c3816e21d11e8878829c9 Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 28 Oct 2024 18:02:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[6.7.0][=E8=BF=90=E8=90=A5=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF]=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/operate/OperatePanelLayout.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt index fb71bff54c..3cab96f7dd 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/OperatePanelLayout.kt @@ -534,7 +534,7 @@ class OperatePanelLayout : LinearLayout { val isPressed = preference.extras.getBoolean("is_pressed", true) if (!isPressed) { preference.extras.remove("is_pressed") - return true + return false } val isChecked = newValue as? Boolean ?: false hmiAction("SOP 演示模式开关, ", !FunctionBuildConfig.isDemoMode) @@ -545,18 +545,21 @@ class OperatePanelLayout : LinearLayout { if (!FunctionBuildConfig.isDemoMode) { //关闭美化模式时，通知工控机 CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode) } + return true } KEY_RECORD_BAG_DIALOG -> { val isChecked = newValue as? Boolean ?: false FunctionBuildConfig.isShowBagRecordWindow = isChecked hmiAction("SOP 是否展示录包弹窗, ", isChecked) clickEventAnalytics("录包弹窗", isChecked) + return true } KEY_TAKE_OVER_WAKE -> { val isChecked = newValue as? Boolean ?: false FunctionBuildConfig.isTakeoverRemind = isChecked hmiAction("SOP 是否展示接管提醒, ", isChecked) clickEventAnalytics("接管提醒", isChecked) + return true } } return super.onPreferenceChange(preference, newValue) @@ -810,6 +813,7 @@ class OperatePanelLayout : LinearLayout { CallerLogger.d(TAG, "发送开关数据:${isChecked}到乘客屏") CallerTelematicManager.sendMsgToAllClients(TelematicConstant.WEATHER_SWITCH_STATUS, (if (isChecked) "1" else "0").toByteArray()) clickEventAnalytics("天气效果开关", isChecked) + return true } KEY_SYSTEM_BOOT_STATUS_SHOW -> { val isChecked = newValue as? Boolean ?: false @@ -817,6 +821,7 @@ class OperatePanelLayout : LinearLayout { clickEventAnalytics("系统启动状态展示", isChecked) HmiBuildConfig.isShowConnectionProgressView = isChecked CallerHmiViewControlListenerManager.updateConnectionProgressView(isChecked) + return true } KEY_SWEEPER_CLOUD_CONTROL -> { val isChecked = newValue as? Boolean ?: false @@ -836,6 +841,7 @@ class OperatePanelLayout : LinearLayout { confirmDialog.showSweeperModeChangeConfirmDialog() } clickEventAnalytics("清扫云控业务", isChecked) + return true } } return super.onPreferenceChange(preference, newValue) @@ -1217,7 +1223,7 @@ class OperatePanelLayout : LinearLayout { val isPressed = preference.extras.getBoolean("is_pressed", true) if (!isPressed) { preference.extras.remove("is_pressed") - return true + return false } val isChecked = newValue as? Boolean ?: false hmiAction("SOP 雨天模式开关, ", isChecked) From f51b8bdf332a23231d29ad58df6588d7a8b9a7a1 Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 28 Oct 2024 18:05:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[6.7.0][=E5=9C=B0=E5=9B=BEsdk]=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8jekins=E6=89=93=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 20c1721fbd..95de9ad7ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.42 MOGO_TELEMATIC_VERSION=1.4.7.42 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=3.4.1.18 +MAP_SDK_VERSION=3.4.1.21 MAP_SDK_DATA_VERSION=1.0.0.9 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket From 904858c3590e74471e9899e9ee2ab16ba5af0079 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 28 Oct 2024 18:19:56 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[6.7.0]=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?= =?UTF-8?q?fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/bone/tab/FaultReasonView.kt | 12 ++++++++++-- .../core/function/hmi/bone/tab/WorkOrderView.kt | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index a3d872ccd0..59247d2321 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -583,9 +583,17 @@ class FaultReasonView @JvmOverloads constructor( reportNote = "" //上报描述 tvUploadSuccess.visibility = View.GONE faultReasonGroup.visibility = View.VISIBLE - }else{ - CallerDevaToolsListenerManager.removeListener(TAG) } } + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerDevaToolsListenerManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerDevaToolsListenerManager.removeListener(TAG) + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt index a37dd2c75e..956d063d61 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/WorkOrderView.kt @@ -364,10 +364,17 @@ class WorkOrderView @JvmOverloads constructor( setAudio(false) //重置工单问题类型 workOrderType = "" - }else{ - CallerDevaToolsListenerManager.removeListener(TAG) } + } + override fun onAttachedToWindow() { + super.onAttachedToWindow() + CallerDevaToolsListenerManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + CallerDevaToolsListenerManager.removeListener(TAG) } } \ No newline at end of file From 4e948fb3577731a0aa675a9674f44a432cc3a237 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 28 Oct 2024 18:39:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.7.2]=20[login]=20[=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=92=8C=E5=8F=8D=E6=B3=A8=E5=86=8C]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/biz/login/ui/LoginFragment.kt | 145 +++++++++--------- .../function/hmi/ui/widget/ColdStartView.kt | 2 +- 2 files changed, 77 insertions(+), 70 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt index 122ec46324..ebcd2a4efe 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt @@ -92,16 +92,7 @@ class LoginFragment : MvpFragment(), ILoginView CallerLogger.d(TAG, "init") context?.let { - val videoUrl:String - if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { - //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_taxi_start) - biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_taxi_start) - videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_taxi_bg - }else{ - //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_bus_start) - biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_bus_start) - videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_bus_bg - } + Debuger.enable() biz_login_svp.setIsTouchWiget(false) @@ -109,66 +100,7 @@ class LoginFragment : MvpFragment(), ILoginView biz_login_svp.enableshowProgressDialog = false biz_login_svp.enableDoubleClick = false - viewColdStart.setColdStartResultListener(object: ColdStartView.ColdStartResultListener{ - override fun coldStartSuccess() { - gsyVideoOptionBuilder.setUrl(videoUrl) - .setCacheWithPlay(false) - .setPlayTag("TaxiPassengerArrivedView") - .build(biz_login_svp) - biz_login_svp.setVideoAllCallBack(object : GSYSampleCallBack() { - override fun onAutoComplete(url: String?, vararg objects: Any?) { - if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { - biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_taxi_end) - }else{ - biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_bus_end) - } - - } - }) - if (showLoginInfoAnimator1 == null) { - showLoginInfoAnimator1 = ObjectAnimator.ofFloat(cl_login_info, "alpha", 0f, 1f) - showLoginInfoAnimator1?.interpolator = LinearInterpolator() - } - if (showLoginInfoAnimator2 == null) { - val dp2px = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), -50f) - showLoginInfoAnimator2 = ObjectAnimator.ofFloat(cl_login_info, "translationY", 0f, dp2px.toFloat()) - showLoginInfoAnimator2?.interpolator = DecelerateInterpolator() - } - UiThreadHandler.postDelayed({ - cl_login_info?.let { - val animatorSet = AnimatorSet() - animatorSet.playTogether(showLoginInfoAnimator1, showLoginInfoAnimator2) - animatorSet.duration = 500 - animatorSet.addListener(object :AnimatorListener{ - override fun onAnimationStart(animation: Animator) { - cl_login_info?.visibility = View.VISIBLE - } - - override fun onAnimationEnd(animation: Animator) { - - } - - override fun onAnimationCancel(animation: Animator) { - - } - - override fun onAnimationRepeat(animation: Animator) { - - } - - }) - animatorSet.start() - } - },2_000,UiThreadHandler.MODE.QUEUE) - biz_login_svp.startPlayLogic() - } - - override fun coldStartFail() { - - } - - }) } inputPhoneNormal() @@ -317,11 +249,86 @@ class LoginFragment : MvpFragment(), ILoginView biz_cl_driver_main?.viewTreeObserver?.addOnGlobalLayoutListener(onlayoutListener) super.onResume() CallerLogger.d(TAG, "onResume") + context?.let { + val videoUrl:String + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_taxi_start) + biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_taxi_start) + videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_taxi_bg + }else{ + //aciv_login_bg.setImageResource(R.drawable.biz_login_bg_bus_start) + biz_login_svp.setBackgroundResource(R.drawable.biz_login_bg_bus_start) + videoUrl = "android.resource://" + it.packageName + "/" + R.raw.biz_login_bus_bg + } + viewColdStart.setColdStartResultListener(object: ColdStartView.ColdStartResultListener{ + override fun coldStartSuccess() { + biz_login_svp?.let { + gsyVideoOptionBuilder.setUrl(videoUrl) + .setCacheWithPlay(false) + .setPlayTag("TaxiPassengerArrivedView") + .build(biz_login_svp) + + biz_login_svp?.setVideoAllCallBack(object : GSYSampleCallBack() { + override fun onAutoComplete(url: String?, vararg objects: Any?) { + if (AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode)) { + biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_taxi_end) + }else{ + biz_login_svp?.setBackgroundResource(R.drawable.biz_login_bg_bus_end) + } + + } + }) + if (showLoginInfoAnimator1 == null) { + showLoginInfoAnimator1 = ObjectAnimator.ofFloat(cl_login_info, "alpha", 0f, 1f) + showLoginInfoAnimator1?.interpolator = LinearInterpolator() + } + if (showLoginInfoAnimator2 == null) { + val dp2px = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), -50f) + showLoginInfoAnimator2 = ObjectAnimator.ofFloat(cl_login_info, "translationY", 0f, dp2px.toFloat()) + showLoginInfoAnimator2?.interpolator = DecelerateInterpolator() + } + UiThreadHandler.postDelayed({ + cl_login_info?.let { + val animatorSet = AnimatorSet() + animatorSet.playTogether(showLoginInfoAnimator1, showLoginInfoAnimator2) + animatorSet.duration = 500 + animatorSet.addListener(object :AnimatorListener{ + override fun onAnimationStart(animation: Animator) { + cl_login_info?.visibility = View.VISIBLE + } + + override fun onAnimationEnd(animation: Animator) { + + } + + override fun onAnimationCancel(animation: Animator) { + + } + + override fun onAnimationRepeat(animation: Animator) { + + } + + }) + animatorSet.start() + } + },2_000,UiThreadHandler.MODE.QUEUE) + biz_login_svp?.startPlayLogic() + } + } + + override fun coldStartFail() { + + } + + }) + } } override fun onPause() { biz_cl_driver_main?.viewTreeObserver?.removeOnGlobalLayoutListener(onlayoutListener) super.onPause() CallerLogger.d(TAG, "onPause") + viewColdStart.setColdStartResultListener(null) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index d97c005d9f..01a6d44932 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -633,7 +633,7 @@ class ColdStartView @JvmOverloads constructor( fun coldStartFail() } - fun setColdStartResultListener(listener: ColdStartResultListener){ + fun setColdStartResultListener(listener: ColdStartResultListener?){ coldStartResultListener = listener }