From 78c1fd857c99306343c2156e8a637a729c56084e Mon Sep 17 00:00:00 2001
From: guozhen <guozhen@qinqiu8.com>
Date: Mon, 16 Jun 2025 19:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95restore?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 2783852 -> 2783888 bytes
 .../jelly/zyreotv/beginning/LogUtils.java     |   2 +-
 .../topics/abslRwgt/AExtractionActivity.java  |  18 ++----------------
 .../abslRwgt/decbn/ZYTStoreActivity.java      |   3 +--
 .../ZYTVideoPlayerDetailsActivity.java        |   2 +-
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 739810c48d805c1606cc5e57d80b2e127b177774..a45d96c58dd3fe8bedff3f0183505e2b5130a018 100644
GIT binary patch
delta 308
zcmaF!WhLW;uPYfFS{PfHT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9f
zT0~pKTEtr<S|qnfX{Ru9Y}ZMVTFA#Q$L!+b__CM*1hlGhwjU{ylICK(xc&cm&AY7a
zSDU1OSQ?0BfLIoY<$zcoh!wV9ZBh)_!C1Fl%~~mtoxdff$$u5!a;Q0V+w+{1s%01-
zZd5ejnJ(~JRDQd|eswM8=?m_1-q<E4$j3N+Lc4n1c7f%b8I036d|<f&mf7Br!2y&4
zDcUYjt#*iUx`H|9mgx#+!mq&Ur++9G{4-tQISa&$$sat#rx*O^<!IkiqXfjtK&%49
Ysz9s;#Ogq-v3*aC=7zu18x$B-0N&(xvj6}9

delta 271
zcmbR6btU7QFDn@vS{PfHT9{i{T3B1yTG(4SS~y#{TDV(yT6kOdTKHQ8S_E5!T7+9f
zT0~pKTEtr<S|qnfX{Ru<Z`VnYTFAHkX_1r=7vs+D&(CXqWo^IOBn8CMKr92qvOp{c
z#PUF_u>ES2V!#f@+U;uAN`dU#`<;}EWVSafP@2axeZgJM8`~%BV3lD4Gq;He@-a@I
z(5_y$U0^w92IKS%A6RZc6g6aU0Hwg{1*+8!F-})7=iD+~!A$rSSpD=5#e#pPD?Dep
q0XAdu2M_V-1^;<D+V|8b0kJX=s{pYo5UT;PIuL7Y-&3Qx;V%H4t#H8r

diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java
index 5a12c5f..c256548 100644
--- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java
+++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/LogUtils.java
@@ -13,7 +13,7 @@ public class LogUtils {
     }
 
     //    public static boolean isDebug = ApiService.isDebug;// 是否需要打印bug，可以在application的onCreate函数里面初始化
-    public static boolean isDebug = true;
+    public static boolean isDebug = false;
 //    public static boolean isDebug = false;// 是否需要打印bug，可以在application的onCreate函数里面初始化
 
     private static final String TAG = "GleeStreamLog";
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 2bb27f1..19827a9 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
@@ -224,17 +224,6 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
                 if (listRestore.size() > 0) {
                     toRestore();
                 }
-//                if (!list.isEmpty()) {
-//                    for (GSGooglePayInfo googlePayInfoItem : list) {
-//                        gsGooglePayInfoRestore = googlePayInfoItem;
-//                        handler.postDelayed(new Runnable() {
-//                            @Override
-//                            public void run() {
-//                                userViewModel.restorePay(gsGooglePayInfoRestore);
-//                            }
-//                        }, 2000);
-//                    }
-//                }
             }
         }, 3000);
 
@@ -543,11 +532,8 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
             int itemCount = primaryClip.getItemCount();
             if (clipboardManager.hasPrimaryClip() && itemCount > 0) {
                 ClipData.Item item = primaryClip.getItemAt(0);
-                if (item != null) {
-                    return item.getText().toString();
-                } else {
-                    return "";
-                }
+                CharSequence text = item.getText();
+                return text != null ? text.toString() : "";
 
             }
         }
diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java
index 522a33d..6cf1044 100644
--- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java
+++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java
@@ -179,7 +179,7 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
             gsGooglePayInfo.setTransaction_id(purchase.getOrderId());
             gsGooglePayInfo.setShow_money(current_price);
             vtUserViewModel.getGooglePay(gsGooglePayInfo);
-            // TIndicator.savePayOrder(gsGooglePayInfo);
+           // TIndicator.savePayOrder(gsGooglePayInfo);
         }, (purchase, str) -> {
             binding.loading.hide();
             PAYLoginHeaddefault.revealToast(str, 0);
@@ -258,7 +258,6 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
                 public void run() {
                     listRestore = TIndicator.getPayOrder();
                     if (!listRestore.isEmpty() && listRestore.size() > 0) {
-
                         toRestore();
 
 //                        for (GSGooglePayInfo googlePayInfoItem : list) {
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 741b8f3..38ebae1 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
@@ -795,7 +795,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         super.onStop();
         if (vtGooglePlayerAdapter != null && !vtGooglePlayerAdapter.getItems().isEmpty()) {
             LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
-            if (!item.isIs_lock() && pageGoogleExoPlayerView() != null) {
+            if (item!=null&&!item.isIs_lock() && pageGoogleExoPlayerView() != null) {
                 vtViewModel.uploadHistorySeconds(needRestart ? 0 : pageGoogleExoPlayerView().getlastProgress(), item.getShort_play_id(), item.getShort_play_video_id());
             }