1.短剧图标替换问题

2.PDLIVE 替换 POYO问题
3.修复了社区发布动态无法选择图片问题
4.修复了开播底部，主播协议展示问题

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

@@ -4,7 +4,7 @@
 <string name="com.twitter.sdk.android.CONSUMER_SECRET">aq0eV4R1pqMK_AAeKRWnjPr7ErGMGgTPGgZJdm73WeRY-Kluws</string>
 
 <string name="dialog_share_title">分享</string>
-<string name="dialog_share_info">快來 PDLIVE觀看%s直播，認識更多有趣的朋友吧！</string>
+<string name="dialog_share_info">快來 POYO觀看%s直播，認識更多有趣的朋友吧！</string>
 <string name="dialog_share_app_facebook" >Facebook</string>
 <string name="dialog_share_app_line" >Line</string>
 <string name="dialog_share_app_twitter">Twitter</string>
@@ -13,6 +13,6 @@
 <string name="dialog_share_app_instagram" >Instagram</string>
 
 <string name="dialog_invite_title">邀請好友</string>
-<string name="dialog_invite_info">快來 PDLIVE觀看直播，認識更多有趣的朋友吧！</string>
+<string name="dialog_invite_info">快來 POYO觀看直播，認識更多有趣的朋友吧！</string>
 <string name="dialog_share_copy">複製</string>
 </resources>

common/src/main/java/com/yunbao/common/http/PDLiveApi.java

