[6.8.0][驾驶位视频流] 修正车牌号获取逻辑

This commit is contained in:
renwj
2024-11-26 19:09:57 +08:00
parent eced61bb52
commit 6ac65d7d54
3 changed files with 29 additions and 3 deletions

View File

@@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.api.driver.video.IDriveSeatVideoProvider.Eve
import com.mogo.eagle.core.function.api.driver.video.IDriveSeatVideoProvider.Event.Failed
import com.mogo.eagle.core.function.api.driver.video.IDriveSeatVideoProvider.Event.Loading
import com.mogo.eagle.core.function.api.driver.video.IDriveSeatVideoProvider.Event.Playing
import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener
import com.mogo.eagle.core.network.MoGoRetrofitFactory
import com.mogo.eagle.core.utilcode.util.AppStateManager
import com.tencent.liteav.basic.log.TXCLog
@@ -58,8 +59,9 @@ class DriveSeatVideoProviderImpl: IDriveSeatVideoProvider {
override suspend fun requestVideoInfo(): VideoUrlData? {
val plateNumber = AppConfigInfo.plateNumber
if (TextUtils.isEmpty(plateNumber)) {
val plateNumber = CallerDataCenterBizListener.getPlateNumber()
// val plateNumber = "京A40188D"
if (plateNumber == null || TextUtils.isEmpty(plateNumber)) {
Log.e(TAG, "-- isVideoLiveUsable -- plate number is empty.")
return null
}

View File

@@ -4,6 +4,7 @@ import android.content.Context
import android.os.Bundle
import android.util.AttributeSet
import android.util.Log
import android.view.Gravity
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -54,6 +55,7 @@ import com.mogo.eagle.core.function.hmi.ui.operate.preferences.PreferenceWithWel
import com.mogo.eagle.core.function.hmi.ui.tools.SweeperModeChangedConfirmDialog
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog.Companion.hmiAction
import com.mogo.eagle.core.function.hmi.ui.utils.SOPAnalyticsManager.clickEventAnalytics
import com.mogo.eagle.core.utilcode.floating.MoGoPopWindow
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -898,8 +900,14 @@ class OperatePanelLayout : LinearLayout {
clickEventAnalytics("视频流驾驶位开关", isChecked)
val map = HashMap<String, String>()
map["open"] = if (isChecked) "1" else "0"
map["playUrl"] = CallerDevaToolsManager.driveSeatVideoProvider()?.getLastData()?.livePlayUrl ?: ""
val playUrl = CallerDevaToolsManager.driveSeatVideoProvider()?.getLastData()?.livePlayUrl ?: ""
map["playUrl"] = playUrl
CallerTelematicManager.sendMsgToAllClients(TelematicConstant.DRIVE_SEAT_VIDEO_STREAM_REQ, toJson(map).toByteArray())
CallerDevaToolsManager.driveSeatVideoProvider()?.getDriveVideoView(playUrl) { event ->
Log.d(TAG, "event -> $event")
}?.also {
showVideoView(it)
}
return false
}
}
@@ -909,6 +917,18 @@ class OperatePanelLayout : LinearLayout {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.operate_panel_preference_details_business, rootKey)
}
private fun showVideoView(target: View) {
val activity = AppStateManager.currentActivity() ?: return
MoGoPopWindow.Builder()
.attachToActivity(activity)
.contentView(target)
.draggable(false)
.width(AutoSizeUtils.dp2px(activity, 640.0f))
.height(AutoSizeUtils.dp2px(activity, 480.0f))
.gravityInActivity(Gravity.CENTER)
.build().show()
}
}
class MoFangPreferenceFragmentCompat : OperatePanelDetailBase(), IMoGoMoFangProvider.OnMoFangStatusListener {

View File

@@ -116,4 +116,8 @@ object CallerDataCenterBizListener : CallerBase<IDataCenterBizListener>() {
fun getCarModel(): Carmodel? {
return carModel
}
fun getPlateNumber(): String? {
return no
}
}