diff --git a/app/build.gradle b/app/build.gradle index dd6b5f3..87112e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { applicationId "com.shortdrama.jelly.zyreotv" minSdk 24 targetSdk 35 - versionCode 6 - versionName "1.0.5" + versionCode 7 + versionName "1.0.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true 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 97b953c..7c7dbfb 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 @@ -60,6 +60,8 @@ public class ITItem { public static final String Constants_FeedBackList_ID = "Constants_FeedBackList_ID"; public static final String Constants_DeepLinkData_URL = "Constants_DeepLinkData_URL"; + public static final String Constants_RestorePay_key = "Constants_RestorePay_Key"; + public static boolean isCanPlay = true; public static boolean isLock = false; @@ -77,11 +79,11 @@ public class ITItem { public static final String CONSTANTS_Language_Refresh_Event = "Constants_Language_Refresh"; - public static final String CONSTANTS_Lang_key="Constants_language_key"; - public static final String CONSTANTS_Lang_key_System="system_"; - public static final String CONSTANTS_Translate_key="CONSTANTS_Translate_key"; - public static final String CONSTANTS_NotifyTime_key="CONSTANTS_NotifyTime_key"; - public static final String CONSTANTS_VipPurchaseTime_key="CONSTANTS_VipPurchaseTime_key"; + public static final String CONSTANTS_Lang_key = "Constants_language_key"; + public static final String CONSTANTS_Lang_key_System = "system_"; + public static final String CONSTANTS_Translate_key = "CONSTANTS_Translate_key"; + public static final String CONSTANTS_NotifyTime_key = "CONSTANTS_NotifyTime_key"; + public static final String CONSTANTS_VipPurchaseTime_key = "CONSTANTS_VipPurchaseTime_key"; static String nextNoneFromTourist(int[] contents, int key, boolean hasEmoji) { 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 9a439d3..e6877da 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 @@ -6,9 +6,14 @@ import static com.shortdrama.jelly.zyreotv.GPplicationLoadingdefault.AppContext; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; +import android.text.TextUtils; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TJEpisodeRoundBean; +import java.util.ArrayList; +import java.util.List; + public class TIndicator { volatile boolean has_VideohistoryButton = false; @@ -118,4 +123,32 @@ public class TIndicator { public static boolean isTourist() { return TIndicator.getBoolean(ITItem.Constants_Is_Tourist, true); } + + + public static void savePayOrder(GSGooglePayInfo googlePayInfo) { + String string = TIndicator.getString(ITItem.Constants_RestorePay_key, ""); + ArrayList orderInfoList = new ArrayList(); + if (!TextUtils.isEmpty(string)) { + orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class)); + }else{ + orderInfoList.add(orderInfoList.size(), googlePayInfo); + } + savePayOrderList(orderInfoList); + } + + public static ArrayList getPayOrder() { + String string = TIndicator.getString(ITItem.Constants_RestorePay_key, ""); + ArrayList orderInfoList = new ArrayList(); + if (!TextUtils.isEmpty(string)) { + orderInfoList.addAll(REnterCircle.getListFromJSON(string, GSGooglePayInfo.class)); + + } + return orderInfoList; + } + + public static void savePayOrderList(ArrayList list) { + TIndicator.saveString(ITItem.Constants_RestorePay_key, REnterCircle.beanToJSONString(list)); + } + + } 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 60cc081..75eafad 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 @@ -8,6 +8,7 @@ import java.util.HashMap; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.CFRewardsLoginBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.CWVIntentBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSDeepLinkResBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSLanguageBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ISeekbarBean; @@ -210,7 +211,7 @@ public interface KGZyreotv { @POST("googlePaid") - Observable getGooglePay(@Body HashMap body); + Observable getGooglePay(@Body GSGooglePayInfo gsGooglePayInfo); @FormUrlEncoded @POST("get_customer/deeplink") diff --git a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/VZBack.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/VZBack.java index 220ae8e..3bd25f0 100644 --- a/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/VZBack.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/dlsym/VZBack.java @@ -65,7 +65,7 @@ public class VZBack extends ZRFTablistAndroid { HttpLoggingInterceptor ecyrpt = new HttpLoggingInterceptor(message -> { try { String ccount = URLDecoder.decode(message, "utf-8"); - LogUtils.d("OKHttp111111-----", ccount); + LogUtils.d("OKHttp111111-----", ccount); } catch (UnsupportedEncodingException e) { e.printStackTrace(); LogUtils.d("OKHttp1111111-----", e.getMessage()); 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 0d1741a..98a8ba9 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 @@ -64,6 +64,7 @@ import com.shortdrama.jelly.zyreotv.topics.abslRwgt.web.ZYTRewardsFragment; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.web.ZYTWebViewIndexActivity; import com.shortdrama.jelly.zyreotv.topics.dts.DOTObserverAndroid; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSDeepLinkResBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSMainEpisodeBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.LSQExampleCloseBean; @@ -115,6 +116,8 @@ 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); + } + } + } + }, 3000); + } @@ -385,6 +406,25 @@ public class AExtractionActivity extends IDDetailsRoundActivity { + if (imaCloseStroke != null) { + int index =-1; + ArrayList list = TIndicator.getPayOrder(); + for (int i=0;i= 0) { + list.remove(index); + } + TIndicator.savePayOrderList(list); + } + + }); } @@ -523,7 +563,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity { - HashMap map = new HashMap<>(); - map.put("order_code", current_order_code); - map.put("pay_setting_id", current_pay_setting_id); - map.put("pkg_name", GSMyVipActivity.this.getPackageName()); - map.put("product_id", android_template_id); - map.put("purchases_token", purchase.getPurchaseToken()); - map.put("transaction_id", purchase.getOrderId()); - map.put("show_money", current_price); - userViewModel.getGooglePay(map); + 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); + userViewModel.getGooglePay(gsGooglePayInfo); }, (purchase, str) -> { PAYLoginHeaddefault.revealToast(str, 0); }); @@ -184,10 +186,15 @@ public class GSMyVipActivity extends IDDetailsRoundActivity { if (imaCloseStroke != null) { - PAYLoginHeaddefault.revealToast(translates!=null?translates.getGleestream_googlepay_success():getString(R.string.google_pay_success), 0); + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); EventBus.getDefault() .post(ITItem.CONSTANTS_User_Refresh_Event); userViewModel.getUserInfo(); + } else { + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_network_error() : getString(R.string.beanFollowlist), 0); + if (gsGooglePayInfo != null) { + TIndicator.savePayOrder(gsGooglePayInfo); + } } }); userViewModel.getGetUserInfoLiveData().observe(this, tjEpisodeRoundBeanIMACloseStroke -> { 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 041704b..eef039c 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,8 +1,13 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn; +import android.os.Handler; +import android.os.Looper; + import java.util.ArrayList; +import java.util.LinkedList; +import java.util.Queue; import java.util.Random; @@ -20,6 +25,7 @@ import com.shortdrama.jelly.zyreotv.beginning.TIndicator; import com.shortdrama.jelly.zyreotv.dlsym.IMACloseStroke; import com.shortdrama.jelly.zyreotv.dlsym.RREStyles; import com.shortdrama.jelly.zyreotv.dlsym.VZBack; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSLanguageBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ListBean; @@ -53,6 +59,7 @@ public class GXCProgressLogin extends ViewModel { private final MutableLiveData>> userSendCoinsLiveData = new MutableLiveData<>(); private final MutableLiveData> createOrderLiveData = new MutableLiveData<>(); private final MutableLiveData googlePayLiveData = new MutableLiveData<>(); + private final MutableLiveData restorePayLiveData = new MutableLiveData<>(); private final MutableLiveData> registLiveData = new MutableLiveData<>(); private final MutableLiveData> loginLiveData = new MutableLiveData<>(); private final MutableLiveData> logoutLiveData = new MutableLiveData<>(); @@ -121,6 +128,10 @@ public class GXCProgressLogin extends ViewModel { return googlePayLiveData; } + public MutableLiveData getRestorePayLiveData() { + return restorePayLiveData; + } + private float splashRefreshingSaltTitleTaskFollow() { double controllerTips = 7516.0; ArrayList allNine = new ArrayList(); @@ -876,8 +887,8 @@ public class GXCProgressLogin extends ViewModel { }); } - public void getGooglePay(HashMap body) { - VZBack.getInstance().getGooglePay(body) + public void getGooglePay(GSGooglePayInfo payInfo) { + VZBack.getInstance().getGooglePay(payInfo) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new RREStyles<>() { @@ -896,6 +907,28 @@ public class GXCProgressLogin extends ViewModel { } + + + + public void restorePay(GSGooglePayInfo restorePay){ + VZBack.getInstance().getGooglePay(restorePay) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new RREStyles<>() { + + + @Override + public void onSuccess(IMACloseStroke o) { + restorePayLiveData.setValue(o); + } + + @Override + public void onError(int code, String msg) { + restorePayLiveData.setValue(null); + } + }); + } + public void doLogin(HashMap body) { VZBack.getInstance().doLogin(body) .subscribeOn(Schedulers.io()) 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 19a1a17..dbb0155 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 @@ -56,6 +56,7 @@ 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; import com.shortdrama.jelly.zyreotv.topics.dts.KDZShareRound; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.TJEpisodeRoundBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean; @@ -447,21 +448,23 @@ public class UBJPrivateOllowFragment extends Fragment { private int current_pay_setting_id; private String current_order_code; + private GSGooglePayInfo gsGooglePayInfo ; + @Override public void onResume() { super.onResume(); seenMarkView.getUserInfo(); if (!TIndicator.is_Vip() && TimeUtils.vipPurchaseIsOpen() && vipPurchaseDialog == null) { zytGooglePayUtils = ZYTGooglePayUtils.getInstance(getActivity(), purchase -> { - HashMap map = new HashMap<>(); - map.put("order_code", current_order_code); - map.put("pay_setting_id", current_pay_setting_id); - map.put("pkg_name", getContext().getPackageName()); - map.put("product_id", android_template_id); - map.put("purchases_token", purchase.getPurchaseToken()); - map.put("transaction_id", purchase.getOrderId()); - map.put("show_money", current_price); - seenMarkView.getGooglePay(map); + gsGooglePayInfo = new GSGooglePayInfo(); + gsGooglePayInfo.setOrder_code(current_order_code); + gsGooglePayInfo.setPay_setting_id(String.valueOf(current_pay_setting_id)); + gsGooglePayInfo.setPkg_name(getContext().getPackageName()); + gsGooglePayInfo.setProduct_id(String.valueOf(android_template_id)); + gsGooglePayInfo.setPurchases_token(purchase.getPurchaseToken()); + gsGooglePayInfo.setTransaction_id(purchase.getOrderId()); + gsGooglePayInfo.setShow_money(current_price); + seenMarkView.getGooglePay(gsGooglePayInfo); }, (purchase, str) -> { PAYLoginHeaddefault.revealToast(str, 0); @@ -667,6 +670,11 @@ public class UBJPrivateOllowFragment extends Fragment { if (imaCloseStroke != null) { PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); seenMarkView.getUserInfo(); + }else{ + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_network_error() : getString(R.string.beanFollowlist), 0); + if (gsGooglePayInfo != null) { + TIndicator.savePayOrder(gsGooglePayInfo); + } } }); } 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 0f8ce0c..6403ed2 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 @@ -1,5 +1,9 @@ package com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn; +import static android.view.View.VISIBLE; + +import android.os.Handler; +import android.os.Looper; import android.text.TextUtils; import androidx.annotation.NonNull; @@ -23,12 +27,14 @@ import com.shortdrama.jelly.zyreotv.beginning.ITItem; import com.shortdrama.jelly.zyreotv.beginning.LogUtils; import com.shortdrama.jelly.zyreotv.beginning.PAYLoginHeaddefault; import com.shortdrama.jelly.zyreotv.beginning.TIndicator; +import com.shortdrama.jelly.zyreotv.beginning.WCenterVideo; import com.shortdrama.jelly.zyreotv.beginning.ZYTGooglePayUtils; import com.shortdrama.jelly.zyreotv.databinding.ActivityStoreBinding; import com.shortdrama.jelly.zyreotv.dlsym.IMACloseStroke; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.IDDetailsRoundActivity; import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreGoldRechargeAdapter; import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreSubVipAdapter; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean; @@ -37,7 +43,9 @@ import org.greenrobot.eventbus.EventBus; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; +import java.util.Queue; public class ZYTStoreActivity extends IDDetailsRoundActivity { @@ -61,6 +69,9 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity { - - HashMap map = new HashMap<>(); - map.put("order_code", current_order_code); - map.put("pay_setting_id", current_pay_setting_id); - map.put("pkg_name", ZYTStoreActivity.this.getPackageName()); - map.put("product_id", android_template_id); - map.put("purchases_token", purchase.getPurchaseToken()); - map.put("transaction_id", purchase.getOrderId()); - map.put("show_money", current_price); - vtUserViewModel.getGooglePay(map); + 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); + vtUserViewModel.getGooglePay(gsGooglePayInfo); }, (purchase, str) -> { binding.loading.hide(); PAYLoginHeaddefault.revealToast(str, 0); @@ -216,9 +231,33 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity { + WCenterVideo.singleClick(new Runnable() { + @Override + public void run() { + ArrayList 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); + } + } else { + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_no_restored() : getString(R.string.toast_norestore_txt), 0); + } + } + }); + }); + } + // private void queryAvailableCoinsProducts(List list) { // List products = new ArrayList<>(); // @@ -386,11 +425,39 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity { binding.loading.hide(); if (imaCloseStroke != null) { - PAYLoginHeaddefault.revealToast(translates!=null?translates.getGleestream_googlepay_success():getString(R.string.google_pay_success), 0); + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); EventBus.getDefault() .post(ITItem.CONSTANTS_User_Refresh_Event); + } else { + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_network_error() : getString(R.string.beanFollowlist), 0); + if (gsGooglePayInfo != null) { + TIndicator.savePayOrder(gsGooglePayInfo); + } } }); + + vtUserViewModel.getRestorePayLiveData().observe(this, imaCloseStroke -> { + 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()) { + PAYLoginHeaddefault.revealToast(translates != null ? translates.getGleestream_googlepay_success() : getString(R.string.google_pay_success), 0); + EventBus.getDefault() + .post(ITItem.CONSTANTS_User_Refresh_Event); + } + } + binding.loading.hide(); + }); } @Override 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 1d106e0..4bd379a 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 @@ -47,12 +47,14 @@ import com.shortdrama.jelly.zyreotv.beginning.TimeUtils; import com.shortdrama.jelly.zyreotv.beginning.WCenterVideo; import com.shortdrama.jelly.zyreotv.beginning.ZYTGooglePayUtils; import com.shortdrama.jelly.zyreotv.databinding.MchDimensHeaderBinding; +import com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn.GSMyVipActivity; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.IDDetailsRoundActivity; import com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma.ZEpisodeEpisode; import com.shortdrama.jelly.zyreotv.topics.amera.BVXHeadView; import com.shortdrama.jelly.zyreotv.topics.dts.WVideoplay; import com.shortdrama.jelly.zyreotv.topics.dts.ZYTRecommondVideoAdapter; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.DBeanUnselectBean; +import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSGooglePayInfo; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSMainEpisodeBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean; import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.LSQExampleCloseBean; @@ -97,6 +99,8 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity map = new HashMap<>(); - map.put("order_code", currentItem.getCurrent_order_code()); - map.put("pay_setting_id", currentItem.getCurrent_pay_setting_id()); - map.put("pkg_name", getPackageName()); - map.put("product_id", currentItem.getAndroid_template_id()); - map.put("purchases_token", purchase.getPurchaseToken()); - map.put("transaction_id", purchase.getOrderId()); - map.put("show_money", currentItem.getCurrent_price()); - userViewModel.getGooglePay(map); + 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()); + userViewModel.getGooglePay(gsGooglePayInfo); } }, (purchase, str) -> @@ -535,6 +539,11 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity + app:srcCompat="@mipmap/bottom_agreement_google" + app:tint="@android:color/white" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a7c29af..5cf3e5c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -122,6 +122,8 @@ Success FeedBack Store + Restore + There are no orders to restore Vip Setting Account Deletion diff --git a/gradle.properties b/gradle.properties index f1cd4af..6e525b4 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