diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle index 07b713d11f..b00e9f4967 100644 --- a/core/mogo-core-res/build.gradle +++ b/core/mogo-core-res/build.gradle @@ -71,6 +71,8 @@ dependencies { api rootProject.ext.dependencies.videoarm64 api rootProject.ext.dependencies.videojava api rootProject.ext.dependencies.livesdk + implementation 'com.android.support:cardview-v7:26.1.0' + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_utils diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeGSYRenderView.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeGSYRenderView.java new file mode 100644 index 0000000000..25414f2f75 --- /dev/null +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeGSYRenderView.java @@ -0,0 +1,22 @@ +package com.mogo.eagle.core.widget.media.video; + +import android.content.Context; +import android.view.ViewGroup; + +import com.shuyu.gsyvideoplayer.render.GSYRenderView; +import com.shuyu.gsyvideoplayer.render.glrender.GSYVideoGLViewBaseRender; +import com.shuyu.gsyvideoplayer.render.view.GSYVideoGLView; +import com.shuyu.gsyvideoplayer.render.view.listener.IGSYSurfaceListener; +import com.shuyu.gsyvideoplayer.utils.MeasureHelper; + +/** + * @author Jing + * @description 描述 + * @since: 11/16/21 + */ +public class NoticeGSYRenderView extends GSYRenderView { + @Override + public void addView(Context context, ViewGroup textureViewContainer, int rotate, IGSYSurfaceListener gsySurfaceListener, MeasureHelper.MeasureFormVideoParamsListener videoParamsListener, GSYVideoGLView.ShaderInterface effect, float[] transform, GSYVideoGLViewBaseRender customRender, int mode) { + super.addView(context, textureViewContainer, rotate, gsySurfaceListener, videoParamsListener, effect, transform, customRender, mode); + } +} diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt index 7a0d7deaa1..d5ab21bef9 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt @@ -188,6 +188,7 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer { override fun onPrepared() { super.onPrepared() + playListener?.onPlayEvent(PLAY_EVT_PLAY_LOADING) } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/TextureVideoViewOutlineProvider.java b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/TextureVideoViewOutlineProvider.java new file mode 100644 index 0000000000..73783ddf3e --- /dev/null +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/TextureVideoViewOutlineProvider.java @@ -0,0 +1,34 @@ +package com.mogo.eagle.core.widget.media.video; + +import android.graphics.Outline; +import android.graphics.Rect; +import android.os.Build; +import android.view.View; +import android.view.ViewOutlineProvider; + +import androidx.annotation.RequiresApi; + +/** + * @author Jing + * @description 描述 + * @since: 11/16/21 + */ +@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) +public class TextureVideoViewOutlineProvider extends ViewOutlineProvider { + private float mRadius; + + public TextureVideoViewOutlineProvider(float radius) { + this.mRadius = radius; + } + + @Override + public void getOutline(View view, Outline outline) { + Rect rect = new Rect(); + view.getGlobalVisibleRect(rect); + int leftMargin = 0; + int topMargin = 0; + Rect selfRect = new Rect(leftMargin, topMargin, + rect.right - rect.left - leftMargin, rect.bottom - rect.top - topMargin); + outline.setRoundRect(selfRect, mRadius); + } +} 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 c04a002a1a..f3988e86a2 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 @@ -48,9 +48,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/notice_time_bottom" android:gravity="center_vertical" android:text="02:23" - android:layout_marginBottom="@dimen/notice_time_bottom" android:textColor="@android:color/white" android:textSize="@dimen/time_textsize" /> @@ -59,10 +59,10 @@ android:layout_width="@dimen/notice_seekbar_width_small" 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" - android:layout_marginBottom="@dimen/notice_seekbar_bottom" android:progressDrawable="@drawable/notice_seekbar_style" android:thumb="@drawable/notice_player_ic_circle_nor" /> @@ -72,8 +72,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom" android:layout_marginBottom="@dimen/notice_time_bottom" - android:text="08:66" android:gravity="center_vertical" + android:text="08:66" android:textColor="@android:color/white" android:textSize="@dimen/time_textsize" /> diff --git a/core/mogo-core-res/src/main/res/layout/notice_video_card_layout.xml b/core/mogo-core-res/src/main/res/layout/notice_video_card_layout.xml new file mode 100644 index 0000000000..63d12a49d1 --- /dev/null +++ b/core/mogo-core-res/src/main/res/layout/notice_video_card_layout.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file