From 610557bada1257f468a2fc06ebc68861544c0872 Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Sat, 5 Mar 2022 16:55:20 +0800
Subject: [PATCH] v2.4.0

---
 app/src/main/assets/updatelog.fy                          | 2 +-
 .../xyz/fycz/myreader/ui/activity/DonateActivity.java     | 2 +-
 .../xyz/fycz/myreader/ui/activity/UserInfoActivity.kt     | 8 ++++----
 app/src/main/res/values/strings.xml                       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index 82d4efb..944f866 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,5 +1,5 @@
 2022.03.04
-风月读书v2.4.0
+风月读书v2.4.0-beta
 更新内容：
 1、新增用户中心
 2、修复v2.3.9版本搜索界面书源分组显示错位的问题
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
index 2190aa0..da2536c 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/DonateActivity.java
@@ -48,7 +48,7 @@ public class DonateActivity extends BaseActivity<ActivityDonateBinding> {
 
     @Override
     protected void initWidget() {
-        AdUtils.checkHasAd().subscribe(new MySingleObserver<Boolean>() {
+        AdUtils.checkHasAd(true, false).subscribe(new MySingleObserver<Boolean>() {
             @Override
             public void onSuccess(@NonNull Boolean aBoolean) {
                 if (aBoolean) {
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/UserInfoActivity.kt b/app/src/main/java/xyz/fycz/myreader/ui/activity/UserInfoActivity.kt
index e31be74..0d0d3d4 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/UserInfoActivity.kt
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/UserInfoActivity.kt
@@ -155,7 +155,7 @@ class UserInfoActivity : BaseActivity<ActivityUserInfoBinding>() {
                         override fun onSuccess(t: Result) {
                             if (t.code < 200) {
                                 user?.noAdId = UserService.getUUID()
-                                ToastUtils.showSuccess("设备绑定成功")
+                                ToastUtils.showSuccess(t.result.toString())
                                 binding.tvNoAdDevice.text = "已绑定此设备"
                             } else {
                                 ToastUtils.showError(t.result.toString())
@@ -174,7 +174,7 @@ class UserInfoActivity : BaseActivity<ActivityUserInfoBinding>() {
         binding.rlCammyEnter.onClick {
             var cammy = ""
             MyAlertDialog.createInputDia(this, getString(R.string.cammy_enter),
-                "请输入卡密", "", true, 25, {
+                "请输入兑换码", "", true, 25, {
                     cammy = it
                 }, { _, _ ->
                     dialog.show()
@@ -187,7 +187,7 @@ class UserInfoActivity : BaseActivity<ActivityUserInfoBinding>() {
 
                             override fun onSuccess(t: Result) {
                                 if (t.code < 200) {
-                                    ToastUtils.showSuccess("卡密绑定成功，免广告服务重启后生效")
+                                    ToastUtils.showSuccess(t.result.toString())
                                     dialog.dismiss()
                                     initData()
                                 } else {
@@ -197,7 +197,7 @@ class UserInfoActivity : BaseActivity<ActivityUserInfoBinding>() {
                             }
 
                             override fun onError(e: Throwable) {
-                                ToastUtils.showError("卡密绑定成功\n" + e.localizedMessage)
+                                ToastUtils.showError("兑换码使用失败\n" + e.localizedMessage)
                                 dialog.dismiss()
                             }
                         })
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a373acc..f91eea5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -551,7 +551,7 @@
     <string name="no_ad_device">免广告设备绑定</string>
     <string name="basic_service">基础服务</string>
     <string name="no_ad_service">免广告服务</string>
-    <string name="cammy_enter">卡密输入</string>
+    <string name="cammy_enter">兑换码输入</string>
     <string name="logout">退出登录</string>