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
OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
View File

@@ -179,6 +179,8 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
OPERATION_ROAD_SIDE_TYPE
)
}
else -> {}
}
}

2
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt
View File

@@ -145,6 +145,8 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback {
LockManager.LockStatus.UNLOCK -> {
aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock)
}
else -> {}
}
aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal)
}

21
OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt
View File

@@ -8,6 +8,7 @@ import android.os.Build
import android.util.AttributeSet
import android.util.TypedValue
import android.view.Gravity
import android.view.MotionEvent
import android.view.Surface
import android.view.View
import android.view.ViewGroup
@@ -166,7 +167,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
}
}
override fun touchDoubleUp() {
override fun touchDoubleUp(e: MotionEvent?) {
}
@@ -185,24 +186,24 @@ class ConsultVideoPlayer : 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)
CallerLogger.d(TAG,"setProgressAndTime￥${progress}-${secProgress}-${currentTime}")
//时间显示
currentTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(currentTime)
totalTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(totalTime)
currentTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(currentTime.toInt())
totalTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(totalTime.toInt())
if(currentTime>=totalTime-3000){//
this.currentTime = -1
}else{
this.currentTime = currentTime
this.currentTime = currentTime.toInt()
}
if (progress != 0) {
mProgressBar?.progress = progress
if (progress != 0L) {
mProgressBar?.progress = progress.toInt()
}
}

2
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt
View File

@@ -37,6 +37,8 @@ class CommonFeedbackDialog : BaseFloatDialog, LifecycleObserver {
Status.fail -> {
ivFeedbackStatus.setImageResource(R.drawable.common_feedback_fail)
}
else -> {}
}
RxUtils.createSubscribe(1_000) {
hide()

2
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt
View File

@@ -175,6 +175,8 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback {
duration = 100
}.start()
}
else -> {}
}
}

2
OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt
View File

@@ -88,6 +88,8 @@ class VisualViewModel : ViewModel(),
Visualangle.UnChange -> {
viewCallback?.setUnableChange()
}
else -> {}
}
}

4
OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/MyDataBase.kt
View File

@@ -26,10 +26,6 @@ import com.mogo.och.offline.repository.db.dao.TaskSiteDataDao
@Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskSiteDataBean::class, TaskDataBean::class], version = 6)
abstract class MyDataBase : RoomDatabase() {
override fun getOpenHelper(): SupportSQLiteOpenHelper {
return super.getOpenHelper()
}
private val dbRepositorys = mutableListOf<IDbRepository>()
override fun close() {

4
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt
View File

@@ -36,10 +36,6 @@ import java.io.File
@Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskDataBean::class, TaskSiteDataBean::class, EventDataBean::class, WriteOffDataBean::class], version = 6)
abstract class MyDataBase : RoomDatabase() {
override fun getOpenHelper(): SupportSQLiteOpenHelper {
return super.getOpenHelper()
}
private val dbRepositorys = mutableListOf<IDbRepository>()
override fun close() {

2
OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt
View File

@@ -370,6 +370,8 @@ object SweeperCloudTaskUtils {
builder.rightStr = ""
VoiceNotice.showNotice("云端异常结束任务")
}
else -> {}
}
builder.countDownTime = 10
builder.listener = listener

2
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt
View File

@@ -194,6 +194,8 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi
taskAndOrderUiState.isStart
)
}
else -> {}
}
}
}

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt
View File

@@ -57,6 +57,8 @@ class BottomBar @JvmOverloads constructor(
SelectView.VIDEO -> {
actv_video.setBagVisable(visibility)
}
else -> {}
}
}

21
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt
View File

