替换app icon，翻译

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

@@ -9,8 +9,8 @@
     <string name="dialog_share_app_messenger">Messenger</string>
     <string name="dialog_share_app_instagram" >Instagram</string>
     <string name="dialog_share_title">Share</string>
-    <string name="dialog_share_info">Come and watch %s live on PDLIVE and meet more interesting people!</string>
+    <string name="dialog_share_info">Come and watch %s live on PoYo and meet more interesting people!</string>
     <string name="dialog_invite_title">Invite Friends</string>
-    <string name="dialog_invite_info">Come to PDLIVE to discover more and better live streams.</string>
+    <string name="dialog_invite_info">Come to PoYo to discover more and better live streams.</string>
     <string name="dialog_share_copy">Copy</string>
 </resources>

app/build.gradle

@@ -177,7 +177,7 @@ android {
             } else {
                 server = '测试服'
             }
-            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.apk"
+            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PoYo-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.apk"
             variant.outputs.forEach { fe ->
                 copy {
                     from fe.outputFile
@@ -207,7 +207,7 @@ android {
             } else {
                 server = '测试服'
             }
-            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.aab"
+            def fileName = "[${new Date().format("yyyy-MM-dd HHmmss", TimeZone.getTimeZone("GMT+8"))}]PoYo-${defaultConfig.versionName}-${defaultConfig.versionCode}-${channel}-${server}-${variant.buildType.name}.aab"
             File finalFile = new File("${project.rootDir}\\outputs\\aab", fileName)
             finalBundleFile.set(finalFile)
         }

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">PDLIVE</string>
+    <string name="app_name">PoYo</string>
     <string name="leak_canary_test_class_name">assertk.Assert</string>
 </resources>

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

@@ -7,8 +7,8 @@ package com.yunbao.common;
 public class HtmlConfig {
 
     //登录即代表同意服务和隐私条款
-    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=3";
+    public static final String LOGIN_PRIVCAY = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=706";
-    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59";
+    public static final String LOGIN_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=705";
 
     //注册用户协议
     public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";

common/src/main/res/layout/notification_message.xml

@@ -54,7 +54,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_marginRight="15dp"
-        android:text="PD LIVE"
+        android:text="PoYo"
         android:textColor="@color/gray3" />
 
 </RelativeLayout>

common/src/main/res/layout/rule_of_war_popup.xml

@@ -37,7 +37,7 @@
                     android:layout_marginStart="14dp"
                     android:layout_marginEnd="14dp"
                     android:textColor="#0D21B2"
-                    tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PDLIVE所有。"
+                    tools:text="1.戰令開啟時，完成戰令任務，提升戰令等級，可獲得大量等級獎勵。\n2.所有用戶免費解鎖普通版，戰令開啟時隨時可進階為精英版和尊享版，獲得豐厚額外專屬獎勵。\n3.三種戰令都會獎勵積分，可在兌換商城中兌換心儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數量限制。\n4.每日任務0點刷新，未完成任務進度不再累計，每季任務將會在新一季戰令開啟時刷新。\n5.任務達成時需主動領取經驗，未领取經驗將會在任務刷新時過期。\n6.活動最終解釋權歸PoYo所有。"
                     android:textSize="14sp" />
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>

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

@@ -74,7 +74,7 @@
     <string name="quit_mic">退出連麥</string>
     <string name="edit_profile_city">所在地</string>
     <string name="edit_one_1">編輯個人資料</string>
-    <string name="edit_one_2">進入PD LIVE</string>
+    <string name="edit_one_2">進入POYO</string>
     <string name="edit_one_3">是否確認使用一下資料</string>
     <string name="edit_one_4">確認</string>
     <string name="edit_one_5">暱稱重複，請重新輸入</string>
@@ -645,7 +645,7 @@
     <string name="one_free">一次免費贈送禮物特權！</string>
 
     <string name="no_car">TA還沒有座騎</string>
-    <string name="welcome_pdlive">歡迎來到PDLIVE</string>
+    <string name="welcome_pdlive">歡迎來到PoYo</string>
     <string name="newcomer">恭喜你獲得了新人獎勵</string>
 
     <string name="FILE_PROVIDER">com.pdsylive.yo.fileprovider</string>
@@ -1070,21 +1070,21 @@
     <string name="sign_in_center">簽到中心</string>
     <string name="to_top">返回首頁</string>
     <string name="go_to_the_sign">前往簽到中心</string>
-    <string name="confirm_pick_up">確認領取</string>
+    <string name="confirm_pick_up">知道了</string>
     <string name="customer_service2">無法登陸？點此聯繫客服</string>
-    <string name="next_step_is_consent">進入下一步即代表同意</string>
+    <string name="next_step_is_consent">登錄即代表您同意</string>
     <string name="user_protocol2">用戶協議</string>
     <string name="and">和</string>
     <string name="privacy_terms">隱私條款</string>
     <string name="terms_and_policies">條款和政策</string>
-    <string name="treat_and_protect">歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
+    <string name="treat_and_protect">歡迎來到POYO，對於您的個人信息及隱私，我們將採用最高標準對待和保護。</string>
     <string name="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
     <string name="anti_cheating_services">為了給用戶提供更好的服務，我們的產品集成[友盟SDK]，SDK需要收集您的设备信息（IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP地址/SIM 卡 IMSI 信息等），為便於您更好地了解[友盟SDK]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸：https://www.umeng.com/page/policy 了解[友盟SDK]隱私權政策【友盟+】隐私政策【友盟+】,第三方全域大数据服务提供商,为客户提供PC/APP/线下统计,广告效果监测,消息推送/微社区/分享/IM等运营工具,DIP,全域指数与行业报告等。https://www.umeng.com/page/policy</string>
     <string name="agreement">同意</string>
     <string name="read_and_agre">點擊同意後即代表您已閱讀並同意以上所有內容。</string>
     <string name="support_login">本應用會收集位置數據以支持登錄和註冊的功能使用。</string>
-    <string name="come_to">歡迎來到PD LIVE。</string>
+    <string name="come_to">歡迎來到POYO。</string>
-    <string name="sign_up_for">註冊PD LIVE</string>
+    <string name="sign_up_for">註冊POYO</string>
     <string name="register_and_log_in">註冊並登錄</string>
     <string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
     <string name="layout_live_anchor_say_ready_title">女神說</string>

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

@@ -659,7 +659,7 @@
     <string name="save">Preservation</string>
     <string name="reg">Register</string>
     <string name="no_more_mic">No one is currently in the voice link</string>
-    <string name="welcome_pdlive">Welcome to PDLive</string>
+    <string name="welcome_pdlive">Welcome to PoYo</string>
     <string name="newcomer">Newcomer Bonus</string>
     <string name="exp">EXP</string>
     <string name="new_rewards">Complete newcomer tasks for more rewards</string>
@@ -1052,11 +1052,11 @@
     <string name="privacy_terms">Privacy Policy</string>
     <string name="terms_and_policies">Terms and policies</string>
     <string name="install_the_application">For details, please read the following message to install the application:</string>
-    <string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
+    <string name="treat_and_protect">Welcome to POYO. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
     <string name="anti_cheating_services">In order to provide users with better services, our products integrate [Alliance SDK], SDK needs to collect your device information (IMEI/MAC/Android ID/IDFA/OpenUDID/GUID/IP address /SIM card IMSI information, etc.), In order for you to better understand the types and purposes of the data collected by [Alliance SDK] and how to protect your personal information, you can log on to: https://www.umeng.com/page/policy  Learn about [Alliance SDK] Privacy Policy [Alliance +] Privacy Policy [Alliance +], a third-party global big data service provider, providing customers with PC/APP/ offline statistics, advertising effect monitoring, message push/micro community/sharing /IM and other operating tools,DIP, global index and industry reports. https://www.umeng.com/page/policy</string>
     <string name="read_and_agre">Clicking Agree means you have read and agree to all of the above.。</string>
     <string name="agreement">agreement</string>
-    <string name="come_to">Welcome to PD LIVE.</string>
+    <string name="come_to">Welcome to POYO.</string>
     <string name="live_gift">gift</string>
     <string name="register_tip_2">User service agreement</string>
     <string name="live_fans_medal_pri_des">一 Fan privilege 一</string>

live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java

@@ -399,7 +399,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
             } else if (bean.getType() == LiveChatBean.SYSTEM) {
                 boolean isContains = false;
                 for (LiveChatBean model : mList) {
-                    if (!TextUtils.isEmpty(model.getContent()) && (model.getContent().contains("堅決維護青少年群體精神文明健康") || model.getContent().contains("click to register if you like. pdlive conducts"))) {
+                    if (!TextUtils.isEmpty(model.getContent()) && (model.getContent().contains("堅決維護青少年群體精神文明健康") || model.getContent().contains("click to register if you like. PoYo conducts"))) {
                         isContains = true;
                     }
                 }

live/src/main/java/com/yunbao/live/socket/SocketRyClient.java

@@ -265,7 +265,7 @@ public class SocketRyClient {
                         int num = LiveAudienceActivity.fansNum + 1;
                         LiveRoomViewHolder.setFansNum(num);
                     }
-                    if (map.getString("ct").contains("堅決維護青少年群體精神文明健康") || map.getString("ct").contains("click to register if you like. pdlive conducts")) {
+                    if (map.getString("ct").contains("堅決維護青少年群體精神文明健康") || map.getString("ct").contains("click to register if you like. PoYo conducts")) {
                         systemChatMessage(map.getString("ct"));
                     } else {
                         if (!WordUtil.isNewZh() && map.getString("ct").contains("退出比賽") && map.getString("ct").contains("獲得勝利")) {

live/src/main/java/com/yunbao/live/socket/SocketSwClient.java

@@ -261,7 +261,7 @@ public class SocketSwClient {
                         int num = LiveAudienceActivity.fansNum + 1;
                         LiveRoomViewHolder.setFansNum(num);
                     }
-                    if (ct.contains("堅決維護青少年群體精神文明健康") ||ct.contains("click to register if you like. pdlive conducts")) {
+                    if (ct.contains("堅決維護青少年群體精神文明健康") ||ct.contains("click to register if you like. PoYo conducts")) {
                         systemChatMessage(ct);
                     } else {
                         if (!WordUtil.isNewZh() && ct.contains("退出比賽") && ct.contains("獲得勝利")) {

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

@@ -102,7 +102,7 @@
     <string name="live_fans_group_info_text3">3. 專屬禮包與主播為 1 對 1 綁定關係，購買專屬 禮包中禮物資源只可送給該主播</string>
     <string name="live_fans_group_info_text4">4. 禮包中禮物資源有效期 30 天，有效期內均可正 常贈送；過期後禮物資源失效不可贈送</string>
     <string name="live_fans_group_info2_text1">1. 當月只可購買一次，購買后禮包实时發放</string>
-    <string name="live_fans_group_info2_text2">2. 该禮包最終解釋權歸 PD Live 所有</string>
+    <string name="live_fans_group_info2_text2">2. 该禮包最終解釋權歸 POYO 所有</string>
     <string name="live_fans_group_info_title">禮包介紹</string>
     <string name="live_fans_group_info2_title">購買規則</string>
     <string name="live_fans_follow_toast">加入粉絲團,解鎖專屬禮物</string>

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

@@ -104,7 +104,7 @@
     <string name="live_fans_group_info_text3">3 The exclusive gift package is bound to the anchor in a one-on-one relationship, and purchasing gift resources in the exclusive gift package can only be given to the anchor</string>
     <string name="live_fans_group_info_text4">4 The gift resources in the gift package are valid for 30 days and can be given normally during the validity period; Gift resources become invalid and cannot be given after expiration</string>
     <string name="live_fans_group_info2_text1">1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase</string>
-    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to PD Live</string>
+    <string name="live_fans_group_info2_text2">2. The final interpretation rights of this gift package belong to PoYo</string>
     <string name="live_fans_group_info_title">Introduction</string>
     <string name="live_fans_group_info2_title">Rules</string>
     <string name="live_fans_follow_toast">Join the fan group and unlock exclusive gifts</string>

main/src/main/res/layout/activity_entry.xml

@@ -119,7 +119,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="使用手機號登錄"
+                    android:text="@string/login_use_phone"
                     android:layout_marginLeft="25dp"
                     android:textColor="@color/black1"
                     android:textSize="14sp" />
@@ -257,7 +257,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="22dp"
-                android:layout_marginBottom="8dp"
+                android:layout_marginBottom="40dp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -300,6 +300,7 @@
                 android:id="@+id/lt_customer"
                 android:layout_marginBottom="20dp"
                 android:layout_width="match_parent"
+                android:visibility="gone"
                 android:layout_height="30dp"
                 android:gravity="center">
 

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

@@ -16,7 +16,7 @@
         android:id="@+id/rt_main_tab"
         android:layout_width="match_parent"
         android:background="@color/white"
-        android:layout_height="65dp"
+        android:layout_height="55dp"
         android:layout_alignParentBottom="true">
 
         <ImageView
@@ -28,7 +28,7 @@
         <RelativeLayout
             android:id="@+id/bottom"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="55dp"
             android:layout_alignParentBottom="true">
 
             <com.yunbao.common.custom.TabButtonGroup
@@ -44,7 +44,7 @@
                     app:tbn_checked="true"
                     app:tbn_icon_array_id="@array/main_tab_home"
                     app:tbn_icon_size="28dp"
-                    app:tbn_tip="遇見"
+                    app:tbn_tip="@string/main_tab_main"
                     app:tbn_text_color_checked="#FFFF4598"
                     app:tbn_text_color_unchecked="#FF101420"
                     app:tbn_text_size="11sp" />
@@ -55,7 +55,7 @@
                     android:layout_weight="1"
                     app:tbn_icon_array_id="@array/main_tab_video"
                     app:tbn_icon_size="28dp"
-                    app:tbn_tip="娛樂"
+                    app:tbn_tip="@string/main_tab_yule"
                     app:tbn_text_color_checked="#FFFF4598"
                     app:tbn_text_color_unchecked="#FF101420"
                     app:tbn_text_size="11sp" />
@@ -66,7 +66,7 @@
                     android:layout_weight="1"
                     app:tbn_icon_array_id="@array/main_tab_list"
                     app:tbn_icon_size="28dp"
-                    app:tbn_tip="廣場"
+                    app:tbn_tip="@string/main_tab_guangchang"
                     app:tbn_text_color_checked="#FFFF4598"
                     app:tbn_text_color_unchecked="#FF101420"
                     app:tbn_text_size="11sp" />
@@ -77,7 +77,7 @@
                     android:layout_weight="1"
                     app:tbn_icon_array_id="@array/main_tab_chat"
                     app:tbn_icon_size="28dp"
-                    app:tbn_tip="我的"
+                    app:tbn_tip="@string/main_me"
                     app:tbn_text_color_checked="#FFFF4598"
                     app:tbn_text_color_unchecked="#FF101420"
                     app:tbn_text_size="11sp" />

main/src/main/res/layout/view_main_home_video.xml

@@ -63,7 +63,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginLeft="10dp"
                 android:textColor="@color/colorPrimary"
-                android:text="PD LIVE"
+                android:text="POYO"
                 android:paddingTop="2dp"
                 android:textSize="20sp"
                 android:textStyle="bold" />

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

@@ -42,4 +42,8 @@
     <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="login_use_phone">使用手機號登錄</string>
+    <string name="main_tab_main">遇見</string>
+    <string name="main_tab_yule">娛樂</string>
+    <string name="main_tab_guangchang">廣場</string>
 </resources>

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

@@ -42,4 +42,8 @@
     <string name="activity_feedback_edit_img_select">Select from album</string>
     <string name="activity_feedback_edit_img_camera">Photo shoot</string>
     <string name="activity_battle_pass_all_get">Receive all</string>
+    <string name="login_use_phone">Sign in with Phone Number</string>
+    <string name="main_tab_main">Meet</string>
+    <string name="main_tab_yule">Game</string>
+    <string name="main_tab_guangchang">Moment</string>
 </resources>