From 9d528524be3d46158808bfe0278261f1437a260c Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Tue, 26 Mar 2024 15:25:23 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=B8=89=E6=98=9F=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IAP6Helper/src/main/AndroidManifest.xml | 8 +- .../lib/listener/OnGetOwnedListListener.java | 20 - .../OnGetProductsDetailsListener.java | 20 - .../activity/AccountActivity.java | 11 +- .../{lib => lib2}/activity/BaseActivity.java | 36 +- .../activity/CheckPackageActivity.java | 12 +- .../activity/DialogActivity.java | 12 +- .../activity/PaymentActivity.java | 10 +- .../dialog/BaseDialogFragment.java | 3 +- .../{lib => lib2}/helper/HelperDefine.java | 2 +- .../helper/HelperListenerManager.java | 16 +- .../iap/{lib => lib2}/helper/HelperUtil.java | 8 +- .../iap/{lib => lib2}/helper/IapHelper.java | 42 +- .../{lib => lib2}/helper/task/BaseTask.java | 7 +- .../task/ConsumePurchasedItemsTask.java | 8 +- .../helper/task/GetOwnedListTask.java | 8 +- .../helper/task/GetProductsDetailsTask.java | 8 +- .../OnConsumePurchasedItemsListener.java | 10 +- .../lib2/listener/OnGetOwnedListListener.java | 20 + .../OnGetProductsDetailsListener.java | 20 + .../listener/OnIapBindListener.java | 2 +- .../listener/OnPaymentListener.java | 6 +- .../{lib => lib2}/listener/OnSucceedBind.java | 2 +- .../{lib => lib2}/service/BaseService.java | 18 +- .../service/ConsumePurchasedItems.java | 14 +- .../{lib => lib2}/service/OwnedProduct.java | 14 +- .../service/ProductsDetails.java | 14 +- .../sdk/iap/{lib => lib2}/vo/BaseVo.java | 2 +- .../sdk/iap/{lib => lib2}/vo/ConsumeVo.java | 2 +- .../sdk/iap/{lib => lib2}/vo/ErrorVo.java | 4 +- .../iap/{lib => lib2}/vo/OwnedProductVo.java | 2 +- .../sdk/iap/{lib => lib2}/vo/ProductVo.java | 2 +- .../sdk/iap/{lib => lib2}/vo/PurchaseVo.java | 2 +- app/build.gradle | 2 +- .../phonelive/activity/LauncherActivity.java | 2 +- .../utils/CustomMessageReceiver.java | 2 +- app/tmp/full-r8-config.txt | 1009 ++++++++--------- .../java/com/yunbao/common/bean/UserBean.java | 9 + .../common/pay/samsung/SamsungUtil.java | 16 +- .../yunbao/main/activity/SamsungFragment.java | 13 +- .../com/yunbao/main/http/MainHttpUtil.java | 8 +- 41 files changed, 708 insertions(+), 718 deletions(-) delete mode 100644 IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java delete mode 100644 IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/activity/AccountActivity.java (91%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/activity/BaseActivity.java (85%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/activity/CheckPackageActivity.java (77%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/activity/DialogActivity.java (78%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/activity/PaymentActivity.java (92%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/dialog/BaseDialogFragment.java (99%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/HelperDefine.java (99%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/HelperListenerManager.java (83%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/HelperUtil.java (98%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/IapHelper.java (92%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/task/BaseTask.java (88%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/task/ConsumePurchasedItemsTask.java (94%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/task/GetOwnedListTask.java (95%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/helper/task/GetProductsDetailsTask.java (95%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/listener/OnConsumePurchasedItemsListener.java (50%) create mode 100644 IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java create mode 100644 IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/listener/OnIapBindListener.java (85%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/listener/OnPaymentListener.java (69%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/listener/OnSucceedBind.java (63%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/service/BaseService.java (78%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/service/ConsumePurchasedItems.java (76%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/service/OwnedProduct.java (76%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/service/ProductsDetails.java (76%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/BaseVo.java (98%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/ConsumeVo.java (97%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/ErrorVo.java (93%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/OwnedProductVo.java (98%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/ProductVo.java (99%) rename IAP6Helper/src/main/java/com/samsung/android/sdk/iap/{lib => lib2}/vo/PurchaseVo.java (99%) diff --git a/IAP6Helper/src/main/AndroidManifest.xml b/IAP6Helper/src/main/AndroidManifest.xml index 15497edba..7f20d0919 100644 --- a/IAP6Helper/src/main/AndroidManifest.xml +++ b/IAP6Helper/src/main/AndroidManifest.xml @@ -10,22 +10,22 @@ diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java deleted file mode 100644 index 35d76f957..000000000 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.samsung.android.sdk.iap.lib.listener; - -import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo; - -import java.util.ArrayList; - -/** - * Callback Interface used with {@link GetOwnedListTask} - */ -public interface OnGetOwnedListListener { - /** - * Callback method to be invoked when {@link GetOwnedListTask} has been finished. - * - * @param _errorVO - * @param _ownedList - */ - void onGetOwnedProducts(ErrorVo _errorVO, ArrayList _ownedList); -} diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java deleted file mode 100644 index 55442b181..000000000 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.samsung.android.sdk.iap.lib.listener; - -import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.ProductVo; - -import java.util.ArrayList; - -/** - * Callback Interface used with {@link GetProductsDetailsTask} - */ -public interface OnGetProductsDetailsListener { - /** - * Callback method to be invoked when {@link GetProductsDetailsTask} has been finished. - * - * @param _errorVO - * @param _productList - */ - void onGetProducts(ErrorVo _errorVO, ArrayList _productList); -} diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java similarity index 91% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java index 4ce2f87a2..417637248 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java @@ -1,13 +1,13 @@ -package com.samsung.android.sdk.iap.lib.activity; +package com.samsung.android.sdk.iap.lib2.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.util.Log; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.HelperUtil; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.HelperUtil; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; /** * Created by sangbum7.kim on 2018-03-06. @@ -16,12 +16,11 @@ import com.samsung.android.sdk.iap.lib.helper.IapHelper; public class AccountActivity extends Activity { private static final String TAG = AccountActivity.class.getSimpleName(); - IapHelper mIapHelper = null; + com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mIapHelper = IapHelper.getInstance(this); // ==================================================================== // 1. If IAP package is installed and valid, start SamsungAccount diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java similarity index 85% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java index 10e581604..1e186d0a1 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.activity; +package com.samsung.android.sdk.iap.lib2.activity; import android.app.Activity; import android.app.Dialog; @@ -8,25 +8,25 @@ import android.util.Log; import android.widget.Toast; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.HelperUtil; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.PurchaseVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment; +import com.samsung.android.sdk.iap.lib2.helper.HelperUtil; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo; public abstract class BaseActivity extends Activity { private static final String TAG = BaseActivity.class.getSimpleName(); - protected ErrorVo mErrorVo = new ErrorVo(); + protected com.samsung.android.sdk.iap.lib2.vo.ErrorVo mErrorVo = new com.samsung.android.sdk.iap.lib2.vo.ErrorVo(); private Dialog mProgressDialog = null; - protected PurchaseVo mPurchaseVo = null; + protected com.samsung.android.sdk.iap.lib2.vo.PurchaseVo mPurchaseVo = null; /** * Helper Class between IAPService and 3rd Party Application */ - IapHelper mIapHelper = null; + com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null; /** * Flag value to show successful pop-up. Error pop-up appears whenever it fails or not. @@ -64,15 +64,15 @@ public abstract class BaseActivity extends Activity { public boolean checkAppsPackage(Activity _activity) { // 1. If Galaxy Store is installed // ==================================================================== - if (HelperUtil.isInstalledAppsPackage(this)) { + if (com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isInstalledAppsPackage(this)) { // 1) If Galaxy Store is enabled // ================================================================ - if (!HelperUtil.isEnabledAppsPackage(this)) { - HelperUtil.showEnableGalaxyStoreDialog(_activity); + if (!com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isEnabledAppsPackage(this)) { + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showEnableGalaxyStoreDialog(_activity); // ================================================================ // 2) If Galaxy Store is valid // ================================================================ - } else if (HelperUtil.isValidAppsPackage(this)) { + } else if (com.samsung.android.sdk.iap.lib2.helper.HelperUtil.isValidAppsPackage(this)) { return true; } else { // Set error to notify result to third-party application @@ -84,7 +84,7 @@ public abstract class BaseActivity extends Activity { R.string.dream_ph_body_contact_p1sscustomer_servicep2ss_for_more_information_n_nerror_code_c_p3ss), "", "", ERROR_ISSUER_IAP_CLIENT + ERROR_CODE_INVALID_GALAXY_STORE); mErrorVo.setError(HelperDefine.IAP_PAYMENT_IS_CANCELED, errorString); - HelperUtil.showInvalidGalaxyStoreDialog(this); + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showInvalidGalaxyStoreDialog(this); } // ================================================================ @@ -92,7 +92,7 @@ public abstract class BaseActivity extends Activity { // 2. If Galaxy Store is not installed // ==================================================================== } else { - HelperUtil.installAppsPackage(this); + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.installAppsPackage(this); } // ==================================================================== return false; @@ -161,12 +161,12 @@ public abstract class BaseActivity extends Activity { else { Log.e(TAG, "finishPurchase: " + mErrorVo.dump()); if (mShowErrorDialog) { - HelperUtil.showIapErrorDialog( + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showIapErrorDialog( this, getString(R.string.dream_ph_pheader_couldnt_complete_purchase), mErrorVo.getErrorString(), mErrorVo.getErrorDetailsString(), - new BaseDialogFragment.OnClickListener() { + new com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment.OnClickListener() { @Override public void onClick() { finish(); diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java similarity index 77% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java index e790a63d0..5455b5663 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java @@ -1,12 +1,12 @@ -package com.samsung.android.sdk.iap.lib.activity; +package com.samsung.android.sdk.iap.lib2.activity; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.HelperUtil; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.HelperUtil; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; /** * Created by sangbum7.kim on 2018-03-07. @@ -27,12 +27,12 @@ public class CheckPackageActivity extends Activity { int DialogType = extras.getInt("DialogType"); switch (DialogType) { case HelperDefine.DIALOG_TYPE_INVALID_PACKAGE: { - HelperUtil.showInvalidGalaxyStoreDialog(this); + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showInvalidGalaxyStoreDialog(this); mFinishFlag = false; } break; case HelperDefine.DIALOG_TYPE_DISABLE_APPLICATION: { - HelperUtil.showEnableGalaxyStoreDialog(this); + com.samsung.android.sdk.iap.lib2.helper.HelperUtil.showEnableGalaxyStoreDialog(this); mFinishFlag = false; } break; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java similarity index 78% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java index 8e77cfa79..d4b2fd427 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java @@ -1,16 +1,12 @@ -package com.samsung.android.sdk.iap.lib.activity; +package com.samsung.android.sdk.iap.lib2.activity; import android.app.Activity; -import android.content.ActivityNotFoundException; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; -import android.text.TextUtils; -import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.HelperUtil; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment; +import com.samsung.android.sdk.iap.lib2.helper.HelperUtil; /** * Created by sangbum7.kim on 2018-03-05. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java similarity index 92% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java index e309aa00c..786c01b94 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.activity; +package com.samsung.android.sdk.iap.lib2.activity; import android.content.ComponentName; import android.content.Context; @@ -9,9 +9,9 @@ import android.util.Log; import android.widget.Toast; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.HelperListenerManager; -import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.HelperListenerManager; +import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; public class PaymentActivity extends BaseActivity { private static final String TAG = PaymentActivity.class.getSimpleName(); @@ -56,7 +56,7 @@ public class PaymentActivity extends BaseActivity { super.preDestory(); if (isFinishing()) { OnPaymentListener onPaymentListener = - HelperListenerManager.getInstance().getOnPaymentListener(); + com.samsung.android.sdk.iap.lib2.helper.HelperListenerManager.getInstance().getOnPaymentListener(); HelperListenerManager.getInstance().setOnPaymentListener(null); if (null != onPaymentListener) { onPaymentListener.onPayment(mErrorVo, mPurchaseVo); diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java similarity index 99% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java index 8f2977cd3..cc0b0272e 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.dialog; +package com.samsung.android.sdk.iap.lib2.dialog; import android.app.ActionBar; import android.app.Dialog; @@ -8,7 +8,6 @@ import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.text.method.LinkMovementMethod; -import android.util.Log; import android.util.TypedValue; import android.view.Gravity; import android.view.View; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java similarity index 99% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java index 15a86549d..fc5ce9330 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper; +package com.samsung.android.sdk.iap.lib2.helper; /** * Created by sangbum7.kim on 2017-07-17. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java similarity index 83% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java index f4a827f65..c44040c09 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java @@ -1,12 +1,12 @@ -package com.samsung.android.sdk.iap.lib.helper; +package com.samsung.android.sdk.iap.lib2.helper; -import com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask; -import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask; -import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask; -import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener; -import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener; -import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener; -import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener; +import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener; +import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener; +import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask; +import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask; +import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask; /** * Created by sangbum7.kim on 2017-08-29. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java similarity index 98% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java index 265ff6f50..b68f19658 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper; +package com.samsung.android.sdk.iap.lib2.helper; import android.app.Activity; import android.content.ComponentName; @@ -14,9 +14,9 @@ import android.text.Html; import android.util.Log; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.activity.BaseActivity; -import com.samsung.android.sdk.iap.lib.dialog.BaseDialogFragment; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.activity.BaseActivity; +import com.samsung.android.sdk.iap.lib2.dialog.BaseDialogFragment; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; /** * Created by sangbum7.kim on 2017-08-17. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java similarity index 92% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java index 7e5ad8a55..319d25159 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper; +package com.samsung.android.sdk.iap.lib2.helper; import android.content.ComponentName; import android.content.Context; @@ -12,20 +12,20 @@ import android.util.Log; import com.samsung.android.iap.IAPConnector; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity; -import com.samsung.android.sdk.iap.lib.activity.PaymentActivity; -import com.samsung.android.sdk.iap.lib.helper.task.ConsumePurchasedItemsTask; -import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask; -import com.samsung.android.sdk.iap.lib.helper.task.GetProductsDetailsTask; -import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener; -import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener; -import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener; -import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener; -import com.samsung.android.sdk.iap.lib.service.BaseService; -import com.samsung.android.sdk.iap.lib.service.ConsumePurchasedItems; -import com.samsung.android.sdk.iap.lib.service.OwnedProduct; -import com.samsung.android.sdk.iap.lib.service.ProductsDetails; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.activity.CheckPackageActivity; +import com.samsung.android.sdk.iap.lib2.activity.PaymentActivity; +import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener; +import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener; +import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener; +import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.service.BaseService; +import com.samsung.android.sdk.iap.lib2.service.ConsumePurchasedItems; +import com.samsung.android.sdk.iap.lib2.service.OwnedProduct; +import com.samsung.android.sdk.iap.lib2.service.ProductsDetails; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask; +import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask; +import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask; import java.util.ArrayList; @@ -46,9 +46,9 @@ public class IapHelper extends HelperDefine { // AsyncTask for API // ======================================================================== - private GetProductsDetailsTask mGetProductsDetailsTask = null; - private GetOwnedListTask mGetOwnedListTask = null; - private ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null; + private com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask mGetProductsDetailsTask = null; + private com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask mGetOwnedListTask = null; + private com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask mConsumePurchasedItemsTask = null; // ======================================================================== private ArrayList mServiceQueue = new ArrayList(); @@ -267,7 +267,7 @@ public class IapHelper extends HelperDefine { if (mIapConnector == null || mContext == null) { return false; } else { - mGetProductsDetailsTask = new GetProductsDetailsTask(_baseService, + mGetProductsDetailsTask = new com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask(_baseService, mIapConnector, mContext, _productIDs, @@ -344,7 +344,7 @@ public class IapHelper extends HelperDefine { if (mIapConnector == null || mContext == null) { return false; } else { - mGetOwnedListTask = new GetOwnedListTask(_baseService, + mGetOwnedListTask = new com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask(_baseService, mIapConnector, mContext, _productType, @@ -417,7 +417,7 @@ public class IapHelper extends HelperDefine { mConsumePurchasedItemsTask.cancel(true); } - mConsumePurchasedItemsTask = new ConsumePurchasedItemsTask(_baseService, + mConsumePurchasedItemsTask = new com.samsung.android.sdk.iap.lib2.helper.task.ConsumePurchasedItemsTask(_baseService, mIapConnector, mContext, _purchaseIds, diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java similarity index 88% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java index c284cef37..b5590d07b 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper.task; +package com.samsung.android.sdk.iap.lib2.helper.task; import android.content.Context; import android.os.AsyncTask; @@ -6,9 +6,8 @@ import android.util.Log; import com.samsung.android.iap.IAPConnector; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.service.BaseService; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.service.BaseService; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; /** * Created by sangbum7.kim on 2017-09-01. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java similarity index 94% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java index 95b7776be..71cf83158 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper.task; +package com.samsung.android.sdk.iap.lib2.helper.task; import android.content.Context; import android.os.Bundle; @@ -6,9 +6,9 @@ import android.util.Log; import com.samsung.android.iap.IAPConnector; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.service.ConsumePurchasedItems; -import com.samsung.android.sdk.iap.lib.vo.ConsumeVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.service.ConsumePurchasedItems; +import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo; import java.util.ArrayList; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java similarity index 95% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java index a52b7d21d..2f7cf13d9 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper.task; +package com.samsung.android.sdk.iap.lib2.helper.task; import android.content.Context; import android.os.Bundle; @@ -6,9 +6,9 @@ import android.util.Log; import com.samsung.android.iap.IAPConnector; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.service.OwnedProduct; -import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.service.OwnedProduct; +import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo; import java.util.ArrayList; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java similarity index 95% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java index 65002d7b0..b93c0f43c 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.helper.task; +package com.samsung.android.sdk.iap.lib2.helper.task; import android.content.Context; import android.os.Bundle; @@ -6,9 +6,9 @@ import android.util.Log; import com.samsung.android.iap.IAPConnector; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.service.ProductsDetails; -import com.samsung.android.sdk.iap.lib.vo.ProductVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.service.ProductsDetails; +import com.samsung.android.sdk.iap.lib2.vo.ProductVo; import java.util.ArrayList; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java similarity index 50% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java index 4311cde1b..bdb56da83 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java @@ -1,13 +1,13 @@ -package com.samsung.android.sdk.iap.lib.listener; +package com.samsung.android.sdk.iap.lib2.listener; -import com.samsung.android.sdk.iap.lib.helper.task.GetOwnedListTask; -import com.samsung.android.sdk.iap.lib.vo.ConsumeVo; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask; +import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; import java.util.ArrayList; /** - * Callback Interface used with {@link GetOwnedListTask} + * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask} */ public interface OnConsumePurchasedItemsListener { /** diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java new file mode 100644 index 000000000..4cee2b6f6 --- /dev/null +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java @@ -0,0 +1,20 @@ +package com.samsung.android.sdk.iap.lib2.listener; + +import com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo; + +import java.util.ArrayList; + +/** + * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetOwnedListTask} + */ +public interface OnGetOwnedListListener { + /** + * Callback method to be invoked when {@link GetOwnedListTask} has been finished. + * + * @param _errorVO + * @param _ownedList + */ + void onGetOwnedProducts(ErrorVo _errorVO, ArrayList _ownedList); +} diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java new file mode 100644 index 000000000..c837fdda8 --- /dev/null +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java @@ -0,0 +1,20 @@ +package com.samsung.android.sdk.iap.lib2.listener; + +import com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.ProductVo; + +import java.util.ArrayList; + +/** + * Callback Interface used with {@link com.samsung.android.sdk.iap.lib2.helper.task.GetProductsDetailsTask} + */ +public interface OnGetProductsDetailsListener { + /** + * Callback method to be invoked when {@link GetProductsDetailsTask} has been finished. + * + * @param _errorVO + * @param _productList + */ + void onGetProducts(ErrorVo _errorVO, ArrayList _productList); +} diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java similarity index 85% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java index ff6ca117c..3e0bd63ea 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.listener; +package com.samsung.android.sdk.iap.lib2.listener; /** * Callback Interface to be invoked when bind to IAPService has been finished. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java similarity index 69% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java index 00a098365..46ad85018 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java @@ -1,7 +1,7 @@ -package com.samsung.android.sdk.iap.lib.listener; +package com.samsung.android.sdk.iap.lib2.listener; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.PurchaseVo; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo; /** * Callback Interface to be invoked when payment has been finished. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java similarity index 63% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java index 3db6ffc21..ad360d795 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.listener; +package com.samsung.android.sdk.iap.lib2.listener; /** * Created by sangbum7.kim on 2018-02-28. diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java similarity index 78% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java index d6b03eb1e..b9ee6f84b 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java @@ -1,15 +1,15 @@ -package com.samsung.android.sdk.iap.lib.service; +package com.samsung.android.sdk.iap.lib2.service; import android.content.Context; import android.content.Intent; import android.util.Log; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.activity.AccountActivity; -import com.samsung.android.sdk.iap.lib.activity.DialogActivity; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.activity.AccountActivity; +import com.samsung.android.sdk.iap.lib2.activity.DialogActivity; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; /** * Created by sangbum7.kim on 2018-02-28. @@ -18,8 +18,8 @@ import com.samsung.android.sdk.iap.lib.vo.ErrorVo; public abstract class BaseService { private static final String TAG = BaseService.class.getSimpleName(); - protected ErrorVo mErrorVo = new ErrorVo(); - protected IapHelper mIapHelper = null; + protected com.samsung.android.sdk.iap.lib2.vo.ErrorVo mErrorVo = new com.samsung.android.sdk.iap.lib2.vo.ErrorVo(); + protected com.samsung.android.sdk.iap.lib2.helper.IapHelper mIapHelper = null; protected Context mContext = null; public BaseService(IapHelper _iapHelper, Context _context) { @@ -28,7 +28,7 @@ public abstract class BaseService { mErrorVo.setError(HelperDefine.IAP_ERROR_INITIALIZATION, mContext.getString(R.string.mids_sapps_pop_unknown_error_occurred)); } - public ErrorVo getErrorVo() { + public com.samsung.android.sdk.iap.lib2.vo.ErrorVo getErrorVo() { return mErrorVo; } diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java similarity index 76% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java index 3766b4a25..b50d1c225 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java @@ -1,13 +1,13 @@ -package com.samsung.android.sdk.iap.lib.service; +package com.samsung.android.sdk.iap.lib2.service; import android.content.Context; import android.util.Log; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener; -import com.samsung.android.sdk.iap.lib.vo.ConsumeVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener; +import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo; import java.util.ArrayList; @@ -18,9 +18,9 @@ import java.util.ArrayList; public class ConsumePurchasedItems extends BaseService { private static final String TAG = ConsumePurchasedItems.class.getSimpleName(); - private OnConsumePurchasedItemsListener mOnConsumePurchasedItemsListener = null; + private com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener mOnConsumePurchasedItemsListener = null; private static String mPurchaseIds = ""; - protected ArrayList mConsumeList = null; + protected ArrayList mConsumeList = null; public ConsumePurchasedItems(IapHelper _iapHelper, Context _context, OnConsumePurchasedItemsListener _onConsumePurchasedItemsListener) { super(_iapHelper, _context); diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java similarity index 76% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java index ac3dd40f0..4b4a2ed7e 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java @@ -1,13 +1,13 @@ -package com.samsung.android.sdk.iap.lib.service; +package com.samsung.android.sdk.iap.lib2.service; import android.content.Context; import android.util.Log; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener; -import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener; +import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo; import java.util.ArrayList; @@ -18,9 +18,9 @@ import java.util.ArrayList; public class OwnedProduct extends BaseService { private static final String TAG = OwnedProduct.class.getSimpleName(); - private OnGetOwnedListListener mOnGetOwnedListListener = null; + private com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener mOnGetOwnedListListener = null; private static String mProductType = ""; - protected ArrayList mOwnedList = null; + protected ArrayList mOwnedList = null; public OwnedProduct(IapHelper _iapHelper, Context _context, OnGetOwnedListListener _onGetOwnedListListener) { super(_iapHelper, _context); diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java similarity index 76% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java index e0f736910..71b60d348 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java @@ -1,13 +1,13 @@ -package com.samsung.android.sdk.iap.lib.service; +package com.samsung.android.sdk.iap.lib2.service; import android.content.Context; import android.util.Log; import com.samsung.android.sdk.iap.lib.R; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.listener.OnGetProductsDetailsListener; -import com.samsung.android.sdk.iap.lib.vo.ProductVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener; +import com.samsung.android.sdk.iap.lib2.vo.ProductVo; import java.util.ArrayList; @@ -18,9 +18,9 @@ import java.util.ArrayList; public class ProductsDetails extends BaseService { private static final String TAG = ProductsDetails.class.getSimpleName(); - private OnGetProductsDetailsListener mOnGetProductsDetailsListener = null; + private com.samsung.android.sdk.iap.lib2.listener.OnGetProductsDetailsListener mOnGetProductsDetailsListener = null; private static String mProductIds = ""; - protected ArrayList mProductsDetails = null; + protected ArrayList mProductsDetails = null; public ProductsDetails(IapHelper _iapHelper, Context _context, OnGetProductsDetailsListener _onGetProductsDetailsListener) { super(_iapHelper, _context); diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java similarity index 98% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java index 76c8f39c2..999d98245 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; import android.text.format.DateFormat; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java similarity index 97% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java index 87fef9461..540b36dc8 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; import android.util.Log; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java similarity index 93% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java index 8f691fe2d..51e0b907e 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java @@ -1,6 +1,6 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; public class ErrorVo { private int mErrorCode = HelperDefine.IAP_PAYMENT_IS_CANCELED; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java similarity index 98% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java index 9bb1c9c4e..17ad2d51a 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; import android.util.Base64; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java similarity index 99% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java index 635056069..3a6ab6d2a 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; import org.json.JSONException; import org.json.JSONObject; diff --git a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java similarity index 99% rename from IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java rename to IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java index 9181cbbf5..0a0860cf3 100644 --- a/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java +++ b/IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java @@ -1,4 +1,4 @@ -package com.samsung.android.sdk.iap.lib.vo; +package com.samsung.android.sdk.iap.lib2.vo; import android.util.Base64; diff --git a/app/build.gradle b/app/build.gradle index b75e6a120..3f651f958 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'com.alibaba.arouter' android { - namespace "myname.pdlive.shayu" + namespace "com.pandoralive.shayu" dexOptions { jumboMode = true } diff --git a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java index f0619923c..9aeb9d016 100644 --- a/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java +++ b/app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java @@ -29,6 +29,7 @@ import androidx.core.app.NotificationManagerCompat; import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.pandoralive.shayu.R; import com.shayu.phonelive.AppContext; import com.tencent.rtmp.ITXLivePlayListener; import com.tencent.rtmp.TXLiveBase; @@ -72,7 +73,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import myname.pdlive.shayu.R; /** * Created by cxf on 2018/9/17. diff --git a/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java b/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java index 4a28cd539..913b822b6 100644 --- a/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java +++ b/app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java @@ -35,6 +35,7 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.request.transition.Transition; import com.makeramen.roundedimageview.RoundedImageView; +import com.pandoralive.shayu.R; import com.shayu.phonelive.AppContext; import com.shayu.phonelive.activity.LauncherActivity; import com.yunbao.common.bean.NotificationMsgBean; @@ -51,7 +52,6 @@ import io.rong.imlib.ConnectChangeReceiver; import io.rong.push.PushType; import io.rong.push.notification.PushMessageReceiver; import io.rong.push.notification.PushNotificationMessage; -import myname.pdlive.shayu.R; public class CustomMessageReceiver extends PushMessageReceiver { diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index 4b735b777..bcc009643 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -1,4 +1,4 @@ -# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 # This is a configuration file for ProGuard. # http://proguard.sourceforge.net/index.html#manual/usage.html # @@ -16,12 +16,14 @@ # project.properties file. -dontoptimize --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --verbose - # Preserve some attributes that may be required for reflection. --keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod +-keepattributes AnnotationDefault, + EnclosingMethod, + InnerClasses, + RuntimeVisibleAnnotations, + RuntimeVisibleParameterAnnotations, + RuntimeVisibleTypeAnnotations, + Signature -keep public class com.google.vending.licensing.ILicensingService -keep public class com.android.vending.licensing.ILicensingService @@ -30,8 +32,8 @@ -dontnote com.google.vending.licensing.ILicensingService -dontnote com.google.android.vending.licensing.ILicensingService -# For native methods, see http://proguard.sourceforge.net/manual/examples.html#native --keepclasseswithmembernames class * { +# For native methods, see https://www.guardsquare.com/manual/configuration/examples#native +-keepclasseswithmembernames,includedescriptorclasses class * { native ; } @@ -46,7 +48,7 @@ public void *(android.view.View); } -# For enumeration classes, see http://proguard.sourceforge.net/manual/examples.html#enumerations +# For enumeration classes, see https://www.guardsquare.com/manual/configuration/examples#enumerations -keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); @@ -56,10 +58,6 @@ public static final ** CREATOR; } --keepclassmembers class **.R$* { - public static ; -} - # Preserve annotated Javascript interface methods. -keepclassmembers class * { @android.webkit.JavascriptInterface ; @@ -73,40 +71,23 @@ -dontwarn android.support.** -dontwarn androidx.** -# This class is deprecated, but remains for backward compatibility. --dontwarn android.util.FloatMath - # Understand the @Keep support annotation. -keep class android.support.annotation.Keep --keep class androidx.annotation.Keep -keep @android.support.annotation.Keep class * {*;} --keep @androidx.annotation.Keep class * {*;} -keepclasseswithmembers class * { @android.support.annotation.Keep ; } --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - -keepclasseswithmembers class * { @android.support.annotation.Keep ; } --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - -keepclasseswithmembers class * { @android.support.annotation.Keep (...); } --keepclasseswithmembers class * { - @androidx.annotation.Keep (...); -} - # These classes are duplicated between android.jar and org.apache.http.legacy.jar. -dontnote org.apache.http.** -dontnote android.net.http.** @@ -114,7 +95,7 @@ # These classes are duplicated between android.jar and core-lambda-stubs.jar. -dontnote java.lang.invoke.** -# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\proguard-files\proguard-android.txt-4.0.2 +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\default_proguard_files\global\proguard-android.txt-8.3.1 # The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\proguard-rules.pro # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified @@ -412,16 +393,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.shayu.lib_huawei.**{*;} # End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\proguard-rules.pro -# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\processReleaseResources\aapt_rules.txt -keep class androidx.core.app.CoreComponentFactory { (); } -keep class androidx.core.content.FileProvider { (); } -keep class androidx.core.content.FileProvider4Utils { (); } -keep class androidx.profileinstaller.ProfileInstallReceiver { (); } -keep class androidx.room.MultiInstanceInvalidationService { (); } -keep class androidx.startup.InitializationProvider { (); } --keep class cn.rongcloud.rtc.process.Client2Service { (); } --keep class cn.rongcloud.rtc.process.IM2Service { (); } --keep class cn.rongcloud.rtc.test.ui.JunitTestActivity { (); } -keep class com.android.billingclient.api.ProxyBillingActivity { (); } -keep class com.blankj.utilcode.util.MessengerUtils$ServerService { (); } -keep class com.blankj.utilcode.util.UtilsFileProvider { (); } @@ -453,6 +431,10 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity { (); } -keep class com.samsung.android.sdk.iap.lib.activity.DialogActivity { (); } -keep class com.samsung.android.sdk.iap.lib.activity.PaymentActivity { (); } +-keep class com.samsung.android.sdk.iap.lib2.activity.AccountActivity { (); } +-keep class com.samsung.android.sdk.iap.lib2.activity.CheckPackageActivity { (); } +-keep class com.samsung.android.sdk.iap.lib2.activity.DialogActivity { (); } +-keep class com.samsung.android.sdk.iap.lib2.activity.PaymentActivity { (); } -keep class com.shayu.phonelive.AppContext { (); } -keep class com.shayu.phonelive.activity.LauncherActivity { (); } -keep class com.shayu.phonelive.utils.CustomMessageReceiver { (); } @@ -500,7 +482,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.yunbao.live.activity.WebViewActivityMedal { (); } -keep class com.yunbao.live.activity.ZhuangBanActivity { (); } -keep class com.yunbao.live.views.OlineListActivity { (); } --keep class com.yunbao.main.MsgSettActivity { (); } -keep class com.yunbao.main.activity.BattlePassActivity { (); } -keep class com.yunbao.main.activity.BindUserActivity { (); } -keep class com.yunbao.main.activity.BuyVipActivity { (); } @@ -1075,8 +1056,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keepclassmembers class * { *** videoEditClick(android.view.View); } -# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\aapt_rules.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\app\build\intermediates\aapt_proguard_file\release\processReleaseResources\aapt_rules.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt # Generated keep rule for Lifecycle observer adapter. -if class com.lxj.xpopup.core.BasePopupView { (...); @@ -1085,8 +1066,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (...); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\b2e9e90b52d04442e4e40e6594bc7727\jetified-XPopup-2.10.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\8d3e3177c15403546de73d87508067d6\transformed\jetified-XPopup-2.10.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1134,16 +1115,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\cdcf913f50a9cd9c127ba2852af80f5c\material-1.4.0\proguard.txt -# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\a1df9a6aa192455030f7c9970b70e0e9\transformed\material-1.4.0\proguard.txt +# The proguard configuration file for the following section is C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt -# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\lib0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd28fe822c831bcca06e71f1991f8163\jetified-linesdk-5.0.1\proguard.txt +# End of content from C:\Users\58381\Documents\AndroidProject\pandorapan\lib_google\build\intermediates\consumer_proguard_dir\release\exportReleaseConsumerProguardFiles\lib0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt -keepattributes *Annotation* -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd28fe822c831bcca06e71f1991f8163\jetified-linesdk-5.0.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\2929985d9627ba3bb45a0ebd18eaf9d3\transformed\jetified-linesdk-5.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt # To enable ProGuard in your project, edit project.properties # to define the proguard.config property as described in that file. # @@ -1183,8 +1164,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public android.os.Bundle getSkuDetails(int, java.lang.String, java.lang.String, android.os.Bundle); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8a269afbcc90daf6a79ec1476c5fbc72\jetified-facebook-android-sdk-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\6baa4e4ee96e21acbcf3a49ef89d9f1f\transformed\jetified-facebook-android-sdk-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1225,8 +1206,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.gamingservices.GamingServices -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a072d8cb5905c3e7e84564de4c319cdb\jetified-facebook-gamingservices-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\44135493e77410a01759fde38f8d0bd2\transformed\jetified-facebook-gamingservices-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1267,8 +1248,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.share.Share -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fe305a934e0ebeb78e9c3479e8cff59f\jetified-facebook-share-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\c831739b6efc746f59d2a47471573f41\transformed\jetified-facebook-share-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1309,8 +1290,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.login.Login -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\d171e70a4961ee6cf244a0458825b753\jetified-facebook-login-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\3815d0ddf4b17772bdba730e93b11daf\transformed\jetified-facebook-login-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1351,12 +1332,12 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.common.Common -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\685cc724c9516cc43731353544646037\jetified-facebook-common-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\43855db83adace9940918a3f6edcdc05\transformed\jetified-facebook-common-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt -keep class com.davemorrissey.labs.subscaleview.** { *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7cf793ae7d9a6befcb1534d2d289dcdc\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\7bbb003dbf2685697cd42cfb46e77b3f\transformed\jetified-subsampling-scale-image-view-androidx-3.10.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt # Copyright (C) 2018 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1380,13 +1361,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; ; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ec4de6d60aa03663a1cbaae1a5a3a84d\appcompat-1.3.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\39456c115dbecb18f0b217830530e5bd\jetified-tweet-ui-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\0fdcb88552259c6c22dbd3bb46b31518\transformed\appcompat-1.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt #Picasso Proguard Config https://github.com/square/picasso -dontwarn com.squareup.okhttp.** -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\39456c115dbecb18f0b217830530e5bd\jetified-tweet-ui-3.1.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\b8e86bdadf487d72a43cd430b3f9db16\transformed\jetified-tweet-ui-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt # Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1413,13 +1394,13 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; RuntimeVisibleParameterAnnotations, RuntimeVisibleTypeAnnotations -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ac13d2b1f8b64cdcc3317a2429d882b2\coordinatorlayout-1.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\2dd2f4200d3a68f4165485a3d207312d\transformed\coordinatorlayout-1.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt -keepclasseswithmembers class androidx.recyclerview.widget.RecyclerView$ViewHolder { public final android.view.View *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\d096341b4b974eaea438ee594a19c07d\jetified-x-1.3.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\77d1284f0a811fa75692d3a73d7624e1\jetified-exoplayer-ui-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\940a969ab3fccb91703d8a9245e2974b\transformed\jetified-x-1.3.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt # Proguard rules specific to the UI module. # Constructor method accessed via reflection in StyledPlayerView @@ -1460,8 +1441,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotations.jvm.** -dontwarn javax.annotation.** -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\77d1284f0a811fa75692d3a73d7624e1\jetified-exoplayer-ui-2.18.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\e452872bf1c6c06c71776c88e0bd7b6a\transformed\jetified-exoplayer-ui-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt # Copyright (C) 2015 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1487,8 +1468,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public void suppressLayout(boolean); public boolean isLayoutSuppressed(); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\b886d2f30193a8d60f5ee16fc45fb909\recyclerview-1.2.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1eb6557d28b7045606afcd1fd617957d\jetified-utilcode-1.30.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\e9de7db2640f13ae2ab2a585dfd19337\transformed\recyclerview-1.2.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified # in G:\Android_IDE\ADT\sdk/tools/proguard/proguard-android.txt @@ -1517,8 +1498,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep @com.blankj.utilcode.util.ApiUtils$Api class * -keepattributes *Annotation* -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1eb6557d28b7045606afcd1fd617957d\jetified-utilcode-1.30.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\6905c56d188193f144e40adf093778f1\transformed\jetified-utilcode-1.30.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1559,8 +1540,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.applinks.AppLinks -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ea6df913e5238eb36aab0d88c30a9305\jetified-facebook-applinks-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\bb5ec4ef561b90312eb1ca52da1f144d\transformed\jetified-facebook-applinks-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1605,8 +1586,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.facebook.messenger.Messenger -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\4280bce120729ff06048cc9bd1fea561\jetified-facebook-messenger-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\88221c7028fd958b12579787bcf1d5e0\transformed\jetified-facebook-messenger-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt # Copyright (C) 2020 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -1635,207 +1616,16 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; android.view.View findViewByAccessibilityIdTraversal(int); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8c728fae3e52c353b946400298cd8674\jetified-ui-1.0.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\d709769056a5279a71bbb18b41ee69d2\transformed\jetified-ui-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt -assumenosideeffects public class androidx.compose.runtime.ComposerKt { void sourceInformation(androidx.compose.runtime.Composer,java.lang.String); void sourceInformationMarkerStart(androidx.compose.runtime.Composer,int,java.lang.String); void sourceInformationMarkerEnd(androidx.compose.runtime.Composer); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\aeaf3ecfe8e20298fccd4838fb1210a6\jetified-runtime-1.0.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro -# Allow R8 to optimize away the FastServiceLoader. -# Together with ServiceLoader optimization in R8 -# this results in direct instantiation when loading Dispatchers.Main --assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader { - boolean FAST_SERVICE_LOADER_ENABLED return false; -} - --assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt { - boolean ANDROID_DETECTED return true; -} - --keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;} - -# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher --assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt { - boolean SUPPORT_MISSING return false; -} - -# Statically turn off all debugging facilities and assertions --assumenosideeffects class kotlinx.coroutines.DebugKt { - boolean getASSERTIONS_ENABLED() return false; - boolean getDEBUG() return false; - boolean getRECOVER_STACK_TRACES() return false; -} -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\0251cdeb71316627150457e90d27778c\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro -# ServiceLoader support --keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {} --keepnames class kotlinx.coroutines.CoroutineExceptionHandler {} - -# Most of volatile fields are updated with AFU and should not be mangled --keepclassmembers class kotlinx.coroutines.** { - volatile ; -} - -# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater --keepclassmembers class kotlin.coroutines.SafeContinuation { - volatile ; -} - -# These classes are only required by kotlinx.coroutines.debug.AgentPremain, which is only loaded when -# kotlinx-coroutines-core is used as a Java agent, so these are not needed in contexts where ProGuard is used. --dontwarn java.lang.instrument.ClassFileTransformer --dontwarn sun.misc.SignalHandler --dontwarn java.lang.instrument.Instrumentation --dontwarn sun.misc.Signal - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8e1b240ec13b6eb6bfbaf23240674e6c\rules\lib\META-INF\proguard\coroutines.pro -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt -#GSON -# Retain Annotations for model objects --keepattributes *Annotation* - -#Okio --dontwarn java.nio.file.** --dontwarn org.codehaus.mojo.animal_sniffer.** - -#Retrofit 2 -# Platform calls Class.forName on types which do not exist on Android to determine platform. --dontnote retrofit2.Platform -# Platform used when running on RoboVM on iOS. Will not be used at runtime. --dontnote retrofit2.Platform$IOS$MainThreadExecutor -# Platform used when running on Java 8 VMs. Will not be used at runtime. --dontwarn retrofit2.Platform$Java8 -# Retain generic type information for use by reflection by converters and adapters. --keepattributes Signature -# Retain declared checked exceptions for use by a Proxy instance. --keepattributes Exceptions -# Retain class members for annotations --keepclasseswithmembers class * { - @retrofit2.http.* ; -} -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a5ae18f4b7c7899c2a1ae628351d2870\jetified-twitter-core-3.1.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro -# JSR 305 annotations are for embedding nullability information. --dontwarn javax.annotation.** - -# A resource is loaded with a relative path so the package of this class must be preserved. --keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase - -# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. --dontwarn org.codehaus.mojo.animal_sniffer.* - -# OkHttp platform used only on JVM and when Conscrypt dependency is available. --dontwarn okhttp3.internal.platform.ConscryptPlatform - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\af50b85ca1dd4e9b13d269c91ae3adf7\rules\lib\META-INF\proguard\okhttp3.pro -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro -# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. --dontwarn org.codehaus.mojo.animal_sniffer.* - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\13b90cb3e32d662d742b3e98d7a7f2f4\rules\lib\META-INF\proguard\okio.pro -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\f8ad553f37e4b77ebef1ab896e7b58f5\jetified-beautysdk-202202241203\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt --keep class cn.rongcloud.xcrash.NativeHandler { - native ; - void crashCallback(...); - void traceCallback(...); - void traceCallbackBeforeDump(...); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f20676bd90bf127b4a68e860e87cd17\jetified-crash-1.0.4\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile - -#################### FaceUnity ####################### --keep class com.faceunity.wrapper.faceunity {*;} --keep class com.faceunity.wrapper.faceunity$RotatedImage {*;} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\9480786e7b0437cce6767fc96b5db736\jetified-core-8.3.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt -# Proguard rules specific to the core module. - -# Constructors accessed via reflection in DefaultRenderersFactory --dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer --keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer { - (long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int); -} --dontnote com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer --keepclassmembers class com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer { - (long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int); -} --dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer --keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer { - (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); -} --dontnote com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer --keepclassmembers class com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer { - (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); -} --dontnote com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer --keepclassmembers class com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer { - (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); -} - -# Constructors accessed via reflection in DefaultDownloaderFactory --dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader --keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader { - (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); -} --dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader --keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader { - (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); -} --dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader --keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader { - (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); -} - -# Constructors accessed via reflection in DefaultMediaSourceFactory --dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory --keepclasseswithmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory { - (com.google.android.exoplayer2.upstream.DataSource$Factory); -} --dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory --keepclasseswithmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory { - (com.google.android.exoplayer2.upstream.DataSource$Factory); -} --dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory --keepclasseswithmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory { - (com.google.android.exoplayer2.upstream.DataSource$Factory); -} --dontnote com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory --keepclasseswithmembers class com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory { - (); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7c2b71c537c1e37ad7eea59ee8a4eccd\jetified-exoplayer-core-2.18.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\27c438b71f991057020f81c8ff042a7a\jetified-glide-transformations-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\3591196def6c89c6af74e7d30dfb6618\transformed\jetified-runtime-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt -dontwarn jp.co.cyberagent.android.gpuimage.** -keep public class * implements com.bumptech.glide.module.GlideModule @@ -1845,8 +1635,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\27c438b71f991057020f81c8ff042a7a\jetified-glide-transformations-3.1.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\7931210372c8927a076053831aae79b7\transformed\jetified-glide-transformations-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt -keep public class * implements com.bumptech.glide.module.GlideModule -keep class * extends com.bumptech.glide.module.AppGlideModule { (...); @@ -1862,34 +1652,127 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # Uncomment for DexGuard only #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\173ceb66d10b0b9d6b4c51edc0589d5c\jetified-glide-4.12.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2ea0abaf1e4fecb531332054a913e6f3\jetified-roundedimageview-2.3.0\proguard.txt -# Proguard configuration. --dontwarn com.squareup.okhttp.** +# End of content from C:\gradle-6.1.1\caches\transforms-3\a9e5e066cbda5595303140a83b7c357f\transformed\jetified-glide-4.12.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\af9bdee4e01691bfa29595eaf6011f49\transformed\jetified-play-services-base-18.0.1\proguard.txt +# b/35135904 Ensure that proguard will not strip the mResultGuardian. +-keepclassmembers class com.google.android.gms.common.api.internal.BasePendingResult { + com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian mResultGuardian; +} -# References to Picasso are okay if the consuming app doesn't use it --dontwarn com.squareup.picasso.Transformation -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2ea0abaf1e4fecb531332054a913e6f3\jetified-roundedimageview-2.3.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt --keep public class pl.droidsonroids.gif.GifIOException{(int, java.lang.String);} -#Prevents warnings for consumers not using AndroidX --dontwarn androidx.annotation.** -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\81e9f59f9a751bf097336d4dd2778fa4\jetified-android-gif-drawable-1.2.23\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt -#https://github.com/leolin310148/ShortcutBadger/issues/46 --keep class me.leolin.shortcutbadger.impl.AdwHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.ApexHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.AsusHomeLauncher { (...); } --keep class me.leolin.shortcutbadger.impl.DefaultBadger { (...); } --keep class me.leolin.shortcutbadger.impl.NewHtcHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.NovaHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.SolidHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.SonyHomeBadger { (...); } --keep class me.leolin.shortcutbadger.impl.XiaomiHomeBadger { (...); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2d7adb392420dbb8511e1d79e7c99954\jetified-ShortcutBadger-1.1.22\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\af9bdee4e01691bfa29595eaf6011f49\transformed\jetified-play-services-base-18.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt +-dontwarn com.google.firebase.platforminfo.KotlinDetector +-dontwarn com.google.auto.value.AutoValue +-dontwarn com.google.auto.value.AutoValue$Builder + +# End of content from C:\gradle-6.1.1\caches\transforms-3\1b549d0d5a78f93d1b3cd259941d27d6\transformed\jetified-firebase-common-20.1.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\4566a60c961a57d307c42a2fd5514004\transformed\jetified-play-services-tasks-18.0.1\proguard.txt + + +# End of content from C:\gradle-6.1.1\caches\transforms-3\4566a60c961a57d307c42a2fd5514004\transformed\jetified-play-services-tasks-18.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\98374b479c7a7c4245d90ea630585909\transformed\jetified-play-services-basement-18.1.0\proguard.txt +# Needed when building against pre-Marshmallow SDK. +-dontwarn android.security.NetworkSecurityPolicy + +# Needed when building against Marshmallow SDK. +-dontwarn android.app.Notification + +# Protobuf has references not on the Android boot classpath +-dontwarn sun.misc.Unsafe +-dontwarn libcore.io.Memory + +# Internal Google annotations for generating Proguard keep rules. +-dontwarn com.google.android.apps.common.proguard.UsedBy* + +# Annotations referenced by the SDK but whose definitions are contained in +# non-required dependencies. +-dontwarn javax.annotation.** +-dontwarn org.checkerframework.** +-dontwarn com.google.errorprone.annotations.** +-dontwarn org.jspecify.nullness.NullMarked + +# Proguard flags for consumers of the Google Play services SDK +# https://developers.google.com/android/guides/setup#add_google_play_services_to_your_project + +# Keep SafeParcelable NULL value, needed for reflection by DowngradeableSafeParcel +-keepclassmembers public class com.google.android.gms.common.internal.safeparcel.SafeParcelable { + public static final *** NULL; +} + +# Needed for Parcelable/SafeParcelable classes & their creators to not get renamed, as they are +# found via reflection. +-keep class com.google.android.gms.common.internal.ReflectedParcelable +-keepnames class * implements com.google.android.gms.common.internal.ReflectedParcelable +-keepclassmembers class * implements android.os.Parcelable { + public static final *** CREATOR; +} + +# Keep the classes/members we need for client functionality. +-keep @interface android.support.annotation.Keep +-keep @androidx.annotation.Keep class * +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +# Keep androidX equivalent of above android.support to allow Jetification. +-keep @interface androidx.annotation.Keep +-keep @androidx.annotation.Keep class * +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} +-keepclasseswithmembers class * { + @androidx.annotation.Keep ; +} + +# Keep the names of classes/members we need for client functionality. +-keep @interface com.google.android.gms.common.annotation.KeepName +-keepnames @com.google.android.gms.common.annotation.KeepName class * +-keepclassmembernames class * { + @com.google.android.gms.common.annotation.KeepName *; +} + +# Keep Dynamite API entry points +-keep @interface com.google.android.gms.common.util.DynamiteApi +-keep @com.google.android.gms.common.util.DynamiteApi public class * { + public ; + public ; +} + + + +# End of content from C:\gradle-6.1.1\caches\transforms-3\98374b479c7a7c4245d90ea630585909\transformed\jetified-play-services-basement-18.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt +# Copyright (C) 2020 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# The default FragmentFactory creates Fragment instances using reflection +-if public class ** extends androidx.fragment.app.Fragment +-keepclasseswithmembers,allowobfuscation public class <1> { + public (); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\8daf89c63ab14ea80f11dcfb9154f87e\transformed\fragment-1.5.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt +# 本库模块专用的混淆规则 + +# End of content from C:\gradle-6.1.1\caches\transforms-3\b826addf48d922103bc9588ad90ee0e6\transformed\jetified-Common-4.1.11\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -1947,8 +1830,251 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; public ; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fb56e54b80d21c0ee7614466594a9fda\jetified-facebook-core-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\cee8df21fdda9dd7e6106d8566e7a8de\transformed\jetified-facebook-core-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt +-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { + (); +} + +-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel { + (android.app.Application); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\570c85082e748d036cbe1ff0c9d5e429\transformed\lifecycle-viewmodel-2.5.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt +-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { + (androidx.lifecycle.SavedStateHandle); +} + +-keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel { + (android.app.Application,androidx.lifecycle.SavedStateHandle); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\badee3548ba9b653d6517fdeb8829767\transformed\jetified-lifecycle-viewmodel-savedstate-2.5.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro +# When editing this file, update the following files as well: +# - META-INF/proguard/coroutines.pro +# - META-INF/com.android.tools/proguard/coroutines.pro + +# Most of volatile fields are updated with AFU and should not be mangled +-keepclassmembers class kotlinx.coroutines.** { + volatile ; +} + +# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater +-keepclassmembers class kotlin.coroutines.SafeContinuation { + volatile ; +} + +# These classes are only required by kotlinx.coroutines.debug.AgentPremain, which is only loaded when +# kotlinx-coroutines-core is used as a Java agent, so these are not needed in contexts where ProGuard is used. +-dontwarn java.lang.instrument.ClassFileTransformer +-dontwarn sun.misc.SignalHandler +-dontwarn java.lang.instrument.Instrumentation +-dontwarn sun.misc.Signal + +# Only used in `kotlinx.coroutines.internal.ExceptionsConstructor`. +# The case when it is not available is hidden in a `try`-`catch`, as well as a check for Android. +-dontwarn java.lang.ClassValue + +# An annotation used for build tooling, won't be directly accessed. +-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement +# End of content from C:\gradle-6.1.1\caches\transforms-3\0e43e19966d3ba7fcce157667e087c7e\transformed\rules\lib\META-INF\com.android.tools\r8\coroutines.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro +# Allow R8 to optimize away the FastServiceLoader. +# Together with ServiceLoader optimization in R8 +# this results in direct instantiation when loading Dispatchers.Main +-assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader { + boolean FAST_SERVICE_LOADER_ENABLED return false; +} + +-assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt { + boolean ANDROID_DETECTED return true; +} + +-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;} + +# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher +-assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt { + boolean SUPPORT_MISSING return false; +} + +# Statically turn off all debugging facilities and assertions +-assumenosideeffects class kotlinx.coroutines.DebugKt { + boolean getASSERTIONS_ENABLED() return false; + boolean getDEBUG() return false; + boolean getRECOVER_STACK_TRACES() return false; +} +# End of content from C:\gradle-6.1.1\caches\transforms-3\039aa78b17fc1889d62d4e8e7d7c1859\transformed\rules\lib\META-INF\com.android.tools\r8-from-1.6.0\coroutines.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt +#GSON +# Retain Annotations for model objects +-keepattributes *Annotation* + +#Okio +-dontwarn java.nio.file.** +-dontwarn org.codehaus.mojo.animal_sniffer.** + +#Retrofit 2 +# Platform calls Class.forName on types which do not exist on Android to determine platform. +-dontnote retrofit2.Platform +# Platform used when running on RoboVM on iOS. Will not be used at runtime. +-dontnote retrofit2.Platform$IOS$MainThreadExecutor +# Platform used when running on Java 8 VMs. Will not be used at runtime. +-dontwarn retrofit2.Platform$Java8 +# Retain generic type information for use by reflection by converters and adapters. +-keepattributes Signature +# Retain declared checked exceptions for use by a Proxy instance. +-keepattributes Exceptions +# Retain class members for annotations +-keepclasseswithmembers class * { + @retrofit2.http.* ; +} +# End of content from C:\gradle-6.1.1\caches\transforms-3\33f970d366250728877e2f4671336331\transformed\jetified-twitter-core-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro +# JSR 305 annotations are for embedding nullability information. +-dontwarn javax.annotation.** + +# A resource is loaded with a relative path so the package of this class must be preserved. +-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase + +# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. +-dontwarn org.codehaus.mojo.animal_sniffer.* + +# OkHttp platform used only on JVM and when Conscrypt dependency is available. +-dontwarn okhttp3.internal.platform.ConscryptPlatform + +# End of content from C:\gradle-6.1.1\caches\transforms-3\c77ecf57bcccb48a1c436095271858a9\transformed\rules\lib\META-INF\proguard\okhttp3.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro +# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java. +-dontwarn org.codehaus.mojo.animal_sniffer.* + +# End of content from C:\gradle-6.1.1\caches\transforms-3\ba2f6b8d754037d8f03e9dcac5bb54b5\transformed\rules\lib\META-INF\proguard\okio.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt + +# End of content from C:\gradle-6.1.1\caches\transforms-3\acd3bab55cb4f819050ef57ea2e25987\transformed\jetified-beautysdk-202202241203\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt +-keep class cn.rongcloud.xcrash.NativeHandler { + native ; + void crashCallback(...); + void traceCallback(...); + void traceCallbackBeforeDump(...); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\b75b75d929caf1295aec25af1cc611a0\transformed\jetified-crash-1.0.8\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3d3f072f1af512d0e751a2c7c5e8b8ec\transformed\jetified-core-8.3.1\proguard.txt +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile + +#################### FaceUnity ####################### +-keep class com.faceunity.wrapper.faceunity {*;} +-keep class com.faceunity.wrapper.faceunity$RotatedImage {*;} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\3d3f072f1af512d0e751a2c7c5e8b8ec\transformed\jetified-core-8.3.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt +# Proguard rules specific to the core module. + +# Constructors accessed via reflection in DefaultRenderersFactory +-dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer +-keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer { + (long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int); +} +-dontnote com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer +-keepclassmembers class com.google.android.exoplayer2.ext.av1.Libgav1VideoRenderer { + (long, android.os.Handler, com.google.android.exoplayer2.video.VideoRendererEventListener, int); +} +-dontnote com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer +-keepclassmembers class com.google.android.exoplayer2.ext.opus.LibopusAudioRenderer { + (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); +} +-dontnote com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer +-keepclassmembers class com.google.android.exoplayer2.ext.flac.LibflacAudioRenderer { + (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); +} +-dontnote com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer +-keepclassmembers class com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioRenderer { + (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioSink); +} + +# Constructors accessed via reflection in DefaultDownloaderFactory +-dontnote com.google.android.exoplayer2.source.dash.offline.DashDownloader +-keepclassmembers class com.google.android.exoplayer2.source.dash.offline.DashDownloader { + (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); +} +-dontnote com.google.android.exoplayer2.source.hls.offline.HlsDownloader +-keepclassmembers class com.google.android.exoplayer2.source.hls.offline.HlsDownloader { + (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); +} +-dontnote com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader +-keepclassmembers class com.google.android.exoplayer2.source.smoothstreaming.offline.SsDownloader { + (com.google.android.exoplayer2.MediaItem, com.google.android.exoplayer2.upstream.cache.CacheDataSource$Factory, java.util.concurrent.Executor); +} + +# Constructors accessed via reflection in DefaultMediaSourceFactory +-dontnote com.google.android.exoplayer2.source.dash.DashMediaSource$Factory +-keepclasseswithmembers class com.google.android.exoplayer2.source.dash.DashMediaSource$Factory { + (com.google.android.exoplayer2.upstream.DataSource$Factory); +} +-dontnote com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory +-keepclasseswithmembers class com.google.android.exoplayer2.source.hls.HlsMediaSource$Factory { + (com.google.android.exoplayer2.upstream.DataSource$Factory); +} +-dontnote com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory +-keepclasseswithmembers class com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource$Factory { + (com.google.android.exoplayer2.upstream.DataSource$Factory); +} +-dontnote com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory +-keepclasseswithmembers class com.google.android.exoplayer2.source.rtsp.RtspMediaSource$Factory { + (); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\526e7910eaa433763f36b642f34c1fee\transformed\jetified-exoplayer-core-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt +# Proguard configuration. +-dontwarn com.squareup.okhttp.** + +# References to Picasso are okay if the consuming app doesn't use it +-dontwarn com.squareup.picasso.Transformation + +# End of content from C:\gradle-6.1.1\caches\transforms-3\a7d2b366ebb4fa695d83564a8f8d9b9e\transformed\jetified-roundedimageview-2.3.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt +-keep public class pl.droidsonroids.gif.GifIOException{(int, java.lang.String);} +#Prevents warnings for consumers not using AndroidX +-dontwarn androidx.annotation.** + +# End of content from C:\gradle-6.1.1\caches\transforms-3\54e4d6b7585273307d9c6823366d92b9\transformed\jetified-android-gif-drawable-1.2.23\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt +#https://github.com/leolin310148/ShortcutBadger/issues/46 +-keep class me.leolin.shortcutbadger.impl.AdwHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.ApexHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.AsusHomeLauncher { (...); } +-keep class me.leolin.shortcutbadger.impl.DefaultBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.NewHtcHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.NovaHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.SolidHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.SonyHomeBadger { (...); } +-keep class me.leolin.shortcutbadger.impl.XiaomiHomeBadger { (...); } +# End of content from C:\gradle-6.1.1\caches\transforms-3\11ff2b99188b7e7bf4e2771916717f0f\transformed\jetified-ShortcutBadger-1.1.22\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt # Add project specific ProGuard rules here. # You can control the filterSet of applied configuration files using the # proguardFiles setting in build.gradle. @@ -1986,8 +2112,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # 保持反射不被混淆 -keepattributes EnclosingMethod -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\03b64a30c619c0f7cb4a74fad54f23b8\jetified-EasyFloat-2.0.4\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\bf0366dad8fd25b42dec7a0b29d3ed94\transformed\jetified-EasyFloat-2.0.4\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt # Add project specific ProGuard rules here. # You can control the set of applied configuration files using the # proguardFiles setting in build.gradle. @@ -2009,19 +2135,15 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # If you keep the line number information, uncomment this to # hide the original source file name. #-renamesourcefileattribute SourceFile -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\58e71098e3703c54f36573c85911b119\jetified-PagerGridLayoutManager-1.1.7\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\6dd79c19a3de7f7b4d3014c08d02f4ca\transformed\jetified-PagerGridLayoutManager-1.1.7\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt # 本库模块专用的混淆规则 -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\782a96165be5097a508b8e05ef72327e\jetified-Common-4.1.11\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt -# 本库模块专用的混淆规则 +# End of content from C:\gradle-6.1.1\caches\transforms-3\adfc563cfaac18f99ab49176e8311139\transformed\jetified-WheelView-4.1.11\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3dd60f4554da3e797ddfca5958de5029\transformed\jetified-uyumao-1.1.2\proguard.txt -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fd218b7eabf5a10941a270b7f71097cc\jetified-WheelView-4.1.11\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\27b86433f45455ea7356d800eab6ba01\jetified-uyumao-1.1.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\3dd60f4554da3e797ddfca5958de5029\transformed\jetified-uyumao-1.1.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\21d010a917a570a947ff266441748328\transformed\jetified-SudMGP-1.3.3.1158\proguard.txt -keep class com.cocos.game.**{ *; } -keep class tech.sud.runtime.**{ *; } -keep class tech.sud.mgp.core.**{ *; } @@ -2173,8 +2295,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1cb22d50a0b8ac312b89ff9cfb4dfe78\jetified-SudMGP-1.3.3.1158\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\21d010a917a570a947ff266441748328\transformed\jetified-SudMGP-1.3.3.1158\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\9bc6fb118e278279304d710763b86c85\transformed\jetified-SudASR-1.3.3.1158\proguard.txt -keep class com.microsoft.cognitiveservices.** { *; } -keep class tech.sud.mgp.asr.azure.** { *; } @@ -2189,8 +2311,28 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; *** *Callback(long); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\697e4f5a1688ae6bfaef5fb0bb5ed541\jetified-SudASR-1.3.3.1158\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\9bc6fb118e278279304d710763b86c85\transformed\jetified-SudASR-1.3.3.1158\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt +# Copyright (C) 2019 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +-keepclassmembers,allowobfuscation class * implements androidx.savedstate.SavedStateRegistry$AutoRecreated { + (); +} + +# End of content from C:\gradle-6.1.1\caches\transforms-3\2d16d937f787a1471d1fcefef8917ded\transformed\jetified-savedstate-1.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt # Copyright (C) 2017 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2210,8 +2352,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; androidx.transition.ChangeBounds$ViewBounds mViewBounds; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\12f5e4d96e78442fa306a3d552f8fbea\transition-1.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\vectordrawable-animated-1.1.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\f55e0290d55f2ec9dfa66384635c714c\transformed\transition-1.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt # Copyright (C) 2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2232,123 +2374,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; *** get*(); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\be99dee16311fad4c697065dc961cbd1\vectordrawable-animated-1.1.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt -# b/35135904 Ensure that proguard will not strip the mResultGuardian. --keepclassmembers class com.google.android.gms.common.api.internal.BasePendingResult { - com.google.android.gms.common.api.internal.BasePendingResult$ReleasableResultGuardian mResultGuardian; -} - - - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\15583486fb49d7b5af523fe98e29a1cf\jetified-play-services-base-18.0.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3eae88e861cf51b2ca4e2107f957c2b8\jetified-firebase-common-20.1.2\proguard.txt --dontwarn com.google.firebase.platforminfo.KotlinDetector --dontwarn com.google.auto.value.AutoValue --dontwarn com.google.auto.value.AutoValue$Builder - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3eae88e861cf51b2ca4e2107f957c2b8\jetified-firebase-common-20.1.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt - - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\6042ba23e15e929b723706919e32093a\jetified-play-services-tasks-18.0.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\35ab4ec49c756949a45b86e9681d0f3a\jetified-play-services-basement-18.1.0\proguard.txt -# Needed when building against pre-Marshmallow SDK. --dontwarn android.security.NetworkSecurityPolicy - -# Needed when building against Marshmallow SDK. --dontwarn android.app.Notification - -# Protobuf has references not on the Android boot classpath --dontwarn sun.misc.Unsafe --dontwarn libcore.io.Memory - -# Internal Google annotations for generating Proguard keep rules. --dontwarn com.google.android.apps.common.proguard.UsedBy* - -# Annotations referenced by the SDK but whose definitions are contained in -# non-required dependencies. --dontwarn javax.annotation.** --dontwarn org.checkerframework.** --dontwarn com.google.errorprone.annotations.** --dontwarn org.jspecify.nullness.NullMarked - -# Proguard flags for consumers of the Google Play services SDK -# https://developers.google.com/android/guides/setup#add_google_play_services_to_your_project - -# Keep SafeParcelable NULL value, needed for reflection by DowngradeableSafeParcel --keepclassmembers public class com.google.android.gms.common.internal.safeparcel.SafeParcelable { - public static final *** NULL; -} - -# Needed for Parcelable/SafeParcelable classes & their creators to not get renamed, as they are -# found via reflection. --keep class com.google.android.gms.common.internal.ReflectedParcelable --keepnames class * implements com.google.android.gms.common.internal.ReflectedParcelable --keepclassmembers class * implements android.os.Parcelable { - public static final *** CREATOR; -} - -# Keep the classes/members we need for client functionality. --keep @interface android.support.annotation.Keep --keep @androidx.annotation.Keep class * --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - -# Keep androidX equivalent of above android.support to allow Jetification. --keep @interface androidx.annotation.Keep --keep @androidx.annotation.Keep class * --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} --keepclasseswithmembers class * { - @androidx.annotation.Keep ; -} - -# Keep the names of classes/members we need for client functionality. --keep @interface com.google.android.gms.common.annotation.KeepName --keepnames @com.google.android.gms.common.annotation.KeepName class * --keepclassmembernames class * { - @com.google.android.gms.common.annotation.KeepName *; -} - -# Keep Dynamite API entry points --keep @interface com.google.android.gms.common.util.DynamiteApi --keep @com.google.android.gms.common.util.DynamiteApi public class * { - public ; - public ; -} - - - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\35ab4ec49c756949a45b86e9681d0f3a\jetified-play-services-basement-18.1.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt -# Copyright (C) 2020 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# The default FragmentFactory creates Fragment instances using reflection --if public class ** extends androidx.fragment.app.Fragment --keepclasseswithmembers,allowobfuscation public class <1> { - public (); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\5f831951c0b8802f6f25e32827841d84\fragment-1.3.6\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\093cf4894c646f12adcf0608a8578513\transformed\vectordrawable-animated-1.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt # Copyright (C) 2017 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2372,8 +2399,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class androidx.media.** implements android.os.Parcelable { public static final android.os.Parcelable$Creator *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\121cb01df8fd6bc6edf7c02dd5c650df\media-1.6.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\13795feba8dd8fc2e0266a202e40730e\transformed\media-1.6.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt # Copyright (c) Meta Platforms, Inc. and affiliates. # All rights reserved. # @@ -2409,8 +2436,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; java.lang.Object readResolve(); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\84773b2cbb4373d03f79d6f369be0b28\jetified-facebook-bolts-15.2.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\3db9f5e64eaa2a61a80545d78dbfe4ed\transformed\jetified-facebook-bolts-15.2.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\4bf1220f49ce7953fbb445d1fb03d04a\transformed\core-1.8.0\proguard.txt # Never inline methods, but allow shrinking and obfuscation. -keepclassmembernames,allowobfuscation,allowshrinking class androidx.core.view.ViewCompat$Api* { ; @@ -2428,8 +2455,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; ; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a40538350a7fb61e0a7b9464dc76595a\core-1.7.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\4bf1220f49ce7953fbb445d1fb03d04a\transformed\core-1.8.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt -keepattributes AnnotationDefault, RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations, @@ -2453,38 +2480,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # this rule is need to work properly when app is compiled with api 28, see b/142778206 # Also this rule prevents registerIn from being inlined. -keepclassmembers class androidx.lifecycle.ReportFragment$LifecycleCallbacks { *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\7009aa331cdc2d036a4ec9c596b22be1\lifecycle-runtime-2.4.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt --keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { - (androidx.lifecycle.SavedStateHandle); -} - --keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel { - (android.app.Application,androidx.lifecycle.SavedStateHandle); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\36cbddc98b6705e5a3746ee7fbe71eb0\jetified-lifecycle-viewmodel-savedstate-2.3.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - --keepclassmembers,allowobfuscation class * implements androidx.savedstate.SavedStateRegistry$AutoRecreated { - (); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ba072b3d68484e88bf78b1163d336301\jetified-savedstate-1.1.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\2c964f4aa7e08caf6a082be78fa332c4\transformed\lifecycle-runtime-2.5.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt # Proguard rules specific to the DataSource module. # Constant folding for resource integers may mean that a resource passed to this method appears to be unused. Keep the method to prevent this from happening. @@ -2498,8 +2495,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; (); } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3674bfadd5a9b3b6847c8ee3facd63b2\jetified-exoplayer-datasource-2.18.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\4a3cce138aa30f2fd0df44bf999a62d2\transformed\jetified-exoplayer-datasource-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt # Proguard rules specific to the extractor module. # Methods accessed via reflection in DefaultExtractorsFactory @@ -2517,8 +2514,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotations.jvm.** -dontwarn javax.annotation.** -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\ed4e3a370ece1a1822fda61c3eb5376b\jetified-exoplayer-extractor-2.18.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\cccc4dd1e5210aae5c702cc866696db2\transformed\jetified-exoplayer-extractor-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt # Proguard rules specific to the common module. # Don't warn about checkerframework and Kotlin annotations @@ -2542,30 +2539,20 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; # This is needed for ProGuard but not R8. -keepclassmembernames class com.google.common.base.Function { *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a7c8701f4c6fa95ee12235eeb0eb6f3a\jetified-exoplayer-common-2.18.2\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\5bd9c5cbdf66400a7932d1da1691bac0\transformed\jetified-exoplayer-common-2.18.2\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt -keep class * implements androidx.versionedparcelable.VersionedParcelable -keep public class android.support.**Parcelizer { *; } -keep public class androidx.**Parcelizer { *; } -keep public class androidx.versionedparcelable.ParcelImpl -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\dc647e1e1676170e42c9f17b26db698b\versionedparcelable-1.1.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\25898cd92bff76be652caaeef3397500\transformed\versionedparcelable-1.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt -keep class * extends androidx.room.RoomDatabase -dontwarn androidx.room.paging.** -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\1b92e6fd8aceb3741009ef09e7234f8b\room-runtime-2.4.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt --keepclassmembers,allowobfuscation class * extends androidx.lifecycle.ViewModel { - (); -} - --keepclassmembers,allowobfuscation class * extends androidx.lifecycle.AndroidViewModel { - (android.app.Application); -} - -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\2c1e2b2b9ed6d726472c78c71e0db379\lifecycle-viewmodel-2.3.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\jetified-startup-runtime-1.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\8c49f53105b230fe43669879f576cab6\transformed\room-runtime-2.4.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt # This Proguard rule ensures that ComponentInitializers are are neither shrunk nor obfuscated. # This is because they are discovered and instantiated during application initialization. -keep class * extends androidx.startup.Initializer { @@ -2575,29 +2562,29 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -assumenosideeffects class androidx.startup.StartupLogger -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\cd120374496e37b1880c17b229c3ba04\jetified-startup-runtime-1.0.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\fec7c4591f7251aeb926648a6566c25e\jetified-transport-backend-cct-3.1.7\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\48f6f745536202396d49c6664e656f00\transformed\jetified-startup-runtime-1.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\f137f81e3ba6bf4187612f01b8d596d6\transformed\jetified-transport-backend-cct-3.1.7\proguard.txt -dontwarn com.google.auto.value.AutoValue -dontwarn com.google.auto.value.AutoValue$Builder -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\fec7c4591f7251aeb926648a6566c25e\jetified-transport-backend-cct-3.1.7\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\f137f81e3ba6bf4187612f01b8d596d6\transformed\jetified-transport-backend-cct-3.1.7\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt -dontwarn com.google.auto.value.AutoValue -dontwarn com.google.auto.value.AutoValue$Builder -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\6021af4c69cfad649d356c3473838da4\jetified-transport-api-3.0.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\8aa6773415180ce53823a4e567cdab83\jetified-firebase-components-17.0.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\ad1f4a6564b34286db155b9a62614b62\transformed\jetified-transport-api-3.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt -dontwarn com.google.firebase.components.Component$Instantiation -dontwarn com.google.firebase.components.Component$ComponentType -keep class * implements com.google.firebase.components.ComponentRegistrar -keep,allowshrinking interface com.google.firebase.components.ComponentRegistrar -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\8aa6773415180ce53823a4e567cdab83\jetified-firebase-components-17.0.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\e1bbd140b52a8e61bea52bf380947059\transformed\jetified-firebase-components-17.0.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\983b4e19318fac60e829f182445d73df\jetified-firebase-encoders-json-18.0.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro +# End of content from C:\gradle-6.1.1\caches\transforms-3\ff39e13547528b628eacff5bee8aa481\transformed\jetified-firebase-encoders-json-18.0.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\3b7d5c4af95619f43e4d0ea1cb1bf304\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro -keep,allowobfuscation @interface androidx.annotation.Keep -keep @androidx.annotation.Keep class * {*;} @@ -2617,8 +2604,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; @androidx.annotation.DoNotInline ; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\a6d74d96fd3bb13fd17dc15c9a0c4454\rules\lib\META-INF\proguard\androidx-annotations.pro -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\3b7d5c4af95619f43e4d0ea1cb1bf304\transformed\rules\lib\META-INF\proguard\androidx-annotations.pro +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\e7e2a2183722056abf9bd4188272512b\transformed\jetified-annotation-experimental-1.1.0\proguard.txt # Copyright (C) 2020 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -2643,8 +2630,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn kotlin.annotation.Retention -dontwarn kotlin.annotation.Target -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\9df899c838441fedfccf1ab27d865636\jetified-annotation-experimental-1.1.0\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\410ee7047c4b7502102a93fa8e774ce4\jetified-calligraphy3-3.1.1\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\e7e2a2183722056abf9bd4188272512b\transformed\jetified-annotation-experimental-1.1.0\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt # Add project specific ProGuard rules here. # By default, the flags in this file are appended to flags specified # in /Developer/android-sdk-osx/tools/proguard/proguard-android.txt @@ -2666,8 +2653,8 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class io.github.inflationx.calligraphy3.* { *; } -keep class io.github.inflationx.calligraphy3.*$* { *; } -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\410ee7047c4b7502102a93fa8e774ce4\jetified-calligraphy3-3.1.1\proguard.txt -# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\e4ea56c12de34fd26c2a84541f3aeb08\transformed\jetified-calligraphy3-3.1.1\proguard.txt +# The proguard configuration file for the following section is C:\gradle-6.1.1\caches\transforms-3\a358ff6705c32d8c6337aefd4316f1b9\transformed\jetified-billing-5.0.0\proguard.txt # Keep the AIDL interface -keep class com.android.vending.billing.** { *; } @@ -2676,7 +2663,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -dontwarn com.google.android.apps.common.proguard.UsedByReflection -keepnames class com.android.billingclient.api.ProxyBillingActivity -# End of content from C:\gradle-6.1.1\caches\transforms-2\files-2.1\3fa9ddf89863b7edbe04056a19226bfe\jetified-billing-5.0.0\proguard.txt +# End of content from C:\gradle-6.1.1\caches\transforms-3\a358ff6705c32d8c6337aefd4316f1b9\transformed\jetified-billing-5.0.0\proguard.txt # The proguard configuration file for the following section is --ignorewarnings + # End of content from \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/bean/UserBean.java b/common/src/main/java/com/yunbao/common/bean/UserBean.java index 8a392d55f..5a8128c02 100644 --- a/common/src/main/java/com/yunbao/common/bean/UserBean.java +++ b/common/src/main/java/com/yunbao/common/bean/UserBean.java @@ -67,6 +67,7 @@ public class UserBean implements Parcelable { //随机天梯排位赛PK img，仅在主播PK时使用 private String mRankPkImgUrl; //是否填写完整资料 + @SerializedName("user_info_complete") private int user_info_complete; //粉丝团等级 private int fansLevel; @@ -169,6 +170,14 @@ public class UserBean implements Parcelable { return user_info_complete; } + public int getUser_info_complete() { + return user_info_complete; + } + + public void setUser_info_complete(int user_info_complete) { + this.user_info_complete = user_info_complete; + } + public UserBean seUserInfoComplete(int userInfoComplete) { this.user_info_complete = userInfoComplete; return this; diff --git a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java b/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java index d77d30acc..0cacbf03e 100644 --- a/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java +++ b/common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java @@ -3,14 +3,14 @@ package com.yunbao.common.pay.samsung; import android.content.Context; import com.google.gson.Gson; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.helper.IapHelper; -import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener; -import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener; -import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener; -import com.samsung.android.sdk.iap.lib.vo.ConsumeVo; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.helper.IapHelper; +import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener; +import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener; +import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo; import com.yunbao.common.utils.L; import java.util.ArrayList; diff --git a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java index 45cde66ae..32b02eaba 100644 --- a/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java +++ b/main/src/main/java/com/yunbao/main/activity/SamsungFragment.java @@ -1,8 +1,6 @@ package com.yunbao.main.activity; -import static com.yunbao.main.activity.MyWalletActivity.dis; - import android.annotation.SuppressLint; import android.os.Bundle; import android.os.Handler; @@ -16,13 +14,10 @@ import android.webkit.WebView; import androidx.fragment.app.Fragment; -import com.facebook.appevents.AppEventsConstants; -import com.samsung.android.sdk.iap.lib.helper.HelperDefine; -import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener; -import com.samsung.android.sdk.iap.lib.vo.ErrorVo; -import com.samsung.android.sdk.iap.lib.vo.PurchaseVo; -import com.yunbao.common.http.CommonHttpUtil; -import com.yunbao.common.http.HttpCallback; +import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; +import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; +import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; +import com.samsung.android.sdk.iap.lib2.vo.PurchaseVo; import com.yunbao.common.pay.samsung.SamsungUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; diff --git a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java index 8fb812113..c201b5113 100644 --- a/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java +++ b/main/src/main/java/com/yunbao/main/http/MainHttpUtil.java @@ -285,7 +285,13 @@ public class MainHttpUtil { public static void getBaseInfo(CommonCallback commonCallback) { getBaseInfo(CommonAppConfig.getInstance().getUid(), CommonAppConfig.getInstance().getToken(), - commonCallback); + new CommonCallback() { + @Override + public void callback(UserBean bean) { + CommonAppConfig.getInstance().setUserBean(bean); + commonCallback.callback(bean); + } + }); } /**