From 17b6f85f46c1e6250ac62b19065db1ab2db891ed Mon Sep 17 00:00:00 2001
From: guozhen <guozhen@qinqiu8.com>
Date: Thu, 15 May 2025 11:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=92=AD=E6=94=BE=E6=97=B6?=
 =?UTF-8?q?=E9=95=BF=E9=97=AE=E9=A2=98=EF=BC=8C=E9=A6=96=E9=A1=B5w2a?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zyreotv/topics/abslRwgt/AExtractionActivity.java  |  2 +-
 .../poolref/ZYTVideoPlayerDetailsActivity.java        | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java
index 3342b5c..5430ede 100644
--- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java
+++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java
@@ -528,7 +528,6 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
             String ddl = TIndicator.getString(ITItem.Constants_DeepLinkData_URL, "");
             LogUtils.d("clipString: ddl " + ddl);
             if (!ddl.isEmpty()) {
-                w2aSelfAttribution(ddl);
                 // 定义正则表达式
                 // Pattern pattern = Pattern.compile("short_play_id=(d+).*");
                 Pattern pattern = Pattern.compile("short_play_id=(\\d+)");
@@ -553,6 +552,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
                                 if (isRequestNotify) {
                                     return;
                                 }
+                                w2aSelfAttribution(ddl);
                                 jumpDetails();
 
                             }
diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java
index bd0761f..1d106e0 100644
--- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java
+++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java
@@ -272,7 +272,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
 
         translates = AppUtils.getTranslates();
         if (translates != null) {
-            viewBinding.viewVideoRecommend.tvRecommend.setText(AppUtils.replace(translates.getGleestream_recommond_title(),"90%"));
+            viewBinding.viewVideoRecommend.tvRecommend.setText(AppUtils.replace(translates.getGleestream_recommond_title(), "90%"));
             viewBinding.viewVideoRecommend.tvWatchNowRecommend.setText(translates.getGleestream_recommond_watchnow());
         }
     }
@@ -285,7 +285,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         if (currentPosition > 0) {
             LSQExampleCloseBean.YPZTestUnselect previousItem = vtGooglePlayerAdapter.getItems().get(currentPosition - 1);
             if (previousItem != null && previousItem.isIs_lock()) {
-                viewBinding.viewLock.tvUnlockEpisode.setText(translates!=null?translates.getGleestream_lock():getString(R.string.unlock_episode_coins_last));
+                viewBinding.viewLock.tvUnlockEpisode.setText(translates != null ? translates.getGleestream_lock() : getString(R.string.unlock_episode_coins_last));
             } else {
                 if (translates != null) {
                     viewBinding.viewLock.tvUnlockEpisode.setText(AppUtils.replace(translates.getGleestream_unlock_coins(), String.valueOf(item.getCoins())));
@@ -530,7 +530,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
                 if (exampleRechargeDialogFragment != null) {
                     exampleRechargeDialogFragment.dismiss();
                 }
-                PAYLoginHeaddefault.revealToast(translates!=null?translates.getGleestream_googlepay_success():getString(R.string.google_pay_success), 0);
+                PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0);
                 needRefresh = true;
                 userViewModel.getUserInfo();
 //                    LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
@@ -657,6 +657,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         }
         if (ITItem.Constants_Google_PLAYER_STATUS_FINISH_DETAIL.equals(event)) {
             LogUtils.d("播放到最后===");
+            needRestart = true;
             if (viewBinding.viewPagerVtEpisode.getCurrentItem() == vtGooglePlayerAdapter.getItems().size() - 1) {
                 //播放到最后
                 vtViewModel.getDetailsRecommand();
@@ -685,7 +686,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
                     viewBinding.viewPagerVtEpisode.setCurrentItem(nextPosition);
                 }
             }
-            needRestart = true;
+
             if (activity_id != 0) {
                 LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition - 1);
                 if (item != null) {
@@ -772,7 +773,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         if (vtGooglePlayerAdapter != null && !vtGooglePlayerAdapter.getItems().isEmpty()) {
             LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
             if (!item.isIs_lock()) {
-                vtViewModel.uploadHistorySeconds(pageGoogleExoPlayerView().getlastProgress(), item.getShort_play_id(), item.getShort_play_video_id());
+                vtViewModel.uploadHistorySeconds(needRestart ? 0 : pageGoogleExoPlayerView().getlastProgress(), item.getShort_play_id(), item.getShort_play_video_id());
             }
 
             if (shortVideoInfo != null) {