詹子聪 5 rokov pred
rodič
commit
5adf536e4c

+ 12 - 1
app/src/main/java/com/miekir/eden/ui/home/about/AboutFragment.java

@@ -111,9 +111,20 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
                     ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
                     return;
                 }
+                int index = zfb.indexOf(";");
+                String realZfb;
+                if (index == -1) {
+                    realZfb = zfb;
+                } else {
+                    realZfb = zfb.substring(0, index);
+                }
+                if (TextUtils.isEmpty(realZfb)) {
+                    ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
+                    return;
+                }
                 SystemTool.copyText(getActivity(), UserInfoManager.getInstance().getBeiUser().email);
                 ToastTool.showLong(StringTool.getString(R.string.about_active_copy_account));
-                ActivityTool.openUrl(getActivity(), zfb);
+                ActivityTool.openUrl(getActivity(), realZfb);
                 break;
 
             case R.id.tv_more:

+ 19 - 1
app/src/main/java/com/miekir/eden/ui/home/goods/detail/MagnetAdapter.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -65,7 +66,24 @@ public class MagnetAdapter extends BaseQuickAdapter<MagnetBean, BaseViewHolder>
                         .setPositiveButton(StringTool.getString(R.string.confirm), (DialogInterface dialog, int which) -> {
                             dialog.dismiss();
 
-                            ActivityTool.openUrl((Activity) mContext, "https://tb.jiuxinban.com/6Fq9k9");
+                            String zfb = UserInfoManager.getInstance().getSystemBean().zfb;
+                            if (TextUtils.isEmpty(zfb)) {
+                                ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
+                                return;
+                            }
+                            int index = zfb.indexOf(";");
+                            String adLink;
+                            if ((index+1) == zfb.length()) {
+                                adLink = null;
+                            } else {
+                                adLink = zfb.substring(index+1);
+                            }
+                            if (TextUtils.isEmpty(adLink)) {
+                                ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
+                                return;
+                            }
+
+                            ActivityTool.openUrl((Activity) mContext, adLink);
                             // 是广告模式,看完广告之后,自动下载
                             if (mContext instanceof BaseBeiActivity) {
                                 ((BaseBeiActivity) mContext).showLoading();

+ 2 - 2
app/src/main/res/values-zh-rCN/strings.xml

@@ -72,14 +72,14 @@
     <string name="mine_zfb_empty">支付宝账号不能为空</string>
     <string name="mine_exit">确定退出当前账号?</string>
     <string name="response_permission_denied">没有权限</string>
-    <string name="about_upgrade_not_available">激活通道暂时关闭</string>
+    <string name="about_upgrade_not_available">暂不可用</string>
     <string name="login_account">请输入账号</string>
     <string name="login_password">请输入并牢记本机密码</string>
     <string name="login_forget">忘记密码</string>
     <string name="login_in_up">登录或注册</string>
     <string name="mine_upgrade_account">请输入要升级的账号</string>
     <string name="mine_upgrade_vip">升级为VIP用户</string>
-    <string name="mine_new_pay_account">请输入新的支付链接</string>
+    <string name="mine_new_pay_account">支付链接与广告链接,中文分号;分隔</string>
     <string name="mine_set_new_pay">设置新的支付链接</string>
     <string name="mine_limit_data">是否限制访问伊甸园</string>
     <string name="mine_walk_next_time">是否在下次启动爬虫</string>

+ 2 - 2
app/src/main/res/values/strings.xml

@@ -72,14 +72,14 @@
     <string name="mine_zfb_empty">Payment account cannot be empty</string>
     <string name="mine_exit">Are you sure to exit current account?</string>
     <string name="response_permission_denied">Permission denied</string>
-    <string name="about_upgrade_not_available">Upgrading not available</string>
+    <string name="about_upgrade_not_available">Not available currently</string>
     <string name="login_account">Please input account</string>
     <string name="login_password">Please input and remember the password</string>
     <string name="login_forget">Forget</string>
     <string name="login_in_up">LOGIN OR REGISTER</string>
     <string name="mine_upgrade_account">Input account to upgrade</string>
     <string name="mine_upgrade_vip">Upgrade to VIP</string>
-    <string name="mine_new_pay_account">Input new payment link</string>
+    <string name="mine_new_pay_account">Payment and ad link, divided by Chinese semicolon</string>
     <string name="mine_set_new_pay">Set New Payment Accout</string>
     <string name="mine_limit_data">Set data limited</string>
     <string name="mine_walk_next_time">Walking next starting up</string>