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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-1030_211020_8.0.14' into dev_MogoAP_eagle-1030_211020_8.0.14

Browse Source
This commit is contained in:
donghongyu
2021-11-12 17:17:12 +08:00
parent 8f50771737 ecbfc7fb1a
commit f286337055
12 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,6 +469,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
cameraListView?.startRoadCameraLive(flvUrl)
}
override fun showNoSignView() {
cameraListView?.showNoSignal()
}
private fun showCameraList(cameraList: List<CameraEntity>?) {
context?.let {
if (cameraViewFloat == null) {

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

@@ -201,6 +201,13 @@ class CameraListView : FrameLayout {
gsyVideoPlay(flvUrl)
}
fun showNoSignal() {
showNoSignalView()
if (!valueAnimator.isStarted && !valueAnimator.isRunning) {
valueAnimator.start()
}
}
private fun handleSnLiveStatus(status: Int) {
when (status) {
0 -> {// 正在直播

4
core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml
View File

@@ -97,8 +97,8 @@
<!--播放按钮-->
<ImageView
android:id="@+id/notice_video_play"
android:layout_width="100px"
android:layout_height="100px"
android:layout_width="@dimen/dp_140"
android:layout_height="@dimen/dp_140"
android:src="@drawable/video_play"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

1
core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -25,6 +25,7 @@
<dimen name="dp_56">56px</dimen>
<dimen name="dp_62">62px</dimen>
<dimen name="dp_75">80px</dimen>
<dimen name="dp_140">140px</dimen>
<dimen name="dp_150">150px</dimen>
<dimen name="dp_180">180px</dimen>
<dimen name="dp_200">200px</dimen>

1
core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml
View File

@@ -25,6 +25,7 @@
<dimen name="dp_56">56px</dimen>
<dimen name="dp_62">62px</dimen>
<dimen name="dp_75">80px</dimen>
<dimen name="dp_140">140px</dimen>
<dimen name="dp_150">150px</dimen>
<dimen name="dp_180">180px</dimen>
<dimen name="dp_200">200px</dimen>

1
core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt
View File

@@ -116,6 +116,7 @@ class CronTaskManager {
}
}, {
Logger.e(TAG, "openCameraStream&message is:${it.message}, cause is:${it.cause}")
CallerHmiManager.showNoSignalView()
it.printStackTrace()
})
}

2
core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
View File

@@ -138,4 +138,6 @@ interface IMoGoWaringProvider : IMoGoFunctionProvider {
fun vipIdentification(visible: Boolean)
fun startRoadCameraLive(flvUrl: String)
fun showNoSignView()
}

4
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
View File

@@ -185,4 +185,8 @@ object CallerHmiManager : CallerBase() {
fun startRoadCameraLive(flvUrl: String) {
waringProviderApi.startRoadCameraLive(flvUrl)
}
fun showNoSignalView() {
waringProviderApi.showNoSignView()
}
}

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

@@ -76,7 +76,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
start.setImageResource(R.drawable.notice_video_pause)
GSYVideoView.CURRENT_STATE_ERROR ->
start.setImageResource(R.drawable.notice_video_pause)
else -> start.setImageResource(R.drawable.notice_video_play)
else -> start.setImageResource(R.drawable.notice_video_after_pause)
}
}
@@ -164,7 +164,7 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer {
mBottomContainer?.visibility = View.VISIBLE
mProgressBar?.visibility = View.VISIBLE
start?.visibility = View.VISIBLE
start.setImageResource(R.drawable.notice_video_play)
start.setImageResource(R.drawable.notice_video_after_pause)
isPostBufferUpdate = false
}

18
core/mogo-core-res/src/main/res/layout/item_notice_video.xml
View File

@@ -8,8 +8,7 @@
android:id="@+id/surface_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center">
</RelativeLayout>
android:gravity="center"></RelativeLayout>
<RelativeLayout
android:id="@+id/thumb"
@@ -36,12 +35,13 @@
<ImageView
android:id="@+id/start"
android:layout_width="@dimen/notice_play_height"
android:layout_height="@dimen/notice_play_height"
android:layout_width="@dimen/dp_52"
android:layout_height="@dimen/dp_52"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/notice_play_marginleft"
android:layout_marginRight="@dimen/notice_play_marginright"
android:src="@drawable/notice_video_pause"
android:layout_gravity="bottom" />
android:layout_marginBottom="@dimen/notice_play_bottom"
android:src="@drawable/notice_video_pause" />
<TextView
android:id="@+id/current"
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginRight="@dimen/notice_current_time_margin"
android:layout_marginBottom="5px"
android:layout_marginBottom="@dimen/notice_time_bottom"
android:gravity="center_vertical"
android:text="02:23"
android:textColor="@android:color/white"
@@ -60,6 +60,7 @@
android:layout_width="@dimen/notice_seekbar_width"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/notice_seekbar_bottom"
android:max="100"
android:maxHeight="8px"
android:minHeight="8px"
@@ -72,7 +73,8 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/notice_current_time_margin"
android:layout_marginBottom="5px"
android:layout_marginBottom="@dimen/notice_time_bottom"
android:gravity="center_vertical"
android:text="08:66"
android:textColor="@android:color/white"
android:textSize="@dimen/time_textsize" />

12
core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml
View File

@@ -35,12 +35,12 @@
<ImageView
android:id="@+id/start"
android:layout_width="@dimen/notice_play_height_small"
android:layout_height="@dimen/notice_play_height_small"
android:layout_width="@dimen/dp_52"
android:layout_height="@dimen/dp_52"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/notice_play_marginleft_small"
android:layout_marginRight="@dimen/notice_play_marginright_small"
android:layout_marginBottom="@dimen/notice_play_bottom_small"
android:layout_marginBottom="@dimen/notice_play_bottom"
android:src="@drawable/notice_video_pause" />
<TextView
@@ -51,7 +51,7 @@
android:layout_marginRight="@dimen/notice_current_time_margin_small"
android:gravity="center_vertical"
android:text="02:23"
android:layout_marginBottom="@dimen/notice_time_bottom_small"
android:layout_marginBottom="@dimen/notice_time_bottom"
android:textColor="@android:color/white"
android:textSize="@dimen/time_textsize" />
@@ -63,7 +63,7 @@
android:max="100"
android:maxHeight="8px"
android:minHeight="8px"
android:layout_marginBottom="@dimen/notice_seekbar_bottom_small"
android:layout_marginBottom="@dimen/notice_seekbar_bottom"
android:progressDrawable="@drawable/notice_seekbar_style"
android:thumb="@drawable/notice_player_ic_circle_nor" />
@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="@dimen/notice_current_time_margin_small"
android:layout_marginBottom="@dimen/notice_time_bottom_small"
android:layout_marginBottom="@dimen/notice_time_bottom"
android:text="08:66"
android:gravity="center_vertical"
android:textColor="@android:color/white"

8
core/mogo-core-res/src/main/res/values/dimens.xml
View File

@@ -2,6 +2,7 @@
<resources>
<dimen name="dp_20">20px</dimen>
<dimen name="dp_52">52px</dimen>
<dimen name="module_ext_speed_width">300px</dimen>
<dimen name="module_ext_speed_height">300px</dimen>
<dimen name="module_ext_speed_padding">60px</dimen>
@@ -57,13 +58,12 @@
<dimen name="time_textsize">26px</dimen>
<dimen name="layout_margin_bottom">20px</dimen>
<dimen name="notice_play_height_small">52px</dimen>
<dimen name="notice_play_marginleft_small">35px</dimen>
<dimen name="notice_play_marginright_small">26px</dimen>
<dimen name="notice_current_time_margin_small">15px</dimen>
<dimen name="notice_seekbar_width_small">600px</dimen>
<dimen name="notice_seekbar_bottom_small">30px</dimen>
<dimen name="notice_time_bottom_small">18px</dimen>
<dimen name="notice_play_bottom_small">28px</dimen>
<dimen name="notice_seekbar_bottom">30px</dimen>
<dimen name="notice_time_bottom">18px</dimen>
<dimen name="notice_play_bottom">28px</dimen>
</resources>