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

[6.5.0] merge

Browse Source
This commit is contained in:
EmArrow
2024-06-27 19:05:12 +08:00
parent 1f06c9a89e
commit 46f3eccecf
47 changed files with 908 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ class CameraListAdapter : Adapter<CameraListAdapter.CameraListHolder> {
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CameraListHolder {
var view = LayoutInflater.from(parent.context)
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_camera_info, parent, false)
return CameraListHolder(view)
}

157
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
View File

@@ -1,26 +1,179 @@
package com.mogo.eagle.core.function.hmi.ui.camera
import android.content.Context
import android.graphics.PorterDuff
import android.graphics.PorterDuffColorFilter
import android.os.Handler
import android.os.Looper
import android.os.Message
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.content.ContextCompat
import com.mogo.eagle.core.data.road.RoadCameraLive
import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
import com.shuyu.gsyvideoplayer.GSYVideoManager
import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder
import com.shuyu.gsyvideoplayer.model.VideoOptionModel
import com.shuyu.gsyvideoplayer.player.IjkPlayerManager
import com.shuyu.gsyvideoplayer.player.PlayerFactory
import com.shuyu.gsyvideoplayer.utils.GSYVideoType
import com.zhidaoauto.map.data.road.RoadCross
import kotlinx.android.synthetic.main.view_road_cross_live.view.roadCrossLiveClose
import kotlinx.android.synthetic.main.view_road_cross_live.view.roadCrossLivePB
import kotlinx.android.synthetic.main.view_road_cross_live.view.roadCrossLivePlayer
import tv.danmaku.ijk.media.player.IjkMediaPlayer
class RoadCrossLiveView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr) {
) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoMapRoadListener {
companion object {
private const val TAG = "RoadCrossLiveView"
private const val CLOSE_VIEW_DELAY_TIME = 10_000L
}
@Volatile
private var curLiveDevice: String? = null
private val gsyVideoOptionBuilder by lazy {
GSYVideoOptionBuilder()
}
private val handler = object : Handler(Looper.getMainLooper()) {
override fun handleMessage(msg: Message) {
super.handleMessage(msg)
if (this@RoadCrossLiveView.visibility == View.VISIBLE) {
closeView()
}
}
}
init {
LayoutInflater.from(context).inflate(R.layout.view_road_cross_live, this, true)
val res = when (CallerSkinModeListenerManager.getMode()) {
0 -> R.layout.view_road_cross_live
1 -> R.layout.view_road_cross_live_light
else -> R.layout.view_road_cross_live
}
LayoutInflater.from(context).inflate(res, this, true)
initVideoPlayer()
roadCrossLivePB.indeterminateDrawable.colorFilter = PorterDuffColorFilter(
ContextCompat.getColor(context, R.color.notice_blue),
PorterDuff.Mode.MULTIPLY
)
roadCrossLiveClose.setOnClickListener {
HmiActionLog.hmiAction("关闭路侧视频流", "")
closeView()
}
}
private fun initVideoPlayer() {
val list: MutableList<VideoOptionModel> = ArrayList()
list.add(VideoOptionModel(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "reconnect", 3))
GSYVideoManager.instance().optionModelList = list
GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9)
PlayerFactory.setPlayManager(IjkPlayerManager::class.java)
roadCrossLivePlayer.outLinePixel = 12f
roadCrossLivePlayer.setPlayListener(object : SimpleVideoPlayer.PlayListener {
override fun onPlayEvent(event: Int) {
CallerLogger.d("$M_HMI$TAG", "onPlayEvent: event is:$event")
when (event) {
SimpleVideoPlayer.PLAY_EVT_PLAY_LOADING -> {
// 会出现临时中断后又可以继续播放，需要停掉倒计时
}
SimpleVideoPlayer.PLAY_EVT_PLAY_BEGIN -> {
roadCrossLivePB.visibility = View.GONE
roadCrossLivePlayer.visibility = View.VISIBLE
}
else -> {
CallerLogger.w("$M_HMI$TAG", "播放视频异常,event is:$event")
}
}
}
})
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
CallerMapRoadListenerManager.addListener(TAG, this)
}
override fun onRoadChange(cross: Boolean, roadCross: RoadCross?) {
super.onRoadChange(cross, roadCross)
// 离开路口，进入路段，发送handler3秒后隐藏播放器
if (!cross) {
handler.sendEmptyMessageDelayed(0, CLOSE_VIEW_DELAY_TIME)
}
}
override fun onRoadCrossClick() {
super.onRoadCrossClick()
if (this.visibility == View.VISIBLE) {
return
}
resetView()
}
override fun onCrossLiveInfo(info: RoadCameraLive) {
super.onCrossLiveInfo(info)
if (curLiveDevice != null && curLiveDevice == info.ip) {
CallerLogger.w("$M_HMI$TAG", "播放视频异常,当前播放设备与上次相同,ip:${info.ip}")
return
}
curLiveDevice = info.ip
ThreadUtils.runOnUiThread {
HmiActionLog.hmiAction("触发marker点击，播放路侧视频流", info.toString())
gsyVideoPlay(info.imageUrl, info.liveUrl)
}
}
private fun gsyVideoPlay(img: String, live: String) {
resetView()
gsyVideoOptionBuilder.setUrl(live)
.setCacheWithPlay(false)
.setAutoFullWithSize(false)
.setIsTouchWigetFull(false)
.setIsTouchWiget(false)
.setPlayTag(TAG).build(roadCrossLivePlayer)
roadCrossLivePlayer.startButton.performClick()
}
/**
* 重置视图,播放下一个
*/
private fun resetView() {
this.visibility = View.VISIBLE
roadCrossLivePB.visibility = View.VISIBLE
roadCrossLivePlayer.onVideoReset()
}
/**
* 隐藏view，释放视频控制器
*/
private fun closeView() {
this.visibility = View.GONE
roadCrossLivePlayer.visibility = View.GONE
curLiveDevice = null
GSYVideoManager.releaseAllVideos()
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
CallerMapRoadListenerManager.removeListener(TAG)
closeView()
}
}

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

