詹子聪 5 роки тому
батько
коміт
15e46109cb

+ 31 - 30
app/src/main/res/layout/activity_mine.xml

@@ -19,6 +19,37 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <TextView
+                android:id="@+id/tv_my_fav"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/height_tool_bar"
+                android:background="?attr/selectableItemBackground"
+                android:gravity="center_vertical"
+                android:paddingStart="@dimen/activity_horizontal_margin"
+                android:paddingEnd="@dimen/activity_horizontal_margin"
+                android:text="@string/mine_my_star"
+                android:textColor="@color/black_text" />
+
+            <include layout="@layout/view_divider_common" />
+
+
+            <android.widget.Button
+                android:id="@+id/btn_exit_login"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="0dp"
+                android:layout_marginTop="@dimen/margin_default"
+                android:layout_marginBottom="@dimen/margin_default"
+                android:layout_marginStart="@dimen/margin_default"
+                android:layout_marginEnd="@dimen/margin_default"
+                android:paddingTop="@dimen/padding_full_width"
+                android:paddingBottom="@dimen/padding_full_width"
+                android:text="@string/mine_exit_account"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:background="@drawable/selector_btn_exit"
+                style="?android:attr/borderlessButtonStyle"/>
+
 
             <!--管理员才能看到此界面-->
             <LinearLayout
@@ -172,37 +203,7 @@
                     style="?android:attr/borderlessButtonStyle"/>
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_my_fav"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/height_tool_bar"
-                android:background="?attr/selectableItemBackground"
-                android:gravity="center_vertical"
-                android:paddingStart="@dimen/activity_horizontal_margin"
-                android:paddingEnd="@dimen/activity_horizontal_margin"
-                android:text="@string/mine_my_star"
-                android:textColor="@color/black_text" />
-
-            <include layout="@layout/view_divider_common" />
 
-
-
-            <android.widget.Button
-                android:id="@+id/btn_exit_login"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="0dp"
-                android:layout_marginTop="@dimen/margin_default"
-                android:layout_marginBottom="@dimen/margin_default"
-                android:layout_marginStart="@dimen/margin_default"
-                android:layout_marginEnd="@dimen/margin_default"
-                android:paddingTop="@dimen/padding_full_width"
-                android:paddingBottom="@dimen/padding_full_width"
-                android:text="@string/mine_exit_account"
-                android:textColor="@color/white"
-                android:textStyle="bold"
-                android:background="@drawable/selector_btn_exit"
-                style="?android:attr/borderlessButtonStyle"/>
         </LinearLayout>
 
 

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

@@ -98,7 +98,7 @@
     <string name="menu_finish">完成</string>
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">确定执行此不可逆转的操作?</string>
-    <string name="ad_title">请领取美食优惠券后继续</string>
+    <string name="ad_title">非VIP用户需要领取美食优惠券后才能下载</string>
     <string name="ad_not_finished">优惠券领取失败,请重新领取</string>
     <string name="err_rest_time">休息时间到</string>
     <string name="title_video">视频</string>

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

@@ -98,7 +98,7 @@
     <string name="menu_finish">FINISH</string>
     <string name="mine_ali_go">Ali Go</string>
     <string name="mine_confirm_aligo">Sure to proceed?</string>
-    <string name="ad_title">Please go and get your coupon first</string>
+    <string name="ad_title">For non-VIP users, please go and get your coupon first</string>
     <string name="ad_not_finished">Maybe getting coupon failed</string>
     <string name="err_rest_time">Rest time now</string>
     <string name="title_video">Video</string>