yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.10.0][Feat]更新GsyVideo版本到10.0.0

Browse Source
This commit is contained in:
chenfufeng
2025-02-18 17:27:27 +08:00
parent 99348fdcc0
commit 6cf9d2ce4e
28 changed files with 105 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
View File

@@ -243,6 +243,8 @@ class MoGoAdasMsgConnectStatusListenerImpl :
)
resetArgs()
}
else -> {}
}
AppConfigInfo.connectStatusDescribe = connectStatusDescribe
CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = status

4
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/dao/IUpgradeRecordDao.kt
View File

@@ -2,8 +2,8 @@ package com.zhjt.mogo_core_function_devatools.upgrade.provider.db.dao
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy.IGNORE
import androidx.room.OnConflictStrategy.REPLACE
import androidx.room.OnConflictStrategy.Companion.IGNORE
import androidx.room.OnConflictStrategy.Companion.REPLACE
import androidx.room.Query
import androidx.room.Transaction
import com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo.*

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/vo/Vo.kt
View File

@@ -1,7 +1,7 @@
package com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo
import androidx.room.*
import androidx.room.ForeignKey.CASCADE
import androidx.room.ForeignKey.Companion.CASCADE
import com.mogo.eagle.core.utilcode.util.*
@Entity(tableName = "records")

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt
View File

@@ -232,6 +232,10 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO
complete(firstBitmap, path)
}
override fun onComplete(url: String?, vararg objects: Any?) {
}
override fun onClickResume(url: String, vararg objects: Any) {
thumbnailImageView!!.visibility = View.GONE
playImageView!!.visibility = View.GONE

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt
View File

@@ -276,6 +276,10 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver {
complete(firstBitmap)
}
override fun onComplete(url: String?, vararg objects: Any?) {
}
override fun onClickResume(url: String, vararg objects: Any) {
thumbnailImage!!.visibility = View.GONE
playImageView!!.visibility = View.GONE

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt
View File

@@ -197,6 +197,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri
AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED -> {
pair = Pair("域控主动断开连接", true)
}
else -> {}
}
UiThreadHandler.post {
if (data.size < 5 || pair == null) return@post

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
View File

@@ -231,6 +231,8 @@ class ColdStartView @JvmOverloads constructor(
AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED ->{
showIPCConnectFailView("域控主动断开连接，建议重启车辆并上报问题")
}
else -> {}
}
}
}

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectStatusView.kt
View File

@@ -168,6 +168,8 @@ class ConnectStatusView @JvmOverloads constructor(
.setForegroundColor(Color.RED)
adasSpan.create()
}
else -> {}
}
}
}

18
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt
View File

@@ -80,11 +80,11 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer {
}
override fun setProgressAndTime(
progress: Int,
secProgress: Int,
currentTime: Int,
totalTime: Int,
forceChange: Boolean
progress: Long,
secProgress: Long,
currentTime: Long,
totalTime: Long,
forceChange: Boolean
) {
super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
mBottomContainer?.visibility = View.VISIBLE
@@ -92,11 +92,11 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer {
start.visibility = View.VISIBLE
fullscreen.visibility = View.GONE
//时间显示
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime)
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime)
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt())
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt())
if (progress != 0) {
mProgressBar?.progress = progress
if (progress != 0L) {
mProgressBar?.progress = progress.toInt()
}
}

18
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt
View File

@@ -81,11 +81,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
}
override fun setProgressAndTime(
progress: Int,
secProgress: Int,
currentTime: Int,
totalTime: Int,
forceChange: Boolean
progress: Long,
secProgress: Long,
currentTime: Long,
totalTime: Long,
forceChange: Boolean
) {
super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
mBottomContainer?.visibility = View.VISIBLE
@@ -93,11 +93,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
start.visibility = View.VISIBLE
fullscreen.visibility = View.GONE
//时间显示
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime)
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime)
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt())
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt())
if (progress != 0) {
mProgressBar?.progress = progress
if (progress != 0L) {
mProgressBar?.progress = progress.toInt()
}
}

21
core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.widget.media.video
import android.annotation.SuppressLint
import android.content.Context
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.Surface
import android.view.View
import android.widget.ImageView
@@ -75,15 +76,15 @@ open class SimpleVideoPlayer : StandardGSYVideoPlayer {
}
override fun setProgressAndTime(
progress: Int,
secProgress: Int,
currentTime: Int,
totalTime: Int,
progress: Long,
secProgress: Long,
currentTime: Long,
totalTime: Long,
forceChange: Boolean
) {
super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange)
if (progress != 0) {
mProgressBar?.progress = progress
if (progress != 0L) {
mProgressBar?.progress = progress.toInt()
}
}
@@ -220,18 +221,18 @@ open class SimpleVideoPlayer : StandardGSYVideoPlayer {
}
}
override fun touchDoubleUp() {
override fun touchDoubleUp(e: MotionEvent?) {
if (enableDoubleClick) {
super.touchDoubleUp()
super.touchDoubleUp(e)
}
}
override fun showProgressDialog(
deltaX: Float,
seekTime: String?,
seekTimePosition: Int,
seekTimePosition: Long,
totalTime: String?,
totalTimeDuration: Int
totalTimeDuration: Long
) {
if (enableshowProgressDialog) {
super.showProgressDialog(