diff --git a/Share/src/main/res/values-zh/strings.xml b/Share/src/main/res/values-zh/strings.xml index ff510adfa..39e3334f3 100644 --- a/Share/src/main/res/values-zh/strings.xml +++ b/Share/src/main/res/values-zh/strings.xml @@ -5,7 +5,7 @@ 分享 站內好友 - 快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！ + 快來 Yola觀看%s直播，認識更多有趣的朋友吧！ Facebook Line Twitter @@ -14,6 +14,6 @@ Instagram 邀請好友 - 快來 PDLIVE觀看直播，認識更多有趣的朋友吧！ + 快來 Yola觀看直播，認識更多有趣的朋友吧！ 複製 \ No newline at end of file diff --git a/Share/src/main/res/values/strings.xml b/Share/src/main/res/values/strings.xml index 8388037b0..ef2da121c 100644 --- a/Share/src/main/res/values/strings.xml +++ b/Share/src/main/res/values/strings.xml @@ -1,9 +1,9 @@ Share - Come and watch %s live on PDLIVE and meet more interesting people! + Come and watch %s live on Yola and meet more interesting people! Invite Friends - Come to PDLIVE to discover more and better live streams. + Come to Yola to discover more and better live streams. Copy Site friends Share To diff --git a/common/src/main/res/layout/notification_message.xml b/common/src/main/res/layout/notification_message.xml index 9cb3fd00d..06b3ce44e 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="Yola LIVE" 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..532a7413c 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.活動最終解釋權歸Yola所有。" android:textSize="14sp" /> diff --git a/common/src/main/res/values-en-rUS/strings.xml b/common/src/main/res/values-en-rUS/strings.xml index 96fab0e31..cf5a573c6 100644 --- a/common/src/main/res/values-en-rUS/strings.xml +++ b/common/src/main/res/values-en-rUS/strings.xml @@ -662,7 +662,7 @@ Save Register No one is currently in the voice link - Welcome to PDLive + Welcome to Yola Newcomer Bonus EXP Complete newcomer tasks for more rewards @@ -894,7 +894,7 @@ Limited ride And limited avatar frame Online Service Hot Ticket Register and log in - Sign in PDlive + Sign in Yola Tell the world！ Tell the world! %s recommends anchor %s to everyone! Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！ @@ -1029,8 +1029,8 @@ Limited ride And limited avatar frame Click To View Anchor Task I have read and agreed to the - Please read and agree to the PDLIVE Host Agreement - PDLIVE Host Agreement + Please read and agree to the Yola Host Agreement + Yola Host Agreement The statute of limitations for new anchors expires coin gold @@ -1379,11 +1379,11 @@ Limited ride And limited avatar frame "Paired Users " " Currently No Records~" "Today " - 1.Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room; + 1.Interactive games are a new section provided by Yola for users, who can participate in the game section on the homepage or in the live room; 2.Currently, [Backgammon], [Flying Chess], [Bumper I’m the Strongest], [Monster Match], [Jump], [Friendly Challenge], [Magic Battle], [American 8 Ball] More game types will be provided in the future, so stay tuned; 3.Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10; 4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; - 5.The final interpretation right of the event belongs to PDLIVE. + 5.The final interpretation right of the event belongs to Yola. Currency Currency: Time: @@ -1398,7 +1398,7 @@ Limited ride And limited avatar frame Exchange&Usage Rules: 1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance; 2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie; - 3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities. + 3.Ticket prohibit illegal activities such as offline trading and acquisitions, and Yola will crack down severely on various profit-making trading activities. 1. When the BattlePass is activated, completing the BattlePass task and increasing the BattlePass level can earn a large amount of level rewards.\n 2. All users can unlock the regular version for free, and when the BattlePass is activated, they can upgrade to the elite version and the luxury version at any time, and receive rich additional exclusive rewards.\n @@ -1413,7 +1413,7 @@ Limited ride And limited avatar frame 3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。 4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。 5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。 - 6.活動最終解釋權歸PDLIVE所有。 + 6.活動最終解釋權歸Yola所有。 More points Gifts worth over 200% Gifts worth over 300% @@ -1481,4 +1481,16 @@ Limited ride And limited avatar frame Show Offline Show Read Show Unread + + User Rights + Creative Center + Other Features + Game Room + No threshold + All players + Player count + Online count + Interaction + System Message + Sign in with Phone number diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 726e699cf..3984156c5 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -648,7 +648,7 @@ 一次免費贈送禮物特權！ TA還沒有座騎 - 歡迎來到PDLIVE + 歡迎來到Yola 恭喜你獲得了新人獎勵 com.newpandora.yo.fileprovider @@ -1052,8 +1052,8 @@ 點擊查看 主播任務 我已閱讀並同意 - 請閱讀並同意《PDLIVE主播協議》 - 《PDLIVE主播協議》 + 請閱讀並同意《Yola主播協議》 + 《Yola主播協議》 新秀主播時效截止至 鑽石收禮 金豆收禮 @@ -1373,11 +1373,11 @@ 對局用戶 暫無記錄~ 今日 - 1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； + 1、互動遊戲是Yola為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與； 2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待； 3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數； 4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶； - 5、活動最終解釋權歸PDLIVE所有。 + 5、活動最終解釋權歸Yola所有。 貨幣 貨幣： 時間： @@ -1395,10 +1395,10 @@ 3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。 4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。 5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。 - 6.活動最終解釋權歸PDLIVE所有。 + 6.活動最終解釋權歸Yola所有。 1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認； 2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片； - 3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。 + 3.觀影券禁止線下交易、收購等不正當行為，Yola將對各類以盈利為目的的交易行為進行嚴厲打擊。 支付取消 支付成功 @@ -1525,7 +1525,7 @@ 1.龍神送財是您開通【神之守護】後給予直播間觀眾的福利，您可選擇自定義金豆數量並召喚龍神給直播间内主播粉丝瓜分（金豆數量不低於1000），或者您可以選擇不开启活动； 2.此次金豆消耗将计入守护贡献值和经验值增长，每提供10金豆將獲得1貢獻值，貢獻值可用於增長守護等級； 3.用戶關注主播並參與活動，將在五分鐘倒計時後將獲得您提供的福利； - 4.此活動的最終解釋權歸PDLIVE所有。 + 4.此活動的最終解釋權歸Yola所有。 立即參與 延續守護特權 前往續費 @@ -1544,7 +1544,7 @@ 暫時無法開通該守護，請當前守護到期後嘗試 1.神龍送財是開通【神之守護】的用戶給予直播間觀眾的免費金豆福利； 2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆； - 3.此活動的最終解釋權歸PDLIVE所有。 + 3.此活動的最終解釋權歸Yola所有。 短劇 主播正在PK，稍後再試 您將花費%s鑽石，為主播開通 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index dd6829156..4d82b9fb5 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -521,7 +521,7 @@ Save Register No one is currently in the voice link - Welcome to PDLive + Welcome to Yola Newcomer Bonus EXP Complete newcomer tasks for more rewards @@ -731,7 +731,7 @@ Limited ride And limited avatar frame Online Service Hot Ticket Register and log in - Sign in PDlive + Sign in Yola Tell the world! %s recommends anchor %s to everyone! Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！ Failed to load data, please try again later @@ -862,8 +862,8 @@ Limited ride And limited avatar frame Click To View Anchor Task I have read and agreed to the - Please read and agree to the PDLIVE Host Agreement - PDLIVE Host Agreement + Please read and agree to the Yola Host Agreement + Yola Host Agreement The statute of limitations for new anchors expires coin gold @@ -1207,11 +1207,11 @@ Limited ride And limited avatar frame "Today " "≤7 days " ≤ 30 days - 1.Interactive games are a new section provided by PDLIVE for users, who can participate in the game section on the homepage or in the live room; + 1.Interactive games are a new section provided by Yola for users, who can participate in the game section on the homepage or in the live room; 2.Currently, [Backgammon], [Flying Chess], [Bumper I’m the Strongest], [Monster Match], [Jump], [Friendly Challenge], [Magic Battle], [American 8 Ball] More game types will be provided in the future, so stay tuned; 3. Users can customize the game threshold, which must be between 100 to 50000 gold beans , and the amount must be a multiple of 10; 4.At the beginning of the game, chips from participating users will be collected. After the game ends, 10% of the chips will be collected as tickets, and all remaining chips will be given to the winning users.In a draw, the corresponding chips will be deducted from the tickets and returned to the users; - 5. The final interpretation right of the event belongs to PDLIVE. + 5. The final interpretation right of the event belongs to Yola. 0-100 coins 100-500 coins Above 500 coins @@ -1221,7 +1221,7 @@ Limited ride And limited avatar frame Exchange&Usage Rules: 1.One star coin can be exchanged for one ticket. You can customize the exchange quantity according to your needs. Once the ticket is exchanged, it cannot be revoked. Please confirm in advance; 2.One ticket can be used to watch one episode of a short drama. After successful redemption, you can return to the viewing page and use the ticket to continue watching the movie; - 3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities. + 3.Ticket prohibit illegal activities such as offline trading and acquisitions, and Yola will crack down severely on various profit-making trading activities. The items inside have not been claimed yet.Are you sure to delete the message？ Are you sure to delete the message？ @@ -1340,7 +1340,7 @@ Limited ride And limited avatar frame "1. Dragon's Wealth is a benefit that you provide to the audience of the live room after activating the 【God Guardian】. You can choose to customize the number of golden beans and summon Dragon God to divide the profits among the fans of the live broadcast room (the number of golden beans is not less than 1000), or you can choose not to activate the activity; " "2. The consumption of gold beans this time will be included in the guardian contribution value and experience value growth. For every 10 gold beans provided, 1 contribution value will be obtained, which can be used to increase the guardian level; " "3. Users who follow the anchor and participate in activities will receive the benefits you provide after a five minute countdown; " - 4. The final interpretation of this activity belongs to PDLIVE. + 4. The final interpretation of this activity belongs to Yola. Participate Renew now to extend guardian privileges\n Now renew and enjoy guardian privileges again\n @@ -1359,7 +1359,7 @@ Limited ride And limited avatar frame We are currently unable to activate this guard. Please try again after the current guard expires 1.Dragon\'s Wealth is a free golden bean benefit provided to live stream viewers by users who have activated the 【God Guardian】 feature; 2.Users who follow the anchor and participate in the activity will divide the gold beans of the activity after the countdown of five minutes ends; - 3.The final interpretation of this activity belongs to PDLIVE. + 3.The final interpretation of this activity belongs to Yola. Theater The anchor is in PK, please try again later once @@ -1420,16 +1420,18 @@ Limited ride And limited avatar frame Show Read Show Unread - 用戶權益 - 創作中心 - 其他功能 - 遊戲大廳 - 不限門檻 - 不限玩家 - 遊戲人數 - 在線人數 - 互動 - 系統消息 + User Rights + Creative Center + Other Features + Game Room + No threshold + All players + Player count + Online count + Interaction + System Message Sign in with Phone number + + 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 05554963d..18f33db74 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. Yolalive conducts")) { systemChatMessage(map.getString("ct")); } else { if (!WordUtil.isNewZh() && map.getString("ct").contains("退出比賽") && map.getString("ct").contains("獲得勝利")) { @@ -457,7 +457,7 @@ public class SocketRyClient { } else if (TextUtils.equals(boxType, "2")) { boxTypeName = WordUtil.isNewZh() ? "典藏盲盒" : "Collection blind box"; } else { - boxTypeName = WordUtil.isNewZh() ? "PD盲盒" : "PD blind box"; + boxTypeName = WordUtil.isNewZh() ? "Yola盲盒" : "Yola blind box"; } AllServerNotifyEvent allServerNotifyEvent = new AllServerNotifyEvent() @@ -838,7 +838,7 @@ public class SocketRyClient { stringBuffer.append(sendQuickGiftModel.getUserNicename()) .append(WordUtil.isNewZh() ? " 送出了 " : " sent ") .append(sendQuickGiftModel.getQuickGiftNumber()) - .append(WordUtil.isNewZh() ? " 個小PD " : " small pandas "); + .append(WordUtil.isNewZh() ? " 個小Yola " : " small pandas "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; 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 ef9c9d535..51198810e 100644 --- a/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java +++ b/live/src/main/java/com/yunbao/live/socket/SocketSwClient.java @@ -764,7 +764,7 @@ public class SocketSwClient { case "sendQuickGift": SendQuickGiftModel sendQuickGiftModel = GsonUtils.fromJson(map.toString(), SendQuickGiftModel.class); StringBuffer stringBuffer = new StringBuffer(); - stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小PD " : " small pandas "); + stringBuffer.append(sendQuickGiftModel.getUserNicename()).append(WordUtil.isNewZh() ? " 送出了 " : " sent ").append(sendQuickGiftModel.getQuickGiftNumber()).append(WordUtil.isNewZh() ? " 個小Yola " : " small pandas "); systemChatMessage2(stringBuffer.toString()); Bus.get().post(new QuickGiftingEvent().setHotNum(sendQuickGiftModel.getHotNum())); break; diff --git a/live/src/main/res/layout/view_receive_red_packet.xml b/live/src/main/res/layout/view_receive_red_packet.xml index a44a0385c..15677b773 100644 --- a/live/src/main/res/layout/view_receive_red_packet.xml +++ b/live/src/main/res/layout/view_receive_red_packet.xml @@ -47,7 +47,7 @@ android:layout_marginTop="10dp" android:layout_marginEnd="20dp" android:gravity="center" - android:text="來自小PD的獎勵，齊心協力連成目標" + android:text="來自小Yola的獎勵，齊心協力連成目標" android:textColor="@color/white" android:textSize="13sp" android:textStyle="bold" /> 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..9b9340716 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="Yola LIVE" android:paddingTop="2dp" android:textSize="20sp" android:textStyle="bold" />