From a39da430c9c995b5ba6fe99d8024df80d182bd44 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 12 Nov 2021 16:44:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=99=AE=E9=80=9A=E4=BA=91=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E5=BC=B9=E7=AA=97UI(=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=99=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notice_dialog_check_with_accessory.xml | 4 ++-- .../main/res/values-xhdpi-2560x1440/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../media/video/NoticeSimpleVideoPlayer.kt | 4 ++-- .../src/main/res/layout/item_notice_video.xml | 18 ++++++++++-------- .../res/layout/item_notice_video_small.xml | 12 ++++++------ .../src/main/res/values/dimens.xml | 8 ++++---- 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml index df90516a23..cb2349e840 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml @@ -97,8 +97,8 @@ 56px 62px 80px + 140px 150px 180px 200px diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml index 98f89b3107..c9ea608070 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -25,6 +25,7 @@ 56px 62px 80px + 140px 150px 180px 200px diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt index 04abb58a55..cdd061b7a1 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt @@ -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 } diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml index 8d504b8a52..91c6cc5e03 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video.xml @@ -8,8 +8,7 @@ android:id="@+id/surface_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center"> - + android:gravity="center"> + android:layout_marginBottom="@dimen/notice_play_bottom" + android:src="@drawable/notice_video_pause" /> diff --git a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml index 6d8eb39b8c..2aa7d13372 100644 --- a/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml +++ b/core/mogo-core-res/src/main/res/layout/item_notice_video_small.xml @@ -35,12 +35,12 @@ @@ -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" diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 4eae569208..139d0d6104 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -2,6 +2,7 @@ 20px + 52px 300px 300px 60px @@ -57,13 +58,12 @@ 26px 20px - 52px 35px 26px 15px 600px - 30px - 18px - 28px + 30px + 18px + 28px \ No newline at end of file From ecbfc7fb1ae946f6803fec9cb3cdc53b8a01b856 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 12 Nov 2021 16:47:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E6=A0=B9=E6=8D=AEip?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9B=B4=E6=92=ADurl=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5=E6=97=B6=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=9C=89=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenfufeng --- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 4 ++++ .../eagle/core/function/hmi/ui/camera/CameraListView.kt | 7 +++++++ .../mogo/eagle/core/function/monitoring/CronTaskManager.kt | 1 + .../core/function/api/hmi/warning/IMoGoWaringProvider.kt | 2 ++ .../mogo/eagle/core/function/call/hmi/CallerHmiManager.kt | 4 ++++ 5 files changed, 18 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index d522f24742..a551e7ae34 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -469,6 +469,10 @@ class MoGoHmiFragment : MvpFragment cameraListView?.startRoadCameraLive(flvUrl) } + override fun showNoSignView() { + cameraListView?.showNoSignal() + } + private fun showCameraList(cameraList: List?) { context?.let { if (cameraViewFloat == null) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 1f30d42ddf..6bde62a705 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -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 -> {// 正在直播 diff --git a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt index b9d7f7c8aa..74e7f4bab0 100644 --- a/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt +++ b/core/function-impl/mogo-core-function-monitoring/src/main/java/com/mogo/eagle/core/function/monitoring/CronTaskManager.kt @@ -116,6 +116,7 @@ class CronTaskManager { } }, { Logger.e(TAG, "openCameraStream&message is:${it.message}, cause is:${it.cause}") + CallerHmiManager.showNoSignalView() it.printStackTrace() }) } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt index 9f5601d782..0ddb6600ca 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -138,4 +138,6 @@ interface IMoGoWaringProvider : IMoGoFunctionProvider { fun vipIdentification(visible: Boolean) fun startRoadCameraLive(flvUrl: String) + + fun showNoSignView() } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 9ab27130b1..7e9e31efdc 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -185,4 +185,8 @@ object CallerHmiManager : CallerBase() { fun startRoadCameraLive(flvUrl: String) { waringProviderApi.startRoadCameraLive(flvUrl) } + + fun showNoSignalView() { + waringProviderApi.showNoSignView() + } } \ No newline at end of file