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

升级34 grd8.0

Browse Source
This commit is contained in:
18142669586
2024-07-13 10:37:37 +08:00
parent 94156e2984
commit 4618c0a4f1
42 changed files with 202 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/build.gradle
View File

@@ -3,8 +3,8 @@ apply plugin: 'img-optimizer'
apply from: "../package_config.gradle"
android {
compileSdkVersion rootProject.ext.android.compileSdkVersion
buildToolsVersion rootProject.ext.android.buildToolsVersion
namespace "com.yunbao.main"
compileSdk rootProject.ext.android.compileSdkVersion
packagingOptions {
pickFirst "lib/armeabi/libyuvutils.so"
pickFirst "lib/arm64-v8a/libyuvutils.so"
@@ -31,7 +31,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
javaCompileOptions {
@@ -54,8 +59,8 @@ android {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_18
targetCompatibility JavaVersion.VERSION_18
}
}
repositories {
@@ -82,7 +87,6 @@ dependencies {
implementation project(path: ':lib_country_code')
//抽屉菜单
implementation 'com.justkiddingbaby:slidemenu:1.3.0'
implementation 'com.xj.marqueeView:marqueeView:0.1.20'
//引导层
implementation 'com.binioter:guideview:1.0.0'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'

2
main/src/main/AndroidManifest.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yunbao.main">
>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />

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