From afc4e207f886d95c9e71811a221107ce5f292649 Mon Sep 17 00:00:00 2001 From: guozhen Date: Mon, 12 May 2025 18:25:28 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug,=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jelly/zyreotv/beginning/TimeUtils.java | 26 ++++++ .../jelly/zyreotv/dlsym/PVideoplayRules.java | 2 - .../abslRwgt/app/GSLanguageActivity.java | 3 +- .../topics/abslRwgt/app/GSLoginActivity.java | 72 ++++++++++++--- .../abslRwgt/app/ZYTSettingActivity.java | 11 ++- .../abslRwgt/decbn/GSPlayListActivity.java | 78 ++++++++++++++-- .../movepage/VItemGradlewFragment.java | 4 +- .../ZYTEpisodesRechargeDialogFragment.java | 24 ++++- .../abslRwgt/web/ZYTWebViewIndexActivity.java | 23 ++++- .../zyreotv/topics/amera/BVXHeadView.java | 13 ++- .../topics/dts/GSPlayListRootAdapter.java | 87 ++++++++++++++++++ .../GSPlayListRootBean.java | 31 +++++++ .../GSTranslatesBean.java | 28 ++++++ app/src/main/res/drawable/g_about.xml | 6 +- app/src/main/res/drawable/ne_edit_ezier.xml | 3 +- app/src/main/res/layout/activity_language.xml | 12 ++- app/src/main/res/layout/activity_login.xml | 17 ++++ .../main/res/layout/activity_playlist_gs.xml | 2 + .../main/res/layout/activity_setting_zyt.xml | 2 +- .../layout/item_mywallet_records_list_zyt.xml | 8 +- .../main/res/layout/item_playlist_root.xml | 25 +++++ app/src/main/res/layout/rkh_default.xml | 9 ++ .../main/res/layout/tej_manifest_launcher.xml | 70 ++++++++------ .../res/mipmap-xxhdpi/ic_playlist_time.png | Bin 0 -> 1697 bytes app/src/main/res/values/strings.xml | 2 +- 25 files changed, 485 insertions(+), 73 deletions(-) create mode 100644 app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSPlayListRootAdapter.java create mode 100644 app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSPlayListRootBean.java create mode 100644 app/src/main/res/layout/item_playlist_root.xml create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_playlist_time.png diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TimeUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TimeUtils.java index caa186d..c5ad10f 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TimeUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TimeUtils.java @@ -48,6 +48,17 @@ public class TimeUtils { } + public static long strToTime(String data) { + try { + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Date date = simpleDateFormat.parse(data); + return date.getTime(); + } catch (Exception e) { + return 0; + } + + } + public static String transToString(Long time) { Date date = new Date(time * 1000); return new SimpleDateFormat("yyyy-MM-dd").format(date); @@ -114,4 +125,19 @@ public class TimeUtils { return true; } } + + + //毫秒 + public static String parseSecond(long currentSecond, long totalSecond) { + + String total = "00:00"; + String current = String.format("%02d", (currentSecond / 1000 / 60)) + ":" + String.format("%02d", (currentSecond / 1000) % 60); + if (totalSecond > 0) { + total = String.format("%02d", (totalSecond / 1000 / 60)) + ":" + String.format("%02d", (totalSecond / 1000) % 60); + } + + + return current + "/" + total; + + } } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/PVideoplayRules.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/PVideoplayRules.java index 8f9c7fb..43175d7 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/PVideoplayRules.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/PVideoplayRules.java @@ -31,8 +31,6 @@ public class PVideoplayRules implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { - LogUtils.d("auth" + TIndicator.getString(TIndicator.auth, "")); - Request request = chain.request().newBuilder() .addHeader("Content-Type", "application/json") .addHeader("authorization", TIndicator.getString(TIndicator.auth, "")) diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java index 0028f15..bb4d3dc 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLanguageActivity.java @@ -53,6 +53,7 @@ public class GSLanguageActivity extends IDDetailsRoundActivity { - + binding.loading.hide(); if (response != null && response.data != null) { gsLanguageAdapter.submitList(response.data.getList()); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLoginActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLoginActivity.java index 3fa05db..42ed9c9 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLoginActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/GSLoginActivity.java @@ -5,10 +5,16 @@ import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Re import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_User_Refresh_Event; import android.content.Intent; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.text.SpannableString; +import android.text.Spanned; +import android.text.TextPaint; +import android.text.method.LinkMovementMethod; +import android.text.style.ClickableSpan; import android.text.style.UnderlineSpan; +import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -67,26 +73,64 @@ public class GSLoginActivity extends IDDetailsRoundActivity { - LRewards.startWebViewActivity(GSLoginActivity.this, KGZyreotv.GleeStream_USERAgreement, getResources().getString(R.string.userVideoSettings), ZYTWebViewIndexActivity.class); + @Override + public void updateDrawState(@NonNull TextPaint ds) { + super.updateDrawState(ds); + ds.setColor(Color.parseColor("#888888")); + } + }; - }); - binding.tvPrivatePolicy.setOnClickListener(v -> { - LRewards.startWebViewActivity(GSLoginActivity.this, KGZyreotv.GleeStream_Private, getResources().getString(R.string.stopSelect), ZYTWebViewIndexActivity.class); - }); + + + ClickableSpan privacyClick = new ClickableSpan() { + @Override + public void onClick(@NonNull View widget) { + LRewards.startWebViewActivity(GSLoginActivity.this, KGZyreotv.GleeStream_USERAgreement, total.toString().substring(startprivacy, endprivacy), ZYTWebViewIndexActivity.class); + } + + @Override + public void updateDrawState(@NonNull TextPaint ds) { + super.updateDrawState(ds); + ds.setColor(Color.parseColor("#888888")); + } + }; + // privacyClick.updateDrawState(userPaint); + + spannableString.setSpan(userClick, startUser, endUser, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + spannableString.setSpan(privacyClick, startprivacy, endprivacy, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); +// spannableString.setSpan(new UnderlineSpan(), useragreementIndex - userAgreement.length(), useragreementIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); +// spannableString.setSpan(new UnderlineSpan(), total.toString().indexOf("&"), total.toString().length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + + binding.tvLoginAgreetotal.setHighlightColor(Color.TRANSPARENT); + binding.tvLoginAgreetotal.setText(spannableString); + binding.tvLoginAgreetotal.setMovementMethod(LinkMovementMethod.getInstance()); +// binding.tvLoginAgreetotal.setHighlightColor(Color.TRANSPARENT); +// binding.tvUserAgreement.setText(spannableString); +// binding.tvPrivatePolicy.setText(spannableString2); +// binding.tvUserAgreement.setOnClickListener(v -> { +// LRewards.startWebViewActivity(GSLoginActivity.this, KGZyreotv.GleeStream_USERAgreement, getResources().getString(R.string.userVideoSettings), ZYTWebViewIndexActivity.class); +// +// }); +// binding.tvPrivatePolicy.setOnClickListener(v -> { +// LRewards.startWebViewActivity(GSLoginActivity.this, KGZyreotv.GleeStream_Private, getResources().getString(R.string.stopSelect), ZYTWebViewIndexActivity.class); +// }); binding.layoutLoginFace.setOnClickListener(v -> { WCenterVideo.singleClick(new Runnable() { diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/ZYTSettingActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/ZYTSettingActivity.java index 1219ca7..e1fdcc3 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/ZYTSettingActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/app/ZYTSettingActivity.java @@ -1,5 +1,6 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.app; +import static android.view.View.GONE; import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Refresh_Event; import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_User_Refresh_Event; import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppEnter; @@ -60,6 +61,11 @@ public class ZYTSettingActivity extends IDDetailsRoundActivity finish()); binding.tvSettingLoginout.setOnClickListener(v -> { if (!TIndicator.isTourist()) { @@ -75,6 +81,9 @@ public class ZYTSettingActivity extends IDDetailsRoundActivity { + }); binding.tvSettingNotify.setOnClickListener(v -> { boolean isOpen = NotifyUtils.isNotificationEnable(ZYTSettingActivity.this); @@ -138,7 +147,7 @@ public class ZYTSettingActivity extends IDDetailsRoundActivity { @@ -39,6 +49,9 @@ public class GSPlayListActivity extends IDDetailsRoundActivity listrootdata = new ArrayList<>(); + + private GSTranslatesBean.Translates translates; @Override public void init() { @@ -53,19 +66,17 @@ public class GSPlayListActivity extends IDDetailsRoundActivity { finish(); }); - GSTranslatesBean.Translates translates = AppUtils.getTranslates(); - if(translates!=null){ + translates = AppUtils.getTranslates(); + if (translates != null) { binding.layoutPlaylistActionbar.tvToptitle.setText(translates.getGleestream_playlist()); - }else{ + } else { binding.layoutPlaylistActionbar.tvToptitle.setText("Play List"); } initData(); binding.recyclerviewPlaylist.setLayoutManager(new GridLayoutManager(this, 3)); adapter = new BAVideoIndicator(this, QyvHeaddefaultBinding.class); - adapter.setItemClickListener((data, holder) -> { - LRewards.startPlayerDetails(this, data.getShort_play_id(), 0); - }); + adapter.setItemClickListener((data, holder) -> LRewards.startPlayerDetails(GSPlayListActivity.this, data.getShort_play_id(), 0)); binding.recyclerviewPlaylist.setAdapter(adapter); binding.ivPlaylistEmpty.setOnClickListener(v -> initData()); initSmartRefreshLayout(); @@ -90,6 +101,54 @@ public class GSPlayListActivity extends IDDetailsRoundActivity listToday = new ArrayList<>(); + private List listYes = new ArrayList<>(); + private List listEarlier = new ArrayList<>(); + + private Map> listMap = new HashMap<>(); + + private void setRootData(List list) { + if (currentPage == 1) { + listrootdata.clear(); + listToday.clear(); + listYes.clear(); + listEarlier.clear(); + listMap.clear(); + } + for (KLAnnerBean item : list) { + long time = TimeUtils.strToTime(item.getUpdated_at()); + long current = System.currentTimeMillis(); + String titletime; + LogUtils.d("item updated_ad " + item.getUpdated_at() + " time==" + time + " currenttime==" + current); + if (current - time <= (24 * 60 * 60 * 1000)) { + titletime = (translates != null ? translates.getGleestream_today() : "Today"); + listToday.add(listToday.size(), item); + listMap.put(titletime, listToday); + } else if (current - time <= (24 * 60 * 60 * 1000) * 2) { + titletime = (translates != null ? translates.getGleestream_yesterday() : "Yesterday"); + listYes.add(listYes.size(), item); + listMap.put(titletime, listYes); + } else { + titletime = (translates != null ? translates.getGleestream_earlier() : "Earlier"); + listEarlier.add(listEarlier.size(), item); + listMap.put(titletime, listEarlier); + } + + } + + for (String key : listMap.keySet()) { + listrootdata.add(new GSPlayListRootBean(key, listMap.get(key))); + } + + } + + public void addLastData(List list) { + GSPlayListRootBean item = listrootdata.get(listrootdata.size() - 1); + listMap.get(item.getTime()).addAll(list); + listrootdata.add(new GSPlayListRootBean(item.getTime(), list)); + } + + @Override public void logic() { userViewModel.getUserVideoHistoryLiveData().observe(this, IMACloseStroke -> { @@ -97,7 +156,14 @@ public class GSPlayListActivity extends IDDetailsRoundActivity feedbackResp) { + loadingdefaultRunning.loading.hide(); if (feedbackResp.data != null) { List KLAnnerBeans = feedbackResp.data.getCategory(); int indicatorO = 1949; @@ -137,7 +139,7 @@ public class VItemGradlewFragment extends Fragment { @Override public void onError(int code, String msg) { - + loadingdefaultRunning.loading.hide(); } }); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java index efd0d80..a8413d4 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import com.android.billingclient.api.BillingClient; +import com.shortdrama.jelly.zyreotv.beginning.AppUtils; import com.shortdrama.jelly.zyreotv.beginning.ZYTGooglePayUtils; import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreSubVipAdapter; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; @@ -27,6 +28,7 @@ import com.shortdrama.jelly.zyreotv.beginning.TIndicator; import com.shortdrama.jelly.zyreotv.databinding.DialogPageEpisodesRechargeZytBinding; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn.GXCProgressLogin; import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreGoldRechargeAdapter; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.LSQExampleCloseBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean; @@ -71,6 +73,8 @@ public class ZYTEpisodesRechargeDialogFragment extends BottomSheetDialogFragment private OnDataItemPass dataPasser; + private GSTranslatesBean.Translates translates; + public void setDataPasser(OnDataItemPass dataPasser) { this.dataPasser = dataPasser; @@ -79,9 +83,23 @@ public class ZYTEpisodesRechargeDialogFragment extends BottomSheetDialogFragment @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()); - vtUserViewModel = new ViewModelProvider(this).get(GXCProgressLogin.class); dialogRechargeBinding = DialogPageEpisodesRechargeZytBinding.inflate(getLayoutInflater()); + AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()); + translates = AppUtils.getTranslates(); + if(translates!=null){ + dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setText(translates.getGleestream_coins()); + dialogRechargeBinding.layoutStoreRecharge.tvStoreMembership.setText(translates.getGleestream_membership()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce01.setText(translates.getGleestream_vip_introduct1()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce02.setText(translates.getGleestream_vip_introduct2()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce03.setText(translates.getGleestream_vip_introduct3()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce04.setText(translates.getGleestream_vip_introduct4()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce05.setText(translates.getGleestream_vip_introduct5()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce06.setText(translates.getGleestream_vip_introduct6()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce07.setText(translates.getGleestream_vip_introduct7()); + dialogRechargeBinding.layoutStoreRecharge.layoutVipIntroduct.tvMembershipIntroduce08.setText(translates.getGleestream_vip_introduct8()); + } + vtUserViewModel = new ViewModelProvider(this).get(GXCProgressLogin.class); + dialogRechargeBinding.avi.show(); zytGooglePayUtils.setqueryProductResult(new ZYTGooglePayUtils.QueryProductResult() { @Override @@ -116,7 +134,7 @@ public class ZYTEpisodesRechargeDialogFragment extends BottomSheetDialogFragment if (parcelable instanceof LSQExampleCloseBean.YPZTestUnselect) { episode = (LSQExampleCloseBean.YPZTestUnselect) parcelable; shorplayId = episode.getShort_play_id(); - dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setText(getString(R.string.coins_txt) + " " + episode.getCoins()); + dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setText((translates!=null?translates.getGleestream_coins():getString(R.string.coins_txt)) + " " + episode.getCoins()); vtUserViewModel.getPaySetting(shorplayId, episode.getShort_play_video_id()); dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsvalue.setText(Html.fromHtml(getString(R.string.store_coins, TIndicator.getAllCoin()), FROM_HTML_MODE_LEGACY)); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTWebViewIndexActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTWebViewIndexActivity.java index a68736e..54dc8c7 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTWebViewIndexActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTWebViewIndexActivity.java @@ -23,6 +23,8 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; +import androidx.activity.OnBackPressedCallback; +import androidx.activity.OnBackPressedDispatcher; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; @@ -135,11 +137,23 @@ public class ZYTWebViewIndexActivity extends IDDetailsRoundActivity { - LRewards.startWebViewActivity(this, KGZyreotv.GleeStream_Feedback_List, translates!=null?translates.getGleestream_feedback_list():"FeedBack List", ZYTFeedBackListActivity.class); + LRewards.startWebViewActivity(this, KGZyreotv.GleeStream_Feedback_List, translates != null ? translates.getGleestream_feedback_list() : "FeedBack List", ZYTFeedBackListActivity.class); + }); + + OnBackPressedDispatcher dispatcher = getOnBackPressedDispatcher(); + dispatcher.addCallback(this, new OnBackPressedCallback(true) { + + @Override + public void handleOnBackPressed() { + if (binding.webview.canGoBack()) { + binding.webview.goBack(); + } else { + finish(); + } + } }); } - WebChromeClient webChromeClient = new WebChromeClient() { @Override public void onProgressChanged(WebView view, int newProgress) { @@ -260,8 +274,8 @@ public class ZYTWebViewIndexActivity extends IDDetailsRoundActivity 0 && grantResults[0] == 0) { openFilePicker(); } else { - GSTranslatesBean.Translates translates= AppUtils.getTranslates(); - PAYLoginHeaddefault.revealToast(translates!=null?translates.getGleestream_permission_denied():"Permission Denied", 0); + GSTranslatesBean.Translates translates = AppUtils.getTranslates(); + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_permission_denied() : "Permission Denied", 0); } } @@ -285,6 +299,7 @@ public class ZYTWebViewIndexActivity extends IDDetailsRoundActivity EventBus.getDefault().post(ITItem.Constants_RecommendPlayerView_CLOSEExample) @@ -193,12 +196,13 @@ public class BVXHeadView extends FrameLayout { long duration = player.getDuration(); long position = player.getCurrentPosition(); int progress = (int) (position * 100 / (duration == C.TIME_UNSET ? 1 : duration)); + textSeconds.setText(TimeUtils.parseSecond(position, player.getDuration())); if (seekBar != null) { seekBar.setMax(100); seekBar.setProgress(progress + 1); } } - handler.postDelayed(this, 1000); // 每 1 秒执行一次 + handler.postDelayed(this, 500); // 每 1 秒执行一次 } }; handler.post(progressRunnable); // 启动 @@ -343,7 +347,7 @@ public class BVXHeadView extends FrameLayout { tv_des_player.setText(shortVideoInfo.getDescription()); Glide.with(getContext()).load(shortVideoInfo.getImage_url()).into(ivCoverPlayerDetail); - // ivCoverPlayerDetail.setVisibility(View.VISIBLE); + // 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())); @@ -360,6 +364,11 @@ public class BVXHeadView extends FrameLayout { bind.playerViewTop.getRoot().setVisibility(GONE); player.setMediaItem(MediaItem.fromUri(Uri.parse(bean.getVideo_url()))); player.prepare(); + if (mediaItem.getPlay_seconds() != 0) { + player.seekTo(mediaItem.getPlay_seconds()); + } + +// textSeconds.setText(TimeUtils.parseSecond(mediaItem.getPlay_seconds(), player.getDuration())); } else { bind.playerViewTop.getRoot().setVisibility(VISIBLE); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSPlayListRootAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSPlayListRootAdapter.java new file mode 100644 index 0000000..2e95c10 --- /dev/null +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/GSPlayListRootAdapter.java @@ -0,0 +1,87 @@ + +package com.shortdrama.jelly.zyreotv.topics.dts; + +import android.content.Context; + +import androidx.recyclerview.widget.GridLayoutManager; + +import com.bumptech.glide.Glide; +import com.bumptech.glide.load.engine.DiskCacheStrategy; +import com.bumptech.glide.request.RequestOptions; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.beginning.LRewards; +import com.shortdrama.jelly.zyreotv.beginning.LogUtils; +import com.shortdrama.jelly.zyreotv.beginning.TimeUtils; +import com.shortdrama.jelly.zyreotv.databinding.ItemPlaylistRootBinding; +import com.shortdrama.jelly.zyreotv.databinding.QyvHeaddefaultBinding; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSPlayListRootBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.KLAnnerBean; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Random; + + +public class GSPlayListRootAdapter + extends TGFollowlistAdapter { + + + OnRootItemClickListener itemClickListener; + + public void setOnRootItemClickListener(OnRootItemClickListener itemClickListener) { + this.itemClickListener = itemClickListener; + } + + public interface OnRootItemClickListener { + void startDetails(int shorplayId); + } + + private Context context; + private int page = 1; + + private BAVideoIndicator adapter; + + private List listload; + + + public GSPlayListRootAdapter( + Context context, Class viewBinding) { + super(context, viewBinding); + this.context = context; + } + + + public void setPage(int currentpage) { + this.page = currentpage; + } + + public void setMoreListData(List list) { + this.listload = list; + } + + @Override + public void onBindViewHolder( + ItemPlaylistRootBinding binding, + int position, + GSPlayListRootBean data, + int bingingAdapterPosition) { + LogUtils.d("position===" + position); + binding.tvPlaylistTime.setText(data.getTime()); + + if (adapter == null) { + binding.recyclerviewPlaylist.setLayoutManager(new GridLayoutManager(context, 3)); + adapter = new BAVideoIndicator(context, QyvHeaddefaultBinding.class); + } + adapter.addDataList(data.getList(), page == 1); + adapter.setItemClickListener((data1, holder) -> { + if (itemClickListener != null) { + itemClickListener.startDetails(data1.getShort_play_id()); + } + }); + + + } + + +} diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSPlayListRootBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSPlayListRootBean.java new file mode 100644 index 0000000..18143a9 --- /dev/null +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSPlayListRootBean.java @@ -0,0 +1,31 @@ +package com.shortdrama.jelly.zyreotv.unconfirmedPiecewise; + +import java.util.ArrayList; +import java.util.List; + +public class GSPlayListRootBean { + + private String time; + private List list; + + public GSPlayListRootBean(String time, List list) { + this.time = time; + this.list = list; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSTranslatesBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSTranslatesBean.java index bc65ee3..20a995c 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSTranslatesBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/GSTranslatesBean.java @@ -141,6 +141,34 @@ public class GSTranslatesBean { private String gleestream_vippurchase_dialog_unlock; private String gleestream_vippurchase_dialog; + private String gleestream_today; + private String gleestream_yesterday; + private String gleestream_earlier; + + public String getGleestream_today() { + return gleestream_today; + } + + public void setGleestream_today(String gleestream_today) { + this.gleestream_today = gleestream_today; + } + + public String getGleestream_yesterday() { + return gleestream_yesterday; + } + + public void setGleestream_yesterday(String gleestream_yesterday) { + this.gleestream_yesterday = gleestream_yesterday; + } + + public String getGleestream_earlier() { + return gleestream_earlier; + } + + public void setGleestream_earlier(String gleestream_earlier) { + this.gleestream_earlier = gleestream_earlier; + } + public String getGleestream_vippurchase_dialog_unlock() { return gleestream_vippurchase_dialog_unlock; } diff --git a/app/src/main/res/drawable/g_about.xml b/app/src/main/res/drawable/g_about.xml index 93f2b13..7ff7da3 100644 --- a/app/src/main/res/drawable/g_about.xml +++ b/app/src/main/res/drawable/g_about.xml @@ -2,13 +2,15 @@ - + + - + + diff --git a/app/src/main/res/drawable/ne_edit_ezier.xml b/app/src/main/res/drawable/ne_edit_ezier.xml index 0b473f2..dd9cd75 100644 --- a/app/src/main/res/drawable/ne_edit_ezier.xml +++ b/app/src/main/res/drawable/ne_edit_ezier.xml @@ -1,4 +1,5 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_language.xml b/app/src/main/res/layout/activity_language.xml index 3ba8cff..ef6663f 100644 --- a/app/src/main/res/layout/activity_language.xml +++ b/app/src/main/res/layout/activity_language.xml @@ -1,5 +1,6 @@ + android:textSize="14sp" + android:visibility="gone" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 083214d..4c3c914 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -70,6 +70,22 @@ android:textSize="@dimen/ragmentSettings" /> + diff --git a/app/src/main/res/layout/activity_playlist_gs.xml b/app/src/main/res/layout/activity_playlist_gs.xml index 6e6cc90..0364402 100644 --- a/app/src/main/res/layout/activity_playlist_gs.xml +++ b/app/src/main/res/layout/activity_playlist_gs.xml @@ -32,6 +32,8 @@ + android:visibility="visible" /> @@ -42,7 +46,7 @@ android:textColor="@color/zyreotvExploreAbout" android:textSize="@dimen/ragmentSettings" android:textStyle="bold" - app:layout_constraintEnd_toStartOf="@+id/iv_mywallet_gold_item" + app:layout_constraintRight_toLeftOf="@+id/iv_mywallet_gold_item" app:layout_constraintTop_toTopOf="@+id/tv_mywallet_name_item" app:layout_goneMarginEnd="@dimen/utilsPage" /> diff --git a/app/src/main/res/layout/item_playlist_root.xml b/app/src/main/res/layout/item_playlist_root.xml new file mode 100644 index 0000000..8f4880c --- /dev/null +++ b/app/src/main/res/layout/item_playlist_root.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/rkh_default.xml b/app/src/main/res/layout/rkh_default.xml index fc2ed83..7cabd29 100644 --- a/app/src/main/res/layout/rkh_default.xml +++ b/app/src/main/res/layout/rkh_default.xml @@ -95,6 +95,15 @@ + + - - + + app:tabSelectedTextColor="#F564B6" app:tabTextAppearance="@style/splashModity" app:tabTextColor="#D2D2D2" /> - - + + + app:layout_constraintTop_toBottomOf="@+id/tablayout" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/ic_playlist_time.png b/app/src/main/res/mipmap-xxhdpi/ic_playlist_time.png new file mode 100644 index 0000000000000000000000000000000000000000..65b914e518c60187ed7560e65a41915061f3a4e1 GIT binary patch literal 1697 zcmV;S244AzP)Px*TS-JgRA@u(ns>-uMG(b*6MKohi(*3%{X?-4yC7J=jvZq`6l*k5V>A)PNFsI- z1i^xeHN;o~ny3+jodm^#F=FqEvBzk1+@o`4y?N!{_ulssLIxfQ-`%^rXJ>Zi%*-_w zBeBH@3roOM(WbjE3oIRD2LXTSXJ)@udB2k}J=2W4F9U2Dzs-TwfRz9N(X)BLAHYYz z7r?u~Y%|l}dm>$farc#hLxF>VO@YAyqS*$ep}D|Mz{d&vy})EM`?Xs{9f5Ioy|-q7 zI2qWu%Z+>n+z3oHv#&dyt2P*SUk=z0I04wX!NOmL32B4c*!*nFCcrv?%y5I!yBaqm zJ-Zv2VrIY81yu`-yRVq+{u1CYV3pEhQ-KG8H-Vo4naw;i^I}}QzdRt*+&bNvrIzx&geYs^gZRF+C$!mQQ>w`%?44~+F8>N(LUA|T zecy0K8Ya&+#LN~jwMs#=?rB#U@9s()Mg`$4_90I-GR2se^E@ZCqx&LmC>dd9(%%21 zuV5l}=?=j&p?`=UGL6rr}6xx3O_1+%g!xl%48U^A0jegqi8z|D+QzL*wF>le03o9}+?RFa=vxV`N@MrADSCS9?bt zjyF(Xls2nyu~pdqF2IHnq1#;{d8^U7?Cs2|JdwMLBR<|!%{1DryNe8NoAR6;E$Fuu^Kf&F9ZMW&rN4r0nA0K=S8ue+rKJ|D3#Z zRA)oojCJ=sx2n#~B4vFjRbG_3Dt74dN<&J}rlmYX-l%U9S`n2giX7Eha|ukbX@L@V zI=4<8s~3p7%4eE@k%=8|X7WmXlPuFz;-*SXy-c$S7!~T1V;Uu8#Q`r6XR?}=a&SGrGOL?CnTq1d z!3U%OSZpfxFfPkqbf~J=J=)4L8i5f78LSfsPjXqbFEo!Ticd%VY(M}-MN@^x1A11` z%uY%6s$yVXYgYSWteMF%^h8?Jnxzfh*S5v^N_58E*Nq~B3JV35e>)0vz32k0kQzRF{4PP~S!- z@egw-=ueoDs+D=?>{wur2Awl`F%<%P-#N>7ob@!-=1{e?bkq>_=k$yL4s&|Om_ z_EX?KrNayDJAg(iXz+!Gn1kH9+I#xRj08far__0tzSdZzzR+l9TcvMjWR_~7&#zm^ rsAId8;!K?h7v|U{U>4@-w_5veBECUVg;3Du00000NkvXXu0mjfnUg>; literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7ae80a5..2bd1eaa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Episode Welcome to GleeStream - By logging in you agree to: + By logging in you agree to:User Agreement&Privacy Policy Login with Facebook &