Merge remote-tracking branch 'origin/main'

Author: heyanLE

.idea/misc.xml

@@ -0,0 +1,84 @@
+package com.heyanle.eplayer_standard.component
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.RelativeLayout
+import com.heyanle.eplayer_core.constant.EasyPlayStatus
+import com.heyanle.eplayer_core.controller.ComponentContainer
+import com.heyanle.eplayer_core.controller.IComponent
+import com.heyanle.eplayer_standard.databinding.ComponentErrorBinding
+
+/**
+ * Create by heyanlin on 2022/11/10
+ */
+class ErrorComponent: FrameLayout, IComponent {
+
+    private val binding: ComponentErrorBinding = ComponentErrorBinding.inflate(LayoutInflater.from(context), this, true)
+
+    private var container: ComponentContainer? = null
+
+    init {
+        visibility = View.GONE
+        binding.btRetry.setOnClickListener {
+            visibility = View.GONE
+            runWithContainer {
+                replay(false)
+            }
+        }
+    }
+
+    override fun getView(): View {
+        return this
+    }
+
+    override fun getLayoutParam(): RelativeLayout.LayoutParams {
+        return RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT)
+    }
+
+    private fun requireContainer(): ComponentContainer {
+        return container ?: throw NullPointerException()
+    }
+
+    private inline fun runWithContainer(block: ComponentContainer.()->Unit){
+        container?.block()
+    }
+
+    override fun onAttachToContainer(container: ComponentContainer) {
+        this.container = container
+    }
+
+    override fun onDetachToContainer(container: ComponentContainer) {
+        this.container = null
+    }
+
+    override fun onPlayStateChanged(playState: Int) {
+        super.onPlayStateChanged(playState)
+        if(playState == EasyPlayStatus.STATE_ERROR) {
+            visibility = View.VISIBLE
+        }else if(playState == EasyPlayStatus.STATE_IDLE) {
+            visibility = View.GONE
+        }
+    }
+
+
+
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+        context,
+        attrs,
+        defStyleAttr
+    )
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int,
+        defStyleRes: Int
+    ) : super(context, attrs, defStyleAttr, defStyleRes)
+
+
+}

eplayer-standard/src/main/java/com/heyanle/eplayer_standard/component/ErrorComponent.kt

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:visibility="gone"
+    tools:visibility="visible"
+    android:id="@+id/center_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:background="#96000000"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <TextView
+        android:textSize="24sp"
+        android:textColor="@android:color/white"
+        android:text="@string/play_error"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.google.android.material.button.MaterialButton
+        android:layout_marginTop="8dp"
+        android:id="@+id/bt_retry"
+        android:text="@string/retry"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>

eplayer-standard/src/main/res/layout/component_error.xml

@@ -6,7 +6,7 @@
     android:layout_gravity="center_horizontal|top"
     android:layout_width="160dp"
     android:textColor="@android:color/white"
-    android:text="加速播放中"
+    android:text="@string/play_speeding_up"
     android:gravity="center"
     android:layout_height="32dp"
     android:background="#96000000"

eplayer-standard/src/main/res/layout/component_long_press.xml

@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:visibility="gone"
+    tools:visibility="visible"
     android:id="@+id/center_container"
     android:layout_width="160dp"
     android:layout_height="120dp"

eplayer-standard/src/main/res/layout/component_volume_brightness.xml

@@ -0,0 +1,8 @@
+<resources>
+    <string name="app_name">EasyPlayer</string>
+
+    <string name="play_error">出了点小问题，请点击重试</string>
+    <string name="retry">重试</string>
+
+    <string name="play_speeding_up">两倍速播放中</string>
+</resources>