Ver código fonte

修改部分UI

杨充 4 anos atrás
pai
commit
f17817155d

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/activity/DetailActivity.java

@@ -53,7 +53,7 @@ public class DetailActivity extends AppCompatActivity {
         Intent intent = getIntent();
         boolean seamlessPlay = intent.getBooleanExtra(IntentKeys.SEAMLESS_PLAY, false);
         String title = intent.getStringExtra(IntentKeys.TITLE);
-        controller.addDefaultControlComponent(title, false);
+        controller.addDefaultControlComponent(title);
         if (seamlessPlay) {
             //无缝播放需还原Controller状态
             controller.setPlayState(mVideoView.getCurrentPlayState());

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdActivity.java

@@ -126,7 +126,7 @@ public class AdActivity extends AppCompatActivity implements View.OnClickListene
     private void playVideo() {
         mVideoPlayer.release();
         controller.removeAllControlComponent();
-        controller.addDefaultControlComponent("正片", false);
+        controller.addDefaultControlComponent("正片");
         //重新设置数据
         mVideoPlayer.setUrl(ConstantVideo.VideoPlayerList[0]);
         //开始播放

+ 2 - 2
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/ad/AdControlView.java

@@ -14,9 +14,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.yc.ycvideoplayer.R;
+
+import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;
-import com.yc.video.controller.ControlWrapper;
-import com.yc.video.ui.view.CustomTitleView;
 import com.yc.video.ui.view.InterControlView;
 import com.yc.video.tool.PlayerUtils;
 

+ 2 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/danmu/MyDanmakuView.java

@@ -18,8 +18,9 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import org.yc.ycvideoplayer.R;
+
+import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;
-import com.yc.video.controller.ControlWrapper;
 import com.yc.video.ui.view.InterControlView;
 import com.yc.video.tool.PlayerUtils;
 

+ 1 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/list/PlayerMonitor.java

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 
 import com.yc.kernel.utils.VideoLogUtils;
 
-import com.yc.video.controller.ControlWrapper;
+import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.ui.view.InterControlView;
 import com.yc.video.tool.PlayerUtils;
 

+ 2 - 1
Demo/src/main/java/com/yc/ycvideoplayer/newPlayer/tiktok/TikTokView.java

@@ -17,8 +17,9 @@ import androidx.annotation.Nullable;
 import com.yc.kernel.utils.VideoLogUtils;
 
 import org.yc.ycvideoplayer.R;
+
+import com.yc.video.bridge.ControlWrapper;
 import com.yc.video.config.ConstantKeys;
-import com.yc.video.controller.ControlWrapper;
 import com.yc.video.ui.view.InterControlView;
 
 public class TikTokView extends FrameLayout implements InterControlView {

+ 1 - 1
VideoPlayer/src/main/java/com/yc/video/ui/view/CustomCompleteView.java

@@ -155,7 +155,7 @@ public class CustomCompleteView extends FrameLayout implements InterControlView,
         if (activity != null && mControlWrapper.hasCutout()) {
             int orientation = activity.getRequestedOrientation();
             int cutoutHeight = mControlWrapper.getCutoutHeight();
-            LayoutParams sflp = (LayoutParams) mIvStopFullscreen.getLayoutParams();
+            LinearLayout.LayoutParams sflp = (LinearLayout.LayoutParams) mIvStopFullscreen.getLayoutParams();
             if (orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
                 sflp.setMargins(0, 0, 0, 0);
             } else if (orientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {

+ 4 - 2
VideoPlayer/src/main/res/drawable/selector_lock_button.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_selected="true" android:drawable="@drawable/ic_player_lock_open"/>
-    <item android:drawable="@drawable/ic_player_lock_close"/>
+
+    <item android:state_selected="true"
+        android:drawable="@drawable/ic_player_lock_close"/>
+    <item android:drawable="@drawable/ic_player_lock_open"/>
 
 </selector>

+ 19 - 8
VideoPlayer/src/main/res/layout/custom_video_player_completed.xml

@@ -7,14 +7,25 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 
-    <ImageView
-        android:id="@+id/iv_stop_fullscreen"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_margin="12dp"
-        android:background="@drawable/ic_player_back"
-        android:visibility="gone"
-        tools:visibility="visible" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:background="@drawable/player_mask_top"
+        android:gravity="center_vertical"
+        android:paddingTop="10dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        android:orientation="horizontal">
+        <ImageView
+            android:id="@+id/iv_stop_fullscreen"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:background="@drawable/ic_player_back"
+            android:visibility="gone"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+
 
     <LinearLayout
         android:layout_width="wrap_content"

+ 1 - 1
VideoPlayer/src/main/res/layout/custom_video_player_standard.xml

@@ -9,7 +9,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_gravity="center|start"
-        android:layout_margin="24dp"
+        android:layout_margin="10dp"
         android:background="@drawable/shape_back_bg"
         android:padding="10dp"
         android:src="@drawable/selector_lock_button"