@@ -8,6 +8,7 @@ import android.os.Build
import android.util.AttributeSet
import android.util.TypedValue
import android.view.Gravity
import android.view.MotionEvent
import android.view.Surface
import android.view.View
import android.view.ViewGroup
@@ -168,7 +169,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
}
}
override fun touchDoubleUp() {
override fun touchDoubleUp(e: MotionEvent?) {
}
@@ -215,23 +216,23 @@ class ConsultVideoPlayer : 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)
//时间显示
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime)
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime)
currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt())
totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt())
if(currentTime>=totalTime-3000){//
this.currentTime = -1
}else{
this.currentTime = currentTime
this.currentTime = currentTime.toInt()
}
if (progress != 0) {
mProgressBar?.progress = progress
if (progress != 0L) {
mProgressBar?.progress = progress.toInt()
}
}

6
app/build.gradle
View File

@@ -172,6 +172,12 @@ repositories {
}
dependencies {
configurations {
all {
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
}
}
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.arouter

3
build.gradle
View File

@@ -17,6 +17,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://artifact.bytedance.com/repository/Volcengine/" }
maven { url "https://artifact.bytedance.com/repository/byteX/" }
maven { url 'https://jitpack.io' }
gradlePluginPortal()
// mavenCentral()
google()
@@ -62,7 +63,7 @@ allprojects {
maven { url 'https://maven.aliyun.com/repository/jcenter' }
maven { url 'https://plugins.gradle.org/m2/' }
// mavenCentral()
maven { url 'https://jitpack.io' }
maven {
url "https://artifact.bytedance.com/repository/Volcengine/"
}

14
config.gradle
View File

@@ -81,9 +81,9 @@ ext {
kotlinstdlib : "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}",
//探路使用的直播组件
videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2",
videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2",
videoarmv7 : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-armv7a:10.0.0",
videoarm64 : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-arm64:10.0.0",
videojava : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-java:10.0.0",
eventbus : "org.greenrobot:eventbus:3.3.1",
videoprocessor : "com.zhidao.video:video-processor:1.0.2.1",
livesdk : "com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211",
@@ -103,15 +103,15 @@ ext {
litezxing : "com.google.zxing:litezxing:1.0.29.8",
// android - room
androidxroomruntime : "androidx.room:room-runtime:2.4.2",
androidxroomcompiler : "androidx.room:room-compiler:2.4.2",
androidxroomktx : "androidx.room:room-ktx:2.4.2",
androidxroomruntime : "androidx.room:room-runtime:2.6.1",
androidxroomcompiler : "androidx.room:room-compiler:2.6.1",
androidxroomktx : "androidx.room:room-ktx:2.6.1",
// androidx-lifecycle-process
androidxlifecycleprocess : "androidx.lifecycle:lifecycle-process:2.4.0",
androidxlifecycleservice : "androidx.lifecycle:lifecycle-service:2.4.0",
// rxjava2 with room
roomRxjava : 'androidx.room:room-rxjava2:2.4.2',
roomRxjava : 'androidx.room:room-rxjava2:2.6.1',
circleimageview : "de.hdodenhof:circleimageview:3.0.1",
//plugin

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

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

@@ -80,10 +80,10 @@ class NoticeSimpleSmallVideoPlayer : 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)
@@ -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()
}
}

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

@@ -81,10 +81,10 @@ class NoticeSimpleVideoPlayer : 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)
@@ -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(

2
gradle/ext.gradle
View File

@@ -1,6 +1,6 @@
ext {
gradle_version = '3.5.4'
kotlin_plugin_version = '1.5.30'
kotlin_plugin_version = '1.7.20'
plugin_version = '10.0.10_mogo'
service_chain_version = '5.3.14'
lancetx_version = '20.10.2'

2
libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt
View File

@@ -341,7 +341,7 @@ object MapDataWrapper : IMogoData {
MapDataApi.getBusStation(routeList, object : IResult<RoutePath> {
override fun result(code: Int, result: RoutePath?) {
result?.steps?.forEach {
it?.busStations.forEach {
it?.busStations?.forEach {
val busStation = BusStation(
it.busStationPoints,
it.id.toLong(),