显示当前账号

app/src/main/java/com/miekir/eden/ui/home/about/AboutFragment.java

@@ -53,6 +53,8 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
         ll_about = rootView.findViewById(R.id.ll_about);
         TextView tv_email = rootView.findViewById(R.id.tv_email);
         tv_email.setText(EdenManager.getInstance().getBeiUser().email);
+        TextView tv_account = rootView.findViewById(R.id.tv_account);
+        tv_account.setText(EdenManager.getInstance().getBeiUser().email);
 
         rootView.findViewById(R.id.tv_feedback).setOnClickListener(this);
         rootView.findViewById(R.id.tv_update).setOnClickListener(this);
@@ -67,7 +69,6 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
     private void initZfb() {
         String zfb = EdenManager.getInstance().getSystemBean().zfb;
         if (TextUtils.isEmpty(zfb)) {
-            ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
             return;
         }
         int index = zfb.indexOf(";");
@@ -141,7 +142,6 @@ public class AboutFragment extends BaseMVPFragment implements View.OnClickListen
 
             case R.id.tv_active:
                 // 立即激活
-
                 if (TextUtils.isEmpty(mRealZfb)) {
                     ToastTool.showShort(StringTool.getString(R.string.about_upgrade_not_available));
                     return;

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

@@ -24,7 +24,7 @@
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_ss"
+            android:layout_marginBottom="@dimen/margin_s"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:paddingStart="@dimen/margin_default"
@@ -48,6 +48,33 @@
         </LinearLayout>
 
 
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_ss"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/margin_default"
+            android:paddingEnd="@dimen/margin_default">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/about_current_account"
+                android:textColor="@color/black_theme"
+                android:textSize="@dimen/text_normal_p"
+                android:textStyle="bold"/>
+            <TextView
+                android:id="@+id/tv_account"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/app_name"
+                android:textColor="@color/black_theme"
+                android:textSize="@dimen/text_normal_p"
+                android:textStyle="bold"
+                android:textIsSelectable="true"/>
+        </LinearLayout>
+
+
         <LinearLayout
             android:id="@+id/ll_desc"
             android:layout_width="match_parent"
@@ -111,7 +138,6 @@
             android:text="@string/about_upgrade_now"
             android:textColor="@color/green_logo"
             android:textSize="@dimen/text_normal_s"
-            android:textStyle="bold"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -124,7 +150,6 @@
             android:text="@string/about_check_new"
             android:textColor="@color/green_logo"
             android:textSize="@dimen/text_normal_s"
-            android:textStyle="bold"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -137,7 +162,6 @@
             android:text="@string/about_feedback"
             android:textColor="@color/green_logo"
             android:textSize="@dimen/text_normal_s"
-            android:textStyle="bold"
             android:background="?attr/selectableItemBackground"/>
 
         <TextView
@@ -150,7 +174,6 @@
             android:text="@string/about_coupon"
             android:textColor="@color/green_logo"
             android:textSize="@dimen/text_normal_s"
-            android:textStyle="bold"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
 
@@ -163,7 +186,6 @@
             android:layout_marginEnd="@dimen/margin_default"
             android:textColor="@color/green_logo"
             android:textSize="@dimen/text_normal_s"
-            android:textStyle="bold"
             android:background="?attr/selectableItemBackground"
             android:visibility="gone"/>
 

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

@@ -90,7 +90,7 @@
     <string name="search_now">立即搜索</string>
     <string name="about_attention">提示：VIP是永久会员，仅需99元，升级后可以下载图片、短视频和影片。</string>
     <string name="about_description">点击下方的“立即激活”进行转账，备注当前要升级的账号(非常重要)，转账后退出应用稍等片刻重新打开APP，即可完成激活。一定要在备注填写需要激活的账号，否则无法完成激活。</string>
-    <string name="about_current_account">本机账号：</string>
+    <string name="about_current_account">当前账号：</string>
     <string name="about_upgrade_now">立即激活</string>
     <string name="about_check_new">检查更新</string>
     <string name="about_feedback">意见反馈</string>

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

@@ -90,7 +90,7 @@
     <string name="search_now">SEARCH</string>
     <string name="about_attention">Tips: VIP is long-term effective, pay once, enjoy forever. VIP members can download photos, videos, and movies.</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_current_account">Current Account:</string>
     <string name="about_upgrade_now">Get VIP Now</string>
     <string name="about_check_new">Check Version</string>
     <string name="about_feedback">Feedback</string>