diff --git a/.gradle/8.2/checksums/checksums.lock b/.gradle/8.2/checksums/checksums.lock index e7d4fb8..a2bee62 100644 Binary files a/.gradle/8.2/checksums/checksums.lock and b/.gradle/8.2/checksums/checksums.lock differ diff --git a/.gradle/8.2/checksums/md5-checksums.bin b/.gradle/8.2/checksums/md5-checksums.bin index cc8aea6..3e26136 100644 Binary files a/.gradle/8.2/checksums/md5-checksums.bin and b/.gradle/8.2/checksums/md5-checksums.bin differ diff --git a/.gradle/8.2/checksums/sha1-checksums.bin b/.gradle/8.2/checksums/sha1-checksums.bin index 7e80a36..b0a554d 100644 Binary files a/.gradle/8.2/checksums/sha1-checksums.bin and b/.gradle/8.2/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibs.java b/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibs.java index d0cff36..5385cad 100644 --- a/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibs.java +++ b/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibs.java @@ -447,7 +447,7 @@ public class LibrariesForLibs extends AbstractExternalDependencyFactory { public Provider getAdjust() { return getVersion("adjust"); } /** - * Returns the version associated to this alias: agp (8.9.2) + * Returns the version associated to this alias: agp (8.2.2) * If the version is a rich version and that its not expressible as a * single version string, then an empty string is returned. * This version was declared in catalog libs.versions.toml diff --git a/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java b/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java index 5b8f0a4..6917480 100644 --- a/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java +++ b/.gradle/8.2/dependencies-accessors/dc00b266830a5b5210886755234b4bb027e46012/sources/org/gradle/accessors/dm/LibrariesForLibsInPluginsBlock.java @@ -604,7 +604,7 @@ public class LibrariesForLibsInPluginsBlock extends AbstractExternalDependencyFa public Provider getAdjust() { return getVersion("adjust"); } /** - * Returns the version associated to this alias: agp (8.9.2) + * Returns the version associated to this alias: agp (8.2.2) * If the version is a rich version and that its not expressible as a * single version string, then an empty string is returned. * This version was declared in catalog libs.versions.toml diff --git a/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock index d45f1f9..bcec5a0 100644 Binary files a/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock and b/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/8.2/dependencies-accessors/executionHistory.bin b/.gradle/8.2/dependencies-accessors/executionHistory.bin index 46528b2..26108d7 100644 Binary files a/.gradle/8.2/dependencies-accessors/executionHistory.bin and b/.gradle/8.2/dependencies-accessors/executionHistory.bin differ diff --git a/.gradle/8.2/executionHistory/executionHistory.bin b/.gradle/8.2/executionHistory/executionHistory.bin index cfde87c..83b8649 100644 Binary files a/.gradle/8.2/executionHistory/executionHistory.bin and b/.gradle/8.2/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.2/executionHistory/executionHistory.lock b/.gradle/8.2/executionHistory/executionHistory.lock index c61ff17..b19906c 100644 Binary files a/.gradle/8.2/executionHistory/executionHistory.lock and b/.gradle/8.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.2/fileHashes/fileHashes.bin b/.gradle/8.2/fileHashes/fileHashes.bin index 309293f..b2d13aa 100644 Binary files a/.gradle/8.2/fileHashes/fileHashes.bin and b/.gradle/8.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.2/fileHashes/fileHashes.lock b/.gradle/8.2/fileHashes/fileHashes.lock index 63387a6..3a05823 100644 Binary files a/.gradle/8.2/fileHashes/fileHashes.lock and b/.gradle/8.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.2/fileHashes/resourceHashesCache.bin b/.gradle/8.2/fileHashes/resourceHashesCache.bin index 0239567..0479f47 100644 Binary files a/.gradle/8.2/fileHashes/resourceHashesCache.bin and b/.gradle/8.2/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d53e482..d13941e 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 2decc01..739810c 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 2be4006..fe780f7 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..1d8e2a6 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..288b36b 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index ad0bb83..f951473 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -147,6 +147,10 @@ -keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; } +-keepclassmembers class ** { + public (android.os.Parcel); +} +-keep class com.shortdrama.jelly.zyreotv.** implements android.os.Parcelable -keepclassmembers class * implements java.io.Serializable { static final long serialVersionUID; diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/GPplicationLoadingdefault.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/GPplicationLoadingdefault.java index 9dd10dd..e140805 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/GPplicationLoadingdefault.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/GPplicationLoadingdefault.java @@ -53,6 +53,7 @@ public class GPplicationLoadingdefault extends Application { if (activityCount == 1 && isBackground) { isBackground = false; EventBus.getDefault().post(ITItem.Constants_AppEnter); + EventBus.getDefault().post(ITItem.Constants_AppOnline); } } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ITItem.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ITItem.java index 7c7dbfb..784735a 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ITItem.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ITItem.java @@ -61,6 +61,8 @@ public class ITItem { public static final String Constants_DeepLinkData_URL = "Constants_DeepLinkData_URL"; public static final String Constants_RestorePay_key = "Constants_RestorePay_Key"; + public static final String Constants_Refresh_Auth = "Constants_Refresh_Auth"; + public static final String Constants_Refresh_LoginUser402 = "Constants_Refresh_LoginUser"; public static boolean isCanPlay = true; public static boolean isLock = false; 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 c256548..5a12c5f 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 = false; + public static boolean isDebug = true; // 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/beginning/TIndicator.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TIndicator.java index e6877da..9e0ebcc 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TIndicator.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/TIndicator.java @@ -126,20 +126,24 @@ public class TIndicator { public static void savePayOrder(GSGooglePayInfo googlePayInfo) { + LogUtils.d("恢复订单== 存储订单" + googlePayInfo.getOrder_code()); String string = TIndicator.getString(ITItem.Constants_RestorePay_key, ""); ArrayList orderInfoList = new ArrayList(); - if (!TextUtils.isEmpty(string)) { - orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class)); - }else{ + if (!TextUtils.isEmpty(string) && !string.equals("[]")) { + List initList = REnterCircle.getListFromJSON(string, GSGooglePayInfo.class); + initList.add(googlePayInfo); + orderInfoList.addAll(initList); + } else { orderInfoList.add(orderInfoList.size(), googlePayInfo); } + LogUtils.d("恢复订单== 存储" + orderInfoList.size()); savePayOrderList(orderInfoList); } public static ArrayList getPayOrder() { String string = TIndicator.getString(ITItem.Constants_RestorePay_key, ""); ArrayList orderInfoList = new ArrayList(); - if (!TextUtils.isEmpty(string)) { + if (!TextUtils.isEmpty(string) && !string.equals("[]")) { orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class)); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ZYTGooglePayUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ZYTGooglePayUtils.java index a60b347..6321158 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ZYTGooglePayUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/beginning/ZYTGooglePayUtils.java @@ -6,6 +6,8 @@ import android.os.Looper; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; + import com.android.billingclient.api.AcknowledgePurchaseParams; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingClientStateListener; @@ -14,6 +16,7 @@ import com.android.billingclient.api.BillingResult; import com.android.billingclient.api.ConsumeParams; import com.android.billingclient.api.ProductDetails; import com.android.billingclient.api.Purchase; +import com.android.billingclient.api.PurchasesResponseListener; import com.android.billingclient.api.PurchasesUpdatedListener; import com.android.billingclient.api.QueryProductDetailsParams; @@ -76,6 +79,7 @@ public class ZYTGooglePayUtils { this.callErrorBack = callErrorBack; PurchasesUpdatedListener purchasesUpdatedListener = (billingResult, purchases) -> { + LogUtils.d("恢复订单 responseCode==" + billingResult.getResponseCode()); if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK && purchases != null) { for (Purchase purchase : purchases) { if (purchase.getPurchaseState() == Purchase.PurchaseState.PURCHASED) { @@ -91,6 +95,7 @@ public class ZYTGooglePayUtils { } else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.USER_CANCELED) { callErrorBack.onCallError(null, userCanceledTip); } else { + LogUtils.d("恢复订单 errormsg==" + billingResult.getDebugMessage()); callErrorBack.onCallError(null, payError + ": " + billingResult.getDebugMessage()); } }; @@ -349,12 +354,29 @@ public class ZYTGooglePayUtils { mBillingClient.consumeAsync(consumeParams, (billingResult, purchaseToken) -> { if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) { callSuccessBack.onCallSuccess(purchase); + } else if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED) { + queryAndConsumePurchases(); } else { callErrorBack.onCallError(purchase, consumingPurchase + ": " + billingResult.getResponseCode() + billingResult.getDebugMessage()); } }); } + private void queryAndConsumePurchases() { + // 查询所有未消费的购买记录 + mBillingClient.queryPurchasesAsync(BillingClient.ProductType.INAPP, new PurchasesResponseListener() { + @Override + public void onQueryPurchasesResponse(@NonNull BillingResult billingResult, @NonNull List list) { + if (billingResult.getResponseCode() == BillingClient.BillingResponseCode.OK) { + for (Purchase purchase : list) { + consumePurchase(purchase); + } + } + } + }); + + } + private void consumePurchaseSub(Purchase purchase) { AcknowledgePurchaseParams acknowledgePurchaseParams = AcknowledgePurchaseParams.newBuilder() .setPurchaseToken(purchase.getPurchaseToken()) @@ -368,4 +390,6 @@ public class ZYTGooglePayUtils { } }); } + + } \ No newline at end of file diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java index 75eafad..b32afd2 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/KGZyreotv.java @@ -78,7 +78,7 @@ public interface KGZyreotv { public static final String GleeStream_USERAgreement = readViewingStop(new int[]{32, 60, 60, 56, 59, 114, 103, 103, 63, 63, 63, 102, 50, 49, 58, 45, 39, 60, 62, 102, 43, 39, 37, 103, 61, 59, 45, 58, 23, 56, 39, 36, 33, 43, 49, 72}, 0x48, false); public static final String GleeStream_Delete = "https://www.zyreotv.com/logout"; - public static final String GleeStream_Feedback_Index = "https://campaign.zyreotv.com/pages/leave/index "; + public static final String GleeStream_Feedback_Index = "https://campaign.zyreotv.com/pages/leave/index"; public static final String GleeStream_Feedback_List = "https://campaign.zyreotv.com/pages/leave/list"; public static final String GleeStream_Feedback_Details = "https://campaign.zyreotv.com/pages/leave/detail"; public static final String GleeStream_VisitWeb = "https://www.zyreotv.com/"; diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/RREStyles.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/RREStyles.java index 1f78044..b0560cf 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/RREStyles.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/RREStyles.java @@ -3,7 +3,9 @@ package com.shortdrama.jelly.zyreotv.dlsym; import com.google.gson.JsonParseException; +import com.shortdrama.jelly.zyreotv.beginning.ITItem; +import org.greenrobot.eventbus.EventBus; import org.json.JSONException; import java.io.InterruptedIOException; @@ -15,40 +17,35 @@ import io.reactivex.observers.DisposableObserver; import retrofit2.HttpException; - - - public abstract class RREStyles extends DisposableObserver { - + public static final int PARSE_ERROR = 1001; - + public static final int BAD_NETWORK = 1002; - + public static final int CONNECT_ERROR = 1003; - + public static final int CONNECT_TIMEOUT = 1004; @Override public void onNext(T o) { try { IMACloseStroke follow = (IMACloseStroke) o; - boolean auto_s9 = true; - while (!auto_s9) { break; } if (follow.code == 200) { onSuccess(o); - int agreemente = 7546; - while (agreemente <= 87) { break; } } else { - onError(follow.code,follow.msg); - int preference_ = 8810; + onError(follow.code, follow.msg); } } catch (Exception e) { e.printStackTrace(); boolean androidm = true; - if (!androidm) {} - onError(407,e.toString()); + if (!androidm) { + } + onError(407, e.toString()); float langX = 5598.0f; - while (langX >= 57) { break; } + while (langX >= 57) { + break; + } } @@ -57,62 +54,81 @@ public abstract class RREStyles extends DisposableObserver { @Override public void onError(Throwable e) { if (e instanceof HttpException) { - - attachPortSupport(BAD_NETWORK); + int code = ((HttpException) e).code(); + if (code == 401) { + EventBus.getDefault().post(ITItem.Constants_Refresh_Auth); + } + if (code == 402) { + EventBus.getDefault().post(ITItem.Constants_Refresh_LoginUser402); + } + attachPortSupport(BAD_NETWORK, e); boolean runnableR = false; - if (!runnableR) {} + if (!runnableR) { + } } else if (e instanceof ConnectException || e instanceof UnknownHostException) { - - attachPortSupport(CONNECT_ERROR); + + attachPortSupport(CONNECT_ERROR, e); boolean gradle0 = true; - while (!gradle0) { break; } + while (!gradle0) { + break; + } } else if (e instanceof InterruptedIOException) { - - attachPortSupport(CONNECT_TIMEOUT); + + attachPortSupport(CONNECT_TIMEOUT, e); boolean updatedw = false; - if (!updatedw) {} + if (!updatedw) { + } } else if (e instanceof JsonParseException || e instanceof JSONException || e instanceof ParseException) { - - attachPortSupport(PARSE_ERROR); + + attachPortSupport(PARSE_ERROR, e); double finishJ = 9621.0; - while (finishJ < 105) { break; } + while (finishJ < 105) { + break; + } System.out.println(finishJ); } else { if (e != null) { - onError(409,e.toString()); - double callA = 6836.0; - if (callA > 66) {} - System.out.println(callA); + onError(409, e.toString()); + double callA = 6836.0; + if (callA > 66) { + } + System.out.println(callA); } else { - onError(407,"未知错误"); - boolean more6 = false; - while (!more6) { break; } - System.out.println(more6); + onError(407, "response body is null"); + boolean more6 = false; + while (!more6) { + break; + } + System.out.println(more6); } } } - private void attachPortSupport(int unknownError) { + private void attachPortSupport(int unknownError, Throwable e) { switch (unknownError) { case CONNECT_ERROR: - onError(CONNECT_ERROR,"连接错误"); + // onError(CONNECT_ERROR,"连接错误"); + onError(CONNECT_ERROR, e.getMessage()); break; case CONNECT_TIMEOUT: - onError(CONNECT_TIMEOUT,"连接超时"); + onError(CONNECT_ERROR, e.getMessage()); + // onError(CONNECT_TIMEOUT,"连接超时"); break; case BAD_NETWORK: - onError(BAD_NETWORK,"网络问题"); + onError(CONNECT_ERROR, e.getMessage()); + // onError(BAD_NETWORK,"网络问题"); break; case PARSE_ERROR: - onError(PARSE_ERROR,"宇宙也是有尽头的"); + onError(CONNECT_ERROR, e.getMessage()); + // onError(PARSE_ERROR,"宇宙也是有尽头的"); break; default: @@ -127,6 +143,6 @@ public abstract class RREStyles extends DisposableObserver { public abstract void onSuccess(T o); - public abstract void onError(int code,String msg); + public abstract void onError(int code, String msg); } 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 98a8ba9..2bb27f1 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 @@ -192,6 +192,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity list = TIndicator.getPayOrder(); - if (!list.isEmpty()) { - for (GSGooglePayInfo googlePayInfoItem : list) { - gsGooglePayInfoRestore = googlePayInfoItem; - handler.postDelayed(new Runnable() { - @Override - public void run() { - userViewModel.restorePay(gsGooglePayInfoRestore); - } - }, 2000); - } + listRestore = TIndicator.getPayOrder(); + 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); } + + private ArrayList listRestore; + public void toRestore() { + gsGooglePayInfoRestore = listRestore.get(listRestore.size() - 1); + userViewModel.restorePay(gsGooglePayInfoRestore); + } + private String path = ""; private String short_play_id = ""; private String message_id = ""; @@ -310,6 +321,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity { if (imaCloseStroke != null) { - int index =-1; - ArrayList list = TIndicator.getPayOrder(); - for (int i=0;i 0) { + toRestore(); + }else{ + TIndicator.savePayOrderList(listRestore); } - if (index >= 0) { - list.remove(index); - } - TIndicator.savePayOrderList(list); +// int index = -1; +// ArrayList list = TIndicator.getPayOrder(); +// for (int i = 0; i < list.size(); i++) { +// if (list.get(i).getOrder_code().equals(gsGooglePayInfoRestore.getOrder_code())) { +// index = i; +// break; +// } +// } +// if (index >= 0) { +// list.remove(index); +// } +// TIndicator.savePayOrderList(list); + }else{ + TIndicator.savePayOrderList(listRestore); } }); @@ -465,6 +486,20 @@ public class AExtractionActivity extends IDDetailsRoundActivity 0) { ClipData.Item item = primaryClip.getItemAt(0); - return item.getText().toString(); + if (item != null) { + return item.getText().toString(); + } else { + return ""; + } + } } return ""; @@ -597,6 +642,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity { if (feedbackResp != null) { PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_deleteaccount_success() : "Account deleted successfully", 0); - EventBus.getDefault() - .post(Constants_AppLeave); LoginManager.getInstance().logOut(); binding.loading.hide(); userViewModel.regist(); } else { + EventBus.getDefault() + .post(Constants_AppEnter); binding.loading.hide(); PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_service_abnormality() : "The service is abnormal. Check the network.", 0); } @@ -134,6 +137,8 @@ public class GSDeleteAccountActivity extends IDDetailsRoundActivity finish()); binding.tvSettingLoginout.setOnClickListener(v -> { if (!TIndicator.isTourist()) { + EventBus.getDefault() + .post(Constants_AppLeave); binding.loading.show(); userViewModel.doLogOut(); } else { @@ -157,22 +160,22 @@ public class ZYTSettingActivity extends IDDetailsRoundActivity { if (feedbackResp != null) { PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_logou_success() : "Logout Succes", 0); - TIndicator.saveString(TIndicator.auth, feedbackResp.data.getToken()); - EventBus.getDefault() - .post(Constants_AppLeave); - LoginManager.getInstance().logOut(); - + TIndicator.saveString(TIndicator.auth, feedbackResp.data.getToken()); EventBus.getDefault() .post(Constants_AppEnter); EventBus.getDefault() .post(CONSTANTS_User_Refresh_Event); EventBus.getDefault() .post(CONSTANTS_UserWeb_Refresh_Event); + EventBus.getDefault() + .post(Constants_AppOnline); binding.loading.hide(); ZYTSettingActivity.this.finish(); } else { + EventBus.getDefault() + .post(Constants_AppEnter); binding.loading.hide(); PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_service_abnormality() : "Service abnormality, please check the network", 0); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GSMyVipActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GSMyVipActivity.java index b0dcb30..e63cada 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GSMyVipActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GSMyVipActivity.java @@ -101,6 +101,18 @@ public class GSMyVipActivity extends IDDetailsRoundActivity { PAYLoginHeaddefault.revealToast(str, 0); + if(purchase!=null){ + gsGooglePayInfo = new GSGooglePayInfo(); + gsGooglePayInfo.setOrder_code(current_order_code); + gsGooglePayInfo.setPay_setting_id(String.valueOf(current_pay_setting_id)); + gsGooglePayInfo.setPkg_name(GSMyVipActivity.this.getPackageName()); + gsGooglePayInfo.setProduct_id(String.valueOf(android_template_id)); + gsGooglePayInfo.setPurchases_token(purchase.getPurchaseToken()); + gsGooglePayInfo.setTransaction_id(purchase.getOrderId()); + gsGooglePayInfo.setShow_money(current_price); + TIndicator.savePayOrder(gsGooglePayInfo); + } + }); zytGooglePayUtils.setqueryProductResult(new ZYTGooglePayUtils.QueryProductResult() { @Override diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java index eef039c..b007006 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java @@ -1,5 +1,7 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn; +import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppLeave; + import android.os.Handler; import android.os.Looper; @@ -20,6 +22,7 @@ import androidx.lifecycle.ViewModel; import com.shortdrama.jelly.zyreotv.beginning.AppUtils; import com.shortdrama.jelly.zyreotv.beginning.ITItem; +import com.shortdrama.jelly.zyreotv.beginning.PAYLoginHeaddefault; import com.shortdrama.jelly.zyreotv.beginning.REnterCircle; import com.shortdrama.jelly.zyreotv.beginning.TIndicator; import com.shortdrama.jelly.zyreotv.dlsym.IMACloseStroke; @@ -39,6 +42,8 @@ import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTUserBuyRecordsBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTUserSendCoinsBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTUserTypeRecordsBean; +import org.greenrobot.eventbus.EventBus; + import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -762,12 +767,10 @@ public class GXCProgressLogin extends ViewModel { .subscribe(new RREStyles() { @Override public void onSuccess(IMACloseStroke o) { - } @Override public void onError(int code, String msg) { - } }); @@ -907,10 +910,7 @@ public class GXCProgressLogin extends ViewModel { } - - - - public void restorePay(GSGooglePayInfo restorePay){ + public void restorePay(GSGooglePayInfo restorePay) { VZBack.getInstance().getGooglePay(restorePay) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -938,6 +938,8 @@ public class GXCProgressLogin extends ViewModel { @Override public void onSuccess(IMACloseStroke o) { + EventBus.getDefault() + .post(Constants_AppLeave); loginLiveData.setValue(o); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java index dbb0155..94fbfc8 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java @@ -52,6 +52,7 @@ import com.shortdrama.jelly.zyreotv.databinding.LpEnterLocalBinding; import com.shortdrama.jelly.zyreotv.dlsym.KGZyreotv; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.XLHeaddefaultActivity; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.app.GSLanguageActivity; +import com.shortdrama.jelly.zyreotv.topics.abslRwgt.movepage.ODQHistoryFragment; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.CommonSelectorDialog; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.VipPurchaseDialog; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.web.ZYTWebViewIndexActivity; @@ -86,6 +87,9 @@ public class UBJPrivateOllowFragment extends Fragment { ZYTGooglePayUtils zytGooglePayUtils; + public UBJPrivateOllowFragment(){ + + } public static UBJPrivateOllowFragment newInstance() { return new UBJPrivateOllowFragment(); @@ -468,6 +472,17 @@ public class UBJPrivateOllowFragment extends Fragment { }, (purchase, str) -> { PAYLoginHeaddefault.revealToast(str, 0); + if(purchase!=null){ + gsGooglePayInfo = new GSGooglePayInfo(); + gsGooglePayInfo.setOrder_code(current_order_code); + gsGooglePayInfo.setPay_setting_id(String.valueOf(current_pay_setting_id)); + gsGooglePayInfo.setPkg_name(getActivity().getPackageName()); + gsGooglePayInfo.setProduct_id(String.valueOf(android_template_id)); + gsGooglePayInfo.setPurchases_token(purchase.getPurchaseToken()); + gsGooglePayInfo.setTransaction_id(purchase.getOrderId()); + gsGooglePayInfo.setShow_money(current_price); + TIndicator.savePayOrder(gsGooglePayInfo); + } }); zytGooglePayUtils.setqueryProductResult(new ZYTGooglePayUtils.QueryProductResult() { @Override 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 6403ed2..522a33d 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 @@ -39,6 +39,7 @@ import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean; import org.greenrobot.eventbus.EventBus; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collections; @@ -47,6 +48,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; +import kotlin.Unit; +import kotlin.coroutines.Continuation; +import kotlin.jvm.functions.Function1; +import kotlinx.coroutines.CoroutineScope; +import kotlinx.coroutines.Dispatchers; +import kotlinx.coroutines.flow.Flow; +import kotlinx.coroutines.flow.FlowCollector; + public class ZYTStoreActivity extends IDDetailsRoundActivity { @@ -170,9 +179,21 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity { binding.loading.hide(); PAYLoginHeaddefault.revealToast(str, 0); + if (purchase != null) { + gsGooglePayInfo = new GSGooglePayInfo(); + gsGooglePayInfo.setOrder_code(current_order_code); + gsGooglePayInfo.setPay_setting_id(String.valueOf(current_pay_setting_id)); + gsGooglePayInfo.setPkg_name(ZYTStoreActivity.this.getPackageName()); + gsGooglePayInfo.setProduct_id(String.valueOf(android_template_id)); + gsGooglePayInfo.setPurchases_token(purchase.getPurchaseToken()); + gsGooglePayInfo.setTransaction_id(purchase.getOrderId()); + gsGooglePayInfo.setShow_money(current_price); + TIndicator.savePayOrder(gsGooglePayInfo); + } }); zytGooglePayUtils.setqueryProductResult(new ZYTGooglePayUtils.QueryProductResult() { @Override @@ -235,18 +256,21 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity list = TIndicator.getPayOrder(); - if (!list.isEmpty()) { - for (GSGooglePayInfo googlePayInfoItem : list) { - gsGooglePayInfoRestore = googlePayInfoItem; - handler.postDelayed(new Runnable() { - @Override - public void run() { - binding.loading.smoothToShow(); - userViewModel.restorePay(gsGooglePayInfoRestore); - } - }, 2000); - } + listRestore = TIndicator.getPayOrder(); + if (!listRestore.isEmpty() && listRestore.size() > 0) { + + toRestore(); + +// for (GSGooglePayInfo googlePayInfoItem : list) { +// handler.postDelayed(new Runnable() { +// @Override +// public void run() { +// gsGooglePayInfoRestore = googlePayInfoItem; +// LogUtils.d("恢复订单===" + gsGooglePayInfoRestore.getOrder_code()); +// userViewModel.restorePay(gsGooglePayInfoRestore); +// } +// }, 2000); +// } } else { PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_no_restored() : getString(R.string.toast_norestore_txt), 0); } @@ -257,6 +281,29 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity listRestore; + + private void toRestore() { + binding.loading.show(); + gsGooglePayInfoRestore = listRestore.get(listRestore.size() - 1); + userViewModel.restorePay(gsGooglePayInfoRestore); + } + +// private void processListWithDelay(List list) { +// Handler handler = new Handler(Looper.getMainLooper()); +// long delayMillis = 500; // 500ms 延迟 +// +// for (int i = 0; i < list.size(); i++) { +// final GSGooglePayInfo item = list.get(i); +// gsGooglePayInfoRestore = item; +// LogUtils.d("恢复订单=== i==" + i + " ordernumber" + item.getOrder_code()); +// handler.postDelayed(() -> { +// binding.loading.show(); +// LogUtils.d("恢复订单===" + gsGooglePayInfoRestore.getOrder_code()); +// userViewModel.restorePay(gsGooglePayInfoRestore); +// }, i * delayMillis); // 延迟依次增加 +// } +// } // private void queryAvailableCoinsProducts(List list) { // List products = new ArrayList<>(); @@ -400,6 +447,7 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity { if (imaCloseStroke != null) { - int index = -1; - ArrayList list = TIndicator.getPayOrder(); - for (int i = 0; i < list.size(); i++) { - if (list.get(i).getOrder_code().equals(gsGooglePayInfoRestore.getOrder_code())) { - index = i; - break; - } - } - if (index >= 0) { - list.remove(index); - } - TIndicator.savePayOrderList(list); - if (list.isEmpty()) { + listRestore.remove(listRestore.size() - 1); + if (listRestore.size() > 0) { + toRestore(); + } else { PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); EventBus.getDefault() .post(ITItem.CONSTANTS_User_Refresh_Event); } + TIndicator.savePayOrderList(listRestore); +// int index = -1; +// ArrayList list = TIndicator.getPayOrder(); +// LogUtils.d("恢复订单 list.size==" + list.size()); +// for (int i = 0; i < list.size(); i++) { +// if (list.get(i).getOrder_code().equals(gsGooglePayInfoRestore.getOrder_code())) { +// index = i; +// break; +// } +// } +// if (index >= 0) { +// list.remove(index); +// } + +// if (list.isEmpty()) { +// PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); +// +// } + } else { + TIndicator.savePayOrderList(listRestore); } binding.loading.hide(); }); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ODQHistoryFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ODQHistoryFragment.java index 0661dcd..7ae2d54 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ODQHistoryFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ODQHistoryFragment.java @@ -64,6 +64,9 @@ public class ODQHistoryFragment extends Fragment { DDetails adapter; LinearLayoutManager layoutManager; + public ODQHistoryFragment(){ + + } public static ODQHistoryFragment newInstance() { return new ODQHistoryFragment(); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/PAXOmmonGradientFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/PAXOmmonGradientFragment.java index e6015bf..602ae8b 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/PAXOmmonGradientFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/PAXOmmonGradientFragment.java @@ -67,10 +67,14 @@ volatile float desEditTickSpace = 0.0f; private int serviceHome; + public PAXOmmonGradientFragment(){ + + } public static PAXOmmonGradientFragment newInstance(int serviceHome) { + + PAXOmmonGradientFragment view = new PAXOmmonGradientFragment(); Bundle bundle = new Bundle(); bundle.putInt("categoryId", serviceHome); - PAXOmmonGradientFragment view = new PAXOmmonGradientFragment(); view.setArguments(bundle); return view; } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/VItemGradlewFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/VItemGradlewFragment.java index 9b5b6d8..9c5edd0 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/VItemGradlewFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/VItemGradlewFragment.java @@ -55,6 +55,10 @@ public class VItemGradlewFragment extends Fragment { private List centerAdapterFragment; + public VItemGradlewFragment(){ + + } + public static VItemGradlewFragment newInstance() { return new VItemGradlewFragment(); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ZPisodesFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ZPisodesFragment.java index df157aa..67d8c73 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ZPisodesFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/movepage/ZPisodesFragment.java @@ -55,6 +55,10 @@ volatile boolean canTry_zEsult = false; ONShapeSingle adapter; LinearLayoutManager layoutManager; + public ZPisodesFragment(){ + + } + public static ZPisodesFragment newInstance() { return new ZPisodesFragment(); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/CClickFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/CClickFragment.java index 1befb7c..37dabb9 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/CClickFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/CClickFragment.java @@ -39,6 +39,11 @@ public class CClickFragment extends DialogFragment { private int currentTab = 0; + LSQExampleCloseBean.YSearchUser readData; + + private int currentPosition; + + private List list; @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -48,9 +53,13 @@ public class CClickFragment extends DialogFragment { RqyHistoryDialogBinding bind = RqyHistoryDialogBinding.bind(view); - LSQExampleCloseBean.YSearchUser readData = getArguments().getParcelable(ITItem.Constants_Page_Episodes_Series_Data_VT); - List list = getArguments().getParcelableArrayList(ITItem.Constants_Page_Episodes_Series_Data_List); - Integer currentPosition = getArguments().getInt(ITItem.Constants_Page_Episodes_Series_Data_currentPosition, 0); + try { + readData = getArguments().getParcelable(ITItem.Constants_Page_Episodes_Series_Data_VT); + list = getArguments().getParcelableArrayList(ITItem.Constants_Page_Episodes_Series_Data_List); + currentPosition = getArguments().getInt(ITItem.Constants_Page_Episodes_Series_Data_currentPosition, 0); + } catch (Exception e) { + + } TFMLoadingdefault hibitEpisodesSeriesAdapter = new TFMLoadingdefault(); @@ -59,8 +68,8 @@ public class CClickFragment extends DialogFragment { bind.rvDataEpisodesSeries.setAdapter(hibitEpisodesSeriesAdapter); - int length = Math.min(list.size(), 30); if (list != null && !list.isEmpty()) { + int length = Math.min(list.size(), 30); int size = list.size(); int count = size / length; int remainder = size % length; @@ -82,7 +91,7 @@ public class CClickFragment extends DialogFragment { break; } } - if(bind.tablayoutEpisodes.getTabCount()>0){ + if (bind.tablayoutEpisodes.getTabCount() > 0) { bind.tablayoutEpisodes.getTabAt(currentTab).select(); updateRecyclerView(bind.tablayoutEpisodes.getTabAt(currentTab).getText().toString(), hibitEpisodesSeriesAdapter); hibitEpisodesSeriesAdapter.setCurrentPosition(currentPosition + 1); 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 1edeb13..a50c9db 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 @@ -60,6 +60,9 @@ public class ZYTEpisodesRechargeDialogFragment extends BottomSheetDialogFragment public ZYTGooglePayUtils zytGooglePayUtils; + public ZYTEpisodesRechargeDialogFragment(){ + + } public ZYTEpisodesRechargeDialogFragment(Context context, ZYTGooglePayUtils zytGooglePayUtil, boolean isConnect) { this.context = context; this.zytGooglePayUtils = zytGooglePayUtil; 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 4bd379a..8727de7 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 @@ -238,6 +238,17 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity isConnect = connect); vtGooglePlayerAdapter = new WVideoplay(); @@ -273,7 +284,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity { DBeanUnselectBean data = recommondVideoBannerAdapter.getData(recommendBannerPosition); if (data != null) { @@ -537,8 +548,8 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity { if (tjEpisodeRoundBeanIMACloseStroke != null) { - TJEpisodeRoundBean data = tjEpisodeRoundBeanIMACloseStroke.data; - if (data.isIs_vip() && needRefresh) { - detailRefresh(); - } +// TJEpisodeRoundBean data = tjEpisodeRoundBeanIMACloseStroke.data; +// if (data.isIs_vip() && needRefresh) { +// detailRefresh(); +// } + detailRefresh(); } @@ -781,7 +793,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity extends Fragment { return _viewBinding; } + public SZIBackgroundInfoFragment(){ + + } + @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GAndroidLoginFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GAndroidLoginFragment.java index 2016191..a2b2cd7 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GAndroidLoginFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GAndroidLoginFragment.java @@ -66,9 +66,12 @@ private volatile long strokeAnd_0Count = 0; private int listHolder = -1; - + public GAndroidLoginFragment() { + + } + public static GAndroidLoginFragment newInstance() { return new GAndroidLoginFragment(); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GHRHeaddefaultFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GHRHeaddefaultFragment.java index 17a03b2..3490267 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GHRHeaddefaultFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/GHRHeaddefaultFragment.java @@ -40,6 +40,10 @@ public class GHRHeaddefaultFragment extends Fragment { private List centerAdapterFragment; + public GHRHeaddefaultFragment() { + + } + public static GHRHeaddefaultFragment newInstance() { return new GHRHeaddefaultFragment(); } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/MBannerPolicyFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/MBannerPolicyFragment.java index 07aa6fb..799ea19 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/MBannerPolicyFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/reach/MBannerPolicyFragment.java @@ -56,7 +56,9 @@ private volatile ArrayList tipRext_list; private BAVideoIndicator lockTablist; + public MBannerPolicyFragment() { + } public static MBannerPolicyFragment newInstance() { return new MBannerPolicyFragment(); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/vars/FLSFragmentOogleFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/vars/FLSFragmentOogleFragment.java index a058d32..b644db4 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/vars/FLSFragmentOogleFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/vars/FLSFragmentOogleFragment.java @@ -59,6 +59,9 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails private GSTranslatesBean.Translates translates; + public FLSFragmentOogleFragment(){ + + } public static FLSFragmentOogleFragment newInstance() { return new FLSFragmentOogleFragment(); diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTFeedBackListActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTFeedBackListActivity.java index b2881c5..03332d5 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTFeedBackListActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/web/ZYTFeedBackListActivity.java @@ -90,7 +90,7 @@ public class ZYTFeedBackListActivity extends IDDetailsRoundActivity items) { super(items); } 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 2ba282d..a5d9061 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 @@ -150,6 +150,16 @@ public class GSTranslatesBean { private String gleestream_restore; private String gleestream_no_restored; + private String gleestream_account_alreadyloged; + + public String getGleestream_account_alreadyloged() { + return gleestream_account_alreadyloged; + } + + public void setGleestream_account_alreadyloged(String gleestream_account_alreadyloged) { + this.gleestream_account_alreadyloged = gleestream_account_alreadyloged; + } + public String getGleestream_no_restored() { return gleestream_no_restored; } diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/LSQExampleCloseBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/LSQExampleCloseBean.java index 2e50613..9232ef2 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/LSQExampleCloseBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/unconfirmedPiecewise/LSQExampleCloseBean.java @@ -9,6 +9,7 @@ import java.util.Random; import java.util.HashMap; +import android.os.Build; import android.os.Parcel; import android.os.Parcelable; @@ -32,10 +33,6 @@ public class LSQExampleCloseBean { public static class YPZTestUnselect implements Parcelable { - private volatile HashMap exploreDonateListMap; - volatile double episodeTheaterCoins_min = 0.0; - volatile long bottomUnselectActivityIdx = 0; - int coins; int episode; @@ -1238,11 +1235,15 @@ public class LSQExampleCloseBean { coins = in.readInt(); episode = in.readInt(); id = in.readInt(); - is_lock = in.readByte() != 0; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + is_lock = in.readBoolean(); + } is_vip = in.readInt(); short_play_id = in.readInt(); video_url = in.readString(); vip_coins = in.readInt(); + short_play_video_id = in.readInt(); + play_seconds = in.readLong(); } public final Creator CREATOR = new Creator() { @@ -1266,43 +1267,24 @@ public class LSQExampleCloseBean { public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeInt(coins); - int mineU = 1168; - while (mineU < 69) { - break; - } + dest.writeInt(episode); - double toastA = 9794.0; - if (toastA >= 109) { - } + dest.writeInt(id); - ArrayList and_kpR = new ArrayList(); - and_kpR.add(767); - and_kpR.add(541); - and_kpR.add(630); - and_kpR.add(364); - and_kpR.add(189); - and_kpR.add(478); - dest.writeByte((byte) (is_lock ? 1 : 0)); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + dest.writeBoolean(is_lock); + } dest.writeInt(is_vip); - boolean foregroundk = true; - while (foregroundk) { - break; - } - System.out.println(foregroundk); + dest.writeInt(short_play_id); - float arrowrightn = 718.0f; - if (arrowrightn == 98) { - } - System.out.println(arrowrightn); + dest.writeString(video_url); - boolean colorsB = true; - while (!colorsB) { - break; - } + dest.writeInt(vip_coins); - ArrayList profilex = new ArrayList(); - profilex.add(64.0); - profilex.add(835.0); + dest.writeInt(short_play_video_id); + dest.writeLong(play_seconds); + } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5cf3e5c..4d3de68 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -129,4 +129,5 @@ Account Deletion Language gleestream + Your account is already logged in on another device~ \ No newline at end of file diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html deleted file mode 100644 index fb78193..0000000 --- a/build/reports/problems/problems-report.html +++ /dev/null @@ -1,663 +0,0 @@ - - - - - - - - - - - - - Gradle Configuration Cache - - - -
- -
- Loading... -
- - - - - - diff --git a/gradle.properties b/gradle.properties index 6e525b4..f1cd4af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ android.nonTransitiveRClass=true #org.gradle.internal.http.connectionTimeout=600000 #org.gradle.internal.http.socketTimeout=600000 # uploadCrashlyticsMappingFile -#systemProp.http.proxyHost=127.0.0.1 -#systemProp.http.proxyPort=7890 -#systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 \ No newline at end of file +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=7890 +systemProp.https.proxyHost=127.0.0.1 +systemProp.https.proxyPort=7890 \ No newline at end of file