优化会员登录

app/src/main/java/com/miekir/eden/ui/TabActivity.java

@@ -50,6 +50,7 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
     UpgradePresenter upgradePresenter;
 
     private SlidingTabLayout stl_home;
+    private List<String> titleList = new ArrayList<>();
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -66,7 +67,6 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
 
     @Override
     public void initViews(Bundle savedInstanceState) {
-        List<String> titleList = new ArrayList<>();
         List<Fragment> fragments = new ArrayList<>();
         fragments.add(new GoodsFragment());
         fragments.add(new TemplateFragment(FunctionFragment.TEMPLATE_TYPE_BONUS));
@@ -143,8 +143,11 @@ public class TabActivity extends BaseBeiActivity implements View.OnClickListener
         abl_main.addOnOffsetChangedListener(listener);
     }
 
-    public void setCurrentPage(int index) {
-        stl_home.setCurrentTab(index, true);
+    /**
+     * 跳转到关于界面
+     */
+    public void setCurrentToAboutPage() {
+        stl_home.setCurrentTab(titleList.size()-1, true);
     }
 
     @Override

app/src/main/java/com/miekir/eden/ui/home/goods/GoodsAdapter.java

@@ -47,7 +47,7 @@ import static android.app.Activity.RESULT_OK;
 //            if (!EdenManager.getInstance().getBeiUser().vip) {
 //                ToastTool.showShort("请先激活会员");
 //                if (mContext instanceof TabActivity) {
-//                    ((TabActivity) mContext).setCurrentPage(2);
+//                    ((TabActivity) mContext).setCurrentToAboutPage(2);
 //                }
 //                return;
 //            }
@@ -105,6 +105,15 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
         holder.setText(R.id.tv_see_num, String.format(GoodsDetailActivity.FORMATTER_SEE_NUM, StringTool.getNumberString(goodsBean.seeNum)));
 
         holder.setOnClickListener(R.id.cv_goods, v -> {
+            // 会员才能进去
+            if (!EdenManager.getInstance().getBeiUser().vip) {
+                ToastTool.showShort(StringTool.getString(R.string.upgrade_to_vip));
+                if (mContext instanceof TabActivity) {
+                    ((TabActivity) mContext).setCurrentToAboutPage();
+                }
+                return;
+            }
+
             if (!goodsBean.enable) {
                 ToastTool.showShort(StringTool.getString(R.string.coming));
                 return;
@@ -131,7 +140,7 @@ public class GoodsAdapter extends BaseQuickAdapter<GoodsBean, BaseViewHolder> {
 
                         boolean refresh = result.data().getBooleanExtra(GoodsDetailActivity.KEY_VIP, false);
                         if (mContext instanceof TabActivity && refresh) {
-                            ((TabActivity) mContext).setCurrentPage(2);
+                            ((TabActivity) mContext).setCurrentToAboutPage();
                         }
                     })
                     .subscribe();

app/src/main/java/com/miekir/eden/ui/mine/login/LoginActivity.java

@@ -52,10 +52,16 @@ public class LoginActivity extends BaseBeiActivity implements View.OnClickListen
         et_password = findViewById(R.id.et_password);
         ViewTool.setOnClickListener(this, this, new int[]{R.id.btn_login, R.id.tv_forget, R.id.toolbar});
 
+        //WifiManager wm = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
+        //String localIP = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress());
+
         BeiUser user = EdenManager.getInstance().getBeiUser();
         if (user != null && !TextUtils.isEmpty(user.email)) {
             et_email.setText(user.email);
         }
+
+
+
     }
 
     private int mAdminTimes = 0;

app/src/main/res/layout/activity_login.xml

@@ -101,4 +101,21 @@
         android:background="@drawable/selector_btn_round"
         style="?android:attr/borderlessButtonStyle"/>
 
+    <Space
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_message"
+        android:layout_marginBottom="@dimen/margin_message"
+        android:layout_marginStart="@dimen/margin_default"
+        android:layout_marginEnd="@dimen/margin_default"
+        android:text="注意：本应用仅对非中国地区开放"
+        android:textColor="@color/red_droid"
+        android:textStyle="bold"
+        android:textSize="@dimen/text_s"
+        android:background="?attr/selectableItemBackground"
+        android:layout_gravity="center_horizontal" />
 </LinearLayout>

app/src/main/res/layout/fragment_about.xml

@@ -54,7 +54,7 @@
             android:paddingStart="@dimen/margin_default"
             android:paddingEnd="@dimen/margin_default"
             android:text="@string/about_attention"
-            android:textColor="@color/red_2"
+            android:textColor="@color/red_droid"
             android:textSize="@dimen/text_normal"
             android:layout_marginTop="@dimen/margin_s"/>
 

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

@@ -88,7 +88,7 @@
     <string name="mine_exit_account">退出当前账号</string>
     <string name="search_hint_keyword">请输入关键字</string>
     <string name="search_now">立即搜索</string>
-    <string name="about_attention">注意：伊甸园仅对非中国地区开放。VIP是永久会员，仅需99元。</string>
+    <string name="about_attention">注意：VIP是永久会员，仅需99元。</string>
     <string name="about_description">点击下方的“立即激活”进行转账，备注当前要升级的账号(非常重要)，转账后退出应用稍等片刻重新打开APP，即可完成激活。一定要在备注填写需要激活的账号，否则无法完成激活。</string>
     <string name="about_current_account">本机账号：</string>
     <string name="about_upgrade_now">立即激活</string>

app/src/main/res/values/strings.xml

@@ -88,7 +88,7 @@
     <string name="mine_exit_account">Exit current account</string>
     <string name="search_hint_keyword">Input keyword</string>
     <string name="search_now">SEARCH</string>
-    <string name="about_attention">Attention: Eden is only open to non-Chinese regions. And the VIP is long-term effective, pay once, enjoy forever.</string>
+    <string name="about_attention">Attention: VIP is long-term effective, pay once, enjoy forever.</string>
     <string name="about_description">Click following button to upgrade to VIP, and paste your account to the remarks(Very important) when you pay, then restart Eden to check in some minutes.</string>
     <string name="about_current_account">Current account:</string>
     <string name="about_upgrade_now">Upgrade Now</string>