diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java index 8b541dd20..9dd772b76 100644 --- a/common/src/main/java/com/yunbao/common/HtmlConfig.java +++ b/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_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=67"; + 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=732";//用户协议 //注册用户协议 - public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/h5/page/index.html?id=2"; - public static final String REG_PRIVCAY2 = CommonAppConfig.HOST + "/h5/page/index.html?id=3"; + 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=733";//隐私政策 //直播间贡献榜 public static final String LIVE_LIST = CommonAppConfig.HOST + "/index.php?g=Appapi&m=contribute&a=index&uid="; diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml index 91ceaaccc..910f96984 100644 --- a/main/src/main/res/layout/view_homemain.xml +++ b/main/src/main/res/layout/view_homemain.xml @@ -57,7 +57,6 @@ + + - + android:layout_height="match_parent"> - + - + - - - - - - - - - - - - - + You can add up to 6, and it is recommended to add 4. Quantity achieved + game \ No newline at end of file diff --git a/main/src/main/res/values-zh/strings.xml b/main/src/main/res/values-zh/strings.xml index de6b8039b..7c5001019 100644 --- a/main/src/main/res/values-zh/strings.xml +++ b/main/src/main/res/values-zh/strings.xml @@ -106,5 +106,6 @@ 從相冊選取 拍照 一鍵領取 + 遊戲 \ No newline at end of file diff --git a/main/src/main/res/values/arrays.xml b/main/src/main/res/values/arrays.xml index 126e5d8c5..1e154f032 100644 --- a/main/src/main/res/values/arrays.xml +++ b/main/src/main/res/values/arrays.xml @@ -1,22 +1,28 @@ - @mipmap/icon_home_uncheck - @mipmap/icon_home_selected + @mipmap/ic_pola_home_uncheck + @mipmap/ic_pola_home_check + - @mipmap/icon_dynamic_uncheck - @mipmap/icon_dynamic_selected + @mipmap/ic_pola_live_uncheck + @mipmap/ic_pola_live_check + + + + @mipmap/ic_pola_game_uncheck + @mipmap/ic_pola_game_check - @mipmap/icon_live_uncheck - @mipmap/icon_live_selected + @mipmap/ic_pola_msg_uncheck + @mipmap/ic_pola_msg_check - @mipmap/icon_me_uncheck - @mipmap/icon_me_selected + @mipmap/ic_pola_mine_uncheck + @mipmap/ic_pola_mine_check \ No newline at end of file diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 07eec9192..6cc1f308c 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -107,4 +107,5 @@ Receive all Join Guard tasks + game