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

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_270_220510_2.7.0' into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source
This commit is contained in:
pangfan
2022-05-26 16:09:59 +08:00
parent 8c01117dad abac82ea28
commit bb8dcf313a
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt
View File

@@ -14,7 +14,6 @@ import android.widget.TextView
import com.amap.api.navi.view.PoiInputSearchWidget import com.amap.api.navi.view.PoiInputSearchWidget
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.util.OverlayViewUtils
import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
import com.mogo.och.common.module.wigets.OCHBorderShadowLayout import com.mogo.och.common.module.wigets.OCHBorderShadowLayout
import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.R
@@ -89,6 +88,11 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener {
ivAnimalList = findViewById(R.id.iv_animal_list) ivAnimalList = findViewById(R.id.iv_animal_list)
svpFrame = findViewById(R.id.svp_frame) svpFrame = findViewById(R.id.svp_frame)
svpFrame.setIsTouchWiget(false)
svpFrame.setIsTouchWigetFull(false)
svpFrame.enableshowProgressDialog = false
svpFrame.enableDoubleClick = false
allStartOrdered = mutableListOf() allStartOrdered = mutableListOf()
initScore() initScore()

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

@@ -29,6 +29,18 @@ class SimpleVideoPlayer : StandardGSYVideoPlayer {
private lateinit var start: ImageView private lateinit var start: ImageView
private var updateTimer = 0L private var updateTimer = 0L
/**
* true 开着双击重新播放
* false 关闭双击播放
*/
var enableDoubleClick = true
/**
* true 显示拖动线上进度弹框
* false 重写拖动进度弹框
*/
var enableshowProgressDialog = true
interface PlayListener { interface PlayListener {
fun onPlayEvent(event: Int) fun onPlayEvent(event: Int)
} }
@@ -195,4 +207,24 @@ class SimpleVideoPlayer : StandardGSYVideoPlayer {
} }
} }
} }
override fun touchDoubleUp() {
if(enableDoubleClick) {
super.touchDoubleUp()
}
}
override fun showProgressDialog(deltaX: Float, seekTime: String?, seekTimePosition: Int, totalTime: String?, totalTimeDuration: Int) {
if(enableshowProgressDialog) {
super.showProgressDialog(deltaX, seekTime, seekTimePosition, totalTime, totalTimeDuration)
}
}
override fun dismissProgressDialog() {
if(enableshowProgressDialog) {
super.dismissProgressDialog()
}
}
} }