From d9743a89d66ed8596c46ef7fc267f75a1e5a4d77 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Thu, 8 Aug 2024 10:39:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=B9=BF=E5=91=8A=E8=A7=86=E9=A2=91=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E9=97=AA=E7=83=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenjuntao --- app/src/main/java/com/gh/ad/AdDelegateHelper.kt | 7 +++---- app/src/main/java/com/gh/ad/SplashAdVideoView.kt | 8 +------- app/src/main/res/layout/layout_splash_ad_video.xml | 11 ----------- app/src/main/res/layout/piece_start_ad_container.xml | 4 ++-- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt index 5471cf0d8a..45871731fa 100644 --- a/app/src/main/java/com/gh/ad/AdDelegateHelper.kt +++ b/app/src/main/java/com/gh/ad/AdDelegateHelper.kt @@ -543,15 +543,14 @@ object AdDelegateHelper { ), null, null ) + adImage.visibleIf(true) + ImageUtils.display(adImage, ad.img) if (ad.isImageType) { - adImage.visibleIf(true) adVideo.visibleIf(false) - ImageUtils.display(adImage, ad.img) } else { - adImage.visibleIf(false) adVideo.visibleIf(true) - adVideo.startPlay(ad.img, ad.video.url) + adVideo.startPlay(ad.video.url) } startAdContainer.setOnClickListener { // 拦截点击事件传递 diff --git a/app/src/main/java/com/gh/ad/SplashAdVideoView.kt b/app/src/main/java/com/gh/ad/SplashAdVideoView.kt index 990c0ed865..c798f00e2b 100644 --- a/app/src/main/java/com/gh/ad/SplashAdVideoView.kt +++ b/app/src/main/java/com/gh/ad/SplashAdVideoView.kt @@ -2,11 +2,8 @@ package com.gh.ad import android.content.Context import android.util.AttributeSet -import com.facebook.drawee.view.SimpleDraweeView import com.gh.gamecenter.R -import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.video.detail.CustomManager -import com.shuyu.gsyvideoplayer.utils.Debuger import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_TYPE_FULL import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer @@ -18,16 +15,13 @@ class SplashAdVideoView @JvmOverloads constructor( ) : StandardGSYVideoPlayer(context, attrs) { - - fun startPlay(cover: String, url: String) { + fun startPlay(url: String) { GSYVideoType.setShowType(SCREEN_TYPE_FULL) GSYVideoType.setRenderType(GSYVideoType.SUFRACE) CustomManager.getCustomManager(getKey()).isNeedMute = true setUp(url, true, "") - val ivCover = findViewById(R.id.thumbImage) - ImageUtils.display(ivCover, cover) setNeedAutoAdaptation(false) isLooping = true startPlayLogic() diff --git a/app/src/main/res/layout/layout_splash_ad_video.xml b/app/src/main/res/layout/layout_splash_ad_video.xml index cfc7d84ecb..021d8feab5 100644 --- a/app/src/main/res/layout/layout_splash_ad_video.xml +++ b/app/src/main/res/layout/layout_splash_ad_video.xml @@ -7,15 +7,4 @@ android:id="@+id/surface_container" android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/piece_start_ad_container.xml b/app/src/main/res/layout/piece_start_ad_container.xml index 0f392f847a..bf7eebe283 100644 --- a/app/src/main/res/layout/piece_start_ad_container.xml +++ b/app/src/main/res/layout/piece_start_ad_container.xml @@ -11,12 +11,12 @@ Date: Thu, 8 Aug 2024 16:40:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=8F=96=E6=B6=88=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=97=B6=E5=B9=BF=E5=91=8A=E8=A7=86=E9=A2=91=E7=9A=84?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E6=92=AD=E6=94=BE=EF=BC=8C=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=AE=8C=E6=88=90=E5=90=8E=E5=81=9C=E7=95=99?= =?UTF-8?q?=E5=9C=A8=E6=9C=80=E5=90=8E=E4=B8=80=E5=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenjuntao --- .../main/java/com/gh/ad/SplashAdVideoView.kt | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/ad/SplashAdVideoView.kt b/app/src/main/java/com/gh/ad/SplashAdVideoView.kt index c798f00e2b..3a9c430178 100644 --- a/app/src/main/java/com/gh/ad/SplashAdVideoView.kt +++ b/app/src/main/java/com/gh/ad/SplashAdVideoView.kt @@ -1,7 +1,9 @@ package com.gh.ad +import android.app.Activity import android.content.Context import android.util.AttributeSet +import android.view.WindowManager import com.gh.gamecenter.R import com.gh.gamecenter.video.detail.CustomManager import com.shuyu.gsyvideoplayer.utils.GSYVideoType @@ -23,7 +25,6 @@ class SplashAdVideoView @JvmOverloads constructor( setUp(url, true, "") setNeedAutoAdaptation(false) - isLooping = true startPlayLogic() } @@ -43,6 +44,31 @@ class SplashAdVideoView @JvmOverloads constructor( return R.layout.layout_splash_ad_video } + override fun onAutoCompletion() { + setStateAndUi(CURRENT_STATE_AUTO_COMPLETE); + + mSaveChangeViewTIme = 0 + mCurrentPosition = 0 + + if (!mIfCurrentIsFullscreen) { + getGSYVideoManager().setLastListener(null) + } + mAudioManager.abandonAudioFocus(onAudioFocusChangeListener); + if (mContext is Activity) { + try { + (mContext as Activity).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } catch (e: Exception) { + e.printStackTrace() + } + } + releaseNetWorkState() + + if (mVideoAllCallBack != null && isCurrentMediaListener()) { + mVideoAllCallBack.onAutoComplete(mOriginUrl, mTitle, this) + } + mHadPlay = false + } + fun clearAll() { GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_DEFAULT) GSYVideoType.setRenderType(GSYVideoType.TEXTURE)