Merge remote-tracking branch 'origin/release2' into translater_version

# Conflicts:
#	app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSDeleteAccountActivity.java
This commit is contained in:
guozhen 2025-05-08 09:41:25 +08:00
commit 2d8bb66b8d
14 changed files with 283 additions and 130 deletions

View File

@ -220,6 +220,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
if (intent != null) {
path = intent.getStringExtra("path");
short_play_id = intent.getStringExtra("short_play_id");
@ -369,7 +370,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
binding.getRoot().postDelayed(new Runnable() {
@Override
public void run() {
LRewards.startPlayerDetails(AExtractionActivity.this, shortPlayId, 0);
LRewards.startPlayerDetails(AExtractionActivity.this, shortPlayId, videoId);
TIndicator.saveString(ITItem.Constants_DeepLinkData_URL, "");
cleanClipData();
@ -441,7 +442,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
videoId = Integer.parseInt(extractVideoInfo.first.toString());
LogUtils.d("urlString: " + clipString + " shortPlayId: " + shortPlayId + " videoId==" + videoId);
if (shortPlayId != 0) {
TIndicator.saveString(ITItem.Constants_Page_video_id, extractVideoInfo.second.toString());
TIndicator.saveString(ITItem.Constants_DeepLinkData_URL, "");
needSave = true;
w2aSelfAttribution(clipString);
}
@ -456,18 +457,27 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
if (!ddl.isEmpty()) {
w2aSelfAttribution(ddl);
// 定义正则表达式
Pattern pattern = Pattern.compile("short_play_id=(d+).*");
// Pattern pattern = Pattern.compile("short_play_id=(d+).*");
Pattern pattern = Pattern.compile("short_play_id=(\\d+)");
Pattern patternVideoId = Pattern.compile("video_id=(\\d+)");
Matcher matcher = pattern.matcher(ddl);
Matcher matcherVideoId = patternVideoId.matcher(ddl);
// 匹配 URL
Matcher matchResult = matcher.find() ? matcher : null;
Matcher matchVideoIdResult = matcherVideoId.find() ? matcherVideoId : null;
if (matchResult != null) {
String shortPlayId = matchResult.group(1);
int shortId = Integer.parseInt(shortPlayId);
if (matchVideoIdResult != null) {
String videoIdValue = matchVideoIdResult.group(1);
videoId = Integer.parseInt(videoIdValue);
}
if (shortId != 0) {
binding.getRoot().postDelayed(new Runnable() {
@Override
public void run() {
LRewards.startPlayerDetails(AExtractionActivity.this, shortId, 0);
LRewards.startPlayerDetails(AExtractionActivity.this, shortId, videoId);
TIndicator.saveString(ITItem.Constants_DeepLinkData_URL, "");
}
}, 200);

View File

@ -553,6 +553,7 @@ public class UBJPrivateOllowFragment extends Fragment {
}
if (ITItem.CONSTANTS_User_Refresh_Event.equals(event)) {
seenMarkView.getUserInfo();
seenMarkView.getHistory(1, 10);
}

View File

@ -61,7 +61,8 @@ public class CClickFragment extends DialogFragment {
bind.rvDataEpisodesSeries.setLayoutManager(layoutManager);
bind.rvDataEpisodesSeries.setAdapter(hibitEpisodesSeriesAdapter);
int length = 30;
int length = Math.min(list.size(), 30);
if (list != null && !list.isEmpty()) {
int size = list.size();
int count = size / length;
@ -84,9 +85,11 @@ public class CClickFragment extends DialogFragment {
break;
}
}
bind.tablayoutEpisodes.getTabAt(currentTab).select();
updateRecyclerView(bind.tablayoutEpisodes.getTabAt(currentTab).getText().toString(), hibitEpisodesSeriesAdapter);
hibitEpisodesSeriesAdapter.setCurrentPosition(currentPosition + 1);
if(bind.tablayoutEpisodes.getTabCount()>0){
bind.tablayoutEpisodes.getTabAt(currentTab).select();
updateRecyclerView(bind.tablayoutEpisodes.getTabAt(currentTab).getText().toString(), hibitEpisodesSeriesAdapter);
hibitEpisodesSeriesAdapter.setCurrentPosition(currentPosition + 1);
}
bind.tablayoutEpisodes.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {

View File

@ -97,6 +97,8 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
private boolean needRefresh = false;
private boolean needRestart = false;
private ZYTRecommondVideoAdapter recommondVideoBannerAdapter;
@Override
public void init() {
getWindow().setFlags(
@ -136,12 +138,14 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
@Override
public void onPageSelected(int position) {
super.onPageSelected(position);
LogUtils.d("onPageSelected " + position);
currentPosition = position;
int previousPosition = vtGooglePlayerAdapter != null ? vtGooglePlayerAdapter.getCurrentEpisodePlayingPosition() : 0;
if (previousPosition != position) {
RecyclerView recyclerViewitem = (RecyclerView) viewBinding.viewPagerVtEpisode.getChildAt(0);
BVXHeadView playView = (BVXHeadView) recyclerViewitem.getLayoutManager().findViewByPosition(previousPosition);
if (playView != null) {
playView.stop();
LSQExampleCloseBean.YPZTestUnselect episode1 = vtGooglePlayerAdapter.getItems().get(previousPosition);
episode1.setPlay_seconds(needRestart ? 0 : playView.getlastProgress());
if (!episode1.isIs_lock()) {
@ -149,47 +153,16 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
needRestart = false;
}
}
if (vtGooglePlayerAdapter != null) {
vtGooglePlayerAdapter.getRecyclerView().post(() -> {
vtGooglePlayerAdapter.notifyDataSetChanged();
});
}
vtGooglePlayerAdapter.getRecyclerView().post(() -> {
vtGooglePlayerAdapter.notifyDataSetChanged();
});
}
if (vtGooglePlayerAdapter != null) {
vtGooglePlayerAdapter.setCurrentEpisodePlayingPosition(position);
LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(position);
//条件判断是否弹窗
if (item != null && item.isIs_lock() && !TIndicator.is_Vip()) {
ITItem.isLock = true;
ITItem.isCanPlay = false;
viewBinding.viewLock.getRoot().setVisibility(View.VISIBLE);
int allCoin = TIndicator.getAllCoin();
if (currentPosition > 0) {
LSQExampleCloseBean.YPZTestUnselect previousItem = vtGooglePlayerAdapter.getItems().get(currentPosition - 1);
if (previousItem != null && previousItem.isIs_lock()) {
viewBinding.viewLock.tvUnlockEpisode.setText(getString(R.string.unlock_episode_coins_last));
} else {
if (XYBGoryShare.translates() != null) {
viewBinding.viewLock.tvUnlockEpisode.setText(
XYBGoryShare.translates().getUnlocking_coins_notice().replace("##", String.valueOf(item.getCoins()))
);
viewBinding.viewLock.tvVideoAdUnlock.setText(XYBGoryShare.translates().getCommon_unlock());
} else {
viewBinding.viewLock.tvUnlockEpisode.setText(String.format(getString(R.string.unlock_episode_coins), item.getCoins()));
}
if (allCoin < item.getCoins()) {
rechargeDialog(item);
}
}
}
if (viewBinding.viewLock.getRoot().getVisibility() == VISIBLE) {
viewBinding.viewLock.getRoot().post(() -> {
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().suspendPlayer();
}
});
}
showLockView(item);
} else {
ITItem.isLock = false;
ITItem.isCanPlay = true;
@ -198,7 +171,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (currentItem != null) {
vtViewModel.createHistory(
currentItem.getShort_play_id(),
currentItem.getId()
currentItem.getShort_play_video_id()
);
EventBus.getDefault().post(ITItem.Constants_PlayerView_CreateHistoryEvent);
}
@ -291,6 +264,44 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
rechargeDialog(item);
}
});
recommondVideoBannerAdapter = new ZYTRecommondVideoAdapter(new ArrayList<>());
viewBinding.viewVideoRecommend.bannerRecommend.setBannerGalleryEffect(
60,
15
);
}
private void showLockView(LSQExampleCloseBean.YPZTestUnselect item) {
ITItem.isLock = true;
ITItem.isCanPlay = false;
viewBinding.viewLock.getRoot().setVisibility(View.VISIBLE);
int allCoin = TIndicator.getAllCoin();
if (currentPosition > 0) {
LSQExampleCloseBean.YPZTestUnselect previousItem = vtGooglePlayerAdapter.getItems().get(currentPosition - 1);
if (previousItem != null && previousItem.isIs_lock()) {
viewBinding.viewLock.tvUnlockEpisode.setText(getString(R.string.unlock_episode_coins_last));
} else {
if (XYBGoryShare.translates() != null) {
viewBinding.viewLock.tvUnlockEpisode.setText(
XYBGoryShare.translates().getUnlocking_coins_notice().replace("##", String.valueOf(item.getCoins()))
);
viewBinding.viewLock.tvVideoAdUnlock.setText(XYBGoryShare.translates().getCommon_unlock());
} else {
viewBinding.viewLock.tvUnlockEpisode.setText(String.format(getString(R.string.unlock_episode_coins), item.getCoins()));
}
if (allCoin < item.getCoins()) {
rechargeDialog(item);
}
}
}
if (viewBinding.viewLock.getRoot().getVisibility() == VISIBLE) {
viewBinding.viewLock.getRoot().post(() -> {
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().suspendPlayer();
}
});
}
}
@OptIn(markerClass = UnstableApi.class)
@ -330,11 +341,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (it.data != null && it.data.getList() != null && !it.data.getList().isEmpty()) {
ITItem.isCanPlay = false;
viewBinding.viewVideoRecommend.getRoot().setVisibility(VISIBLE);
ZYTRecommondVideoAdapter recommondVideoBannerAdapter = new ZYTRecommondVideoAdapter(it.data.getList());
viewBinding.viewVideoRecommend.bannerRecommend.setBannerGalleryEffect(
60,
15
);
recommondVideoBannerAdapter.setDatas(it.data.getList());
viewBinding.viewVideoRecommend.bannerRecommend.addOnPageChangeListener(new OnPageChangeListener() {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
@ -439,15 +446,19 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (it != null) {
AppCompatImageView imageView = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.iv_collection_controller) : null;
AppCompatTextView textview = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.tv_collection_num_controller) : null;
AppCompatImageView imageViewTop = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.player_view_top).findViewById(R.id.iv_collection_controller) : null;
AppCompatTextView textviewTop = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.player_view_top).findViewById(R.id.tv_collection_num_controller) : null;
if (shortVideoInfo != null) {
shortVideoInfo.setIs_collect(true);
shortVideoInfo.setCollect_total(shortVideoInfo.getCollect_total() + 1);
}
if (imageView != null) {
imageView.setImageResource(R.mipmap.banner_ffffff);
imageViewTop.setImageResource(R.mipmap.banner_ffffff);
}
if (textview != null && shortVideoInfo != null) {
textview.setText(TimeUtils.formatNumber(shortVideoInfo.getCollect_total()));
textviewTop.setText(TimeUtils.formatNumber(shortVideoInfo.getCollect_total()));
}
if (vtGooglePlayerAdapter != null) {
vtGooglePlayerAdapter.setShortVideoInfo(shortVideoInfo);
@ -469,15 +480,20 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (it != null) {
AppCompatImageView imageView = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.iv_collection_controller) : null;
AppCompatTextView textview = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.tv_collection_num_controller) : null;
AppCompatImageView imageViewTop = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.player_view_top).findViewById(R.id.iv_collection_controller) : null;
AppCompatTextView textviewTop = pageGoogleExoPlayerView() != null ? pageGoogleExoPlayerView().findViewById(R.id.player_view_top).findViewById(R.id.tv_collection_num_controller) : null;
if (shortVideoInfo != null) {
shortVideoInfo.setIs_collect(false);
shortVideoInfo.setCollect_total(shortVideoInfo.getCollect_total() - 1);
}
if (imageView != null) {
imageView.setImageResource(R.mipmap.launcher_preference);
imageViewTop.setImageResource(R.mipmap.launcher_preference);
}
if (textview != null && shortVideoInfo != null) {
textview.setText(TimeUtils.formatNumber(shortVideoInfo.getCollect_total()));
textviewTop.setText(TimeUtils.formatNumber(shortVideoInfo.getCollect_total()));
}
EventBus.getDefault().post(new ZEpisodeEpisode<>(ITItem.Constants_Episodes_Series_DataExample, shortVideoInfo));
} else {
@ -534,9 +550,11 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
}
private void detailRefresh() {
if (pageGoogleExoPlayerView() != null) pageGoogleExoPlayerView().suspendPlayer();
if (pageGoogleExoPlayerView() != null) pageGoogleExoPlayerView().stop();
if (pageGoogleExoPlayerView() != null) pageGoogleExoPlayerView().release();
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().suspendPlayer();
pageGoogleExoPlayerView().stop();
pageGoogleExoPlayerView().release();
}
LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
if (item != null) {
vtViewModel.getVideoDetails(item.getShort_play_id(), item.getShort_play_video_id(), activity_id);
@ -607,6 +625,12 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
return (BVXHeadView) Objects.requireNonNull(recyclerView.getLayoutManager()).findViewByPosition(currentPosition);
}
private BVXHeadView lastpageGoogleExoPlayerView(int lastposition) {
RecyclerView recyclerView = (RecyclerView) viewBinding.viewPagerVtEpisode.getChildAt(0);
return (BVXHeadView) Objects.requireNonNull(recyclerView.getLayoutManager()).findViewByPosition(lastposition);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void onEvent(String event) {
// 处理事件
@ -629,6 +653,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
}
if (ITItem.Constants_Google_PLAYER_STATUS_FINISH_DETAIL.equals(event)) {
LogUtils.d("播放到最后===");
if (viewBinding.viewPagerVtEpisode.getCurrentItem() == vtGooglePlayerAdapter.getItems().size() - 1) {
//播放到最后
vtViewModel.getDetailsRecommand();
@ -649,6 +674,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (nextPosition < vtGooglePlayerAdapter.getItems().size()) {
LSQExampleCloseBean.YPZTestUnselect episode = vtGooglePlayerAdapter.getItems().get(nextPosition);
ITItem.isLock = episode.isIs_lock();
LogUtils.d("isLock==" + ITItem.isLock);
}
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().stop();
@ -658,7 +684,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
}
needRestart = true;
if (activity_id != 0) {
LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition - 1);
if (item != null) {
vtViewModel.activeAfterWatchingVideo(item.getShort_play_id(), item.getShort_play_video_id(), activity_id);
EventBus.getDefault()
@ -690,6 +716,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
rechargeDialog(currentItem);
}
}
ITItem.isLock = true;
viewBinding.viewLock.getRoot().setVisibility(VISIBLE);
}
}
@ -706,9 +733,10 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
if (duration > 3000) {
vtViewModel.getDetailsRecommand();
viewBinding.viewPagerVtEpisode.post(() -> {
if (pageGoogleExoPlayerView() != null)
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().suspendPlayer();
if (pageGoogleExoPlayerView() != null) pageGoogleExoPlayerView().release();
pageGoogleExoPlayerView().release();
}
viewBinding.viewPagerVtEpisode.setVisibility(GONE);
viewBinding.cover.setVisibility(VISIBLE);
@ -757,12 +785,14 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
@Override
protected void onDestroy() {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
zytGooglePayUtils.clearInstance();
ITItem.isCanPlay = false;
viewBinding.viewPagerVtEpisode.post(new Runnable() {
@Override
public void run() {
if (pageGoogleExoPlayerView() != null) {
LogUtils.d("pageGoogleExoPlayerView() != null");
LogUtils.d("player != null");
pageGoogleExoPlayerView().stop();
pageGoogleExoPlayerView().release();
pageGoogleExoPlayerView().setPlayerNull();
@ -772,8 +802,6 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
player = null;
}
});
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
zytGooglePayUtils.clearInstance();
super.onDestroy();
EventBus.getDefault().unregister(this);
System.gc();
@ -801,11 +829,16 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
@Override
public void chooseEpisodesSeries(LSQExampleCloseBean.YPZTestUnselect bean) {
ITItem.isLock = bean.isIs_lock();
if (pageGoogleExoPlayerView() != null) {
pageGoogleExoPlayerView().suspendPlayer();
// if (pageGoogleExoPlayerView() != null) {
// pageGoogleExoPlayerView().suspendPlayer();
// }
LogUtils.d("chooseEpisodesSeries " + (bean.getEpisode() - 1) + " " + currentPosition);
if ((bean.getEpisode() - 1) == currentPosition && bean.isIs_lock()) {
showLockView(bean);
}
viewBinding.viewPagerVtEpisode.setCurrentItem(bean.getEpisode() - 1);
}

View File

@ -7,6 +7,7 @@ import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.SeekBar;
@ -47,7 +48,8 @@ public class BVXHeadView extends FrameLayout {
private boolean isDragging = false;
private AppCompatSeekBar seekBar;
private AppCompatImageView ivCoverPlayerDetail;
private ImageView ivCoverPlayerDetail;
private ImageView cover;
private AppCompatImageView ivPagePlay;
private AppCompatImageView iv_collection_controller;
private AppCompatImageView iv_back_hibit_episode;
@ -64,7 +66,9 @@ public class BVXHeadView extends FrameLayout {
private RelativeLayout rl_ep;
private boolean isEpisodePlaying = false;
private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
private KbvFollowUnitBinding bind;
// private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
@OptIn(markerClass = UnstableApi.class)
public BVXHeadView(Context context, AttributeSet attrs) {
@ -72,7 +76,7 @@ public class BVXHeadView extends FrameLayout {
player = new ExoPlayer.Builder(context).setMediaSourceFactory(new DefaultMediaSourceFactory(GSExplayCacheUtils.getCacheFactory(context))).build();
LayoutInflater inflater = LayoutInflater.from(context);
View inflate = inflater.inflate(R.layout.kbv_follow_unit, this, true);
KbvFollowUnitBinding bind = KbvFollowUnitBinding.bind(inflate);
bind = KbvFollowUnitBinding.bind(inflate);
bind.playerView.setPlayer(player);
seekBar = bind.playerView.findViewById(R.id.seekBar_player_detail);
ivCoverPlayerDetail = bind.playerView.findViewById(R.id.iv_cover_player_detail);
@ -90,6 +94,10 @@ public class BVXHeadView extends FrameLayout {
iv_back_hibit_episode.setOnClickListener(v ->
EventBus.getDefault().post(ITItem.Constants_RecommendPlayerView_CLOSEExample)
);
bind.playerViewTop.ivBackVtEpisode.setOnClickListener(v -> {
EventBus.getDefault().post(ITItem.Constants_RecommendPlayerView_CLOSEExample);
});
tv_collection_num_controller = bind.playerView.findViewById(R.id.tv_collection_num_controller);
tv_title_hibit_episode = bind.playerView.findViewById(R.id.tv_title_vt_episode);
@ -106,7 +114,8 @@ public class BVXHeadView extends FrameLayout {
break;
case Player.STATE_READY:
bind.playerView.setEnabled(true);
if (ITItem.isCanPlay && !ITItem.isLock) {
LogUtils.d("start ==" + ITItem.isLock);
if (ITItem.isCanPlay && !mediaItem.isIs_lock()) {
start();
setProgress();
}
@ -127,7 +136,7 @@ public class BVXHeadView extends FrameLayout {
@Override
public void onPlayerError(PlaybackException error) {
Player.Listener.super.onPlayerError(error);
ivCoverPlayerDetail.setVisibility(View.INVISIBLE);
ivCoverPlayerDetail.setVisibility(View.VISIBLE);
load_line.setVisibility(INVISIBLE);
if (XYBGoryShare.translates() != null) {
PAYLoginHeaddefault.revealToast(XYBGoryShare.translates().getNetwork_error(), 0);
@ -137,13 +146,25 @@ public class BVXHeadView extends FrameLayout {
}
});
bind.playerViewTop.ivVtPlay.setOnClickListener(v -> {
if (!ITItem.isLock) {
if (isEpisodePlaying) {
ivPagePlay.setImageResource(R.mipmap.cate_playinfo);
suspendPlayer();
} else {
ivPagePlay.setImageResource(R.mipmap.search_tablist_service);
start();
}
} else {
EventBus.getDefault().post(ITItem.Constants_Clock_Click);
}
});
ivPagePlay.setOnClickListener(v -> {
if (!ITItem.isLock) {
if (isEpisodePlaying) {
ivPagePlay.setImageResource(R.mipmap.cate_playinfo);
suspendPlayer();
} else {
ivPagePlay.setImageResource(R.mipmap.search_tablist_service);
start();
}
@ -167,7 +188,7 @@ public class BVXHeadView extends FrameLayout {
progressRunnable = new Runnable() {
@Override
public void run() {
if (!isDragging&&player!=null) {
if (!isDragging && player != null) {
long duration = player.getDuration();
long position = player.getCurrentPosition();
int progress = (int) (position * 100 / (duration == C.TIME_UNSET ? 1 : duration));
@ -263,6 +284,7 @@ public class BVXHeadView extends FrameLayout {
}
private void start() {
LogUtils.d("player start");
player.play();
ivPagePlay.setImageResource(R.mipmap.search_tablist_service);
isEpisodePlaying = true;
@ -270,7 +292,8 @@ public class BVXHeadView extends FrameLayout {
}
public void suspendPlayer() {
if(player!=null){
if (player != null) {
LogUtils.d("player pause");
player.pause();
ivPagePlay.setImageResource(R.mipmap.cate_playinfo);
isEpisodePlaying = false;
@ -284,8 +307,17 @@ public class BVXHeadView extends FrameLayout {
player.seekTo(duration * progress / 100);
}
public void setLoadCoverImage(String url) {
Glide.with(this).load(url).into(ivCoverPlayerDetail);
}
public LSQExampleCloseBean.YPZTestUnselect mediaItem;
public void setMedia(LSQExampleCloseBean.YPZTestUnselect bean, LSQExampleCloseBean.YSearchUser shortVideoInfo) {
ITItem.isCanPlay = true;
ITItem.isLock = bean.isIs_lock();
mediaItem = bean;
LogUtils.d("isLock==" + ITItem.isLock);
tv_title_player.setText(shortVideoInfo.getName());
if (XYBGoryShare.translates() != null) {
tv_title_hibit_episode.setText(XYBGoryShare.replace(
@ -297,13 +329,16 @@ public class BVXHeadView extends FrameLayout {
String.valueOf(shortVideoInfo.getEpisode_total())));
} else {
tv_title_hibit_episode.setText(GPplicationLoadingdefault.getAppContext().getString(R.string.episode_txt) + (bean.getEpisode() + " / " + shortVideoInfo.getName()));
bind.playerViewTop.tvTitleVtEpisode.setText(GPplicationLoadingdefault.getAppContext().getString(R.string.episode_txt) + (bean.getEpisode() + " / " + shortVideoInfo.getName()));
tv_episode_player.setText("Complete set : ".concat(String.valueOf(shortVideoInfo.getEpisode_total())));
}
// tv_episode_playertotal.setText(String.valueOf(shortVideoInfo.getEpisode_total()));
tv_des_player.setText(shortVideoInfo.getDescription());
Glide.with(getContext()).load(shortVideoInfo.getImage_url()).into(ivCoverPlayerDetail);
ivCoverPlayerDetail.setVisibility(View.VISIBLE);
iv_collection_controller.setImageResource(shortVideoInfo.isIs_collect() ? R.mipmap.banner_ffffff : R.mipmap.launcher_preference);
bind.playerViewTop.ivCollectionController.setImageResource(shortVideoInfo.isIs_collect() ? R.mipmap.banner_ffffff : R.mipmap.launcher_preference);
tv_collection_num_controller.setText(TimeUtils.formatNumber(shortVideoInfo.getCollect_total()));
rl_ep.setOnClickListener(v ->
EventBus.getDefault().post(ITItem.Constants_PlayerView_MoreItemEvent)
@ -311,11 +346,24 @@ public class BVXHeadView extends FrameLayout {
iv_episode_playertotal.setOnClickListener(v ->
EventBus.getDefault().post(ITItem.Constants_PlayerView_MoreItemEvent)
);
player.setMediaItem(MediaItem.fromUri(Uri.parse(bean.getVideo_url())));
player.prepare();
bind.playerViewTop.ivEpisodesController.setOnClickListener(v -> {
EventBus.getDefault().post(ITItem.Constants_PlayerView_MoreItemEvent);
});
if (!bean.isIs_lock()) {
bind.playerViewTop.getRoot().setVisibility(GONE);
player.setMediaItem(MediaItem.fromUri(Uri.parse(bean.getVideo_url())));
player.prepare();
} else {
bind.playerViewTop.getRoot().setVisibility(VISIBLE);
}
// player.setMediaItem(MediaItem.fromUri(Uri.parse(bean.getVideo_url())));
// player.prepare();
}
public void stop() {
LogUtils.d("player stop");
player.stop();
if (progressJob != null) {
progressJob.cancel(true);
@ -324,11 +372,13 @@ public class BVXHeadView extends FrameLayout {
}
public void release() {
LogUtils.d("player release");
stopProgressJob();
player.release();
}
public void setPlayerNull(){
player=null;
public void setPlayerNull() {
LogUtils.d("player null" + player.isReleased());
player = null;
}
}

View File

@ -886,7 +886,7 @@ public class XCcountView extends FrameLayout {
public void setMedia(DBeanUnselectBean bean) {
ITItem.isLock = false;
long llvidencdspBatches = this.dismissParsePoolStorage(5303);
if (llvidencdspBatches > 31) {

View File

@ -9,15 +9,16 @@ import java.util.ArrayList;
import java.util.HashMap;
import android.content.Context;
import android.view.ViewGroup;
import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.media3.ui.PlayerView;
import com.bumptech.glide.Glide;
import com.chad.library.adapter4.BaseQuickAdapter;
import com.chad.library.adapter4.viewholder.QuickViewHolder;
import com.shortdrama.jelly.zyreotv.R;
@ -25,10 +26,6 @@ import com.shortdrama.jelly.zyreotv.topics.amera.BVXHeadView;
import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.LSQExampleCloseBean;
public class WVideoplay
extends BaseQuickAdapter<LSQExampleCloseBean.YPZTestUnselect, QuickViewHolder> {
@ -42,9 +39,10 @@ public class WVideoplay
public void setPlayerDetailCollection(QUnitActivity playerDetailCollection) {
this.playerDetailCollection = playerDetailCollection;
float backgroundw = 3578.0f;
if (backgroundw >= 188) {}
System.out.println(backgroundw);
float backgroundw = 3578.0f;
if (backgroundw >= 188) {
}
System.out.println(backgroundw);
}
public int currentEpisodePlayingPosition = 0;
@ -57,13 +55,14 @@ public class WVideoplay
public void setCurrentEpisodePlayingPosition(int currentEpisodePlayingPosition) {
this.currentEpisodePlayingPosition = currentEpisodePlayingPosition;
ArrayList<Integer> keyv = new ArrayList<Integer>();
keyv.add(119);
keyv.add(179);
keyv.add(456);
keyv.add(794);
keyv.add(57);
if (keyv.contains("X")) {}
ArrayList<Integer> keyv = new ArrayList<Integer>();
keyv.add(119);
keyv.add(179);
keyv.add(456);
keyv.add(794);
keyv.add(57);
if (keyv.contains("X")) {
}
}
public LSQExampleCloseBean.YSearchUser getShortVideoInfo() {
@ -72,55 +71,83 @@ public class WVideoplay
public void setShortVideoInfo(LSQExampleCloseBean.YSearchUser shortVideoInfo) {
this.shortVideoInfo = shortVideoInfo;
HashMap<String,Integer> squarea = new HashMap<String,Integer>();
squarea.put("fraction", 261);
squarea.put("parent", 63);
squarea.put("preamble", 377);
squarea.put("clearbit", 952);
squarea.put("biguint", 782);
squarea.put("nhance", 268);
while (squarea.size() > 116) { break; }
HashMap<String, Integer> squarea = new HashMap<String, Integer>();
squarea.put("fraction", 261);
squarea.put("parent", 63);
squarea.put("preamble", 377);
squarea.put("clearbit", 952);
squarea.put("biguint", 782);
squarea.put("nhance", 268);
while (squarea.size() > 116) {
break;
}
}
@NonNull
@Override
protected QuickViewHolder onCreateViewHolder(@NonNull Context context, @NonNull ViewGroup viewGroup, int i) {
return new QuickViewHolder(R.layout.lqa_episodes,viewGroup);
return new QuickViewHolder(R.layout.lqa_episodes, viewGroup);
}
@Override
protected void onBindViewHolder(@NonNull QuickViewHolder holder, int position, @Nullable LSQExampleCloseBean.YPZTestUnselect episode) {
BVXHeadView browsing = (BVXHeadView) holder.getView(R.id.page_google_exo_player);
double stopB = 4987.0;
while (stopB < 89) { break; }
System.out.println(stopB);
double stopB = 4987.0;
while (stopB < 89) {
break;
}
System.out.println(stopB);
PlayerView square = browsing.findViewById(R.id.player_view);
ArrayList<Boolean> anner6 = new ArrayList<Boolean>();
anner6.add(true);
anner6.add(true);
anner6.add(false);
anner6.add(true);
System.out.println(anner6);
ImageView imageViewCover = browsing.findViewById(R.id.player_view_top).findViewById(R.id.iv_cover_player_detail);
Glide.with(holder.itemView.getContext()).load(shortVideoInfo.getImage_url()).into(imageViewCover);
ArrayList<Boolean> anner6 = new ArrayList<Boolean>();
anner6.add(true);
anner6.add(true);
anner6.add(false);
anner6.add(true);
System.out.println(anner6);
browsing.setLoadCoverImage(shortVideoInfo.getImage_url());
AppCompatImageView free = square.findViewById(R.id.iv_collection_controller);
float pplicationD = 7470.0f;
if (pplicationD > 186) {}
System.out.println(pplicationD);
float pplicationD = 7470.0f;
if (pplicationD > 186) {
}
System.out.println(pplicationD);
free.setOnClickListener(v -> {
if (playerDetailCollection != null) {
playerDetailCollection.collection(episode);
long tabindicatorY = 9737L;
if (tabindicatorY < 139) {}
long tabindicatorY = 9737L;
if (tabindicatorY < 139) {
}
}
});
browsing.findViewById(R.id.player_view_top).findViewById(R.id.iv_collection_controller).setOnClickListener(v -> {
if (playerDetailCollection != null) {
playerDetailCollection.collection(episode);
long tabindicatorY = 9737L;
if (tabindicatorY < 139) {
}
}
});
// AppCompatImageView cover = browsing.findViewById(R.id.player_topview).findViewById(R.id.iv_cover_player_detail);
// Glide.with(holder.itemView.getContext()).load(shortVideoInfo.getImage_url()).into(cover);
if (position == currentEpisodePlayingPosition) {
browsing.setMedia(episode, shortVideoInfo);
int settingso = 4537;
if (settingso <= 160) {}
if (settingso <= 160) {
}
} else {
browsing.stop();
boolean pullingC = false;
while (!pullingC) { break; }
while (!pullingC) {
break;
}
}
}

View File

@ -9,6 +9,7 @@ import static android.view.View.VISIBLE;
import android.content.Context;
import com.shortdrama.jelly.zyreotv.beginning.TimeUtils;
import com.shortdrama.jelly.zyreotv.databinding.ItemMywalletRecordsListZytBinding;
import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTUserBuyRecordsBean;
import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTUserSendCoinsBean;
@ -45,7 +46,7 @@ public class ZYTCommonRecordsAdapter<T>
name = "Purchase Single Episode";
time = buyRecordsBean.getCreated_at();
value = "+" + buyRecordsBean.getCoins();
des = "Ep." + buyRecordsBean.getEpisode() +" "+ buyRecordsBean.getName();
des = "Ep." + buyRecordsBean.getEpisode() + " " + buyRecordsBean.getName();
}
if (data instanceof ZYTUserSendCoinsBean) {
@ -53,13 +54,14 @@ public class ZYTCommonRecordsAdapter<T>
name = sendCoinsBean.getType();
time = sendCoinsBean.getCreated_at();
value = "+" + sendCoinsBean.getCoins();
des = "Expires in "+sendCoinsBean.getDiff_datetime();
}
if (data instanceof ZYTUserTypeRecordsBean) {
ZYTUserTypeRecordsBean typeRecordsBean = (ZYTUserTypeRecordsBean) data;
name = typeRecordsBean.getType();
time = typeRecordsBean.getCreated_at();
value = "+" + typeRecordsBean.getValue();
if (name.equals("vip") || name.equals("sub_vip")||name.equals("Subscribe or Renew")) {
if (name.equals("vip") || name.equals("sub_vip") || name.equals("Subscribe or Renew")) {
name = "Purchase VIP";
binding.ivMywalletGoldItem.setVisibility(GONE);
value = "+" + typeRecordsBean.getValue();

View File

@ -1,6 +1,7 @@
package com.shortdrama.jelly.zyreotv.topics.dts;
import android.content.Context;
import android.view.View;
import android.view.ViewGroup;
import androidx.appcompat.widget.AppCompatTextView;
@ -9,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
import com.chad.library.adapter4.BaseQuickAdapter;
import com.chad.library.adapter4.viewholder.QuickViewHolder;
import com.shortdrama.jelly.zyreotv.R;
import com.shortdrama.jelly.zyreotv.beginning.TimeUtils;
import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean;
@ -28,12 +30,20 @@ public class ZYTStoreGoldRechargeAdapter extends BaseQuickAdapter<ZYTPaySettingB
ConstraintLayout root = holder.getView(R.id.layout_store_root_item);
AppCompatTextView tvCoins = holder.getView(R.id.tv_store_coins_item);
AppCompatTextView tvLimited = holder.getView(R.id.tv_store_coins_limited_item);
AppCompatTextView tvPercent = holder.getView(R.id.tv_store_coins_item_percent);
AppCompatTextView tvCoinsSend = holder.getView(R.id.tv_store_coins_add_item);
AppCompatTextView tvCoinPrice = holder.getView(R.id.tv_store_coins_price_item);
// tvLimited.setVisibility(GONE);
// if (position == 0) {
// tvLimited.setVisibility(VISIBLE);
// }
if (item.getSend_coins() <= 0) {
tvPercent.setVisibility(View.GONE);
} else {
tvPercent.setVisibility(View.VISIBLE);
tvPercent.setText(TimeUtils.precess(item.getSend_coins(), item.getCoins()) + "%");
}
root.setBackgroundResource(R.drawable.cornor_ffffff_gradient_10dp);
if (position == currentPosition) {
root.setBackgroundResource(R.drawable.cornor_f564b6_gradient_10dp);

View File

@ -37,7 +37,7 @@ public class ZYTStoreSubVipAdapter extends BaseQuickAdapter<ZYTPaySettingBean.Vi
tvPrice.setText(item.getPrice() + "");
tvVipType.setText("/" + item.getVip_type() + "");
tvDesc.setText(item.getDescription() + "");
tvDonateCoins.setText("+Extra " + item.getCoins());
tvDonateCoins.setText("+Extra " + item.getSend_coins());
}

View File

@ -5,7 +5,7 @@ public class ZYTUserSendCoinsBean {
public int coins;
public String created_at;
public String diff_datetime;
public int expired_time;
public long expired_time;
public int id;
public int is_effective;
@ -36,11 +36,11 @@ public class ZYTUserSendCoinsBean {
this.diff_datetime = diff_datetime;
}
public int getExpired_time() {
public long getExpired_time() {
return expired_time;
}
public void setExpired_time(int expired_time) {
public void setExpired_time(long expired_time) {
this.expired_time = expired_time;
}

View File

@ -4,12 +4,27 @@
android:id="@+id/layout_store_root_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/agreementLock"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/agreementLock"
app:layout_constraintEnd_toEndOf="parent">
android:layout_marginEnd="@dimen/agreementLock"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
app:layout_constraintRight_toRightOf="parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/cornor_f564b6_left_right_10dp"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="6dp"
android:paddingBottom="2dp"
android:visibility="gone"
android:id="@+id/tv_store_coins_item_percent"
android:textColor="@android:color/white"
android:textSize="11sp" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_store_coins_item"
android:layout_width="wrap_content"
@ -18,9 +33,9 @@
android:layout_marginTop="@dimen/followHistoryOllow"
android:drawableStart="@mipmap/ic_mywallet_coins"
android:drawablePadding="@dimen/cateSplash"
android:gravity="center_vertical"
android:textColor="@android:color/white"
android:textSize="@dimen/pisodesPisodesNine"
android:gravity="center_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@ -9,11 +9,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
app:controller_layout_id="@layout/rkh_default"
app:resize_mode="zoom" />
app:resize_mode="zoom"
app:use_controller="true" />
<ImageView
android:layout_width="0dp"
android:layout_height="0dp"
android:background="#726139"
android:visibility="visible" />
<include
android:id="@+id/player_view_top"
layout="@layout/rkh_default"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="match_parent" />
</FrameLayout>

View File

@ -5,7 +5,7 @@
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatImageView
<ImageView
android:id="@+id/iv_cover_player_detail"
android:layout_width="match_parent"
android:layout_height="match_parent"