詹子聪 5 роки тому
батько
коміт
289c33eb46

+ 2 - 2
app/build.gradle

@@ -43,8 +43,8 @@ android {
 
         rel {
             // 正式上线
-            buildConfigField("String", "BASE_URL", '"http://app.jianjie.life:11111/"')
-            buildConfigField("String", "HOST_STATIC_RESOURCE", '"http://jianjie.life/"')
+            buildConfigField("String", "BASE_URL", '"http://app.icsmabc.cyou:8856/"')
+            buildConfigField("String", "HOST_STATIC_RESOURCE", '"http://icsmabc.cyou/"')
         }
 
         company {

+ 1 - 1
app/src/main/java/com/miekir/eden/bean/SystemBean.java

@@ -13,7 +13,7 @@ public class SystemBean {
     /**
      * 是否有VIP限制,true表示必须要VIP才能使用特殊服务,false表示免费开放中...
      */
-    public boolean isRestMode;
+    public boolean isRestMode = true;
     public boolean isWalking;
     public String zfb;
     public boolean isAdMode;

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

@@ -70,29 +70,29 @@ public class MagnetAdapter extends BaseQuickAdapter<MagnetBean, BaseViewHolder>
                     return;
                 }
 
+                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 || (index+1) == zfb.length()) {
+                    adLink = null;
+                } else {
+                    adLink = zfb.substring(index+1);
+                }
+                if (TextUtils.isEmpty(adLink)) {
+                    requestVIP();
+                    return;
+                }
+
                 AlertDialog alertDialog = new AlertDialog.Builder(mContext)
                         .setMessage(StringTool.getString(R.string.ad_title))
                         .setNegativeButton(StringTool.getString(R.string.cancel), (dialog, which) -> dialog.dismiss())
                         .setPositiveButton(StringTool.getString(R.string.confirm), (DialogInterface dialog, int which) -> {
                             dialog.dismiss();
 
-                            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)) {
-                                requestVIP();
-                                return;
-                            }
-
                             setWaitingAd(true);
                             AdManager.getInstance().setMagnetBean(magnetBean);
                             AdManager.getInstance().setStartTimeMillis(System.currentTimeMillis());

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

@@ -66,7 +66,7 @@
     <string name="login_password_empty">Password cannot be empty</string>
     <string name="login_phone_not_support">Not available for this phone</string>
     <string name="login_encrypt_not_support">Encryption not available</string>
-    <string name="reboot">Please reboot Eden</string>
+    <string name="reboot">Please reboot Eden later</string>
     <string name="mine_not_set_zfb">Payment info is not set</string>
     <string name="mine_account_empty">Account to upgrade cannot be empty</string>
     <string name="mine_zfb_empty">Payment account cannot be empty</string>

+ 2 - 2
network/build.gradle

@@ -36,8 +36,8 @@ android {
 
         rel {
             // 正式上线
-            buildConfigField("String", "BASE_URL", '"http://app.jianjie.life:11111/"')
-            buildConfigField("String", "HOST_STATIC_RESOURCE", '"http://jianjie.life/"')
+            buildConfigField("String", "BASE_URL", '"http://app.icsmabc.cyou:8856/"')
+            buildConfigField("String", "HOST_STATIC_RESOURCE", '"http://icsmabc.cyou/"')
         }
 
         company {