完善谷歌重订阅,修改crash
This commit is contained in:
parent
e7fea6f3c4
commit
b264d8633c
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -447,7 +447,7 @@ public class LibrariesForLibs extends AbstractExternalDependencyFactory {
|
||||
public Provider<String> 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
|
||||
|
@ -604,7 +604,7 @@ public class LibrariesForLibsInPluginsBlock extends AbstractExternalDependencyFa
|
||||
public Provider<String> 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
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8
.idea/deploymentTargetSelector.xml
generated
8
.idea/deploymentTargetSelector.xml
generated
@ -4,6 +4,14 @@
|
||||
<selectionStates>
|
||||
<SelectionState runConfigName="app">
|
||||
<option name="selectionMode" value="DROPDOWN" />
|
||||
<DropdownSelection timestamp="2025-05-06T05:29:51.114312500Z">
|
||||
<Target type="DEFAULT_BOOT">
|
||||
<handle>
|
||||
<DeviceId pluginId="PhysicalDevice" identifier="serial=XW69EAMRN7FAFYR4" />
|
||||
</handle>
|
||||
</Target>
|
||||
</DropdownSelection>
|
||||
<DialogSelection />
|
||||
</SelectionState>
|
||||
</selectionStates>
|
||||
</component>
|
||||
|
1
.idea/vcs.xml
generated
1
.idea/vcs.xml
generated
@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
4
app/proguard-rules.pro
vendored
4
app/proguard-rules.pro
vendored
@ -147,6 +147,10 @@
|
||||
-keep class * implements android.os.Parcelable {
|
||||
public static final android.os.Parcelable$Creator *;
|
||||
}
|
||||
-keepclassmembers class ** {
|
||||
public <init>(android.os.Parcel);
|
||||
}
|
||||
-keep class com.shortdrama.jelly.zyreotv.** implements android.os.Parcelable
|
||||
|
||||
-keepclassmembers class * implements java.io.Serializable {
|
||||
static final long serialVersionUID;
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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";
|
||||
|
@ -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<GSGooglePayInfo> orderInfoList = new ArrayList<GSGooglePayInfo>();
|
||||
if (!TextUtils.isEmpty(string)) {
|
||||
orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class));
|
||||
}else{
|
||||
if (!TextUtils.isEmpty(string) && !string.equals("[]")) {
|
||||
List<GSGooglePayInfo> 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<GSGooglePayInfo> getPayOrder() {
|
||||
String string = TIndicator.getString(ITItem.Constants_RestorePay_key, "");
|
||||
ArrayList<GSGooglePayInfo> orderInfoList = new ArrayList<GSGooglePayInfo>();
|
||||
if (!TextUtils.isEmpty(string)) {
|
||||
if (!TextUtils.isEmpty(string) && !string.equals("[]")) {
|
||||
orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class));
|
||||
|
||||
}
|
||||
|
@ -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<Purchase> 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 {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -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/";
|
||||
|
@ -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<T> extends DisposableObserver<T> {
|
||||
|
||||
|
||||
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<T> extends DisposableObserver<T> {
|
||||
@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<T> extends DisposableObserver<T> {
|
||||
|
||||
public abstract void onSuccess(T o);
|
||||
|
||||
public abstract void onError(int code,String msg);
|
||||
public abstract void onError(int code, String msg);
|
||||
|
||||
}
|
||||
|
@ -192,6 +192,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
public void run() {
|
||||
userViewModel.onlineApp();
|
||||
handler.postDelayed(this, 600000); // 每 10 分钟执行一次
|
||||
// handler.postDelayed(this, 60000); // 每 1 分钟执行一次
|
||||
}
|
||||
};
|
||||
handler.post(onLineRunnable); // 启动
|
||||
@ -219,24 +220,34 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
binding.getRoot().postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ArrayList<GSGooglePayInfo> 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<GSGooglePayInfo> 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<TManifestService
|
||||
) == PackageManager.PERMISSION_GRANTED
|
||||
) {
|
||||
isRequestNotify = false;
|
||||
jumpDetails();
|
||||
firebaseToken();
|
||||
userViewModel.opendNotify();
|
||||
} else {
|
||||
@ -321,6 +333,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
} else {
|
||||
if (NotifyUtils.isNotificationEnable(this)) {
|
||||
isRequestNotify = false;
|
||||
jumpDetails();
|
||||
firebaseToken();
|
||||
userViewModel.opendNotify();
|
||||
} else {
|
||||
@ -410,18 +423,26 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
|
||||
userViewModel.getRestorePayLiveData().observe(this, imaCloseStroke -> {
|
||||
if (imaCloseStroke != null) {
|
||||
int index =-1;
|
||||
ArrayList<GSGooglePayInfo> list = TIndicator.getPayOrder();
|
||||
for (int i=0;i<list.size();i++){
|
||||
if(list.get(i).getOrder_code().equals(gsGooglePayInfoRestore.getOrder_code())){
|
||||
index = i;
|
||||
break;
|
||||
}
|
||||
listRestore.remove(listRestore.size() - 1);
|
||||
if (listRestore.size() > 0) {
|
||||
toRestore();
|
||||
}else{
|
||||
TIndicator.savePayOrderList(listRestore);
|
||||
}
|
||||
if (index >= 0) {
|
||||
list.remove(index);
|
||||
}
|
||||
TIndicator.savePayOrderList(list);
|
||||
// int index = -1;
|
||||
// ArrayList<GSGooglePayInfo> 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<TManifestService
|
||||
if (ITItem.CONSTANTS_Language_Refresh_Event.equals(event)) {
|
||||
userViewModel.getTransLates();
|
||||
}
|
||||
if (ITItem.Constants_Refresh_Auth.equals(event)) {
|
||||
userViewModel.regist();
|
||||
userViewModel.enterApp();
|
||||
userViewModel.onlineApp();
|
||||
}
|
||||
|
||||
if (ITItem.Constants_Refresh_LoginUser402.equals(event)) {
|
||||
PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_account_alreadyloged() : getString(R.string.youraccount_isalreadylogged), 0);
|
||||
userViewModel.regist();
|
||||
EventBus.getDefault().post(ITItem.CONSTANTS_User_Refresh_Event);
|
||||
userViewModel.enterApp();
|
||||
userViewModel.onlineApp();
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -487,12 +522,17 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
|
||||
|
||||
private void jumpDetails() {
|
||||
w2aSelfAttribution(clipString);
|
||||
clipString = "";
|
||||
LRewards.startPlayerDetails(AExtractionActivity.this, shortPlayId, videoId);
|
||||
TIndicator.saveString(ITItem.Constants_DeepLinkData_URL, "");
|
||||
cleanClipData();
|
||||
needSave = false;
|
||||
if (shortPlayId != 0) {
|
||||
w2aSelfAttribution(clipString);
|
||||
clipString = "";
|
||||
LRewards.startPlayerDetails(AExtractionActivity.this, shortPlayId, videoId);
|
||||
shortPlayId = 0;
|
||||
videoId = 0;
|
||||
TIndicator.saveString(ITItem.Constants_DeepLinkData_URL, "");
|
||||
cleanClipData();
|
||||
needSave = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private String getClipContent() {
|
||||
@ -503,7 +543,12 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
|
||||
int itemCount = primaryClip.getItemCount();
|
||||
if (clipboardManager.hasPrimaryClip() && itemCount > 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<TManifestService
|
||||
binding.getRoot().postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
clipString = ddl;
|
||||
if (isRequestNotify) {
|
||||
return;
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Re
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_User_Refresh_Event;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppEnter;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppLeave;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppOnline;
|
||||
|
||||
import android.graphics.Color;
|
||||
|
||||
@ -96,6 +97,8 @@ public class GSDeleteAccountActivity extends IDDetailsRoundActivity<ActivityDele
|
||||
@Override
|
||||
public void toSure() {
|
||||
binding.loading.show();
|
||||
EventBus.getDefault()
|
||||
.post(Constants_AppLeave);
|
||||
userViewModel.logoOff();
|
||||
|
||||
}
|
||||
@ -114,13 +117,13 @@ public class GSDeleteAccountActivity extends IDDetailsRoundActivity<ActivityDele
|
||||
userViewModel.getLogoffLiveData().observe(this, feedbackResp -> {
|
||||
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<ActivityDele
|
||||
userViewModel.getUserInfo();
|
||||
EventBus.getDefault()
|
||||
.post(Constants_AppEnter);
|
||||
EventBus.getDefault()
|
||||
.post(Constants_AppOnline);
|
||||
EventBus.getDefault()
|
||||
.post(CONSTANTS_User_Refresh_Event);
|
||||
EventBus.getDefault()
|
||||
@ -143,6 +148,8 @@ public class GSDeleteAccountActivity extends IDDetailsRoundActivity<ActivityDele
|
||||
GSDeleteAccountActivity.this.finish();
|
||||
|
||||
} else {
|
||||
EventBus.getDefault()
|
||||
.post(Constants_AppEnter);
|
||||
PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_service_abnormality() : "The service is abnormal. Check the network.", 0);
|
||||
}
|
||||
});
|
||||
|
@ -24,6 +24,7 @@ import com.facebook.FacebookCallback;
|
||||
import com.facebook.FacebookException;
|
||||
import com.facebook.FacebookSdk;
|
||||
import com.facebook.GraphRequest;
|
||||
import com.facebook.login.LoginBehavior;
|
||||
import com.facebook.login.LoginManager;
|
||||
import com.facebook.login.LoginResult;
|
||||
import com.shortdrama.jelly.zyreotv.R;
|
||||
@ -98,7 +99,6 @@ public class GSLoginActivity extends IDDetailsRoundActivity<ActivityLoginBinding
|
||||
};
|
||||
|
||||
|
||||
|
||||
ClickableSpan privacyClick = new ClickableSpan() {
|
||||
@Override
|
||||
public void onClick(@NonNull View widget) {
|
||||
@ -111,7 +111,7 @@ public class GSLoginActivity extends IDDetailsRoundActivity<ActivityLoginBinding
|
||||
ds.setColor(Color.parseColor("#888888"));
|
||||
}
|
||||
};
|
||||
// privacyClick.updateDrawState(userPaint);
|
||||
// privacyClick.updateDrawState(userPaint);
|
||||
|
||||
spannableString.setSpan(userClick, startUser, endUser, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
spannableString.setSpan(privacyClick, startprivacy, endprivacy, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
@ -136,6 +136,7 @@ public class GSLoginActivity extends IDDetailsRoundActivity<ActivityLoginBinding
|
||||
WCenterVideo.singleClick(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
LoginManager.getInstance().logOut(); // 清除 Facebook 登录缓存
|
||||
LoginManager.getInstance().logInWithReadPermissions(GSLoginActivity.this, Arrays.asList("email", "public_profile"));
|
||||
}
|
||||
});
|
||||
|
@ -6,6 +6,7 @@ import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Re
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_User_Refresh_Event;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppEnter;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppLeave;
|
||||
import static com.shortdrama.jelly.zyreotv.beginning.ITItem.Constants_AppOnline;
|
||||
|
||||
import android.content.Intent;
|
||||
|
||||
@ -82,6 +83,8 @@ public class ZYTSettingActivity extends IDDetailsRoundActivity<ActivitySettingZy
|
||||
binding.layoutSettingActionbar.ivTopback.setOnClickListener(v -> 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<ActivitySettingZy
|
||||
userViewModel.getLogoutLiveData().observe(this, feedbackResp -> {
|
||||
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);
|
||||
}
|
||||
|
@ -101,6 +101,18 @@ public class GSMyVipActivity extends IDDetailsRoundActivity<ActivityVipZytBindin
|
||||
userViewModel.getGooglePay(gsGooglePayInfo);
|
||||
}, (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(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
|
||||
|
@ -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<IMACloseStroke>() {
|
||||
@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<VPisodesAppnameBean> o) {
|
||||
EventBus.getDefault()
|
||||
.post(Constants_AppLeave);
|
||||
loginLiveData.setValue(o);
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
@ -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<ActivityStoreBinding> {
|
||||
|
||||
@ -170,9 +179,21 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
|
||||
gsGooglePayInfo.setTransaction_id(purchase.getOrderId());
|
||||
gsGooglePayInfo.setShow_money(current_price);
|
||||
vtUserViewModel.getGooglePay(gsGooglePayInfo);
|
||||
// TIndicator.savePayOrder(gsGooglePayInfo);
|
||||
}, (purchase, str) -> {
|
||||
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<ActivityStoreBindin
|
||||
WCenterVideo.singleClick(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
ArrayList<GSGooglePayInfo> 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<ActivityStoreBindin
|
||||
|
||||
}
|
||||
|
||||
private ArrayList<GSGooglePayInfo> listRestore;
|
||||
|
||||
private void toRestore() {
|
||||
binding.loading.show();
|
||||
gsGooglePayInfoRestore = listRestore.get(listRestore.size() - 1);
|
||||
userViewModel.restorePay(gsGooglePayInfoRestore);
|
||||
}
|
||||
|
||||
// private void processListWithDelay(List<GSGooglePayInfo> 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<ZYTPaySettingBean.Coins> list) {
|
||||
// List<QueryProductDetailsParams.Product> products = new ArrayList<>();
|
||||
@ -400,6 +447,7 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
|
||||
if (vtCreateOrderBean != null && vtCreateOrderBean.data != null) {
|
||||
String userId = TIndicator.getUserInfo().getId();
|
||||
current_order_code = vtCreateOrderBean.data.getOrder_code();
|
||||
LogUtils.d("恢复订单== 创建订单===" + current_order_code);
|
||||
if (vtCreateOrderBean.data.getType().equals(BillingClient.ProductType.SUBS)) {
|
||||
String productType = BillingClient.ProductType.SUBS;
|
||||
zytGooglePayUtils.getGoogleProduct(
|
||||
@ -438,23 +486,34 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
|
||||
|
||||
vtUserViewModel.getRestorePayLiveData().observe(this, imaCloseStroke -> {
|
||||
if (imaCloseStroke != null) {
|
||||
int index = -1;
|
||||
ArrayList<GSGooglePayInfo> 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<GSGooglePayInfo> 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();
|
||||
});
|
||||
|
@ -64,6 +64,9 @@ public class ODQHistoryFragment extends Fragment {
|
||||
DDetails adapter;
|
||||
LinearLayoutManager layoutManager;
|
||||
|
||||
public ODQHistoryFragment(){
|
||||
|
||||
}
|
||||
public static ODQHistoryFragment newInstance() {
|
||||
return new ODQHistoryFragment();
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -55,6 +55,10 @@ public class VItemGradlewFragment extends Fragment {
|
||||
|
||||
private List<Fragment> centerAdapterFragment;
|
||||
|
||||
public VItemGradlewFragment(){
|
||||
|
||||
}
|
||||
|
||||
public static VItemGradlewFragment newInstance() {
|
||||
return new VItemGradlewFragment();
|
||||
}
|
||||
|
@ -55,6 +55,10 @@ volatile boolean canTry_zEsult = false;
|
||||
ONShapeSingle adapter;
|
||||
LinearLayoutManager layoutManager;
|
||||
|
||||
public ZPisodesFragment(){
|
||||
|
||||
}
|
||||
|
||||
public static ZPisodesFragment newInstance() {
|
||||
return new ZPisodesFragment();
|
||||
}
|
||||
|
@ -39,6 +39,11 @@ public class CClickFragment extends DialogFragment {
|
||||
|
||||
private int currentTab = 0;
|
||||
|
||||
LSQExampleCloseBean.YSearchUser readData;
|
||||
|
||||
private int currentPosition;
|
||||
|
||||
private List<LSQExampleCloseBean.YPZTestUnselect> 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<LSQExampleCloseBean.YPZTestUnselect> 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);
|
||||
|
@ -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;
|
||||
|
@ -238,6 +238,17 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
|
||||
|
||||
{
|
||||
PAYLoginHeaddefault.revealToast(str, 0);
|
||||
if (purchase != null && currentItem != null) {
|
||||
gsGooglePayInfo = new GSGooglePayInfo();
|
||||
gsGooglePayInfo.setOrder_code(currentItem.getCurrent_order_code());
|
||||
gsGooglePayInfo.setPay_setting_id(String.valueOf(currentItem.getCurrent_pay_setting_id()));
|
||||
gsGooglePayInfo.setPkg_name(getPackageName());
|
||||
gsGooglePayInfo.setProduct_id(currentItem.getAndroid_template_id());
|
||||
gsGooglePayInfo.setPurchases_token(purchase.getPurchaseToken());
|
||||
gsGooglePayInfo.setTransaction_id(purchase.getOrderId());
|
||||
gsGooglePayInfo.setShow_money(currentItem.getCurrent_price());
|
||||
TIndicator.savePayOrder(gsGooglePayInfo);
|
||||
}
|
||||
});
|
||||
zytGooglePayUtils.startConnection(connect -> isConnect = connect);
|
||||
vtGooglePlayerAdapter = new WVideoplay();
|
||||
@ -273,7 +284,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
|
||||
60,
|
||||
15
|
||||
);
|
||||
|
||||
viewBinding.viewVideoRecommend.bannerRecommend.setAdapter(recommondVideoBannerAdapter);
|
||||
translates = AppUtils.getTranslates();
|
||||
if (translates != null) {
|
||||
viewBinding.viewVideoRecommend.tvRecommend.setText(AppUtils.replace(translates.getGleestream_recommond_title(), "90%"));
|
||||
@ -393,7 +404,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
|
||||
|
||||
}
|
||||
});
|
||||
viewBinding.viewVideoRecommend.bannerRecommend.setAdapter(recommondVideoBannerAdapter);
|
||||
|
||||
viewBinding.viewVideoRecommend.tvWatchNowRecommend.setOnClickListener(v -> {
|
||||
DBeanUnselectBean data = recommondVideoBannerAdapter.getData(recommendBannerPosition);
|
||||
if (data != null) {
|
||||
@ -537,8 +548,8 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
|
||||
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);
|
||||
// vtViewModel.getVideoDetails(item.getShort_play_id(), item.getShort_play_video_id(),activity_id);
|
||||
// LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
|
||||
// vtViewModel.getVideoDetails(item.getShort_play_id(), 0, activity_id);
|
||||
} else {
|
||||
PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_network_error() : getString(R.string.beanFollowlist), 0);
|
||||
if (gsGooglePayInfo != null) {
|
||||
@ -550,10 +561,11 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
|
||||
userViewModel.getGetUserInfoLiveData().observe(this, tjEpisodeRoundBeanIMACloseStroke -> {
|
||||
|
||||
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<MchDim
|
||||
super.onStop();
|
||||
if (vtGooglePlayerAdapter != null && !vtGooglePlayerAdapter.getItems().isEmpty()) {
|
||||
LSQExampleCloseBean.YPZTestUnselect item = vtGooglePlayerAdapter.getItems().get(currentPosition);
|
||||
if (!item.isIs_lock()) {
|
||||
if (!item.isIs_lock() && pageGoogleExoPlayerView() != null) {
|
||||
vtViewModel.uploadHistorySeconds(needRestart ? 0 : pageGoogleExoPlayerView().getlastProgress(), item.getShort_play_id(), item.getShort_play_video_id());
|
||||
}
|
||||
|
||||
|
@ -22,6 +22,10 @@ public abstract class SZIBackgroundInfoFragment<T> extends Fragment {
|
||||
return _viewBinding;
|
||||
}
|
||||
|
||||
public SZIBackgroundInfoFragment(){
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onViewCreated(View view, Bundle savedInstanceState) {
|
||||
super.onViewCreated(view, savedInstanceState);
|
||||
|
@ -66,9 +66,12 @@ private volatile long strokeAnd_0Count = 0;
|
||||
|
||||
private int listHolder = -1;
|
||||
|
||||
|
||||
|
||||
|
||||
public GAndroidLoginFragment() {
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static GAndroidLoginFragment newInstance() {
|
||||
return new GAndroidLoginFragment();
|
||||
|
@ -40,6 +40,10 @@ public class GHRHeaddefaultFragment extends Fragment {
|
||||
|
||||
private List<Fragment> centerAdapterFragment;
|
||||
|
||||
public GHRHeaddefaultFragment() {
|
||||
|
||||
}
|
||||
|
||||
public static GHRHeaddefaultFragment newInstance() {
|
||||
return new GHRHeaddefaultFragment();
|
||||
}
|
||||
|
@ -56,7 +56,9 @@ private volatile ArrayList<Double> tipRext_list;
|
||||
|
||||
private BAVideoIndicator lockTablist;
|
||||
|
||||
public MBannerPolicyFragment() {
|
||||
|
||||
}
|
||||
|
||||
public static MBannerPolicyFragment newInstance() {
|
||||
return new MBannerPolicyFragment();
|
||||
|
@ -59,6 +59,9 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
|
||||
|
||||
private GSTranslatesBean.Translates translates;
|
||||
|
||||
public FLSFragmentOogleFragment(){
|
||||
|
||||
}
|
||||
|
||||
public static FLSFragmentOogleFragment newInstance() {
|
||||
return new FLSFragmentOogleFragment();
|
||||
|
@ -90,7 +90,7 @@ public class ZYTFeedBackListActivity extends IDDetailsRoundActivity<FBannerPolic
|
||||
binding.avi.show();
|
||||
}
|
||||
view.setBackgroundColor(Color.parseColor("#000000"));
|
||||
// view.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
|
||||
// view.setLayerType(View.LAYER_TYPE_SOFTWARE, null); //关闭硬件加速
|
||||
}
|
||||
};
|
||||
WebViewClient webViewClient = new WebViewClient() {
|
||||
|
@ -35,6 +35,10 @@ public class ZYTRewardsFragment extends Fragment {
|
||||
private FragmentRewardsBinding binding;
|
||||
|
||||
|
||||
public ZYTRewardsFragment(){
|
||||
|
||||
}
|
||||
|
||||
public static ZYTRewardsFragment newInstance() {
|
||||
return new ZYTRewardsFragment();
|
||||
}
|
||||
|
@ -17,6 +17,7 @@ import com.shortdrama.jelly.zyreotv.R;
|
||||
import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.DBeanUnselectBean;
|
||||
import com.youth.banner.adapter.BannerAdapter;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@ -24,6 +25,7 @@ public class ZYTRecommondVideoAdapter extends BannerAdapter<DBeanUnselectBean, Z
|
||||
|
||||
private int currentPlayingPosition = 0;
|
||||
|
||||
|
||||
public ZYTRecommondVideoAdapter(List<DBeanUnselectBean> items) {
|
||||
super(items);
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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<String, Float> 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<YPZTestUnselect> CREATOR = new Creator<YPZTestUnselect>() {
|
||||
@ -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<Integer> and_kpR = new ArrayList<Integer>();
|
||||
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<Double> profilex = new ArrayList<Double>();
|
||||
profilex.add(64.0);
|
||||
profilex.add(835.0);
|
||||
dest.writeInt(short_play_video_id);
|
||||
dest.writeLong(play_seconds);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -129,4 +129,5 @@
|
||||
<string name="deleteaccount_txt">Account Deletion</string>
|
||||
<string name="language_txt">Language</string>
|
||||
<string name="default_notification_channel_id">gleestream</string>
|
||||
<string name="youraccount_isalreadylogged">Your account is already logged in on another device~</string>
|
||||
</resources>
|
File diff suppressed because one or more lines are too long
@ -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
|
||||
systemProp.http.proxyHost=127.0.0.1
|
||||
systemProp.http.proxyPort=7890
|
||||
systemProp.https.proxyHost=127.0.0.1
|
||||
systemProp.https.proxyPort=7890
|
Loading…
x
Reference in New Issue
Block a user