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

修复 点击去支付无反应 问题

Browse Source
This commit is contained in:
hch 2024-01-18 14:48:49 +08:00
parent a307e6f864
commit 65d38de73c
13 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -83,6 +83,7 @@
tools:ignore="ProtectedPermissions" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="com.samsung.android.iap.permission.BILLING"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<!-- Android11新增 -->
<!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->

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

@ -331,7 +331,7 @@ public class AppContext extends CommonAppContext {
if (!CommonAppConfig.IS_UPLOAD_ERROR_LOG) {
return;
}
if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
GoogleUtils.newInstance(this).initializeApp(this);
}
}

2
common/build.gradle
View File

@ -214,7 +214,7 @@ dependencies {
//api project(':lib_huawei')
//google插件包
//api project(':lib_google')
api project(':lib_google')
//samsung插件包
api project(':IAP6Helper')

2
common/src/main/java/com/yunbao/common/CommonAppContext.java
View File

@ -55,7 +55,7 @@ public class CommonAppContext extends MultiDexApplication {
// RongPushClient.setPushConfig(config); //将推送相关配置设置到 SDK
//设置新加坡融云服务器 有时候国内收不到推送是因为这个
RongIMClient.setServerInfo("navsg01.cn.ronghub.com", null);
if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
//谷歌推送
PushConfig gconfig = new PushConfig.Builder().enableFCM(true).build();
RongPushClient.setPushConfig(gconfig);

2
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -331,6 +331,8 @@ public class CommonHttpUtil {
isGoogle = "1";
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
isGoogle = "2";
}else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
isGoogle = "3";
} else {
isGoogle = "-1";
}

4
common/src/main/java/com/yunbao/common/views/APKUpdateCustomPopup.java
View File

@ -97,9 +97,13 @@ public class APKUpdateCustomPopup extends CenterPopupView {
if (CommonAppConfig.IS_GOOGLE_PLAY == 2 && APKManager.get().getAPKGoogleIsUp() != 1) {
dismiss();
}
if (CommonAppConfig.IS_GOOGLE_PLAY == 3 && APKManager.get().getAPKGoogleIsUp() != 1) {
dismiss();
}
if (CommonAppConfig.IS_GOOGLE_PLAY == 0 && APKManager.get().getApkIsUp() != 1) {
dismiss();
}
}
}

2
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 21,
targetSdkVersion : 33,
versionCode : 461,
versionCode : 462,
versionName : "6.6.3"
]
manifestPlaceholders = [

5
lib_google/src/main/java/com/shayu/lib_google/utils/GoogleBillingManage.java
View File

@ -117,11 +117,6 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
}
}
public boolean getGoogleService() {
int code = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(mContext);
return code == 0;
}
int querySize = -1;
JSONArray tokenList = new JSONArray();
JSONArray orderList = new JSONArray();

7
main/src/main/java/com/yunbao/main/activity/EntryActivity.java
View File

@ -185,6 +185,7 @@ public class EntryActivity extends AppCompatActivity {
activity = this;
Contexts = this;
setStatusBar();
googleLayout = findViewById(R.id.googleLayout);
if (CommonAppConfig.IS_GOOGLE_PLAY == 2) {
@ -539,7 +540,7 @@ public class EntryActivity extends AppCompatActivity {
Log.d("OpenInstall", "appData.getData()= " + appData.getData());
//获取自定义数据
if (appData.getData() != null && !appData.getData().equals("")) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
} else {
JSONObject data = JSON.parseObject(appData.getData());
@ -575,7 +576,7 @@ public class EntryActivity extends AppCompatActivity {
*/
private void loginBuyThird(LoginData data) {
mLoginType = data.getType();
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2||CommonAppConfig.IS_GOOGLE_PLAY == 3) {
mPromoCode = "";
}
MainHttpUtil.loginByThird(UserID, data.getOpenID(), mPromoCode, mUuidDevice, data.getNickName(), data.getAvatar(), data.getType(), new HttpCallback() {
@ -623,7 +624,7 @@ public class EntryActivity extends AppCompatActivity {
public void callback(UserBean bean) {
if (mFirstLogin) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
EntryActivity.this.startActivity(new Intent(EntryActivity.this, OneLoginActivity.class));
} else {
HttpClient.getInstance().post("Home.getRandJoinAnchor", "Home.getRandJoinAnchor").execute(new HttpCallback() {

2
main/src/main/java/com/yunbao/main/activity/MainActivity.java
View File

@ -288,7 +288,7 @@ public class MainActivity extends AbsActivity implements MainAppBarLayoutListene
WebViewActivity.forward(mContext, getIntent().getStringExtra("activityUrl"), true, false);
}
if (CommonAppConfig.IS_GOOGLE_PLAY == 1) {
if (CommonAppConfig.IS_GOOGLE_PLAY != 2) {
/* GoogleUtils.newInstance(MainActivity.this).setFirebaseTokenListener(MainActivity.this, new GoogleUtils.FirebaseTokenListener() {
@Override
public void onResultToken(String token) {

3
main/src/main/java/com/yunbao/main/activity/MyWalletActivity.java
View File

@ -86,6 +86,9 @@ public class MyWalletActivity extends AbsActivity {
} else if (CommonAppConfig.IS_GOOGLE_PLAY == 3) {
samsungUtil = SamsungUtil.newInstance(mContext);
samsungUtil.init();
}else{
googleUtils = new GoogleUtils(mContext);
googleUtils.initGooglePay();
}

2
main/src/main/java/com/yunbao/main/activity/RegisterActivity.java
View File

@ -404,7 +404,7 @@ public class RegisterActivity extends AbsActivity {
//获取自定义数据
if (appData.getData() != null && !appData.getData().equals("")) {
JSONObject data = JSON.parseObject(appData.getData());
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2) {
if (CommonAppConfig.IS_GOOGLE_PLAY == 1 || CommonAppConfig.IS_GOOGLE_PLAY == 2|| CommonAppConfig.IS_GOOGLE_PLAY == 3) {
yqm_view.setVisibility(View.VISIBLE);
MainHttpUtil.getDeviceLoginType(new HttpCallback() {
@Override

2
settings.gradle
View File

@ -5,5 +5,5 @@ include ':FaceUnity'
include ':Share'
include ':pluginsForAnchor'
//include ':lib_huawei'
//include ':lib_google'
include ':lib_google'
include ':IAP6Helper'