Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts: # OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt
2024-10-28 18:42:54 +08:00
parent 0f0af9bf1d 4e948fb357
commit 46a0aa6300
4 changed files with 97 additions and 81 deletions
--- 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,17 +92,9 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), ILoginView

    override fun initViews() {
        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 = SkinResources.getInstance().getRawMp4FilePath(R.raw.video_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 = SkinResources.getInstance().getRawMp4FilePath(R.raw.video_biz_login_bus_bg)
-            }
+
            Debuger.enable()

            biz_login_svp.setIsTouchWiget(false)
@@ -110,73 +102,7 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), 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()
@@ -325,11 +251,86 @@ class LoginFragment : MvpFragment<LoginFragment?, LoginPresenter?>(), 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 = SkinResources.getInstance().getRawMp4FilePath(R.raw.video_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 = SkinResources.getInstance().getRawMp4FilePath(R.raw.video_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)
    }
 }
--- 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)
+    }
+
 }
--- 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)
    }

 }
--- 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
    }