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

三星SDK升级

Browse Source
This commit is contained in:
hch 2024-03-26 16:20:24 +08:00
parent 9d528524be
commit 80fd2a1bbc
6 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.gradle
View File

@ -229,7 +229,7 @@ dependencies {
api project(':lib_google') api project(':lib_google')
//samsung插件包 //samsung插件包
api project(':IAP6Helper') //api project(':IAP6Helper')
//時間選擇器 //時間選擇器
api 'com.contrarywind:Android-PickerView:4.1.9' api 'com.contrarywind:Android-PickerView:4.1.9'

BIN
common/libs/samsung-iap-6.1.1.aar Normal file
View File

Binary file not shown.

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

@ -3,14 +3,16 @@ package com.yunbao.common.pay.samsung;
import android.content.Context; import android.content.Context;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.samsung.android.sdk.iap.lib2.helper.HelperDefine; import com.samsung.android.sdk.iap.lib.constants.HelperDefine;
import com.samsung.android.sdk.iap.lib2.helper.IapHelper; import com.samsung.android.sdk.iap.lib.helper.IapHelper;
import com.samsung.android.sdk.iap.lib2.listener.OnConsumePurchasedItemsListener; import com.samsung.android.sdk.iap.lib.listener.OnConsumePurchasedItemsListener;
import com.samsung.android.sdk.iap.lib2.listener.OnGetOwnedListListener; import com.samsung.android.sdk.iap.lib.listener.OnGetOwnedListListener;
import com.samsung.android.sdk.iap.lib2.listener.OnPaymentListener; import com.samsung.android.sdk.iap.lib.listener.OnPaymentListener;
import com.samsung.android.sdk.iap.lib2.vo.ConsumeVo; import com.samsung.android.sdk.iap.lib.vo.ConsumeVo;
import com.samsung.android.sdk.iap.lib2.vo.ErrorVo; import com.samsung.android.sdk.iap.lib.vo.ErrorVo;
import com.samsung.android.sdk.iap.lib2.vo.OwnedProductVo; import com.samsung.android.sdk.iap.lib.vo.OwnedProductVo;
import com.samsung.android.sdk.iap.lib.vo.PurchaseVo;
import com.yunbao.common.R;
import com.yunbao.common.utils.L; import com.yunbao.common.utils.L;
import java.util.ArrayList; import java.util.ArrayList;
@ -57,9 +59,27 @@ public class SamsungUtil {
*/ */
public void buy(String skuId, OnPaymentListener onPaymentListener) { public void buy(String skuId, OnPaymentListener onPaymentListener) {
//购买 //购买
iapHelper.startPayment(skuId, "", onPaymentListener); iapHelper.startPayment(skuId, "", (errorVo, purchaseVo) -> {
if (purchaseVo != null) {
onPaymentListener.onPaymentSuccess(purchaseVo.getPurchaseId());
} else {
if (errorVo.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) {
onPaymentListener.onPaymentFailed(mContext.getString(R.string.pay_cancel));
} else {
onPaymentListener.onPaymentFailed(errorVo.getErrorString());
}
}
});
} }
public interface OnPaymentListener {
void onPaymentSuccess(String purchaseVo);
void onPaymentFailed(String errorVo);
}
/** /**
* 消耗指定商品 * 消耗指定商品
* *

2
config.gradle
View File

@ -22,7 +22,7 @@ ext {
// true表示谷歌支付 false // true表示谷歌支付 false
// isGooglePlay : false, // isGooglePlay : false,
// true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包 // true表示谷歌支付 false 0 链接包 1 谷歌包 2华为包
isGooglePlay : 1, isGooglePlay : 3,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,

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

@ -14,10 +14,6 @@ import android.webkit.WebView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
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.pay.samsung.SamsungUtil;
import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
@ -99,15 +95,13 @@ public class SamsungFragment extends Fragment {
mProductId = ProductId; mProductId = ProductId;
mOrderid = OrderNumber; mOrderid = OrderNumber;
MoneyUsds = MoneyUsd; MoneyUsds = MoneyUsd;
SamsungUtil.newInstance(getActivity()).buy(mProductId, new SamsungUtil.OnPaymentListener() {
SamsungUtil.newInstance(getActivity()).buy(mProductId, new OnPaymentListener() {
@Override @Override
public void onPayment(ErrorVo _errorVO, PurchaseVo _purchaseVO) { public void onPaymentSuccess(String purchaseVo) {
if (_purchaseVO != null) { SamsungUtil.newInstance(getActivity()).consume(purchaseVo);
SamsungUtil.newInstance(getActivity()).consume(_purchaseVO.getPurchaseId()); payHandler.post(new Runnable() {
payHandler.post(new Runnable() { @Override
@Override public void run() {
public void run() {
// CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() { // CommonHttpUtil.notifySamsung(_purchaseVO.getPurchaseId(), mOrderid, new HttpCallback() {
// @Override // @Override
// public void onSuccess(int code, String msg, String[] info) { // public void onSuccess(int code, String msg, String[] info) {
@ -117,23 +111,22 @@ public class SamsungFragment extends Fragment {
// } // }
// } // }
// }); // });
} }
}); });
} else { }
payHandler.post(new Runnable() {
@Override @Override
public void run() { public void onPaymentFailed(String errorVo) {
if (_errorVO.getErrorCode() == HelperDefine.IAP_PAYMENT_IS_CANCELED) { payHandler.post(new Runnable() {
ToastUtil.show(getString(R.string.pay_cancel)); @Override
} else { public void run() {
ToastUtil.show(_errorVO.getErrorString()); ToastUtil.show(errorVo);
} }
} });
});
}
} }
}); });
} }
lastClickTime = currentTime; lastClickTime = currentTime;
Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd); Log.e(TAG, "ProductId" + ProductId + "OrderNumber" + OrderNumber + "MoneyUsd" + MoneyUsd);
@ -149,6 +142,7 @@ public class SamsungFragment extends Fragment {
public void androidGoBack() { public void androidGoBack() {
getActivity().onBackPressed(); getActivity().onBackPressed();
} }
} }

2
settings.gradle
View File

@ -6,4 +6,4 @@ include ':Share'
include ':pluginsForAnchor' include ':pluginsForAnchor'
//include ':lib_huawei' //include ':lib_huawei'
include ':lib_google' include ':lib_google'
include ':IAP6Helper' //include ':IAP6Helper'