主页底部菜单切花页面UI调整完成

common/src/main/java/com/yunbao/common/HtmlConfig.java

@@ -7,12 +7,12 @@ package com.yunbao.common;
 public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
-    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=68";
+    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/h5/page/index.html?id=733"; //隐私政策
-    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=67";
+    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=732";//用户协议
 
     //注册用户协议
-    public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=2";
+    public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=735";//用户服务协议
-    public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.html?id=3";
+    public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.html?id=733";//隐私政策
 
     //直播间贡献榜
     public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid=";

main/src/main/res/layout/view_homemain.xml

@@ -57,7 +57,6 @@
                 <com.yunbao.common.custom.TabButton
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_marginRight="60dp"
                     android:layout_weight="1"
                     app:tbn_icon_array_id="@array/main_tab_video"
                     app:tbn_icon_size="25dp"
@@ -66,6 +65,17 @@
                     app:tbn_text_size="11sp"
                     app:tbn_tip="@string/live" />
 
+                <com.yunbao.common.custom.TabButton
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    app:tbn_icon_array_id="@array/main_tab_game"
+                    app:tbn_icon_size="25dp"
+                    app:tbn_text_color_checked="@color/colorMainTab"
+                    app:tbn_text_color_unchecked="@color/gray1"
+                    app:tbn_text_size="11sp"
+                    app:tbn_tip="@string/game" />
+
                 <com.yunbao.common.custom.TabButton
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
@@ -90,65 +100,48 @@
 
             </com.yunbao.common.custom.TabButtonGroup>
 
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="match_parent">
-                android:orientation="horizontal">
 
-                <LinearLayout
+                <TextView
-                    android:layout_width="match_parent"
+                    android:id="@+id/v_table_redpoint"
-                    android:layout_height="match_parent"
+                    android:layout_width="18dp"
-                    android:layout_weight="1">
+                    android:layout_height="18dp"
+                    android:background="@drawable/background_ff5075"
+                    android:gravity="center"
+                    android:textColor="@color/white"
+                    android:textSize="10dp"
+                    android:visibility="visible"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.74"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.17" />
 
-                </LinearLayout>
+                <View
+                    android:id="@+id/v_table_redpoint_me"
+                    android:layout_width="12dp"
+                    tools:visibility="visible"
+                    android:layout_height="12dp"
+                    android:background="@drawable/background_ff5075"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.97"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.18"
+                    />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
 
-                </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="3dp"
-                    android:layout_marginEnd="5dp"
-                    android:layout_weight="1"
-                    android:gravity="right">
-
-                    <TextView
-                        android:id="@+id/v_table_redpoint"
-                        android:layout_width="18dp"
-                        android:layout_height="18dp"
-                        android:background="@drawable/background_ff5075"
-                        android:gravity="center"
-                        android:textColor="@color/white"
-                        android:textSize="10dp"
-                        android:visibility="visible" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="right">
-
-                    <View
-                        android:id="@+id/v_table_redpoint_me"
-                        android:layout_width="12dp"
-                        tools:visibility="visible"
-                        android:layout_height="12dp"
-                        android:layout_marginTop="5dp"
-                        android:layout_marginEnd="20dp"
-                        android:background="@drawable/background_ff5075"
-                        android:visibility="gone" />
-                </LinearLayout>
-            </LinearLayout>
 
         </RelativeLayout>
 
         <ImageView
+            android:visibility="gone"
             android:id="@+id/btn_start"
             android:layout_width="40dp"
             android:layout_height="40dp"

main/src/main/res/values-en/strings.xml

@@ -156,4 +156,5 @@
     <string name="live_prank_gift_tips">You can add up to 6, and it is recommended to add 4.</string>
 
     <string name="live_prank_dialog_gift_type_achieved">Quantity achieved</string>
+    <string name="game">game</string>
 </resources>

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

@@ -106,5 +106,6 @@
     <string name="activity_feedback_edit_img_select">從相冊選取</string>
     <string name="activity_feedback_edit_img_camera">拍照</string>
     <string name="activity_battle_pass_all_get">一鍵領取</string>
+    <string name="game">遊戲</string>
 
 </resources>

main/src/main/res/values/arrays.xml

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="main_tab_home">
-        <item>@mipmap/icon_home_uncheck</item>
+        <item>@mipmap/ic_pola_home_uncheck</item>
-        <item>@mipmap/icon_home_selected</item>
+        <item>@mipmap/ic_pola_home_check</item>
+
     </string-array>
 
     <string-array name="main_tab_video">
-        <item>@mipmap/icon_dynamic_uncheck</item>
+        <item>@mipmap/ic_pola_live_uncheck</item>
-        <item>@mipmap/icon_dynamic_selected</item>
+        <item>@mipmap/ic_pola_live_check</item>
+    </string-array>
+
+    <string-array name="main_tab_game">
+        <item>@mipmap/ic_pola_game_uncheck</item>
+        <item>@mipmap/ic_pola_game_check</item>
     </string-array>
 
     <string-array name="main_tab_list">
-        <item>@mipmap/icon_live_uncheck</item>
+        <item>@mipmap/ic_pola_msg_uncheck</item>
-        <item>@mipmap/icon_live_selected</item>
+        <item>@mipmap/ic_pola_msg_check</item>
     </string-array>
     <string-array name="main_tab_chat">
-        <item>@mipmap/icon_me_uncheck</item>
+        <item>@mipmap/ic_pola_mine_uncheck</item>
-        <item>@mipmap/icon_me_selected</item>
+        <item>@mipmap/ic_pola_mine_check</item>
     </string-array>
 
 </resources>

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

@@ -107,4 +107,5 @@
     <string name="activity_battle_pass_all_get">Receive all</string>
     <string name="live_room_sud_hint_join">Join</string>
     <string name="live_dialog_top_guardian_tasks">Guard tasks</string>
+    <string name="game">game</string>
 </resources>