yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 三星包

Browse Source
This commit is contained in:
zlzw 2024-03-26 15:25:23 +08:00
parent bb4621ee13
commit 9d528524be
41 changed files with 708 additions and 718 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IAP6Helper/src/main/AndroidManifest.xml
View File

@ -10,22 +10,22 @@
<!-- IAP 라이브러리 내 Activity 선언 시작-->
<activity
android:name="com.samsung.android.sdk.iap.lib.activity.DialogActivity"
android:name="com.samsung.android.sdk.iap.lib2.activity.DialogActivity"
android:theme="@style/Theme.Empty"
android:configChanges="orientation|screenSize"/>
<activity
android:name="com.samsung.android.sdk.iap.lib.activity.CheckPackageActivity"
android:name="com.samsung.android.sdk.iap.lib2.activity.CheckPackageActivity"
android:theme="@style/Theme.Empty"
android:configChanges="orientation|screenSize"/>
<activity
android:name="com.samsung.android.sdk.iap.lib.activity.AccountActivity"
android:name="com.samsung.android.sdk.iap.lib2.activity.AccountActivity"
android:theme="@style/Theme.Transparent"
android:configChanges="orientation|screenSize"/>
<activity
android:name="com.samsung.android.sdk.iap.lib.activity.PaymentActivity"
android:name="com.samsung.android.sdk.iap.lib2.activity.PaymentActivity"
android:theme="@style/Theme.Empty"
android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden|locale|uiMode|fontScale|density"/>

20
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetOwnedListListener.java
View File

@ -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<OwnedProductVo> _ownedList);
}

20
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnGetProductsDetailsListener.java
View File

@ -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<ProductVo> _productList);
}

11
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/AccountActivity.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/AccountActivity.java
View File

@ -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

36
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/BaseActivity.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/BaseActivity.java
View File

@ -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();

12
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/CheckPackageActivity.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/CheckPackageActivity.java
View File

@ -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;

12
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/DialogActivity.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/DialogActivity.java
View File

@ -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.

10
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/activity/PaymentActivity.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/activity/PaymentActivity.java
View File

@ -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);

3
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/dialog/BaseDialogFragment.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/dialog/BaseDialogFragment.java
View File

@ -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;

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperDefine.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperDefine.java
View File

@ -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.

16
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperListenerManager.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperListenerManager.java
View File

@ -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.

8
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/HelperUtil.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/HelperUtil.java
View File

@ -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.

42
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/IapHelper.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/IapHelper.java
View File

@ -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<BaseService> mServiceQueue = new ArrayList<BaseService>();
@ -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,

7
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/BaseTask.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/BaseTask.java
View File

@ -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.

8
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/ConsumePurchasedItemsTask.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/ConsumePurchasedItemsTask.java
View File

@ -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;

8
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetOwnedListTask.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetOwnedListTask.java
View File

@ -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;

8
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/helper/task/GetProductsDetailsTask.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/helper/task/GetProductsDetailsTask.java
View File

@ -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;

10
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnConsumePurchasedItemsListener.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnConsumePurchasedItemsListener.java
View File

@ -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 {
/**

20
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetOwnedListListener.java Normal file
View File

@ -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<OwnedProductVo> _ownedList);
}

20
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnGetProductsDetailsListener.java Normal file
View File

@ -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<ProductVo> _productList);
}

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnIapBindListener.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnIapBindListener.java
View File

@ -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.

6
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnPaymentListener.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnPaymentListener.java
View File

@ -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.

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/listener/OnSucceedBind.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/listener/OnSucceedBind.java
View File

@ -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.

18
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/BaseService.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/BaseService.java
View File

@ -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;
}

14
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ConsumePurchasedItems.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ConsumePurchasedItems.java
View File

@ -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<ConsumeVo> mConsumeList = null;
protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.ConsumeVo> mConsumeList = null;
public ConsumePurchasedItems(IapHelper _iapHelper, Context _context, OnConsumePurchasedItemsListener _onConsumePurchasedItemsListener) {
super(_iapHelper, _context);

14
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/OwnedProduct.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/OwnedProduct.java
View File

@ -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<OwnedProductVo> mOwnedList = null;
protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo> mOwnedList = null;
public OwnedProduct(IapHelper _iapHelper, Context _context, OnGetOwnedListListener _onGetOwnedListListener) {
super(_iapHelper, _context);

14
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/service/ProductsDetails.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/service/ProductsDetails.java
View File

@ -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<ProductVo> mProductsDetails = null;
protected ArrayList<com.samsung.android.sdk.iap.lib2.vo.ProductVo> mProductsDetails = null;
public ProductsDetails(IapHelper _iapHelper, Context _context, OnGetProductsDetailsListener _onGetProductsDetailsListener) {
super(_iapHelper, _context);

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/BaseVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/BaseVo.java
View File

@ -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;

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ConsumeVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ConsumeVo.java
View File

@ -1,4 +1,4 @@
package com.samsung.android.sdk.iap.lib.vo;
package com.samsung.android.sdk.iap.lib2.vo;
import android.util.Log;

4
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ErrorVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ErrorVo.java
View File

@ -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;

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/OwnedProductVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/OwnedProductVo.java
View File

@ -1,4 +1,4 @@
package com.samsung.android.sdk.iap.lib.vo;
package com.samsung.android.sdk.iap.lib2.vo;
import android.util.Base64;

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/ProductVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/ProductVo.java
View File

@ -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;

2
IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib/vo/PurchaseVo.java → IAP6Helper/src/main/java/com/samsung/android/sdk/iap/lib2/vo/PurchaseVo.java
View File

@ -1,4 +1,4 @@
package com.samsung.android.sdk.iap.lib.vo;
package com.samsung.android.sdk.iap.lib2.vo;
import android.util.Base64;

2
app/build.gradle
View File

@ -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
}

2
app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java
View File

@ -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.

2
app/src/main/java/com/shayu/phonelive/utils/CustomMessageReceiver.java
View File

@ -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 {

1009
app/tmp/full-r8-config.txt
View File

File diff suppressed because it is too large Load Diff

9
common/src/main/java/com/yunbao/common/bean/UserBean.java
View File

@ -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;

16
common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java
View File

@ -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;

13
main/src/main/java/com/yunbao/main/activity/SamsungFragment.java
View File

@ -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;

8
main/src/main/java/com/yunbao/main/http/MainHttpUtil.java
View File

@ -285,7 +285,13 @@ public class MainHttpUtil {
public static void getBaseInfo(CommonCallback<UserBean> commonCallback) {
getBaseInfo(CommonAppConfig.getInstance().getUid(),
CommonAppConfig.getInstance().getToken(),
commonCallback);
new CommonCallback<UserBean>() {
@Override
public void callback(UserBean bean) {
CommonAppConfig.getInstance().setUserBean(bean);
commonCallback.callback(bean);
}
});
}
/**