[8.0.0]

[fea]
[唤醒 线程调整]

OCH/common/biz/src/main/res/layout/biz_login_business_view.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_200"
-    android:layout_height="@dimen/dp_580"
+    android:layout_height="@dimen/dp_680"
     android:orientation="vertical"
     android:background="@drawable/biz_login_error_info">
 

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -13,9 +13,9 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
-import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
+import com.mogo.mgintelligent.speech.iflytek.WakeUpManager
 import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.common.module.constant.OchCommonConst
 import com.mogo.och.common.module.manager.xiaozhi.ZhiStateManager
@@ -135,6 +135,12 @@ class TaxiPassengerBaseFragment :
         settingAndMusicListener()
         bottom.setOverMapApplyClick(object : BottomBar.ApplyClickLintener{
             override fun onApplyClick(selectItem: BottomBar.SelectView) {
+                CallerLogger.d(TAG,"选择的项:${selectItem}")
+                if(selectItem==BottomBar.SelectView.PRECISIONMAP){
+                    WakeUpManager.startWakeUp()
+                }else{
+                    WakeUpManager.stopWakeup()
+                }
                 when (selectItem) {
                     BottomBar.SelectView.PRECISIONMAP -> {
                         CallerHmiViewControlListenerManager.invokeMainPageViewVisible(View.VISIBLE)

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AIViewModel.kt

@@ -11,8 +11,8 @@ import com.mogo.mgintelligent.speech.AsrResult
 import com.mogo.mgintelligent.speech.AsrState
 import com.mogo.mgintelligent.speech.IWakeUpListener
 import com.mogo.mgintelligent.speech.MGSpeech
-import com.mogo.mgintelligent.speech.iflytek.WakeManager
 import com.mogo.mgintelligent.speech.iflytek.WakeUpListener
+import com.mogo.mgintelligent.speech.iflytek.WakeUpManager
 import com.mogo.och.bridge.autopilot.location.OchLocationManager
 import com.mogo.och.data.taxi.BaseOrderBean
 import com.mogo.och.data.taxi.TaxiOrderStatusEnum
@@ -86,7 +86,7 @@ class AIViewModel : ViewModel(), AIMessageManager.AIMessageListener, IWakeUpList
     private val wakeUpListener = object :WakeUpListener{
         override fun wakeupSuccess() {
             onWakeUp()
-            WakeManager.stopWakeup()
+            WakeUpManager.stopWakeup()
         }
 
     }
@@ -99,7 +99,7 @@ class AIViewModel : ViewModel(), AIMessageManager.AIMessageListener, IWakeUpList
         OrderModel.setOrderStatusCallback(TAG,orderListener)
         OchLocationManager.addGCJ02Listener(TAG,1,locationCallback)
         AIMessageManager.registerListener(this)
-        WakeManager.setWakeUpListener(wakeUpListener)
+        WakeUpManager.setWakeUpListener(wakeUpListener)
         mgSpeech.weakUpListener = this
         mgSpeech.startWeakUp()
 
@@ -134,7 +134,7 @@ class AIViewModel : ViewModel(), AIMessageManager.AIMessageListener, IWakeUpList
     override fun onCleared() {
         AIMessageManager.unregisterListener(this)
         mgSpeech.weakUpListener = null
-        WakeManager.setWakeUpListener(null)
+        WakeUpManager.setWakeUpListener(null)
         mgSpeech.stopWeakUp()
         llmResultJob?.cancel()
         OrderModel.setOrderStatusCallback(TAG,null)
@@ -240,7 +240,7 @@ class AIViewModel : ViewModel(), AIMessageManager.AIMessageListener, IWakeUpList
             }
 
             AsrState.STATE_EXIT -> {
-                WakeManager.startWakeUp()
+                WakeUpManager.startWakeUp()
                 _asrUIStateFlow.value = AsrUIState.Idle
                 mgSpeech.speak(tipsExit)
                 mgSpeech.isAssistantShow(false)

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt

@@ -15,15 +15,10 @@ import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.mgintelligent.speech.iflytek.WakeManager
+import com.mogo.mgintelligent.speech.iflytek.WakeUpManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 import com.mogo.och.common.module.utils.BigFrameAnimatorContainer
 import com.mogo.och.common.module.utils.RxUtils
@@ -42,8 +37,6 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
-import mogo.telematics.pad.MessagePad
-import mogo.telematics.pad.MessagePad.DrivingState.USING_RSI_LINK_VALUE
 
 class AiView @JvmOverloads constructor(
     context: Context,
@@ -170,11 +163,6 @@ class AiView @JvmOverloads constructor(
         super.onVisibilityAggregated(isVisible)
         CallerLogger.d(TAG,"是否展示中：${isVisible}")
         try {
-            if(isVisible){
-                WakeManager.startWakeUp()
-            }else{
-                WakeManager.stopWakeup()
-            }
             if(isVisible){
                 aiAnimator?.start()
                 RxUtils.createSubscribe(3_000) {
@@ -202,6 +190,7 @@ class AiView @JvmOverloads constructor(
                         ) {
                             CallerLogger.d(TAG,"${tName()} onTransitionCompleted:${motionLayout?.id}_$currentId")
                             rvMessagesEmpty.visibility = View.VISIBLE
+                            WakeUpManager.startWakeUp()
                             startContextInfo()
                             startListInfo()
                         }

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/statusview/StatusBarView.kt

@@ -62,12 +62,6 @@ class StatusBarView @JvmOverloads constructor(
         LayoutInflater.from(context).inflate(R.layout.taxt_u_p_statusview, this, true)
         isClickable = true
         isFocusable = true
-        textClockDate.onClick {
-            WakeManager.startWakeUp()
-        }
-        bcsv_status.onClick {
-            WakeManager.stopWakeup()
-        }
     }
 
     override fun onAttachedToWindow() {