From 090454aaa06b656b57fa348254a69eb3fd5bc4a9 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 29 Sep 2022 19:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=B7=E6=AD=8C=E5=86=85?= =?UTF-8?q?=E8=B4=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 15 +++++- .../erban/ui/login/BindPhoneActivity.java | 1 - .../yizhuan/erban/ui/pay/BillingManager.java | 2 +- .../yizhuan/erban/ui/pay/ChargeActivity.java | 46 +++++++++++-------- app/src/main/res/layout/activity_charge.xml | 3 +- build.gradle | 2 +- .../XChatConstants.java | 2 +- .../xchat_android_core/user/UserModel.java | 8 +--- .../utils/DeviceUtils.java | 4 +- 9 files changed, 51 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6128e1a26..1179a3938 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,17 @@ android { flavorDimensions 'default' } + bundle { + language { + enableSplit = false + } + density { + enableSplit = true + } + abi { + enableSplit = true + } + } //在apk文件后边生成版本号信息 android.applicationVariants.all { @@ -127,7 +138,7 @@ android { buildTypes { release { // buildConfigField "String", "BASE_URL", "\"https://api.lecheng163.com/\"" - buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\"" + buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" @@ -138,7 +149,7 @@ android { } debug { - buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\"" + buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "\"https://api.lecheng163.com/\"" buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.lecheng163.com/\"" diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java index cc3f6bb86..f6a55e6e2 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/BindPhoneActivity.java @@ -1,6 +1,5 @@ package com.yizhuan.erban.ui.login; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java index 092ff380f..f9192673f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java @@ -36,7 +36,7 @@ public class BillingManager implements PurchasesUpdatedListener { private static final String TAG = "BillingManager"; /*购买key*/ - private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnagnKdJFBKmp3zb8lmnZfnRcVc7hRf39Zes2YaBQrhNIcesrbtSvV8uCHQrFLan1ekYVPT52mX+AylEvdQ3n5isotS2nfp0jf7l05bJ9bxVKGU7fe2jnT0B+rW2LJpacNzBj/pRDgp1TSN/kl/FI+SXP+jL6f8vhRMwY7GmSvOSHUl/pm8Imi0Se+Y7hBpUtTQioHF0oMiUuNH6vrB/eyx73//thS4D2YylPSN4Q8P4UTLpq4YMCGj8IbY6ZBjDRqGdUfLcb2eU6IRFoyHaBGZWfG/KdrCj1PfnEwh4hIBTBrnZXY1OhPPvztTLVx/sd8iIUX371GJ8GfWfuqvpTXQIDAQAB"; + private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs1/xs5aYKXp5iWlhuM763hAaNt3GneWBf2I4DjM2vTf43UWs1wgAnTpMIgoI80epnVPvdqbInu9fPMU7dp8d2XmjOF0GKydvnwUN0BpWKtg0kAcMCd7TW2s+FoZRmii2RkX2VGYMxLsCaN4P++DcpXQ8v8UyfvMNcLiVBeERM8+/FYfB94cA6OEoILb1bYwn4pGb7UlY7h11Zu0Hzmp2g209rfAmVRtO4SnEbvTicQI2l3mC6ggZi3pz5ffZxkWY7D3Y+NPgNogL/ZVZd8S8tt7lwpnmuF9s3fKcj3c6zun+B599YYxDVmZR688f5a43jc81/BHQwWKuMVCyCIPIFwIDAQAB"; /*客户端*/ private BillingClient billingClient; diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java index 33fcc0e0a..65feded23 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.view.View; -import android.widget.ImageView; import android.widget.TextView; import androidx.recyclerview.widget.LinearLayoutManager; @@ -59,12 +58,16 @@ public class ChargeActivity extends BaseMvpActivity initProduceList(chargeListResult.getList())); } - public void initProduceList(List chargeBeanList) { final List productKeys = new ArrayList<>(); @@ -144,10 +146,10 @@ public class ChargeActivity extends BaseMvpActivity { @@ -166,7 +168,7 @@ public class ChargeActivity extends BaseMvpActivity { - buyProduct(mChargeAdapter.getItem(position).getSkuDetails()); + mChargePosition = position; + }); + mIvCharge.setOnClickListener(view -> { + if (mChargePosition != -1) { + ChargeBean bean = mChargeAdapter.getItem(mChargePosition); + if (bean != null && bean.getSkuDetails() != null) { + buyProduct(bean.getSkuDetails()); + } + } }); } diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml index 752efc178..4a61a766d 100644 --- a/app/src/main/res/layout/activity_charge.xml +++ b/app/src/main/res/layout/activity_charge.xml @@ -18,7 +18,7 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_30" + android:layout_marginTop="@dimen/dp_40" app:layout_constraintTop_toTopOf="parent" tools:layout_height="50dp" /> @@ -63,6 +63,7 @@ android:layout_centerHorizontal="true" android:fontFamily="sans-serif-medium" android:includeFontPadding="false" + android:text="0.0" android:textColor="@color/color_333333" android:textSize="@dimen/text_size_30" android:layout_marginTop="@dimen/dp_4" diff --git a/build.gradle b/build.gradle index d6d732841..7ee24a154 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.tencent.vasdolly:plugin:3.0.3' classpath "com.mob.sdk:MobSDK:2018.0319.1724" - classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.gms:google-services:4.3.13' } } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index 1dadb9b73..5af370776 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -242,7 +242,7 @@ public class XChatConstants { /** * Referer (DEBUG) */ - public static final String KEY_REFERER_DEBUG = "https://beta.api.pekolive.com/"; + public static final String KEY_REFERER_DEBUG = "http://beta.api.pekolive.com/"; /** * Referer (RELEASE) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java index 541e2de77..986a9edf8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java @@ -421,12 +421,8 @@ public final class UserModel extends BaseModel implements IUserModel { }) .doOnSuccess(data -> { EventBus.getDefault().post(new CurrentUserInfoCompleteEvent()); - if (data.getDefUser() != 4 && !data.isBindPhone()) { - EventBus.getDefault().post(new NeedBindPhoneEvent()); - } else { - //如果是手机号码注册，完善资料后，登录流程结束，发出加载事件 - EventBus.getDefault().post(new LoadLoginUserInfoEvent()); - } + //完善资料后，登录流程结束，发出加载事件 + EventBus.getDefault().post(new LoadLoginUserInfoEvent()); }) .doOnError(throwable -> { EventBus.getDefault().post(new CurrentUserInfoCompleteFailEvent(throwable.getMessage())); diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java index bf30ffbf4..54067c628 100644 --- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java +++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/DeviceUtils.java @@ -4,6 +4,8 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; +import com.orhanobut.logger.Logger; + /** * 设备信息工具类 */ @@ -29,7 +31,7 @@ public class DeviceUtils { installed = true; } } catch (Exception e) { -// Logger.info(TAG, "isAppInstalled packageName=" + packageName + " "+ e); + Logger.i("isAppInstalled packageName=" + packageName + " "+ e); } return installed; }