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

update 中英文

Browse Source
This commit is contained in:
zlzw 2023-09-15 16:15:51 +08:00
parent d1edf6bdd8
commit a475e5dc2f
9 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
common/src/main/res/values-en-rUS/string.xml
View File

@ -56,14 +56,14 @@
<string name="coin_qq_not_install">No QQ installed</string>
<string name="copy_link">Replication link</string>
<string name="copy_success">Replication success</string>
<string name="edit_profile">Editing materials</string>
<string name="edit_profile_avatar">Head portrait</string>
<string name="edit_profile_nickname">Nickname</string>
<string name="edit_profile">Edit</string>
<string name="edit_profile_avatar">Photo</string>
<string name="edit_profile_nickname">Name</string>
<string name="edit_profile_update_nickname">ModifyName</string>
<string name="edit_profile_update_remarks">Modify remarks</string>
<string name="edit_profile_remarks">Please enter comments~</string>
<string name="edit_profile_update_sign">Signature</string>
<string name="edit_profile_sign">autograph</string>
<string name="edit_profile_sign">Bio</string>
<string name="bind_phone">Binding phone</string>
<string name="task1">TASK1</string>
<string name="task2">TASK2</string>
@ -242,8 +242,8 @@
<string name="login_tip_2">Service and privacy terms</string>
<string name="login_other_type">Other login methods</string>
<string name="login_tip_3">More exciting experience after registering!</string>
<string name="login_input_phone">Please enter your mobile number</string>
<string name="login_input_pwd">Please input a password</string>
<string name="login_input_phone">Phone Number</string>
<string name="login_input_pwd">Password</string>
<string name="login_immediately_login">Login immediately</string>
<string name="login_ing">Logon</string>
<string name="login_immediately_register">Immediate registration</string>
@ -256,7 +256,7 @@
<string name="live">Live broadcast</string>
<string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string>
<string name="recomment">Recomm</string>
<string name="recomment">Recommend</string>
<string name="cust_server">CSD</string>
<string name="live_anchor">anchor</string>
<string name="live_start">Live broadcast</string>
@ -289,7 +289,7 @@
<string name="live_zg">Trickster</string>
<string name="live_dr">MultiplayerPK</string>
<string name="live_mic">Voice Link</string>
<string name="live_wks">Start</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">LeaveTemporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_flash">Flash lamp</string>
@ -491,11 +491,11 @@
<string name="reg_register">register</string>
<string name="reg_input_phone">Please enter your mobile number</string>
<string name="reg_input_code">Please enter the verification code</string>
<string name="reg_input_pwd_1">Please fill in the password</string>
<string name="reg_input_pwd_2">Please confirm the password</string>
<string name="reg_input_pwd_3">Fill in the invitation code (optional)</string>
<string name="reg_input_pwd_1">Password</string>
<string name="reg_input_pwd_2">Password Again</string>
<string name="reg_input_pwd_3">Invite Code(Optional)</string>
<string name="reg_register_and_login">Register and log in</string>
<string name="reg_get_code">Get verification code</string>
<string name="reg_get_code">Get Code</string>
<string name="reg_get_code_again">Regain</string>
<string name="reg_pwd_error">Passwords are inconsistent</string>
<string name="reg_register_ing">In registration</string>
@ -659,7 +659,7 @@
<string name="save">Preservation</string>
<string name="reg">Register</string>
<string name="no_more_mic">No one is currently in the voice link</string>
<string name="welcome_pdlive">Welcome to PDLIVE</string>
<string name="welcome_pdlive">Welcome to PDLive</string>
<string name="newcomer">Newcomer Bonus</string>
<string name="exp">EXP</string>
<string name="new_rewards">Complete newcomer tasks for more rewards</string>
@ -888,7 +888,7 @@ Limited ride And limited avatar frame</string>
<string name="online_service">Online Service</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="sign_up_for">Sign in PDlive</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="emperor_hint">Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！</string>
@ -1018,7 +1018,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_fhd">There is no choice, the anchor is not turned on FHD live.</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">phone</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
@ -1047,10 +1047,10 @@ Limited ride And limited avatar frame</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="next_step_is_consent">By continuing, you are agree to our Terms of </string>
<string name="user_protocol2"> use</string>
<string name="and">&amp;</string>
<string name="privacy_terms">Privacy Policy</string>
<string name="terms_and_policies">Terms and policies</string>
<string name="install_the_application">For details, please read the following message to install the application:</string>
<string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
@ -1126,7 +1126,7 @@ Limited ride And limited avatar frame</string>
<string name="unfollow_cancel">unfollow</string>
<string name="unfollow"> Where is the host doing badly~\nBrother, are you sure you want to unfollow?</string>
<string name="unfollow_confrim">follow</string>
<string name="heat_add">Heat Add</string>
<string name="heat_add">Heating</string>
<string name="live_room_chat_fount_size_low">LOW</string>
<string name="live_room_chat_fount_size_def">DEFAULT</string>
<string name="live_room_chat_fount_size_high">HIGH</string>
@ -1150,7 +1150,7 @@ Limited ride And limited avatar frame</string>
<string name="delete_account1">Do you want to delete the account</string>
<string name="delete_account2">After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue?</string>
<string name="delete_account3">Confirm deletion</string>
<string name="complete_information">Fill And gift</string>
<string name="complete_information">Fill for Gift</string>
<string name="complete_information_consumable">Fill in the \'*\' option to complete</string>
<string name="love_powder">True love powder\nPhoto Frame(7 days)</string>
<string name="golden_beans_128">128 Golden Beans</string>
@ -1211,7 +1211,7 @@ Limited ride And limited avatar frame</string>
<string name="red_packet_info_residue_none">None</string>
<string name="red_packet_info_residue_back">Return to account</string>
<string name="red_packet_user_tips2">Popularity Red packet</string>
<string name="main_tabs_red_packet">Red packets</string>
<string name="main_tabs_red_packet">Earn Cash</string>
<string name="save_popular_red_packets">Popular red packets</string>
<string name="amount">amount</string>
<string name="drill">Diamonds</string>
@ -1318,5 +1318,6 @@ Limited ride And limited avatar frame</string>
<string name="trial_coupon">Whether to use trial coupons</string>
<string name="use_diamonds">Use diamonds</string>
<string name="live_send_red_packge_fans_group">Join a fans club</string>
<string name="live_pk_link_error">Sorry, your network failed to pull the other party.</string>
</resources>

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@ -1314,4 +1314,6 @@
<string name="trial_coupon">是否使用試用劵</string>
<string name="use_diamonds">使用鑽石</string>
<string name="live_send_red_packge_fans_group">加入粉絲團</string>
<string name="live_pk_link_error">抱歉，您的網絡不佳拉取對方畫面失敗</string>
</resources>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@ -1313,4 +1313,6 @@
<string name="live_mic_anchor_to_user_dialog">主播：</string>
<string name="trial_coupon">是否使用試用劵</string>
<string name="use_diamonds">使用鑽石</string>
<string name="live_pk_link_error">抱歉，您的網絡不佳拉取對方畫面失敗</string>
</resources>

1
common/src/main/res/values-zh/strings.xml
View File

@ -1314,5 +1314,6 @@
<string name="live_mic_anchor_to_user_dialog">主播：</string>
<string name="live_send_red_packge_fans_group">加入粉絲團</string>
<string name="live_pk_link_error">抱歉，您的網絡不佳拉取對方畫面失敗</string>
</resources>

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

@ -56,14 +56,14 @@
<string name="coin_qq_not_install">No QQ installed</string>
<string name="copy_link">Replication link</string>
<string name="copy_success">Replication success</string>
<string name="edit_profile">Editing materials</string>
<string name="edit_profile_avatar">Head portrait</string>
<string name="edit_profile_nickname">Nickname</string>
<string name="edit_profile">Edit</string>
<string name="edit_profile_avatar">Photo</string>
<string name="edit_profile_nickname">Name</string>
<string name="edit_profile_update_nickname">ModifyName</string>
<string name="edit_profile_update_remarks">Modify remarks</string>
<string name="edit_profile_remarks">Please enter comments~</string>
<string name="edit_profile_update_sign">Signature</string>
<string name="edit_profile_sign">autograph</string>
<string name="edit_profile_sign">Bio</string>
<string name="bind_phone">Binding phone</string>
<string name="task1">TASK1</string>
<string name="task2">TASK2</string>
@ -242,8 +242,8 @@
<string name="login_tip_2">Service and privacy terms</string>
<string name="login_other_type">Other login methods</string>
<string name="login_tip_3">More exciting experience after registering!</string>
<string name="login_input_phone">Please enter your mobile number</string>
<string name="login_input_pwd">Please input a password</string>
<string name="login_input_phone">Phone Number</string>
<string name="login_input_pwd">Password</string>
<string name="login_immediately_login">Login immediately</string>
<string name="login_ing">Logon</string>
<string name="login_immediately_register">Immediate registration</string>
@ -256,7 +256,7 @@
<string name="live">Live broadcast</string>
<string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string>
<string name="recomment">Recomm</string>
<string name="recomment">Recommend</string>
<string name="cust_server">CSD</string>
<string name="live_anchor">anchor</string>
<string name="live_start">Live broadcast</string>
@ -289,7 +289,7 @@
<string name="live_zg">Trickster</string>
<string name="live_dr">MultiplayerPK</string>
<string name="live_mic">Voice Link</string>
<string name="live_wks">Start</string>
<string name="live_wks">billboard</string>
<string name="live_zslk">LeaveTemporarily</string>
<string name="live_zslk1">ResumeLive</string>
<string name="live_flash">Flash lamp</string>
@ -491,11 +491,11 @@
<string name="reg_register">register</string>
<string name="reg_input_phone">Please enter your mobile number</string>
<string name="reg_input_code">Please enter the verification code</string>
<string name="reg_input_pwd_1">Please fill in the password</string>
<string name="reg_input_pwd_2">Please confirm the password</string>
<string name="reg_input_pwd_3">Fill in the invitation code (optional)</string>
<string name="reg_input_pwd_1">Password</string>
<string name="reg_input_pwd_2">Password Again</string>
<string name="reg_input_pwd_3">Invite Code(Optional)</string>
<string name="reg_register_and_login">Register and log in</string>
<string name="reg_get_code">Get verification code</string>
<string name="reg_get_code">Get Code</string>
<string name="reg_get_code_again">Regain</string>
<string name="reg_pwd_error">Passwords are inconsistent</string>
<string name="reg_register_ing">In registration</string>
@ -659,7 +659,7 @@
<string name="save">Preservation</string>
<string name="reg">Register</string>
<string name="no_more_mic">No one is currently in the voice link</string>
<string name="welcome_pdlive">Welcome to PDLIVE</string>
<string name="welcome_pdlive">Welcome to PDLive</string>
<string name="newcomer">Newcomer Bonus</string>
<string name="exp">EXP</string>
<string name="new_rewards">Complete newcomer tasks for more rewards</string>
@ -888,7 +888,7 @@ Limited ride And limited avatar frame</string>
<string name="online_service">Online Service</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="sign_up_for">Sign in PDlive</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="emperor_hint">Tell the world! %s recommends the anchor %s to everyone, and the splendid glance is amazing！</string>
@ -1018,7 +1018,7 @@ Limited ride And limited avatar frame</string>
<string name="live_user_ban_fhd">There is no choice, the anchor is not turned on FHD live.</string>
<string name="live_user_ban_hd">There is no choice, the anchor is not turned on HD live.</string>
<string name="function_is_suspended">Sorry, this feature is on hold.</string>
<string name="phone_number">phone</string>
<string name="phone_number">Phone Number</string>
<string name="broadcast_data">Broadcast</string>
<string name="click_to_view">Click To View</string>
<string name="anchor_task">Anchor Task</string>
@ -1047,10 +1047,10 @@ Limited ride And limited avatar frame</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="next_step_is_consent">By continuing, you are agree to our Terms of </string>
<string name="user_protocol2"> use</string>
<string name="and">&amp;</string>
<string name="privacy_terms">Privacy Policy</string>
<string name="terms_and_policies">Terms and policies</string>
<string name="install_the_application">For details, please read the following message to install the application:</string>
<string name="treat_and_protect">Welcome to PD LIVE. For your personal information and privacy, we will adopt the highest standards of treatment and protection.</string>
@ -1126,7 +1126,7 @@ Limited ride And limited avatar frame</string>
<string name="unfollow_cancel">unfollow</string>
<string name="unfollow"> Where is the host doing badly~\nBrother, are you sure you want to unfollow?</string>
<string name="unfollow_confrim">follow</string>
<string name="heat_add">Heat Add</string>
<string name="heat_add">Heating</string>
<string name="live_room_chat_fount_size_low">LOW</string>
<string name="live_room_chat_fount_size_def">DEFAULT</string>
<string name="live_room_chat_fount_size_high">HIGH</string>
@ -1168,7 +1168,7 @@ Limited ride And limited avatar frame</string>
<string name="live_vote_hide_text">VOTE</string>
<string name="live_room_vote_over_tip">%s <br /> box disappears after %s seconds</string>
<string name="live_anchor_vote_tip">Please complete the form.</string>
<string name="complete_information">Fill And gift</string>
<string name="complete_information">Fill for Gift</string>
<string name="complete_information_consumable">Fill in the \'*\' option to complete</string>
<string name="love_powder">True love powder\nPhoto Frame(7 days)</string>
<string name="golden_beans_128">128 Golden Beans</string>
@ -1212,7 +1212,7 @@ Limited ride And limited avatar frame</string>
<string name="red_packet_info_residue_none">None</string>
<string name="red_packet_info_residue_back">Return to account</string>
<string name="red_packet_user_tips2">Popularity Red packet</string>
<string name="main_tabs_red_packet">Red packets</string>
<string name="main_tabs_red_packet">Earn Cash</string>
<string name="save_popular_red_packets">Popular red packets</string>
<string name="amount">amount</string>
<string name="drill">Diamonds</string>
@ -1320,4 +1320,5 @@ Limited ride And limited avatar frame</string>
<string name="live_mic_anchor_to_user_dialog">Anchor:</string>
<string name="live_send_red_packge_fans_group">Join a fans club</string>
<string name="live_pk_link_error">Sorry, your network failed to pull the other party.</string>
</resources>

6
live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
View File

@ -642,6 +642,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}
@ -768,6 +769,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}
@ -924,6 +926,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.i("ry", "订阅资源失败： " + rtcErrorCode);
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}
@ -1000,6 +1003,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.e("ry", "订阅资源失败： " + rtcErrorCode);
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}
@ -1773,6 +1777,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
//2. 合流画布设置
@ -1963,6 +1968,7 @@ public class LiveRyLinkMicPkPresenter implements View.OnClickListener {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.i("ry", "订阅资源失败： " + rtcErrorCode.getReason());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});

4
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@ -1007,7 +1007,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
@Override
public void onFailed(RTCErrorCode errorCode) {
Log.e("ry", userinputStreamList.size() + LiveActivity.mLiveUid + "订阅失败" + errorCode.toString());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
@Override
@ -1045,6 +1045,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.e("ry", "远端失败" + list.size());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}
@ -1197,6 +1198,7 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.e("ry", "订阅资源失败： " + rtcErrorCode.getReason());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}

1
live/src/main/java/com/yunbao/live/views/LivePushRyViewHolder.java
View File

@ -176,6 +176,7 @@ public class LivePushRyViewHolder extends AbsRyLivePushViewHolder implements ITX
@Override
public void onFailed(RTCErrorCode rtcErrorCode) {
Log.e("ry", "远端失败" + list.size());
ToastUtil.show(mContext.getString(R.string.live_pk_link_error));
}
});
}

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

@ -45,7 +45,7 @@
<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="noble_seat" >VIP seats</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>