@@ -1029,7 +1029,7 @@ public interface PDLiveApi {
      *
      * @return
      */
-    @GET("/sudhuoquyanzhengma")
+    @GET("/sudhuoquyanzhengma?service=Sudgame.getCode")
     Observable<ResponseModel<List<SudgameCodeModel>>> getCode();
 
     /**

common/src/main/java/com/yunbao/common/utils/LogUtil.java

@@ -146,7 +146,7 @@ public class LogUtil {
 
 
     public static void shareFile(Context context) {
-        String title = "[PDLIVE]" + CommonAppConfig.getInstance().getUid() + "_";
+        String title = "[POYO]" + CommonAppConfig.getInstance().getUid() + "_";
         String today = title + SimpleDateFormat.getDateInstance(DEFAULT, Locale.CHINA).format(new Date());
         File dir = new File("/data/data/" + context.getPackageName() + File.separator);
         File zip = new File(context.getDir("files", Context.MODE_PRIVATE).getAbsolutePath() + File.separator + today + ".zip");

common/src/main/java/com/yunbao/common/utils/LogUtils.java

@@ -40,7 +40,7 @@ public class LogUtils {
                     BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()));
                     String line;
                     PrintWriter writer = null;
-                    String title = "[PDLIVE]" + CommonAppConfig.getInstance().getUid() + "_";
+                    String title = "[POYO]" + CommonAppConfig.getInstance().getUid() + "_";
                     String today = title + SimpleDateFormat.getDateInstance(DEFAULT, Locale.CHINA).format(new Date());
                     File dir = new File(context.getDir("files", Context.MODE_PRIVATE).getAbsolutePath() + File.separator);
                     if (dir.listFiles() != null) {

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

@@ -1048,8 +1048,8 @@
     <string name="click_to_view">點擊查看</string>
     <string name="anchor_task">主播任務</string>
     <string name="anchor_agreement">我已閱讀並同意</string>
-    <string name="anchor_agreement_hint">請閱讀並同意《PDLIVE主播協議》</string>
-    <string name="anchor_hint">《PDLIVE主播協議》</string>
+    <string name="anchor_agreement_hint">請閱讀並同意《POYO主播協議》</string>
+    <string name="anchor_hint">《POYO主播協議》</string>
     <string name="live_task_new_user_timer">新秀主播時效截止至 </string>
     <string name="live_data_coin">鑽石收禮</string>
     <string name="live_data_gold">金豆收禮</string>
@@ -1373,11 +1373,11 @@
     <string name="sud_in_game_game_game_peer_user">對局用戶</string>
     <string name="sud_in_game_game_game_peer_user_nodata">暫無記錄~</string>
     <string name="sud_in_game_game_game_peer_today">今日</string>
-    <string name="sud_in_game_rule_hint1">1、互動遊戲是PDLIVE為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
+    <string name="sud_in_game_rule_hint1">1、互動遊戲是POYO為用戶提供的全新板塊，用戶可以在首頁【遊戲專區】或直播間內參與；</string>
     <string name="sud_in_game_rule_hint2">2、目前已上線【五子棋】、【飛行棋】、【碰碰我最強】、【怪物消消樂】、【跳一跳】、【友情闖關】、【魔法大樂鬥】、【美式8球】後續將會提供更多遊戲種類，敬請期期待；</string>
     <string name="sud_in_game_rule_hint3">3、 用戶可自定義設定遊戲門檻，要求在100~50000金豆之間，數額必須為10的倍數；</string>
     <string name="sud_in_game_rule_hint4">4、 遊戲開始時將會收取參與遊戲用戶的籌碼，在遊戲結束後，將收取10%的籌碼作為門票，剩餘籌碼將全部給予勝利用戶，平局時將會扣除相應籌碼门票後返還給用戶；</string>
-    <string name="sud_in_game_rule_hint5">5、活動最終解釋權歸PDLIVE所有。</string>
+    <string name="sud_in_game_rule_hint5">5、活動最終解釋權歸POYO所有。</string>
     <string name="sud_in_game_game_currency_item">貨幣</string>
     <string name="sud_in_game_game_currency">貨幣：</string>
     <string name="sud_in_game_game_time">時間：</string>
@@ -1395,10 +1395,10 @@
     <string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
     <string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
     <string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
-    <string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
+    <string name="rule_of_war_hint6">6.活動最終解釋權歸POYO所有。</string>
     <string name="conversion_quantity_need_of_use1">1.1星幣兌換1張觀影券，您可以根據需求自定義兌換數量，觀影券一經兌換不可撤銷，請提前確認；</string>
     <string name="conversion_quantity_need_of_use2">2.1張觀影券可觀看一集短劇，兌換成功後即可返回觀影頁面，使用觀影券繼續觀看影片；</string>
-    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，PDLIVE將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
+    <string name="conversion_quantity_need_of_use3">3.觀影券禁止線下交易、收購等不正當行為，POYO將對各類以盈利為目的的交易行為進行嚴厲打擊。</string>
 
     <string name="pay_cancel">支付取消</string>
     <string name="pay_suc">支付成功</string>
@@ -1479,7 +1479,7 @@
     <string name="dragon_rule1">1.龍神送財是您開通【神之守護】後給予直播間觀眾的福利，您可選擇自定義金豆數量並召喚龍神給直播间内主播粉丝瓜分（金豆數量不低於1000），或者您可以選擇不开启活动；</string>
     <string name="dragon_rule2">2.此次金豆消耗将计入守护贡献值和经验值增长，每提供10金豆將獲得1貢獻值，貢獻值可用於增長守護等級；</string>
     <string name="dragon_rule3">3.用戶關注主播並參與活動，將在五分鐘倒計時後將獲得您提供的福利；</string>
-    <string name="dragon_rule4">4.此活動的最終解釋權歸PDLIVE所有。</string>
+    <string name="dragon_rule4">4.此活動的最終解釋權歸POYO所有。</string>
     <string name="dragon_immediate_participation">立即參與</string>
     <string name="continuative_guardian_privilege">延續守護特權</string>
     <string name="travel_renewal">前往續費</string>
@@ -1498,7 +1498,7 @@
     <string name="current_guard_expires">暫時無法開通該守護，請當前守護到期後嘗試</string>
     <string name="dragon_rule5">1.神龍送財是開通【神之守護】的用戶給予直播間觀眾的免費金豆福利；</string>
     <string name="dragon_rule6">2.用戶關注主播並參與活動，將在倒計時五分鐘結束後瓜分活動金豆；</string>
-    <string name="dragon_rule7">3.此活動的最終解釋權歸PDLIVE所有。</string>
+    <string name="dragon_rule7">3.此活動的最終解釋權歸POYO所有。</string>
     <string name="main_type_theater">短劇</string>
     <string name="prank_complete">完成*1</string>
     <string name="pking_over">主播正在PK，稍後再試</string>

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

@@ -1023,8 +1023,8 @@
     <string name="click_to_view">Click To View</string>
     <string name="anchor_task">Anchor Task</string>
     <string name="anchor_agreement">I have read and agreed to the </string>
-    <string name="anchor_agreement_hint">Please read and agree to the PDLIVE Host Agreement</string>
-    <string name="anchor_hint">PDLIVE Host Agreement</string>
+    <string name="anchor_agreement_hint">Please read and agree to the POYO Host Agreement</string>
+    <string name="anchor_hint">POYO Host Agreement</string>
     <string name="live_task_new_user_timer">The statute of limitations for new anchors expires</string>
     <string name="live_data_coin">coin</string>
     <string name="live_data_gold">gold</string>
@@ -1385,11 +1385,11 @@
     <string name="sud_in_game_game_game_peer_today">"Today "</string>
     <string name="sud_in_game_game_game_peer_today_7">"≤7 days "</string>
     <string name="sud_in_game_game_game_peer_today_30">≤ 30 days</string>
-    <string name="sud_in_game_rule_hint1">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;</string>
+    <string name="sud_in_game_rule_hint1">1.Interactive games are a new section provided by POYO for users, who can participate in the game section on the homepage or in the live room;</string>
     <string name="sud_in_game_rule_hint2">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;</string>
     <string name="sud_in_game_rule_hint3">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;</string>
     <string name="sud_in_game_rule_hint4">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;</string>
-    <string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to PDLIVE.</string>
+    <string name="sud_in_game_rule_hint5">5. The final interpretation right of the event belongs to POYO.</string>
     <string name="room_sill0_100">0-100 coins</string>
     <string name="room_sill100_500">100-500 coins</string>
     <string name="room_sill500_m">Above 500 coins</string>
@@ -1399,7 +1399,7 @@
     <string name="conversion_quantity_need_of_use">Exchange&amp;Usage Rules:</string>
     <string name="conversion_quantity_need_of_use1">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;</string>
     <string name="conversion_quantity_need_of_use2">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;</string>
-    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and PDLIVE will crack down severely on various profit-making trading activities.</string>
+    <string name="conversion_quantity_need_of_use3">3.Ticket prohibit illegal activities such as offline trading and acquisitions, and POYO will crack down severely on various profit-making trading activities.</string>
 
     <string name="msg_del_sys01">The items inside have not been claimed yet.Are you sure to delete the message？</string>
     <string name="msg_del_sys02">Are you sure to delete the message？</string>
@@ -1417,7 +1417,7 @@
     <string name="rule_of_war_hint3">3.三種戰令都會獎勵積分，可在兌換商城中兌換心 儀的寶貝，部分寶貝兌換有戰令等級要求或兌換數 量限制。</string>
     <string name="rule_of_war_hint4">4.每日任務0點刷新，未完成任務進度不再累計， 每季任務將會在新一季戰令開啟時刷新。</string>
     <string name="rule_of_war_hint5">5.任務達成時需主動領取經驗，未领取經驗將會在 任務刷新時自动领取。</string>
-    <string name="rule_of_war_hint6">6.活動最終解釋權歸PDLIVE所有。</string>
+    <string name="rule_of_war_hint6">6.活動最終解釋權歸POYO所有。</string>
     <string name="more_integral">More points</string>
     <string name="gift_overvalue">Gifts worth over 200%</string>
     <string name="gift_overvalue3">Gifts worth over 300%</string>
@@ -1486,7 +1486,7 @@
     <string name="dragon_rule1">"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; "</string>
     <string name="dragon_rule2">"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; "</string>
     <string name="dragon_rule3">"3. Users who follow the anchor and participate in activities will receive the benefits you provide after a five minute countdown; "</string>
-    <string name="dragon_rule4">4. The final interpretation of this activity belongs to PDLIVE.</string>
+    <string name="dragon_rule4">4. The final interpretation of this activity belongs to POYO.</string>
     <string name="dragon_immediate_participation">Participate</string>
     <string name="continuative_guardian_privilege">Renew now to extend guardian privileges\n</string>
     <string name="continuative_guardian_privilege2">Now renew and enjoy guardian privileges again\n</string>
@@ -1506,7 +1506,7 @@
     <string name="current_guard_expires">We are currently unable to activate this guard. Please try again after the current guard expires</string>
     <string name="dragon_rule5">1.Dragon\'s Wealth is a free golden bean benefit provided to live stream viewers by users who have activated the 【God Guardian】 feature;</string>
     <string name="dragon_rule6">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;</string>
-    <string name="dragon_rule7">3.The final interpretation of this activity belongs to PDLIVE.</string>
+    <string name="dragon_rule7">3.The final interpretation of this activity belongs to POYO.</string>
     <string name="main_type_theater" >Theater</string>
     <string name="pking_over">The anchor is in PK, please try again later</string>
     <string name="prank_complete">once</string>

live/src/main/java/com/yunbao/live/views/LiveNewReadyRyViewHolder.java

@@ -578,11 +578,7 @@ public class LiveNewReadyRyViewHolder extends AbsViewHolder implements View.OnCl
             IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
             StringBuffer url = new StringBuffer();
             url.append(CommonAppConfig.HOST);
-            if (TextUtils.equals(ct, "zh")) {
-                url.append("/index.php?g=portal&m=page&a=index&id=671");
-            } else {
-                url.append("/index.php?g=portal&m=page&a=index&id=672");
-            }
+            url.append("/h5/page/index.html?id=708");
             url.append("&uid=")
                     .append(model.getId())
                     .append("&token=")

live/src/main/java/com/yunbao/live/views/LiveNewReadySwViewHolder.java

@@ -29,6 +29,7 @@ import com.lxj.xpopup.core.BasePopupView;
 import com.lxj.xpopup.interfaces.XPopupCallback;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
+import com.yunbao.common.activity.WebViewActivity;
 import com.yunbao.common.bean.IMLoginModel;
 import com.yunbao.common.bean.LiveAnchorCallMeModel;
 import com.yunbao.common.bean.LiveAnchorSayModel;
@@ -546,17 +547,13 @@ public class LiveNewReadySwViewHolder extends AbsViewHolder implements View.OnCl
             IMLoginModel model = IMLoginManager.get(mContext).getUserInfo();
             StringBuffer url = new StringBuffer();
             url.append(CommonAppConfig.HOST);
-            if (TextUtils.equals(ct, "zh")) {
-                url.append("/index.php?g=portal&m=page&a=index&id=671");
-            } else {
-                url.append("/index.php?g=portal&m=page&a=index&id=672");
-            }
+            url.append("/h5/page/index.html?id=708");
             url.append("&uid=")
                     .append(model.getId())
                     .append("&token=")
                     .append(model.getToken()).append("&isZh=")
                     .append(WordUtil.isNewZh() ? "1" : 0);
-            RouteUtil.forwardLiveZhuangBanActivity(url.toString(), false);
+            WebViewActivity.forward(mContext, url.toString(), false);
         } else if (i == R.id.btn_live_anchor_say) {
             openAnchorSayDialog();
         } else if (i == R.id.btn_live_anchor_call_me) {