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

23
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,
forceChange: Boolean
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 -> {}
}
}

23
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,
forceChange: Boolean
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()
}
}