@@ -419,8 +419,6 @@ internal class DebugSettingView @JvmOverloads constructor(
* 状态中心
*/
tbStatusCenter.setOnCheckedChangeListener { buttonView, isChecked ->
val cross = RoadCross()
// CallerMapRoadListenerManager.invokeRoadChange(0, cross)
if (isChecked) {
buttonView.setCompoundDrawables(null, null, iconDown, null)
//展示状态中心

5
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_empty.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="@dimen/dp_12"/>
<solid android:color="@color/color_252B3F"/>
</shape>

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 KiB

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_live_close.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_road_cross_xiaozhi.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

78
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml
View File

@@ -1,6 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/bg_road_cross_live">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/roadCrossLiveBg"
android:layout_width="@dimen/dp_760"
android:layout_height="@dimen/dp_428"
android:layout_margin="@dimen/dp_20"
android:background="@drawable/bg_road_cross_empty"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/bg_road_cross_logo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.mogo.eagle.core.widget.media.video.SimpleVideoPlayer
android:id="@+id/roadCrossLivePlayer"
android:layout_width="@dimen/dp_760"
android:layout_height="@dimen/dp_428"
android:layout_margin="@dimen/dp_20"
android:visibility="visible"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.ContentLoadingProgressBar
android:id="@+id/roadCrossLivePB"
style="?android:attr/progressBarStyleSmall"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_55"
android:layout_marginTop="@dimen/dp_214"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/roadCrossLiveClose"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:src="@drawable/bg_road_cross_live_close"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<ImageView
android:layout_width="@dimen/dp_63"
android:layout_height="@dimen/dp_46"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_480"
android:src="@drawable/bg_road_cross_xiaozhi"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_90"
android:layout_marginTop="@dimen/dp_473"
android:text="@string/road_cross_live_tip"
android:textColor="@color/color_50E8E4"
android:textSize="@dimen/dp_30"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

6
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>

2
core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
View File

@@ -23,6 +23,8 @@
<color name="color_2C2E30">#2C2E30</color>
<color name="color_2D3E5F">#2D3E5F</color>
<color name="color_D4D8DC">#D4D8DC</color>
<color name="color_50E8E4">#50E8E4</color>
<color name="color_252B3F">#252B3F</color>
<color name="color_27FFFFFF">#27FFFFFF</color>
<color name="color_1E111111">#1E111111</color>
<color name="color_FF213757">#FF213757</color>

2
core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
View File

@@ -127,4 +127,6 @@
<string name="exploration_title">正在为您探查前方道路</string>
<string name="exploration_close">自动探索关闭按钮</string>
<string name="road_cross_live_tip">蘑菇为您实时护航中，请放心驾驶！</string>
</resources>