From 7f49dcec77481d9f267047341df52a948d31e854 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 24 Nov 2021 13:49:24 +0800 Subject: [PATCH] =?UTF-8?q?[Fix]=E8=A1=8C=E8=BD=A6=E8=B6=85=E8=A7=86?= =?UTF-8?q?=E8=B7=9DUI=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 2 +- .../core/function/hmi/ui/camera/CameraListView.kt | 11 +++++++++-- .../res/drawable/camera_gradient_shadow_bg.xml | 9 +++++++++ .../src/main/res/layout/item_camera_info.xml | 6 +++--- .../src/main/res/layout/view_camera_list.xml | 15 ++++++++++++--- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/camera_gradient_shadow_bg.xml 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 9e135a418c..b63780441a 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 @@ -495,7 +495,7 @@ class MoGoHmiFragment : MvpFragment .setTag("CameraListFloat") .setLayout(cameraListView!!) .setSidePattern(SidePattern.RIGHT) - .setLocation(1742, 280) + .setGravity(Gravity.RIGHT, -40, 280) .setImmersionStatusBar(true) .setAnimator(object : DefaultAnimator() { override fun enterAnim( 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 753137155f..549a767ab2 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 @@ -4,6 +4,8 @@ import android.animation.ValueAnimator import android.app.Application import android.content.Context import android.graphics.Color +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter import android.text.SpannableStringBuilder import android.text.Spanned import android.text.style.ForegroundColorSpan @@ -11,6 +13,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.widget.FrameLayout +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.cloud.live.manager.LiveStreamManagerImpl import com.mogo.cloud.passport.MoGoAiCloudClientConfig @@ -139,7 +142,6 @@ class CameraListView : FrameLayout { GSYVideoManager.instance().optionModelList = list GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL) PlayerFactory.setPlayManager(IjkPlayerManager::class.java) - IjkPlayerManager.setLogLevel(IjkMediaPlayer.IJK_LOG_DEBUG) svpPlayer.setPlayListener(object : SimpleVideoPlayer.PlayListener { override fun onPlayEvent(event: Int) { Logger.d(TAG, "onPlayEvent: event is:$event") @@ -148,6 +150,7 @@ class CameraListView : FrameLayout { } SimpleVideoPlayer.PLAY_EVT_PLAY_BEGIN -> { + clickListener?.onShowLive(true) progressBar.visibility = View.GONE svpPlayer.visibility = View.VISIBLE isPlaySuccess = true @@ -162,6 +165,7 @@ class CameraListView : FrameLayout { } } }) + progressBar.indeterminateDrawable.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(context, R.color.notice_blue), PorterDuff.Mode.MULTIPLY) // 后期可改为动态获取3s起始位置，暂时写死 spannableStringBuilder.setSpan( ForegroundColorSpan(Color.parseColor("#2966EE")), @@ -239,6 +243,7 @@ class CameraListView : FrameLayout { override fun onFirstFrame() { Logger.d(TAG, "onFirstFrame:isFirstPage is:$isFirstPage,isCarLive is:${isCarLive()}") if (!isFirstPage && isCarLive()) { + clickListener?.onShowLive(true) // 会出现临时中断后又可以继续播放，需要停掉倒计时 if (valueAnimator.isStarted || valueAnimator.isRunning) { valueAnimator.cancel() @@ -287,7 +292,6 @@ class CameraListView : FrameLayout { * 两者播放直播的方式之一 */ private fun gsyVideoPlay(flvUrl: String) { - clickListener?.onShowLive(true) gsyVideoOptionBuilder.setUrl(flvUrl) .setCacheWithPlay(false) .setAutoFullWithSize(false) @@ -335,6 +339,7 @@ class CameraListView : FrameLayout { tvCameraTitle.visibility = View.GONE rvCameraList.visibility = View.GONE ivCloseIcon.setBackgroundResource(R.drawable.icon_back) + shadowView.visibility = View.GONE } private fun showCameraList() { @@ -346,6 +351,7 @@ class CameraListView : FrameLayout { ivSignalIcon.visibility = View.GONE tvTipContent.visibility = View.GONE ivCloseIcon.setBackgroundResource(R.drawable.icon_close_nor) + shadowView.visibility = View.VISIBLE } private fun showNoSignalView() { @@ -356,6 +362,7 @@ class CameraListView : FrameLayout { surfaceView.visibility = View.GONE svpPlayer.visibility = View.GONE progressBar.visibility = View.GONE + shadowView.visibility = View.GONE } interface ClickListener { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/camera_gradient_shadow_bg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/camera_gradient_shadow_bg.xml new file mode 100644 index 0000000000..387fbea296 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/camera_gradient_shadow_bg.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_camera_info.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_camera_info.xml index e291851262..f6fa8e6a31 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_camera_info.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_camera_info.xml @@ -9,8 +9,8 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml index 907783400a..19fb13cef7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_camera_list.xml @@ -13,14 +13,14 @@ android:id="@+id/tvCameraTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="24px" + android:layout_marginTop="30px" android:text="视频设备" android:textColor="#FFFFFF" android:textSize="42px" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:visibility="gone" /> + tools:visibility="visible" /> + tools:visibility="gone" /> + + \ No newline at end of file