diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml
index b1b94a0b5..2cd7a3526 100644
--- a/Share/src/main/res/values/strings.xml
+++ b/Share/src/main/res/values/strings.xml
@@ -9,8 +9,8 @@
Messenger
Instagram
Share
- Come and watch %s live on PDLIVE and meet more interesting people!
+ Come and watch %s live on PoYo and meet more interesting people!
Invite Friends
- Come to PDLIVE to discover more and better live streams.
+ Come to PoYo to discover more and better live streams.
Copy
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3378311dc..d9bbbb299 100644
--- a/app/build.gradle
+++ b/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)
}
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 50257bea6..65571177e 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 33cbef52d..65571177e 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index a70ceeb93..65571177e 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 072f87ff3..c89643834 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 2d52cdd94..c89643834 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f229165b..004d07d5a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
- PDLIVE
+ PoYo
assertk.Assert
\ No newline at end of file
diff --git a/common/src/main/java/com/yunbao/common/HtmlConfig.java b/common/src/main/java/com/yunbao/common/HtmlConfig.java
index d128d9001..3dabe06ff 100644
--- a/common/src/main/java/com/yunbao/common/HtmlConfig.java
+++ b/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_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=Portal&m=Page&a=index&id=59";
+ 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=705";
//注册用户协议
public static final String REG_PRIVCAY1 = CommonAppConfig.HOST + "/index.php?g=portal&m=page&a=index&id=2";
diff --git a/common/src/main/res/layout/notification_message.xml b/common/src/main/res/layout/notification_message.xml
index 9cb3fd00d..cb54c3fa1 100644
--- a/common/src/main/res/layout/notification_message.xml
+++ b/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" />
\ No newline at end of file
diff --git a/common/src/main/res/layout/rule_of_war_popup.xml b/common/src/main/res/layout/rule_of_war_popup.xml
index b57f0eec2..7cea0bf94 100644
--- a/common/src/main/res/layout/rule_of_war_popup.xml
+++ b/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" />
diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml
index 6903ce046..e325ac19b 100644
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -74,7 +74,7 @@
退出連麥
所在地
編輯個人資料
- 進入PD LIVE
+ 進入POYO
是否確認使用一下資料
確認
暱稱重複,請重新輸入
@@ -645,7 +645,7 @@
一次免費贈送禮物特權!
TA還沒有座騎
- 歡迎來到PDLIVE
+ 歡迎來到PoYo
恭喜你獲得了新人獎勵
com.pdsylive.yo.fileprovider
@@ -1070,21 +1070,21 @@
簽到中心
返回首頁
前往簽到中心
- 確認領取
+ 知道了
無法登陸?點此聯繫客服
- 進入下一步即代表同意
+ 登錄即代表您同意
用戶協議
和
隱私條款
條款和政策
- 歡迎來到PD LIVE,對於您的個人信息及隱私,我們將採用最高標準對待和保護。
+ 歡迎來到POYO,對於您的個人信息及隱私,我們將採用最高標準對待和保護。
詳情請您閱讀以下安裝應用程序的消息:
為了給用戶提供更好的服務,我們的產品集成[友盟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
同意
點擊同意後即代表您已閱讀並同意以上所有內容。
本應用會收集位置數據以支持登錄和註冊的功能使用。
- 歡迎來到PD LIVE。
- 註冊PD LIVE
+ 歡迎來到POYO。
+ 註冊POYO
註冊並登錄
開通貴族,尊享超多特權!
女神說
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7a95a9e4f..07a65815f 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -659,7 +659,7 @@
Preservation
Register
No one is currently in the voice link
- Welcome to PDLive
+ Welcome to PoYo
Newcomer Bonus
EXP
Complete newcomer tasks for more rewards
@@ -1052,11 +1052,11 @@
Privacy Policy
Terms and policies
For details, please read the following message to install the application:
- Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.
+ Welcome to POYO. For your personal information and privacy, we will adopt the highest standards of treatment and protection.
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
Clicking Agree means you have read and agree to all of the above.。
agreement
- Welcome to PD LIVE.
+ Welcome to POYO.
gift
User service agreement
一 Fan privilege 一
diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
index 3c739cc9f..66d51b9be 100644
--- a/live/src/main/java/com/yunbao/live/adapter/LiveChatAdapter.java
+++ b/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;
}
}
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java b/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
index 492773d4b..65f3d424e 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
+++ b/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("獲得勝利")) {
diff --git a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
index d7917ade1..93bad8965 100644
--- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
+++ b/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("獲得勝利")) {
diff --git a/live/src/main/res/values-zh/strings.xml b/live/src/main/res/values-zh/strings.xml
index 04f92fff9..cbd7412b8 100644
--- a/live/src/main/res/values-zh/strings.xml
+++ b/live/src/main/res/values-zh/strings.xml
@@ -102,7 +102,7 @@
3. 專屬禮包與主播為 1 對 1 綁定關係,購買專屬 禮包中禮物資源只可送給該主播
4. 禮包中禮物資源有效期 30 天,有效期內均可正 常贈送;過期後禮物資源失效不可贈送
1. 當月只可購買一次,購買后禮包实时發放
- 2. 该禮包最終解釋權歸 PD Live 所有
+ 2. 该禮包最終解釋權歸 POYO 所有
禮包介紹
購買規則
加入粉絲團,解鎖專屬禮物
diff --git a/live/src/main/res/values/strings.xml b/live/src/main/res/values/strings.xml
index d0dcf7d23..1bf0ce743 100644
--- a/live/src/main/res/values/strings.xml
+++ b/live/src/main/res/values/strings.xml
@@ -104,7 +104,7 @@
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
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
1 Purchase can only be made once a month, and the gift package will be distributed in real-time after purchase
- 2. The final interpretation rights of this gift package belong to PD Live
+ 2. The final interpretation rights of this gift package belong to PoYo
Introduction
Rules
Join the fan group and unlock exclusive gifts
diff --git a/main/src/main/res/layout/activity_entry.xml b/main/src/main/res/layout/activity_entry.xml
index 289aefc1f..45e2ce5c5 100644
--- a/main/src/main/res/layout/activity_entry.xml
+++ b/main/src/main/res/layout/activity_entry.xml
@@ -119,7 +119,7 @@
@@ -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">
diff --git a/main/src/main/res/layout/view_homemain.xml b/main/src/main/res/layout/view_homemain.xml
index 66b6922d3..6e644a872 100644
--- a/main/src/main/res/layout/view_homemain.xml
+++ b/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">
@@ -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" />
diff --git a/main/src/main/res/layout/view_main_home_video.xml b/main/src/main/res/layout/view_main_home_video.xml
index 88173de50..266b62e7f 100644
--- a/main/src/main/res/layout/view_main_home_video.xml
+++ b/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" />
diff --git a/main/src/main/res/values-zh/strings.xml b/main/src/main/res/values-zh/strings.xml
index d84064e0c..2f92b4a0e 100644
--- a/main/src/main/res/values-zh/strings.xml
+++ b/main/src/main/res/values-zh/strings.xml
@@ -42,4 +42,8 @@
從相冊選取
拍照
一鍵領取
+ 使用手機號登錄
+ 遇見
+ 娛樂
+ 廣場
\ 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 419fbe8a0..4d7f0171e 100644
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -42,4 +42,8 @@
Select from album
Photo shoot
Receive all
+ Sign in with Phone Number
+ Meet
+ Game
+ Moment