Skip to content

A
android_vedio
Commit 393453bc authored by jyx's avatar jyx
Browse files
Options

优化样式

parent 963fb4af
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 58 deletions
video/app/src/main/java/com/mints/helivideo/video/tx/SuperShortVideoView.java
View file @ 393453bc
...@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -15,7 +15,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mints.helivideo.R; import com.mints.helivideo.R;
import com.mints.helivideo.mvp.model.VedioBean; import com.mints.helivideo.mvp.model.VedioBean;
import com.mints.helivideo.mvp.model.VideoMultiItemEntity; import com.mints.helivideo.mvp.model.VideoMultiItemEntity;
import com.mints.helivideo.utils.LogUtil;
import com.mints.helivideo.video.tx.adapter.TxVideoAdapter; import com.mints.helivideo.video.tx.adapter.TxVideoAdapter;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -129,6 +128,7 @@ public class SuperShortVideoView extends RelativeLayout { ...@@ -129,6 +128,7 @@ public class SuperShortVideoView extends RelativeLayout {
case RecyclerView.SCROLL_STATE_IDLE://停止滚动 case RecyclerView.SCROLL_STATE_IDLE://停止滚动
View view = mSnapHelper.findSnapView(mLayoutManager); View view = mSnapHelper.findSnapView(mLayoutManager);
int position = recyclerView.getChildAdapterPosition(view); int position = recyclerView.getChildAdapterPosition(view);
if (position == mCurrentPosition) return;
Log.i(TAG, "[SCROLL_STATE_IDLE] mLastPositionInIDLE " + mLastPositionInIDLE + " position " + position); Log.i(TAG, "[SCROLL_STATE_IDLE] mLastPositionInIDLE " + mLastPositionInIDLE + " position " + position);
mCurrentPosition = position; mCurrentPosition = position;
onPageSelectedMethod(position); onPageSelectedMethod(position);
......
video/app/src/main/java/com/mints/helivideo/video/tx/TXVideoBaseView.java
View file @ 393453bc
...@@ -3,6 +3,7 @@ package com.mints.helivideo.video.tx; ...@@ -3,6 +3,7 @@ package com.mints.helivideo.video.tx;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.Spanned; import android.text.Spanned;
...@@ -13,11 +14,13 @@ import android.view.LayoutInflater; ...@@ -13,11 +14,13 @@ import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.SeekBar; import android.widget.SeekBar;
import android.widget.TextView; import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.mints.helivideo.utils.UIUtils;
import com.tencent.rtmp.TXLiveConstants; import com.tencent.rtmp.TXLiveConstants;
import com.tencent.rtmp.ui.TXCloudVideoView; import com.tencent.rtmp.ui.TXCloudVideoView;
import com.mints.helivideo.R; import com.mints.helivideo.R;
...@@ -31,7 +34,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe ...@@ -31,7 +34,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe
SeekBar.OnSeekBarChangeListener, TXVodPlayerWrapper.OnPlayEventChangedListener { SeekBar.OnSeekBarChangeListener, TXVodPlayerWrapper.OnPlayEventChangedListener {
private static final String TAG = "TXVideoBaseView"; private static final String TAG = "TXVideoBaseView";
private View mRootView; private View mRootView;
private ProgressBar mBgProgress;
private SeekBar mSeekBar; private SeekBar mSeekBar;
private TXCloudVideoView mTXCloudVideoView; private TXCloudVideoView mTXCloudVideoView;
private ImageView mIvCover; private ImageView mIvCover;
...@@ -68,7 +70,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe ...@@ -68,7 +70,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe
private void init(Context context) { private void init(Context context) {
mRootView = LayoutInflater.from(context).inflate(R.layout.player_item_base_view, null); mRootView = LayoutInflater.from(context).inflate(R.layout.player_item_base_view, null);
addView(mRootView); addView(mRootView);
mBgProgress = mRootView.findViewById(R.id.progress_short_video);
mSeekBar = mRootView.findViewById(R.id.seekbar_short_video); mSeekBar = mRootView.findViewById(R.id.seekbar_short_video);
mSeekBar.setOnSeekBarChangeListener(this); mSeekBar.setOnSeekBarChangeListener(this);
mIvCover = mRootView.findViewById(R.id.iv_cover); mIvCover = mRootView.findViewById(R.id.iv_cover);
...@@ -95,30 +96,33 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe ...@@ -95,30 +96,33 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe
} }
}); });
mBgProgress.setVisibility(View.GONE); mSeekBar.setVisibility(View.VISIBLE);
// mSeekBar.setVisibility(View.GONE); mProgressTime.setVisibility(View.GONE);
// mProgressTime.setVisibility(View.GONE); mSeekBar.setOnTouchListener((v, event) -> {
// switch (event.getAction()) {
// OnTouchListener listener = new OnTouchListener() { case MotionEvent.ACTION_DOWN:
// @Override setSeekBarStyle(true);
// public boolean onTouch(View v, MotionEvent event) { break;
// switch (event.getAction()) { case MotionEvent.ACTION_UP:
// case MotionEvent.ACTION_DOWN: if (mTXVodPlayerWrapper.isPlaying()) {
// mBgProgress.setVisibility(View.GONE); setSeekBarStyle(false);
// mSeekBar.setVisibility(View.VISIBLE); }
// mProgressTime.setVisibility(View.VISIBLE); break;
// break; }
// case MotionEvent.ACTION_UP: return false;
// mBgProgress.setVisibility(View.VISIBLE); });
// mSeekBar.setVisibility(View.GONE); }
// mProgressTime.setVisibility(View.GONE);
// break; private void setSeekBarStyle(boolean isMove) {
// } if (isMove) {
// return false; mSeekBar.setThumb(ContextCompat.getDrawable(getContext(), R.drawable.player_thumb_view));
// } mSeekBar.setProgressDrawable(ContextCompat.getDrawable(getContext(), R.drawable.player_video_seek_bar));
// }; mProgressTime.setVisibility(View.VISIBLE);
// mBgProgress.setOnTouchListener(listener); } else {
// mSeekBar.setOnTouchListener(listener); mSeekBar.setThumb(ContextCompat.getDrawable(getContext(), R.drawable.player_thumb_view_small));
mSeekBar.setProgressDrawable(ContextCompat.getDrawable(getContext(), R.drawable.player_video_seek_bar_small));
mProgressTime.setVisibility(View.GONE);
}
} }
private void handlePlayProgress(Bundle param) { private void handlePlayProgress(Bundle param) {
...@@ -142,8 +146,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe ...@@ -142,8 +146,6 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe
if (mSeekBar != null) { if (mSeekBar != null) {
mSeekBar.setMax(durationMS); mSeekBar.setMax(durationMS);
mSeekBar.setProgress(progressMS); mSeekBar.setProgress(progressMS);
mBgProgress.setMax(durationMS);
mBgProgress.setProgress(progressMS);
} }
if (mProgressTime != null) { if (mProgressTime != null) {
String tempString = String.format(Locale.CHINA, "%02d:%02d/%02d:%02d", (progress) / 60, progress % 60, (duration) / 60, duration % 60); String tempString = String.format(Locale.CHINA, "%02d:%02d/%02d:%02d", (progress) / 60, progress % 60, (duration) / 60, duration % 60);
...@@ -160,9 +162,11 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe ...@@ -160,9 +162,11 @@ public class TXVideoBaseView extends RelativeLayout implements View.OnClickListe
return; return;
} }
if (!mTXVodPlayerWrapper.isPlaying()) { if (!mTXVodPlayerWrapper.isPlaying()) {
setSeekBarStyle(false);
mTXVodPlayerWrapper.resumePlay(); mTXVodPlayerWrapper.resumePlay();
mPauseImageView.setVisibility(View.GONE); mPauseImageView.setVisibility(View.GONE);
} else { } else {
setSeekBarStyle(true);
pausePlayer(); pausePlayer();
} }
} }
......
video/app/src/main/res/drawable/player_thumb_view.xml
View file @ 393453bc
...@@ -3,14 +3,14 @@ ...@@ -3,14 +3,14 @@
<item android:state_pressed="true"> <item android:state_pressed="true">
<shape android:shape="oval"> <shape android:shape="oval">
<solid android:color="#FFFFFFFF" /> <solid android:color="#FFFFFFFF" />
<size android:width="8dp" android:height="8dp" /> <size android:width="7dp" android:height="7dp" />
</shape> </shape>
</item> </item>
<item> <item>
<shape android:shape="oval"> <shape android:shape="oval">
<solid android:color="#FFFFFFFF" /> <solid android:color="#FFFFFFFF" />
<size android:width="8dp" android:height="8dp" /> <size android:width="7dp" android:height="7dp" />
</shape> </shape>
</item> </item>
</selector> </selector>
\ No newline at end of file
video/app/src/main/res/drawable/player_thumb_view_small.xml 0 → 100644
View file @ 393453bc
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<solid android:color="#FFFFFFFF" />
<size android:width="4dp" android:height="4dp" />
</shape>
</item>
<item>
<shape android:shape="oval">
<solid android:color="#FFFFFFFF" />
<size android:width="4dp" android:height="4dp" />
</shape>
</item>
</selector>
\ No newline at end of file
video/app/src/main/res/drawable/player_video_seek_bar.xml
View file @ 393453bc
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background" android:height="5dp"> <item
android:id="@android:id/background"
android:height="4dp"
android:top="2dp">
<shape> <shape>
<corners android:radius="5dp"/> <corners android:radius="4dp" />
<solid android:color="#4CD8D8D8"/> <!-- 颜色--> <solid android:color="#4CD8D8D8" /> <!-- 颜色-->
</shape> </shape>
</item> </item>
<item android:id="@android:id/secondaryProgress" android:height="5dp"> <item
android:id="@android:id/secondaryProgress"
android:height="4dp"
android:top="2dp">
<clip> <clip>
<shape> <shape>
<corners android:radius="5dp"/> <corners android:radius="4dp" />
<solid android:color="#20B2AA"/> <!-- 颜色--> <solid android:color="#20B2AA" /> <!-- 颜色-->
</shape> </shape>
</clip> </clip>
</item> </item>
<item android:id="@android:id/progress" android:height="5dp"> <item
android:id="@android:id/progress"
android:height="4dp"
android:top="2dp">
<clip> <clip>
<shape> <shape>
<corners android:radius="5dp"/> <corners android:radius="4dp" />
<solid android:color="#C9C7C7"/> <!-- 颜色--> <solid android:color="#C9C7C7" /> <!-- 颜色-->
</shape> </shape>
</clip> </clip>
</item> </item>
......
video/app/src/main/res/drawable/player_video_seek_bar_small.xml 0 → 100644
View file @ 393453bc
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@android:id/background"
android:height="2dp"
android:top="3dp">
<shape>
<corners android:radius="2dp" />
<solid android:color="#4CD8D8D8" /> <!-- 颜色-->
</shape>
</item>
<item
android:id="@android:id/secondaryProgress"
android:height="2dp"
android:top="3dp">
<clip>
<shape>
<corners android:radius="2dp" />
<solid android:color="#20B2AA" /> <!-- 颜色-->
</shape>
</clip>
</item>
<item
android:id="@android:id/progress"
android:height="2dp"
android:top="3dp">
<clip>
<shape>
<corners android:radius="2dp" />
<solid android:color="#C9C7C7" /> <!-- 颜色-->
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
video/app/src/main/res/layout/dialog_video_episode.xml
View file @ 393453bc
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="-" android:text="-"
android:textColor="@color/black" /> android:textColor="@color/black"
android:textSize="16sp" />
<TextView <TextView
android:id="@+id/label_tv" android:id="@+id/label_tv"
......
video/app/src/main/res/layout/item_item_video_epsiode.xml
View file @ 393453bc
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<com.airbnb.lottie.LottieAnimationView <com.airbnb.lottie.LottieAnimationView
android:id="@+id/item_iv_play" android:id="@+id/item_iv_play"
android:layout_width="20dp" android:layout_width="16dp"
android:layout_height="20dp" android:layout_height="16dp"
android:layout_gravity="start|bottom" android:layout_gravity="start|bottom"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_fileName="playing.json" app:lottie_fileName="playing.json"
......
video/app/src/main/res/layout/player_item_base_view.xml
View file @ 393453bc
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/empty_view" android:layout_above="@id/empty_view"
android:maxHeight="6dp" android:maxHeight="8dp"
android:minHeight="6dp" android:minHeight="8dp"
android:progressDrawable="@drawable/player_video_seek_bar" android:progressDrawable="@drawable/player_video_seek_bar_small"
android:thumb="@drawable/player_thumb_view" /> android:thumb="@drawable/player_thumb_view_small" />
<TextView <TextView
android:id="@+id/tv_progress_time" android:id="@+id/tv_progress_time"
...@@ -40,21 +40,12 @@ ...@@ -40,21 +40,12 @@
android:layout_height="30dp" android:layout_height="30dp"
android:layout_above="@id/seekbar_short_video" android:layout_above="@id/seekbar_short_video"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp" android:layout_marginBottom="20dp"
android:background="@drawable/player_short_video_time" android:background="@drawable/player_short_video_time"
android:gravity="center" android:gravity="center"
android:text="00:00/00:00" android:text="00:00/00:00"
android:textSize="16sp" /> android:textSize="16sp" />
<ProgressBar
android:id="@+id/progress_short_video"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="6dp"
android:layout_above="@id/empty_view"
android:max="100"
android:progressDrawable="@drawable/jz_bottom_seek_progress" />
<ImageView <ImageView
android:id="@+id/iv_pause" android:id="@+id/iv_pause"
android:layout_width="80dp" android:layout_width="80dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment