yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改界面的中英文

Browse Source
This commit is contained in:
18401019693 2023-03-17 10:19:35 +08:00
parent 07f8f46f1f
commit 8455d1253c
19 changed files with 414 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
common/src/main/res/values-en/strings.xml
View File

@ -845,8 +845,8 @@ Limited ride And limited avatar frame</string>
<string name="hurry_contact">Contact a mentor now!</string> <string name="hurry_contact">Contact a mentor now!</string>
<string name="withdraw_success">Withdrawal succeeded</string> <string name="withdraw_success">Withdrawal succeeded</string>
<string name="normal_barrage">normal barrage</string> <string name="normal_barrage">normal barrage</string>
<string name="floating_screen">floating screen</string> <string name="floating_screen">Float barrage</string>
<string name="whole_station_horn">Whole station horn</string> <string name="whole_station_horn">Total speaker</string>
<string name="quote">quote</string> <string name="quote">quote</string>
<string name="whole_station_horn_hint">Available times: %s Note: Update times at 4:00 am on the 1st of each month</string> <string name="whole_station_horn_hint">Available times: %s Note: Update times at 4:00 am on the 1st of each month</string>
<string name="cannot_be_empty">Content cannot be empty</string> <string name="cannot_be_empty">Content cannot be empty</string>
@ -882,7 +882,8 @@ Limited ride And limited avatar frame</string>
<string name="system_notice">Notice</string> <string name="system_notice">Notice</string>
<string name="online_service">Online Service</string> <string name="online_service">Online Service</string>
<string name="popular_tickets">Hot Ticket</string> <string name="popular_tickets">Hot Ticket</string>
<string name="register_and_log_in">Register and log in</string>
<string name="sign_up_for">Sign up for PD LIVE</string>
<string name="tell_the_world">Tell the world！</string> <string name="tell_the_world">Tell the world！</string>
<string name="better_emperor_hint">Tell the world! %s recommends anchor %s to everyone!</string> <string name="better_emperor_hint">Tell the world! %s recommends anchor %s to everyone!</string>
<string name="emperor_hint">Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！</string> <string name="emperor_hint">Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！</string>
@ -1021,4 +1022,58 @@ Limited ride And limited avatar frame</string>
<string name="live_data_loading">loading…</string> <string name="live_data_loading">loading…</string>
<string name="yoursystemisolder">Gift and seat effects have been turned off and can be turned on manually in "Settings".</string> <string name="yoursystemisolder">Gift and seat effects have been turned off and can be turned on manually in "Settings".</string>
<string name="net_error">i \'m sorry! An error occurred.</string> <string name="net_error">i \'m sorry! An error occurred.</string>
<string name="getting_it">Congratulations on getting it!</string>
<string name="this_month">You have accumulated sign-ups this month %s Heaven</string>
<string name="more_day_to">Sign in for 1 more day to get extra bonus.</string>
<string name="sign_in_to_the_center">Sign in to the center」</string>
<string name="go_to_the">Go to the「Sign-in Center」to get extra rewards!</string>
<string name="sign_in_center">Sign-in Center</string>
<string name="to_top">Back to top</string>
<string name="go_to_the_sign">Go to the sign-in center</string>
<string name="confirm_pick_up">Confirm pick up</string>
<string name="customer_service2">Unable to login? Click here to contact customer service</string>
<string name="next_step_is_consent">By logging in, you agree to the Terms of</string>
<string name="user_protocol2"> Service</string>
<string name="and">and</string>
<string name="privacy_terms">Privacy</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="anti_cheating_services">In order to provide you with one-click sharing service, our product integrates Mob+U-Share SDK, The Mob+SDK needs to collect your device Mac address, unique device identifier (1MEIandroid IDIDFAOPENUDIDGUID, SIM card IMSI information), and public social account information that you need to share in order to complete the one-click sharing service. And through the geographical location calibration report data accuracy, provide basic anti-cheating services. For the sake of your information security, we have made data security and confidentiality agreements with third-party SDK service providers, and these companies will strictly abide by our data privacy and security requirements. We will not share your personally identifiable information with them unless we have your consent. To facilitate you better understand/Mob + data types and USES, and how to protect your personal information, you can log on to https:www.mob.com aboutpolicy understand [Mob +] privacy 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="live_gift">gift</string>
<string name="register_tip_2">User service agreement</string>
<string name="live_fans_medal_pri_des">一 Fan privilege 一</string>
<string name="live_item_gift_name">Gift name</string>
<string name="live_medal_name">True love ranking</string>
<string name="register_tip_4">and</string>
<string name="live_medal_des1">Speech memo</string>
<string name="register_tip_3">Privacy policy</string>
<string name="live_medal_des2">Daily gift pack</string>
<string name="live_send_gift_4">To one\'s liking</string>
<string name="live_send_buy_guard_1">Opened a pair of</string>
<string name="live_send_buy_guard_2">guard</string>
<string name="live_send_buy_zuoji_1">I bought a ride</string>
<string name="live_send_buy_liang_name_1">Purchased a beautiful number</string>
<string name="live_send_buy_vip_1">VIP</string>
<string name="live_random">Random PK</string>
<string name="live_medal_des3">VIP seating</string>
<string name="live_medal_des5">True love ranking</string>
<string name="live_set_wishlist_num">Please enter the number</string>
<string name="guard_tip_day">You are the current anchor whose weekly guardian \n guardian date is up</string>
<string name="wallet_gold_name">My %1$s:</string>
<string name="charge_explain">Top-up instructions</string>
<string name="register_tip_1">Registration means consent</string>
<string name="live_become_fans_medal">One-time gift ≥2000 diamonds), can obtain fan privilege yo</string>
<string name="live_go_charge">Top up</string>
<string name="live_user_card_level">User level</string>
<string name="live_noble_level_anchor">aristocracy</string>
<string name="live_noble_fens_anchor">Fan club</string>
<string name="live_anchor_open_mic">Voice connection is not enabled</string>
<string name="live_honor_number_anchor">Wall of honor</string>
<string name="live_medal_des4">Get a fan badge for giving gifts</string>
<string name="clear_unread_messages">Whether to clear unread messages</string>
<string name="support_login">The application collects location data to support login and registration functions.</string>
</resources> </resources>

156
common/src/main/res/values/strings.xml
View File

@ -720,10 +720,10 @@
<string name="live_send_buy_zuoji_1">購買了座騎</string> <string name="live_send_buy_zuoji_1">購買了座騎</string>
<string name="live_send_buy_liang_name_1">購買了靚號</string> <string name="live_send_buy_liang_name_1">購買了靚號</string>
<string name="live_send_buy_vip_1">VIP</string> <string name="live_send_buy_vip_1">VIP</string>
<string name="live_random">随机PK</string>
<string name="live_wishlist">心願單</string> <string name="live_wishlist">心願單</string>
<string name="live_zg">娛樂整蠱</string> <string name="live_zg">娛樂整蠱</string>
<string name="live_dr">多人PK</string> <string name="live_dr">多人PK</string>
<string name="live_random" >随机PK</string>
<string name="live_mic">語音連麥</string> <string name="live_mic">語音連麥</string>
<string name="live_wks">周星榜</string> <string name="live_wks">周星榜</string>
<string name="live_zslk">暫時離開</string> <string name="live_zslk">暫時離開</string>
@ -739,22 +739,22 @@
<string name="live_gift">禮物</string> <string name="live_gift">禮物</string>
<string name="register_tip_2">用戶服務協議</string> <string name="register_tip_2">用戶服務協議</string>
<string name="live_fans_medal_pri_des">一 粉絲特權 一</string> <string name="live_fans_medal_pri_des">一 粉絲特權 一</string>
<string name="live_wrap">包裹</string>
<string name="wishlist_title2">許下心願，觀衆幫你實現</string>
<string name="live_item_gift_name">禮物名稱</string> <string name="live_item_gift_name">禮物名稱</string>
<string name="live_wish_list">心願單</string>
<string name="live_medal_name">真愛排行</string> <string name="live_medal_name">真愛排行</string>
<string name="register_tip_4">和</string> <string name="register_tip_4">和</string>
<string name="live_medal_des1">發言微章</string> <string name="live_medal_des1">發言微章</string>
<string name="wishlist_done">生成心願</string>
<string name="register_tip_3">隱私政策</string> <string name="register_tip_3">隱私政策</string>
<string name="live_medal_des2">每日禮包</string> <string name="live_medal_des2">每日禮包</string>
<string name="live_item_add_gift">添加禮物和數量</string>
<string name="live_medal_des3">貴賓座席</string> <string name="live_medal_des3">貴賓座席</string>
<string name="wishlist_title3">當日設置的心願，會在當天24:00失效</string>
<string name="live_medal_des5">真爱排行</string> <string name="live_medal_des5">真爱排行</string>
<string name="copy">複製</string>
<string name="live_medal_des4">送禮獲得粉絲微章</string> <string name="live_medal_des4">送禮獲得粉絲微章</string>
<string name="wishlist_title3">當日設置的心願，會在當天24:00失效</string>
<string name="live_item_add_gift">添加禮物和數量</string>
<string name="live_wrap">包裹</string>
<string name="wishlist_title2">許下心願，觀衆幫你實現</string>
<string name="copy">複製</string>
<string name="live_wish_list">心願單</string>
<string name="wishlist_done">生成心願</string>
<string name="lives_state">直播中</string> <string name="lives_state">直播中</string>
<string name="rest_state">休息中</string> <string name="rest_state">休息中</string>
@ -959,14 +959,14 @@
<string name="in_batch">換一批</string> <string name="in_batch">換一批</string>
<string name="chat_chat">聊聊天</string> <string name="chat_chat">聊聊天</string>
<string name="want_pre">想在其他APP上方也顯示小窗，\n可前往設置進行授權。</string> <string name="want_pre">想在其他APP上方也顯示小窗，\n可前往設置進行授權。</string>
<string name="lucky_angel" >恭喜 %s 在幸運天使中抽中 %s！下一個幸運天使就是你哦！</string> <string name="lucky_angel">恭喜 %s 在幸運天使中抽中 %s！下一個幸運天使就是你哦！</string>
<string name="lucky_100" >恭喜 %s 在好運百分百中抽中 %s！快去接力好運吧~</string> <string name="lucky_100">恭喜 %s 在好運百分百中抽中 %s！快去接力好運吧~</string>
<string name="user_card_guard" >守護團%s人</string> <string name="user_card_guard">守護團%s人</string>
<string name="to_receive" >領取</string> <string name="to_receive">領取</string>
<string name="to_complete" >去完成</string> <string name="to_complete">去完成</string>
<string name="already_collected" >已領取</string> <string name="already_collected">已領取</string>
<string name="image_quality_selection" >畫質選擇</string> <string name="image_quality_selection">畫質選擇</string>
<string name="more_settings" >更多設置</string> <string name="more_settings">更多設置</string>
<string name="moer">查看更多</string> <string name="moer">查看更多</string>
<string name="gift_way">礼物正在获取中...</string> <string name="gift_way">礼物正在获取中...</string>
<string name="start_pk">開始PK</string> <string name="start_pk">開始PK</string>
@ -976,55 +976,55 @@
<string name="end_pk">結束\nPK</string> <string name="end_pk">結束\nPK</string>
<string name="pk_time">時間 %s</string> <string name="pk_time">時間 %s</string>
<string name="random_pk_dialog_apply" >接受</string> <string name="random_pk_dialog_apply">接受</string>
<string name="random_pk_dialog_refuse" >拒绝</string> <string name="random_pk_dialog_refuse">拒绝</string>
<string name="random_pk_dialog_refuse_again" >坚持拒绝</string> <string name="random_pk_dialog_refuse_again">坚持拒绝</string>
<string name="random_pk_dialog_title" >随机PK提示</string> <string name="random_pk_dialog_title">随机PK提示</string>
<string name="speech_robot_setup" >自動發言機器人設置</string> <string name="speech_robot_setup">自動發言機器人設置</string>
<string name="robot_switch" >機器人開關</string> <string name="robot_switch">機器人開關</string>
<string name="robot_name_setting" >機器人名字設置</string> <string name="robot_name_setting">機器人名字設置</string>
<string name="word_limit" >字數限制2-8個字</string> <string name="word_limit">字數限制2-8個字</string>
<string name="automatic_greeting_setting" >自動打招呼設置</string> <string name="automatic_greeting_setting">自動打招呼設置</string>
<string name="configured_items" >已配置條數</string> <string name="configured_items">已配置條數</string>
<string name="automatic_message_sending" >自動發消息設置</string> <string name="automatic_message_sending">自動發消息設置</string>
<string name="robot_go_setting" >前往設置</string> <string name="robot_go_setting">前往設置</string>
<string name="robot_hint" >感謝送禮、PK開始、PK結束的自動機器人消息，\n暫不支持自定義。</string> <string name="robot_hint">感謝送禮、PK開始、PK結束的自動機器人消息，\n暫不支持自定義。</string>
<string name="robot_add_content" >添加內容</string> <string name="robot_add_content">添加內容</string>
<string name="robot_add_content_hint1" >每隔一段時間，機器人自動隨機以下一句話發出。</string> <string name="robot_add_content_hint1">每隔一段時間，機器人自動隨機以下一句話發出。</string>
<string name="robot_add_content_hint2" >填寫內容推薦，如：求送心願單、加粉絲團等</string> <string name="robot_add_content_hint2">填寫內容推薦，如：求送心願單、加粉絲團等</string>
<string name="robot_automatic_speech_interval" >自動發言間隔時間(分鐘)</string> <string name="robot_automatic_speech_interval">自動發言間隔時間(分鐘)</string>
<string name="robot_minimum_interval" >最少間隔5分鐘1次</string> <string name="robot_minimum_interval">最少間隔5分鐘1次</string>
<string name="robot_add_content_hint3" >當有用戶進入直播間時，機器人會@該用戶並自動</string> <string name="robot_add_content_hint3">當有用戶進入直播間時，機器人會@該用戶並自動</string>
<string name="robot_add_content_hint4" >隨機以下一句話。最少設置1條，最多20條。</string> <string name="robot_add_content_hint4">隨機以下一句話。最少設置1條，最多20條。</string>
<string name="robot_setup" >機器人設置</string> <string name="robot_setup">機器人設置</string>
<string name="high_definition" >高清</string> <string name="high_definition">高清</string>
<string name="standard_clear" >流暢</string> <string name="standard_clear">流暢</string>
<string name="ultra_hd" >超高清</string> <string name="ultra_hd">超高清</string>
<string name="clarity_hint" >確定清晰度開播後，需要重新開播才能更改</string> <string name="clarity_hint">確定清晰度開播後，需要重新開播才能更改</string>
<string name="confirmation_of_broadcast" >開播設置確認</string> <string name="confirmation_of_broadcast">開播設置確認</string>
<string name="clarity" >清晰度</string> <string name="clarity">清晰度</string>
<string name="live_class1" >直播頻道</string> <string name="live_class1">直播頻道</string>
<string name="broadcast" >開播</string> <string name="broadcast">開播</string>
<string name="robot" >機器人</string> <string name="robot">機器人</string>
<string name="do_set" >已設置</string> <string name="do_set">已設置</string>
<string name="not_set" >未設置</string> <string name="not_set">未設置</string>
<string name="robot_no" >關</string> <string name="robot_no">關</string>
<string name="robot_yes" >開</string> <string name="robot_yes">開</string>
<string name="ultra_hd_hint" >超高清提示</string> <string name="ultra_hd_hint">超高清提示</string>
<string name="ultra_hd_hint2" >在網速不穩定的情況下，選擇超高清將會有可能導致直播間畫面卡頓，是否確認選擇？</string> <string name="ultra_hd_hint2">在網速不穩定的情況下，選擇超高清將會有可能導致直播間畫面卡頓，是否確認選擇？</string>
<string name="stick_to_choice" >堅持選擇</string> <string name="stick_to_choice">堅持選擇</string>
<string name="net_hint" >網絡提示</string> <string name="net_hint">網絡提示</string>
<string name="net_hint2" >系統監測到您的網絡不穩定，設備內存不足將會影響到您的直播流暢度，因此建議您選擇流暢清晰度。</string> <string name="net_hint2">系統監測到您的網絡不穩定，設備內存不足將會影響到您的直播流暢度，因此建議您選擇流暢清晰度。</string>
<string name="check_the_new_version" >检查新版本</string> <string name="check_the_new_version">检查新版本</string>
<string name="discover_a_new_version" >發現新版本，點此更新</string> <string name="discover_a_new_version">發現新版本，點此更新</string>
<string name="latest_version" >已是最新版本</string> <string name="latest_version">已是最新版本</string>
<string name="updating" >更新中</string> <string name="updating">更新中</string>
<string name="live_user_ban_fhd" >無法選擇，該主播未開啟超高清直播。</string> <string name="live_user_ban_fhd">無法選擇，該主播未開啟超高清直播。</string>
<string name="live_user_ban_hd" >無法選擇，該主播未開啟高清直播。</string> <string name="live_user_ban_hd">無法選擇，該主播未開啟高清直播。</string>
<string name="function_is_suspended" >抱歉，該功能暫停使用中。</string> <string name="function_is_suspended">抱歉，該功能暫停使用中。</string>
<string name="phone_number" >手機號</string> <string name="phone_number">手機號</string>
<string name="broadcast_data" >開播數據</string> <string name="broadcast_data">開播數據</string>
<string name="click_to_view">點擊查看</string> <string name="click_to_view">點擊查看</string>
<string name="anchor_task">主播任務</string> <string name="anchor_task">主播任務</string>
<string name="anchor_agreement">我已閱讀並同意</string> <string name="anchor_agreement">我已閱讀並同意</string>
@ -1042,4 +1042,32 @@
<string name="live_data_loading">加载中…</string> <string name="live_data_loading">加载中…</string>
<string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string> <string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string>
<string name="net_error">抱歉！出錯了！</string> <string name="net_error">抱歉！出錯了！</string>
<string name="getting_it">恭喜你獲得了</string>
<string name="this_month">本月您已累積簽到%s天</string>
<string name="more_day_to">再簽到1天即可獲得額外獎勵。</string>
<string name="sign_in_to_the_center">「簽到中心」</string>
<string name="go_to_the">快前往「簽到中心」獲得額外獎勵吧！</string>
<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="customer_service2">無法登陸？點此聯繫客服</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="install_the_application">詳情請您閱讀以下安裝應用程序的消息：</string>
<string name="anti_cheating_services">為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。 除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。</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="sign_up_for">註冊PD LIVE</string>
<string name="register_and_log_in">註冊並登錄</string>
</resources> </resources>

2
config.gradle
View File

@ -23,7 +23,7 @@ ext {
baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB",
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false // true表示谷歌支付 false
isGooglePlay : true, isGooglePlay : false,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true isUploadLog : true
] ]

3
live/src/main/res/layout/dialog_live_blowkiss.xml
View File

@ -195,6 +195,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:maxWidth="80dp"
android:maxLines="1"
android:ellipsize="end"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/live_blowkiss_time" android:text="@string/live_blowkiss_time"
android:layout_gravity="center" android:layout_gravity="center"

2
live/src/main/res/layout/dialog_live_chat_input.xml
View File

@ -64,7 +64,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1.2" />
</RadioGroup> </RadioGroup>
</LinearLayout> </LinearLayout>

1
live/src/main/res/layout/view_live_room.xml
View File

@ -2307,6 +2307,7 @@
<com.yunbao.common.views.weight.NobleNoticeView <com.yunbao.common.views.weight.NobleNoticeView
android:id="@+id/noble" android:id="@+id/noble"
android:layout_width="match_parent" android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="60dp" /> android:layout_marginTop="60dp" />
</RelativeLayout> </RelativeLayout>

5
live/src/main/res/layout/view_noble_seat.xml
View File

@ -5,6 +5,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
tools:ignore="MissingDefaultResource"> tools:ignore="MissingDefaultResource">
<LinearLayout <LinearLayout
android:id="@+id/wish_list_layout" android:id="@+id/wish_list_layout"
android:layout_width="80dp" android:layout_width="80dp"
@ -27,9 +28,11 @@
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginStart="6dp" android:layout_marginStart="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:ellipsize="end"
android:gravity="center" android:gravity="center"
android:textColor="#FFFFFF" android:maxLength="7"
android:text="@string/noble_seat" android:text="@string/noble_seat"
android:textColor="#FFFFFF"
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </LinearLayout>

33
live/src/main/res/values-en/strings.xml
View File

@ -34,4 +34,37 @@
<string name="live_data_msg1">This live data statistics</string> <string name="live_data_msg1">This live data statistics</string>
<string name="live_data_msg2">Historical data can be viewed in the anchor center</string> <string name="live_data_msg2">Historical data can be viewed in the anchor center</string>
<string name="live_data_tip">* Non-real-time calculation of data</string> <string name="live_data_tip">* Non-real-time calculation of data</string>
<string name="buy_guard_info" >Be TA\'s guardian, escort for TA!</string>
<string name="buy_guard_back_coin" >return</string>
<string name="praise">Be praised</string>
<string name="live_gift_buy_gold" >Open aristocracy</string>
<string name="live_gift_buy_gold_desc" >Enjoy exclusive privileges!</string>
<string name="live_gift_buy_gold_desc_to" >Head to the noble Center</string>
<string name="fingers_slide" >Swipe up to cancel send</string>
<string name="release_cancel_send" >Release cancel send</string>
<string name="more_than" >No recording has been recognized in over 10 seconds</string>
<string name="live_role_title" >Identity privilege</string>
<string name="noble_seat" >Nobleman\'s seat</string>
<string name="live_mic_user_apply" >%s applies for connected wheat. Check whether</string>
<string name="live_mic_user_down" >The wheat has been kicked off</string>
<string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
<string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>
<string name="random_pk_info_view_title" >Random PK</string>
<string name="random_pk_info_title" >PK main rules:</string>
<string name="random_pk_info_time_desc" >Random PK qualifying time</string>
<string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
<string name="random_pk_info_desc_1" >1. After matching, the system will automatically select opponents for PK;</string>
<string name="random_pk_info_desc_2" >2. If you cannot match your opponent for a long time, you can try to match again；</string>
<string name="random_pk_info_desc_3" >3. During the PK process, if there is any delay or delay, please check your personal device and network first, and then try to log in again and start broadcasting.</string>
<string name="random_pk_info_desc_4" >4, the security department will be 24 hours of inspection, please civilized PK, strictly abide by the anchor rules;</string>
<string name="random_pk_info_switch" >Random PK switch:</string>
<string name="random_pk_info_btn_start" >Start matching</string>
<string name="random_pk_info_btn_ing" >Match %s</string>
<string name="random_pk_info_btn_ing_desc" >Click again to cancel the match</string>
<string name="random_pk_info_btn_end" >Exiting match %s</string>
<string name="random_pk_info_btn_end_desc" >It\'s also possible to match an opponent during the exit process</string>
<string name="random_pk_search_hint" >Please enter the anchor nickname or id you want to pk</string>
<string name="free_pk_user_pking" >The other team is engaged in a PK</string>
<string name="free_pk_num_null" >The PK number is used up</string>
</resources> </resources>

62
live/src/main/res/values/strings.xml
View File

@ -1,6 +1,6 @@
<resources> <resources>
<string name="buy_guard_info" translatable="false">成爲TA的守護，爲TA保駕護航！</string> <string name="buy_guard_info" >成爲TA的守護，爲TA保駕護航！</string>
<string name="buy_guard_back_coin" translatable="false">返還</string> <string name="buy_guard_back_coin" >返還</string>
<string name="no_more_day_rank">暫時無人上榜，快來成為第一位上榜的人吧！</string> <string name="no_more_day_rank">暫時無人上榜，快來成為第一位上榜的人吧！</string>
<string name="no_more_guard">主播正在等待您的守護！</string> <string name="no_more_guard">主播正在等待您的守護！</string>
<string name="no_rank_data">未上榜</string> <string name="no_rank_data">未上榜</string>
@ -19,36 +19,36 @@
<string name="live_room_public_des">所有人可觀看</string> <string name="live_room_public_des">所有人可觀看</string>
<string name="live_room_private_des">僅擁有房間密碼的人可觀看</string> <string name="live_room_private_des">僅擁有房間密碼的人可觀看</string>
<string name="live_room_type_submit">確認</string> <string name="live_room_type_submit">確認</string>
<string name="live_gift_buy_gold" translatable="false">開通貴族</string> <string name="live_gift_buy_gold" >開通貴族</string>
<string name="live_gift_buy_gold_desc" translatable="false">享受專屬特權！</string> <string name="live_gift_buy_gold_desc" >享受專屬特權！</string>
<string name="live_gift_buy_gold_desc_to" translatable="false">前往貴族中心</string> <string name="live_gift_buy_gold_desc_to" >前往貴族中心</string>
<string name="fingers_slide" translatable="false">手指上滑，取消發送</string> <string name="fingers_slide" >手指上滑，取消發送</string>
<string name="release_cancel_send" translatable="false">松開取消發送</string> <string name="release_cancel_send" >松開取消發送</string>
<string name="more_than" translatable="false">已超过10秒未识别到录音</string> <string name="more_than" >已超过10秒未识别到录音</string>
<string name="live_role_title" translatable="false">身份特權</string> <string name="live_role_title" >身份特權</string>
<string name="noble_seat" translatable="false">貴族坐席</string> <string name="noble_seat" >貴族坐席</string>
<string name="live_mic_max">當前連麥語音人數已達到3人，無法再添加。</string> <string name="live_mic_max">當前連麥語音人數已達到3人，無法再添加。</string>
<string name="live_mic_user_apply" translatable="false">%s 申請連麥,是否查看</string> <string name="live_mic_user_apply" >%s 申請連麥,是否查看</string>
<string name="live_mic_user_down" translatable="false">已踢下麥</string> <string name="live_mic_user_down" >已踢下麥</string>
<string name="live_mic_invite" translatable="false">已發出邀請,等待用戶接受</string> <string name="live_mic_invite" >已發出邀請,等待用戶接受</string>
<string name="live_mic_request" translatable="false">已同意請求,等待用戶接受</string> <string name="live_mic_request" >已同意請求,等待用戶接受</string>
<string name="random_pk_info_view_title" translatable="false">隨機PK</string> <string name="random_pk_info_view_title" >隨機PK</string>
<string name="random_pk_info_title" translatable="false">PK主要規則說明：</string> <string name="random_pk_info_title" >PK主要規則說明：</string>
<string name="random_pk_info_time_desc" translatable="false">隨機PK排位賽時間</string> <string name="random_pk_info_time_desc" >隨機PK排位賽時間</string>
<string name="random_pk_info_time" translatable="false">12:00~17:00、19:00~23:59</string> <string name="random_pk_info_time" >12:00~17:00、19:00~23:59</string>
<string name="random_pk_info_desc_1" translatable="false">1、開始匹配後，系統將自動挑選對手進行PK；</string> <string name="random_pk_info_desc_1" >1、開始匹配後，系統將自動挑選對手進行PK；</string>
<string name="random_pk_info_desc_2" translatable="false">2、若長時間無法匹配到對手，可嘗試重新匹配；</string> <string name="random_pk_info_desc_2" >2、若長時間無法匹配到對手，可嘗試重新匹配；</string>
<string name="random_pk_info_desc_3" translatable="false">3、PK過程中卡頓及延遲，可先檢查個人設備及網絡後，嘗試重新登錄並開播；</string> <string name="random_pk_info_desc_3" >3、PK過程中卡頓及延遲，可先檢查個人設備及網絡後，嘗試重新登錄並開播；</string>
<string name="random_pk_info_desc_4" translatable="false">4、安全部門將會24小時巡查，請文明PK，嚴格遵守主播守則；</string> <string name="random_pk_info_desc_4" >4、安全部門將會24小時巡查，請文明PK，嚴格遵守主播守則；</string>
<string name="random_pk_info_switch" translatable="false">隨機PK開關：</string> <string name="random_pk_info_switch" >隨機PK開關：</string>
<string name="random_pk_info_btn_start" translatable="false">開始匹配</string> <string name="random_pk_info_btn_start" >開始匹配</string>
<string name="random_pk_info_btn_ing" translatable="false">匹配中 %s </string> <string name="random_pk_info_btn_ing" >匹配中 %s </string>
<string name="random_pk_info_btn_ing_desc" translatable="false">再次點擊可取消匹配</string> <string name="random_pk_info_btn_ing_desc" >再次點擊可取消匹配</string>
<string name="random_pk_info_btn_end" translatable="false">正在退出匹配 %s</string> <string name="random_pk_info_btn_end" >正在退出匹配 %s</string>
<string name="random_pk_info_btn_end_desc" translatable="false">退出過程中也有可能匹配到對手</string> <string name="random_pk_info_btn_end_desc" >退出過程中也有可能匹配到對手</string>
<string name="random_pk_search_hint" translatable="false">請輸入您要pk的主播昵稱或id</string> <string name="random_pk_search_hint" >請輸入您要pk的主播昵稱或id</string>
<string name="free_pk_user_pking" translatable="false">對方正在PK中</string> <string name="free_pk_user_pking" >對方正在PK中</string>
<string name="free_pk_num_null" translatable="false">PK次數已用完</string> <string name="free_pk_num_null" >PK次數已用完</string>
<string name="live_task_no1">當日連續開播時長(分鐘)</string> <string name="live_task_no1">當日連續開播時長(分鐘)</string>
<string name="live_task_no2">當日累計PK次數(不限模式)</string> <string name="live_task_no2">當日累計PK次數(不限模式)</string>
<string name="live_task_fans_no1">當日累積新增關註粉絲</string> <string name="live_task_fans_no1">當日累積新增關註粉絲</string>

5
main/src/main/java/com/yunbao/main/dialog/SigninDialog.java
View File

@ -2,6 +2,7 @@ package com.yunbao.main.dialog;
import static com.yunbao.common.utils.RouteUtil.PATH_REWARD; import static com.yunbao.common.utils.RouteUtil.PATH_REWARD;
import android.annotation.SuppressLint;
import android.os.Bundle; import android.os.Bundle;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
@ -44,6 +45,7 @@ public class SigninDialog extends AbsDialogFragment {
window.setAttributes(params); window.setAttributes(params);
} }
@SuppressLint("StringFormatInvalid")
@Override @Override
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
@ -73,6 +75,7 @@ public class SigninDialog extends AbsDialogFragment {
return; return;
} }
gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "EXP"); gold.setText(bundle.getString("send_gold") + "金豆+" + bundle.getString("send_exp") + "EXP");
sign_day.setText("本月您已累積簽到" + bundle.getString("sign_day") + "天，");
sign_day.setText(String.format(getString(R.string.this_month), bundle.getString("sign_day")));
} }
} }

4
main/src/main/java/com/yunbao/main/views/MainMeViewHolder.java
View File

@ -302,8 +302,8 @@ public class MainMeViewHolder extends AbsMainViewHolder implements OnItemClickLi
user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text)); user_noble_time.setText(mContext.getResources().getString(R.string.open_noble_text));
} }
String singnature = u.getSignature(); String singnature = u.getSignature();
if (TextUtils.equals(singnature, "貴族") || TextUtils.equals(singnature, "贵族")) { if (TextUtils.equals(singnature, "這個人很懶，什麼也沒留下") ||TextUtils.equals(singnature, "这家伙很懒，什么都没留下") || TextUtils.isEmpty(singnature)) {
singnature = singnature + "中心"; singnature ="The guy was lazy and didn't write anything.";
} }
signature.setText(singnature); signature.setText(singnature);
CommonAppConfig appConfig = CommonAppConfig.getInstance(); CommonAppConfig appConfig = CommonAppConfig.getInstance();

10
main/src/main/res/layout/activity_entry.xml
View File

@ -235,7 +235,7 @@
android:id="@+id/tv_customer" android:id="@+id/tv_customer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="無法登陸？點此聯繫客服" android:text="@string/customer_service2"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="11sp" /> android:textSize="11sp" />
</LinearLayout> </LinearLayout>
@ -252,7 +252,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="進入下一步即代表同意" android:text="@string/next_step_is_consent"
android:textColor="#ffb1b1b1" android:textColor="#ffb1b1b1"
android:textSize="10sp" /> android:textSize="10sp" />
@ -262,7 +262,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:text="用户協議" android:text="@string/user_protocol2"
android:textColor="#ffb1b1b1" android:textColor="#ffb1b1b1"
android:textSize="10sp" /> android:textSize="10sp" />
@ -270,7 +270,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:text="和" android:text="@string/and"
android:textColor="#ffb1b1b1" android:textColor="#ffb1b1b1"
android:textSize="10sp" /> android:textSize="10sp" />
@ -279,7 +279,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="1dp" android:layout_marginLeft="1dp"
android:text="隱私條款" android:text="privacy_terms"
android:textColor="#ffb1b1b1" android:textColor="#ffb1b1b1"
android:textSize="10sp" /> android:textSize="10sp" />

6
main/src/main/res/layout/activity_find_pwd.xml
View File

@ -37,7 +37,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="忘記密碼" android:text="@string/find_pwd_forget"
android:textColor="#ffff8d41" android:textColor="#ffff8d41"
android:textSize="24sp" android:textSize="24sp"
android:layout_marginLeft="41dp" android:layout_marginLeft="41dp"
@ -194,7 +194,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:background="@null" android:background="@null"
android:hint="請填寫新密碼" android:hint="@string/modify_pwd_new_1"
android:inputType="textPassword" android:inputType="textPassword"
android:textColor="@color/textColor" android:textColor="@color/textColor"
android:textColorHint="@color/gray3" android:textColorHint="@color/gray3"
@ -243,7 +243,7 @@
android:background="@drawable/border_fdbe40" android:background="@drawable/border_fdbe40"
android:gravity="center" android:gravity="center"
android:onClick="registerClick" android:onClick="registerClick"
android:text="立即找回" android:text="@string/find_pwd_find"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
/> />

81
main/src/main/res/layout/activity_login.xml
View File

@ -1,19 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/root" android:id="@+id/root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="@color/white"
android:background="@color/white"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="65dp" android:layout_height="65dp"
android:background="@color/white"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginTop="23dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:layout_marginTop="23dp"> android:background="@color/white">
<ImageView <ImageView
android:id="@+id/btn_back" android:id="@+id/btn_back"
@ -23,40 +22,39 @@
android:onClick="backClick" android:onClick="backClick"
android:padding="9dp" android:padding="9dp"
android:src="@mipmap/icon_back" android:src="@mipmap/icon_back"
android:tint="@color/textColor" android:tint="@color/textColor" />
/>
<TextView android:id="@+id/btn_forget_pwd" <TextView
android:id="@+id/btn_forget_pwd"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="忘記密碼"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:textColor="#ffc4c6ca" android:layout_centerVertical="true"
android:onClick="loginClick" android:onClick="loginClick"
android:textSize="14sp" android:text="@string/find_pwd_forget"
/> android:textColor="#ffc4c6ca"
</RelativeLayout> android:textSize="14sp" />
</RelativeLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="45dp"
android:layout_marginTop="49dp"
android:text="Hello，" android:text="Hello，"
android:textColor="#ffff8d41" android:textColor="#ffff8d41"
android:textSize="33sp" android:textSize="33sp"
android:textStyle="bold" android:textStyle="bold" />
android:layout_marginLeft="45dp"
android:layout_marginTop="49dp"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="歡迎來到PD LIVE。" android:layout_marginLeft="45dp"
android:textColor="#ffb1b1b1"
android:textSize="20sp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="39dp" android:layout_marginBottom="39dp"
android:layout_marginLeft="45dp"/> android:text="@string/come_to"
android:textColor="#ffb1b1b1"
android:textSize="20sp" />
<LinearLayout <LinearLayout
android:id="@+id/view" android:id="@+id/view"
@ -66,32 +64,31 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="47dp" android:layout_height="47dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginBottom="15dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:background="@drawable/border_grey_50"> android:layout_marginBottom="15dp"
android:background="@drawable/border_grey_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="27dp" android:layout_marginLeft="27dp"
android:layout_marginRight="36dp" android:layout_marginRight="36dp"
android:src="@mipmap/icon_phone"/> android:src="@mipmap/icon_phone" />
<EditText <EditText
android:id="@+id/edit_phone" android:id="@+id/edit_phone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null"
android:gravity="left|center" android:gravity="left|center"
android:hint="@string/login_input_phone" android:hint="@string/login_input_phone"
android:background="@null"
android:maxLength="20" android:maxLength="20"
android:singleLine="true" android:singleLine="true"
android:textColor="#161616" android:textColor="#161616"
@ -103,29 +100,29 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="47dp" android:layout_height="47dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_marginBottom="15dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp" android:layout_marginRight="30dp"
android:background="@drawable/border_grey_50"> android:layout_marginBottom="15dp"
android:background="@drawable/border_grey_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="27dp" android:layout_marginLeft="27dp"
android:layout_marginRight="36dp" android:layout_marginRight="36dp"
android:src="@mipmap/icon_password"/> android:src="@mipmap/icon_password" />
<EditText <EditText
android:id="@+id/edit_pwd" android:id="@+id/edit_pwd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@null"
android:gravity="left|center" android:gravity="left|center"
android:hint="@string/login_input_pwd" android:hint="@string/login_input_pwd"
android:inputType="textPassword" android:inputType="textPassword"
android:background="@null"
android:maxLength="20" android:maxLength="20"
android:singleLine="true" android:singleLine="true"
android:textColor="#161616" android:textColor="#161616"
@ -139,8 +136,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_fdbe40" android:background="@drawable/border_fdbe40"
android:gravity="center" android:gravity="center"
android:onClick="loginClick" android:onClick="loginClick"
@ -154,8 +151,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginLeft="30dp" android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginRight="30dp"
android:background="@drawable/border_fff_lin" android:background="@drawable/border_fff_lin"
android:gravity="center" android:gravity="center"
android:onClick="loginClick" android:onClick="loginClick"
@ -167,8 +164,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone" android:layout_marginTop="10dp"
android:layout_marginTop="10dp"> android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -249,12 +246,12 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="8sp"
android:layout_marginRight="40dp"
android:layout_marginLeft="50dp" android:layout_marginLeft="50dp"
android:layout_marginRight="40dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="為了提供分享服務，我們的產品集成Mob+ SDK，SDK需要收集您的設備識別碼和您需要分享的社交賬號。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政策" android:text="為了提供分享服務，我們的產品集成Mob+ SDK，SDK需要收集您的設備識別碼和您需要分享的社交賬號。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政策"
android:textColor="@color/red"/> android:textColor="@color/red"
android:textSize="8sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

4
main/src/main/res/layout/activity_register.xml
View File

@ -40,7 +40,7 @@
android:layout_marginLeft="41dp" android:layout_marginLeft="41dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:layout_marginBottom="25dp" android:layout_marginBottom="25dp"
android:text="註冊PD LIVE" android:text="@string/sign_up_for"
android:textColor="#ffff8d41" android:textColor="#ffff8d41"
android:textSize="24sp" /> android:textSize="24sp" />
@ -246,7 +246,7 @@
android:gravity="center" android:gravity="center"
android:clickable="true" android:clickable="true"
android:onClick="registerClick" android:onClick="registerClick"
android:text="註冊並登錄" android:text="@string/register_and_log_in"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="16sp" android:textSize="16sp"
android:focusable="true" /> android:focusable="true" />

77
main/src/main/res/layout/dialog_login_tips.xml
View File

@ -1,70 +1,75 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/login_ties_bg"> android:background="@mipmap/login_ties_bg"
android:orientation="vertical">
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp" android:layout_marginRight="24dp"
android:gravity="center"
android:layout_marginBottom="100dp" android:layout_marginBottom="100dp"
android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="條款和政策"
android:textColor="#ff161616"
android:textSize="16sp"
android:textStyle="bold"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:layout_marginBottom="22dp" android:layout_marginBottom="22dp"
android:gravity="center"/> android:gravity="center"
android:text="@string/terms_and_policies"
android:textColor="#ff161616"
android:textSize="16sp"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:text="@string/treat_and_protect"
android:text="歡迎來到PD LIVE，對於您的個人信息及隱私，我們將採用最高標準對待和保護。"
android:textColor="#ff161616" android:textColor="#ff161616"
android:textSize="14sp"/> android:textSize="14sp"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:layout_marginBottom="22dp"
android:text="詳情請您閱讀以下安裝應用程序的消息：" android:gravity="left"
android:text="@string/install_the_application"
android:textColor="#ff161616" android:textColor="#ff161616"
android:textSize="14sp" android:textSize="14sp"
android:gravity="left" android:textStyle="bold" />
android:layout_marginBottom="22dp"/>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="140dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:text="為了向您提供一鍵分享服務，我們的產品集成Mob+U-Share SDK，Mob+SDK需要收集您的設備Mac地址、唯一設備識別碼(1MEI/android ID/IDFA/OPENUDID/GUID、 SIM卡IMSI信息)以及您需要分享的社交賬號公開信息，以便完成一鍵分享服務。並通過地理位置校準報表數據準確性，提供基礎反作弊服務。為了您的信息安全，我們已與第三方SDK服務商進行數據安全保密約定，這些公司會嚴格遵守我們的數據隱私和安全要求。 除非得到您的同意，我們不會與其共享您的個人身份信息。為便於您更好地了解[Mob+]采集的數據類型及用途，以及何保護您的個人信息，您可以登陸https://www.mob.com/about/policy了解[Mob+]隱私權政）。"
android:textColor="#ffb1b1b1"
android:layout_marginBottom="22dp" android:layout_marginBottom="22dp"
android:textSize="11sp"/> android:text="@string/anti_cheating_services"
android:textColor="#ffb1b1b1"
android:textSize="11sp" />
</androidx.core.widget.NestedScrollView>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="本應用會收集位置數據以支持登錄和註冊的功能使用。"
android:textColor="#ffb1b1b1"
android:drawablePadding="5dp"
android:textSize="11sp"
android:drawableLeft="@mipmap/icon_position"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
/> android:drawableLeft="@mipmap/icon_position"
android:drawablePadding="5dp"
android:text="@string/support_login"
android:textColor="#ffb1b1b1"
android:textSize="11sp" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
@ -73,28 +78,28 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginRight="24dp"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:layout_marginRight="24dp"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<Button android:id="@+id/btn_agree" <Button
android:id="@+id/btn_agree"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="47dp" android:layout_height="47dp"
android:text="同意" android:background="@drawable/border_89b6ff"
android:textSize="18sp" android:text="@string/agreement"
android:textStyle="bold"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:background="@drawable/border_89b6ff"/> android:textSize="18sp"
android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="點擊同意後即代表您已閱讀並同意以上所有內容。"
android:textColor="#ffb1b1b1"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginBottom="22dp" android:layout_marginBottom="22dp"
android:textSize="12sp" android:text="@string/read_and_agre"
/> android:textColor="#ffb1b1b1"
android:textSize="12sp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

56
main/src/main/res/layout/signin_dialog.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/successfully"> android:background="@mipmap/successfully">
@ -8,71 +8,79 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerInParent="true"
android:layout_centerVertical="true" android:gravity="center"
android:orientation="vertical" android:orientation="vertical">
android:gravity="center">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="恭喜你獲得了"
android:textColor="#ffc4c6ca"
android:textSize="15sp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
/> android:text="@string/getting_it"
android:textColor="#ffc4c6ca"
android:textSize="15sp" />
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/btn_live" android:id="@+id/btn_live"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
android:adjustViewBounds="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:src="@mipmap/jindou"/> android:adjustViewBounds="true"
android:src="@mipmap/jindou" />
<TextView android:id="@+id/gold" <TextView
android:id="@+id/gold"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="200 金豆 + 2000 EXP" android:text="200 金豆 + 2000 EXP"
android:textColor="#ffffbe41" android:textColor="#ffffbe41"
android:textSize="20sp" /> android:textSize="20sp" />
<TextView android:id="@+id/sign_day" <TextView
android:id="@+id/sign_day"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="本月您已累積簽到6天，" android:text="@string/this_month"
android:textColor="#ffc4c6ca" android:textColor="#ffc4c6ca"
android:textSize="12sp"/> android:textSize="12sp" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:text="再簽到1天即可獲得額外獎勵。" android:text="@string/more_day_to"
android:textColor="#ffc4c6ca" android:textColor="#ffc4c6ca"
android:textSize="12sp"/> android:textSize="12sp" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_marginTop="10dp"
android:layout_marginTop="10dp"> android:orientation="horizontal">
<Button android:id="@+id/goto_sign" <Button
android:id="@+id/goto_sign"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="38dp" android:layout_height="38dp"
android:layout_marginRight="10dp" android:layout_marginRight="10dp"
android:background="@mipmap/btn_goto"/> android:background="@mipmap/btn_goto"
android:text="@string/go_to_the_sign"
android:textColor="#C9CACE"
android:textSize="9sp" />
<Button android:id="@+id/confirm" <Button
android:id="@+id/confirm"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="38dp" android:layout_height="38dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"
android:background="@mipmap/btn_signin"/> android:textColor="#fff"
android:textSize="9sp"
android:text="@string/confirm_pick_up"
android:background="@mipmap/btn_signin" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

BIN
main/src/main/res/mipmap-mdpi/btn_goto.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
main/src/main/res/mipmap-mdpi/btn_signin.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB