From 06f0e59c70d29a471b33343eef3309c419744100 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Tue, 24 Oct 2023 17:20:38 +0800 Subject: [PATCH] update --- .../onetoone/activity/HomeScreenActivity.java | 2 +- .../onetoone/activity/HomeSearchActivity.java | 2 +- .../shayu/onetoone/activity/MainActivity.java | 20 +- .../onetoone/activity/MatchingActivity.java | 22 +- .../activity/fragments/MyFragment.java | 2 +- .../message/ChatMessageFragment.java | 53 ++--- .../fragments/message/MsgFriendFragment.java | 5 +- .../fragments/message/MsgMessageFragment.java | 4 +- .../activity/login/CompleteActivity.java | 37 ++- .../activity/message/CallAudioActivity.java | 18 +- .../activity/message/CallVideoActivity.java | 12 +- .../activity/message/ChatActivity.java | 5 +- .../message/MsgMoreGreetConfigActivity.java | 3 +- .../onetoone/activity/user/AuthActivity.java | 13 +- .../activity/user/AuthBloggerActivity.java | 9 +- .../user/AuthBloggerInletActivity.java | 21 +- .../activity/user/EditProfileActivity.java | 15 +- .../adapter/HomeRecommendListAdapter.java | 8 +- .../MsgMessageRecyclerViewAdapter.java | 6 +- .../onetoone/manager/CallClientManager.java | 11 +- .../provider/MessageChatAutoItemProvider.java | 9 +- .../MessageChatReceiveGiftItemProvider.java | 5 +- .../onetoone/view/MsgInputPanelForAudio.java | 5 +- .../onetoone/view/MsgInputPanelForGift.java | 4 +- .../src/main/res/layout/activity_auth.xml | 12 +- .../main/res/layout/activity_auth_blogger.xml | 30 +-- .../layout/activity_auth_blogger_inlet.xml | 10 +- .../main/res/layout/activity_call_audio.xml | 1 - .../main/res/layout/activity_choose_label.xml | 8 +- .../src/main/res/layout/activity_complete.xml | 14 +- .../main/res/layout/activity_edit_name.xml | 2 +- .../main/res/layout/activity_edit_profile.xml | 18 +- .../src/main/res/layout/activity_find_pwd.xml | 2 +- .../src/main/res/layout/activity_login.xml | 2 +- .../main/res/layout/activity_main_list.xml | 4 +- .../src/main/res/layout/activity_matching.xml | 8 +- .../main/res/layout/activity_msg_message.xml | 2 +- .../src/main/res/layout/activity_register.xml | 2 +- .../src/main/res/layout/activity_screen.xml | 24 +- .../src/main/res/layout/activity_search.xml | 2 +- .../src/main/res/layout/activity_setting.xml | 26 +-- .../main/res/layout/adapter_choose_label.xml | 2 +- .../src/main/res/layout/adapter_item_tag.xml | 2 +- .../main/res/layout/dialog_bottom_list.xml | 2 +- .../src/main/res/layout/dialog_end_call.xml | 12 +- .../src/main/res/layout/dialog_msg_more.xml | 4 +- OneToOne/src/main/res/layout/dialog_tips1.xml | 4 +- .../src/main/res/layout/fragment_friends.xml | 4 +- .../main/res/layout/fragment_home_ranking.xml | 6 +- OneToOne/src/main/res/layout/fragment_msg.xml | 4 +- OneToOne/src/main/res/layout/fragment_my.xml | 4 +- .../src/main/res/layout/item_home_rank.xml | 8 +- .../main/res/layout/item_home_recommend.xml | 6 +- .../src/main/res/layout/item_main_me_2.xml | 3 +- .../main/res/layout/item_msg_greet_config.xml | 2 +- OneToOne/src/main/res/layout/item_sys_msg.xml | 5 +- .../res/layout/rc_extension_input_panel.xml | 2 +- .../view_conversation_system_fragment.xml | 2 +- .../src/main/res/layout/view_empty_list.xml | 2 +- .../view_exchange_record_item_holder.xml | 7 +- .../res/layout/view_message_chat_auth.xml | 4 +- .../layout/view_message_chat_receive_gift.xml | 2 +- .../main/res/layout/view_message_chat_tip.xml | 2 +- .../res/layout/view_message_input_gift.xml | 4 +- .../main/res/layout/view_message_msg_bar.xml | 12 +- .../res/layout/view_msg_greet_config_add.xml | 2 +- .../src/main/res/layout/view_title_custom.xml | 2 +- .../src/main/res/values-zh-rHK/strings.xml | 213 +++++++++++++++++ .../src/main/res/values-zh-rTW/strings.xml | 213 +++++++++++++++++ OneToOne/src/main/res/values/strings.xml | 214 ++++++++++++++++++ .../com/yunbao/common/utils/ToastUtil.java | 2 +- 71 files changed, 944 insertions(+), 265 deletions(-) diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java index 6b0cd6982..9d36f8255 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java @@ -70,7 +70,7 @@ public class HomeScreenActivity extends AbsOTOActivity { tvSearch.setOnClickListener(v -> { String search = etSearch.getText().toString(); if(StringUtil.isEmpty(search)){ - ToastUtil.show("空的不能搜索"); + ToastUtil.show(R.string.search_empty); return; } Bundle bundle=new Bundle(); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeSearchActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeSearchActivity.java index 2560a5c53..cf2059dc1 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeSearchActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/HomeSearchActivity.java @@ -83,7 +83,7 @@ public class HomeSearchActivity extends AbsOTOActivity { private void search(String key) { if (StringUtil.isEmpty(key)) { - ToastUtil.show("不能为空"); + ToastUtil.show(R.string.search_empty); return; } OTONetManager.getInstance(mContext) diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java index b0e4f8275..bdc3bae80 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java @@ -10,6 +10,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import androidx.viewpager2.widget.ViewPager2; import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.fastjson.JSONObject; import com.angcyo.tablayout.DslTabLayout; import com.angcyo.tablayout.DslTabLayoutConfig; import com.angcyo.tablayout.delegate2.ViewPager2Delegate; @@ -22,14 +23,17 @@ import com.shayu.onetoone.activity.fragments.MyFragment; import com.shayu.onetoone.bean.JoinAnchorBean; import com.shayu.onetoone.bean.MatchingItemSizeBean; import com.shayu.onetoone.bean.OfficialNoticeBean; +import com.shayu.onetoone.bean.SendConsumeBean; import com.shayu.onetoone.dialog.FirstTipsDialog; import com.shayu.onetoone.dialog.TipsDialog; import com.shayu.onetoone.event.HomeBusEvent; import com.shayu.onetoone.event.MessageMsgBusEvent; import com.shayu.onetoone.listener.OnDialogClickListener; +import com.shayu.onetoone.listener.OnSendMessageListener; import com.shayu.onetoone.manager.CallClientManager; import com.shayu.onetoone.manager.OTONetManager; import com.shayu.onetoone.manager.RouteManager; +import com.shayu.onetoone.manager.SendMessageManager; import com.yunbao.common.CommonAppConfig; import com.yunbao.common.bean.IMLoginModel; import com.yunbao.common.http.base.HttpCallback; @@ -150,7 +154,21 @@ public class MainActivity extends AbsOTOActivity { @Override public void onItemClick(FirstTipsDialog dialog, int position) { if (position == 0) { - ToastUtil.show("灵魂速配"); + SendMessageManager.matching(new OnSendMessageListener() { + @Override + public void onSuccess(String token, SendConsumeBean bean) { + super.onSuccess(token, bean); + Bundle bundle = new Bundle(); + bundle.putString("data", JSONObject.toJSONString(bean)); + RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING, bundle); + } + + @Override + public void onError(int status, String msg, SendConsumeBean bean) { + super.onError(status, msg, bean); + RouteManager.forwardActivity(RouteManager.ACTIVITY_MATCHING); + } + }); } else { viewPager.setCurrentItem(2); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MatchingActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MatchingActivity.java index 26a21006b..4df201b02 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MatchingActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MatchingActivity.java @@ -26,6 +26,7 @@ import com.shayu.onetoone.utils.ConversationUtils; import com.yunbao.common.glide.ImgLoader; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import java.util.ArrayList; import java.util.List; @@ -81,9 +82,9 @@ public class MatchingActivity extends AbsOTOActivity { imageViewList.add(user5); back.setOnClickListener(v -> { new TipsDialog(mContext) - .setTitle("確定要退出靈魂速配嗎？") - .setApplyText("繼續匹配") - .setCancelText("徹底離開") + .setTitle(WordUtil.getNewString(R.string.matching_quit_title)) + .setApplyText(WordUtil.getNewString(R.string.matching_quit_cancel)) + .setCancelText(WordUtil.getNewString(R.string.matching_quit_apply)) .setOnDialogClickListener(new OnDialogClickListener() { @Override public void onCancel(Dialog dialog) { @@ -101,7 +102,6 @@ public class MatchingActivity extends AbsOTOActivity { if (data != null) { SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class); if (bean != null) { - ToastUtil.show("有结果直接进"); new Handler(Looper.getMainLooper()).postDelayed(() -> { ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle); MatchingActivity.this.finish(); @@ -133,7 +133,7 @@ public class MatchingActivity extends AbsOTOActivity { } private void call() { - handler.post(() -> ToastUtil.show("匹配")); + handler.post(() -> ToastUtil.showDebug("匹配")); SendMessageManager.matching(new OnSendMessageListener() { @Override public void onSuccess(String token, SendConsumeBean bean) { @@ -152,10 +152,10 @@ public class MatchingActivity extends AbsOTOActivity { public void onError(int status, String msg, SendConsumeBean bean) { super.onError(status, msg, bean); if (bean.getCode() == 503) { - handler.post(() -> ToastUtil.show("没人，继续")); + handler.post(() -> ToastUtil.showDebug("没人，继续")); }else if(status==OnSendMessageListener.STATUS_NOT_PRICE){ task.cancel(); - handler.post(() -> ToastUtil.show("价格不足")); + handler.post(() -> ToastUtil.showDebug("价格不足")); MatchingActivity.this.finish(); } } @@ -173,9 +173,9 @@ public class MatchingActivity extends AbsOTOActivity { } else { handler.post(() -> { new TipsDialog(mContext) - .setTitle("当前等待时间较长，建议您 先去观看动态哦，稍后再来哦~") - .setApplyText("去看动态") - .setCancelText("繼續匹配") + .setTitle(WordUtil.getNewString(R.string.matching_wait_title)) + .setApplyText(WordUtil.getNewString(R.string.matching_wait_apply)) + .setCancelText(WordUtil.getNewString(R.string.matching_wait_cancel)) .setOnDialogClickListener(new OnDialogClickListener() { @Override public void onCancel(Dialog dialog) { @@ -199,7 +199,7 @@ public class MatchingActivity extends AbsOTOActivity { @Override public boolean cancel() { - handler.post(() -> ToastUtil.show("取消")); + handler.post(() -> ToastUtil.showDebug("取消")); return super.cancel(); } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java index 797a489b8..6465ac26e 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java @@ -158,7 +158,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener { new BottomListDialog(mContext) - .setStrings(Arrays.asList("相册", "拍照")) + .setStrings(Arrays.asList(WordUtil.getNewString(R.string.album), WordUtil.getNewString(R.string.camera))) .setSelect(new OnItemClickListener() { @Override public void onItemClick(String bean, int position) { boolean isCamera = position == 1; - SendMessageManager.sendMessageForText(targetId, "图片信息", new OnSendMessageListener() { + SendMessageManager.sendMessageForText(targetId, WordUtil.getNewString(R.string.photo_info), new OnSendMessageListener() { @Override public void onSuccess(String token, SendConsumeBean bean) { super.onSuccess(token, bean); @@ -439,21 +437,6 @@ public class ChatMessageFragment extends AbsConversationFragment { public void onSuccess(String token, SendConsumeBean bean) { super.onSuccess(token, bean); mEditText.setText(""); - if (!SpUtil.getInstance().isExists("chat_msg_safe_tip_" + targetId)) { - SpUtil.getInstance().setBooleanValue("chat_msg_safe_tip_" + targetId, true); - MessageChatTipsContent content = MessageChatTipsContent.obtain(WordUtil.getNewString(R.string.message_chat_tip1)); - IMCenter.getInstance().insertOutgoingMessage(conversationType, targetId, Message.SentStatus.SENT, content, System.currentTimeMillis(), new RongIMClient.ResultCallback() { - @Override - public void onSuccess(Message message) { - } - - @Override - public void onError(RongIMClient.ErrorCode e) { - System.out.println("失败:" + e.getMessage()); - - } - }); - } } }); } @@ -601,13 +584,13 @@ public class ChatMessageFragment extends AbsConversationFragment { String[] list; if (isTextMessage) { if (isMy) { - list = new String[]{"複製", "刪除"}; + list = new String[]{WordUtil.getNewString(R.string.copy),WordUtil.getNewString(R.string.delete)}; } else { - list = new String[]{"複製"}; + list = new String[]{WordUtil.getNewString(R.string.copy)}; } } else { if (isMy) { - list = new String[]{"刪除"}; + list = new String[]{WordUtil.getNewString(R.string.delete)}; } else { list = null; } @@ -624,7 +607,7 @@ public class ChatMessageFragment extends AbsConversationFragment { .setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(String bean, int position) { - if (bean.equals("複製")) { + if (bean.equals(WordUtil.getNewString(R.string.copy))) { copyText(data); } else { delete(data); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java index f22b3ee21..d32c1b935 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java @@ -31,6 +31,7 @@ import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DpUtil; import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.WordUtil; import org.greenrobot.eventbus.Subscribe; @@ -136,8 +137,8 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte SwipeMenuItem del = new SwipeMenuItem(getContext()); top.setBackgroundColor(Color.parseColor("#D9D9D9")); del.setBackgroundColor(Color.parseColor("#FE5268")); - top.setText("置顶"); - del.setText("删除"); + top.setText(R.string.top); + del.setText(R.string.delete); top.setHeight(ViewGroup.LayoutParams.MATCH_PARENT); top.setWidth(DpUtil.dp2px(71)); del.setHeight(ViewGroup.LayoutParams.MATCH_PARENT); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java index f9f4071fe..0bde6aea0 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java @@ -501,8 +501,8 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt SwipeMenuItem del = new SwipeMenuItem(getContext()); top.setBackgroundColor(Color.parseColor("#D9D9D9")); del.setBackgroundColor(Color.parseColor("#FE5268")); - top.setText("置顶"); - del.setText("删除"); + top.setText(R.string.top); + del.setText(R.string.delete); top.setHeight(ViewGroup.LayoutParams.MATCH_PARENT); top.setWidth(DpUtil.dp2px(71)); del.setHeight(ViewGroup.LayoutParams.MATCH_PARENT); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java index ea01f7485..dcb099a7e 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java @@ -33,10 +33,12 @@ import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import java.io.File; import java.util.Calendar; import java.util.Date; +import java.util.Locale; /** @@ -81,7 +83,7 @@ public class CompleteActivity extends AbsOTOActivity { initView(); initCamera(); - dialog = DialogUitl.loadingDialog(mContext, "上传中"); + dialog = DialogUitl.loadingDialog(mContext, WordUtil.getNewString(R.string.upload_in_progress)); } private void initCamera() { @@ -105,13 +107,13 @@ public class CompleteActivity extends AbsOTOActivity { //txtChoose.setVisibility(View.GONE); avatarUrl = data.getAvatar(); dialog.hide(); - ToastUtil.show("上传成功"); + ToastUtil.show(R.string.upload_success); } @Override public void onError(String error) { dialog.hide(); - ToastUtil.show("上传失败"); + ToastUtil.show(R.string.upload_failed); } }); } @@ -148,7 +150,14 @@ public class CompleteActivity extends AbsOTOActivity { } }); - userBirthday.setText(year + " 年 " + (month + 1) + " 月 " + day + " 日 "); + userBirthday.setText(String.format(Locale.getDefault(), "%d %s %d %s %d %s", + year, + WordUtil.getNewString(R.string.year), + month + 1, + WordUtil.getNewString(R.string.month), + day, + WordUtil.getNewString(R.string.day) + )); userSex1.setOnClickListener(new View.OnClickListener() { @Override @@ -179,9 +188,21 @@ public class CompleteActivity extends AbsOTOActivity { month = calendar.get(Calendar.MONTH); day = calendar.get(Calendar.DAY_OF_MONTH); - userBirthday.setText(year + " 年 " + (month + 1) + " 月 " + day + " 日 "); + userBirthday.setText(String.format(Locale.getDefault(), "%d %s %d %s %d %s", + year, + WordUtil.getNewString(R.string.year), + month + 1, + WordUtil.getNewString(R.string.month), + day, + WordUtil.getNewString(R.string.day) + )); } - }).setCancelText("生日").setSubmitColor(getResources().getColor(R.color.blue01)).setSubmitText("完成").setContentTextSize(20).setDate(selectedDate).build(); + }).setCancelText(WordUtil.getNewString(R.string.birthday)) + .setSubmitColor(getResources().getColor(R.color.blue01)) + .setSubmitText(WordUtil.getNewString(R.string.complete)) + .setContentTextSize(20) + .setDate(selectedDate) + .build(); pvTime.show(); } }); @@ -189,11 +210,11 @@ public class CompleteActivity extends AbsOTOActivity { @Override public void onClick(View v) { if (StringUtils.isEmpty(userNickName.getText().toString())) { - Toast.makeText(mContext, "请填写昵称", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, WordUtil.getNewString(R.string.nickname_hint), Toast.LENGTH_SHORT).show(); return; } if (sex == -1) { - Toast.makeText(mContext, "请选择性别", Toast.LENGTH_SHORT).show(); + Toast.makeText(mContext, WordUtil.getNewString(R.string.gender_hint), Toast.LENGTH_SHORT).show(); return; } OTONetManager.getInstance(mContext).setInfo(avatarUrl, userNickName.getText().toString(), sex, year + "-" + month + "-" + day, new HttpCallback() { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java index 3ae8bff15..19a50af68 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java @@ -194,11 +194,11 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis } private void showWindow(boolean toChatView) { - if(!PermissionUtils.checkPermission(this)){ + if (!PermissionUtils.checkPermission(this)) { new TipsDialog(mContext) - .setTitle("请允许悬浮窗权限才能进行小窗") - .setApplyText("前往") - .setCancelText("取消") + .setTitle(WordUtil.getNewString(R.string.permission_hint)) + .setApplyText(WordUtil.getNewString(R.string.permission_setting)) + .setCancelText(WordUtil.getNewString(R.string.permission_cancel)) .setOnDialogClickListener(new OnDialogClickListener() { @Override public void onApply(Dialog dialog) { @@ -206,7 +206,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis PermissionUtils.requestPermission(CallAudioActivity.this, new OnPermissionResult() { @Override public void permissionResult(boolean b) { - if(b){ + if (b) { showWindow(toChatView); } } @@ -315,7 +315,7 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis @Override public void onTime(String time) { super.onTime(time); - callTime.setText("通话时长:" + time); + callTime.setText(WordUtil.getNewString(R.string.call_time)+""+ time); } @@ -328,17 +328,17 @@ public class CallAudioActivity extends AbsOTOActivity implements View.OnClickLis if (tipsView == null) { createShow(msg); } else { - tipsDialog.updateTips("通话将在" + msg + "秒后断\n开，请及时充值"); + tipsDialog.updateTips(String.format(WordUtil.getNewString(R.string.call_tips), msg)); } } void createShow(long msg) { - if (model.equals(CallClientManager.AUDIO_RECEIVED_CALL)) { + if (model.equals(CallClientManager.AUDIO_RECEIVED_CALL)||model.equals(CallClientManager.VIDEO_RECEIVED_CALL)) { return; } tipsDialog = new TipsTextDialog(mContext) - .setTips("通话将在" + msg + "秒后断\n开，请及时充值") + .setTips(String.format(WordUtil.getNewString(R.string.call_tips), msg)) .setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(String bean, int position) { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java index 75cb35575..a20730946 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java @@ -245,9 +245,9 @@ public class CallVideoActivity extends AbsOTOActivity { private void showWindow(boolean toChatView) { if(!PermissionUtils.checkPermission(this)){ new TipsDialog(mContext) - .setTitle("请允许悬浮窗权限才能进行小窗") - .setApplyText("前往") - .setCancelText("取消") + .setTitle(WordUtil.getNewString(R.string.permission_hint)) + .setApplyText(WordUtil.getNewString(R.string.permission_setting)) + .setCancelText(WordUtil.getNewString(R.string.permission_cancel)) .setOnDialogClickListener(new OnDialogClickListener() { @Override public void onApply(Dialog dialog) { @@ -445,7 +445,7 @@ public class CallVideoActivity extends AbsOTOActivity { public void onTime(String time) { super.onTime(time); if (callTime != null) { - callTime.setText("通话时长:" + time); + callTime.setText(WordUtil.getNewString(R.string.call_time)+""+ time); } } @@ -458,7 +458,7 @@ public class CallVideoActivity extends AbsOTOActivity { if (tipsView == null) { createShow(msg); } else { - tipsDialog.updateTips("通话将在" + msg + "秒后断\n开，请及时充值"); + tipsDialog.updateTips(String.format(WordUtil.getNewString(R.string.call_tips), msg)); } } @@ -468,7 +468,7 @@ public class CallVideoActivity extends AbsOTOActivity { return; } tipsDialog = new TipsTextDialog(mContext) - .setTips("通话将在" + msg + "秒后断\n开，请及时充值") + .setTips(String.format(WordUtil.getNewString(R.string.call_tips), msg)) .setOnItemClickListener(new OnItemClickListener() { @Override public void onItemClick(String bean, int position) { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java index 897488667..c44d8f2f2 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java @@ -34,6 +34,7 @@ import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.utils.RouteUtil; import com.yunbao.common.utils.SpUtil; import com.yunbao.common.utils.StringUtil; +import com.yunbao.common.utils.WordUtil; import org.greenrobot.eventbus.Subscribe; @@ -90,8 +91,8 @@ public class ChatActivity extends AbsOTOActivity { ImageView imageView = new ImageView(this); new TipsDialog(mContext) - .setTitle("首次匹配成功奖励") - .setContent("恭喜获得" + bean.getProp().getCnTitle() + "*" + bean.getProp().getNum()) + .setTitle(WordUtil.getNewString(R.string.dialog_normal_title)) + .setContent(WordUtil.getNewString(R.string.dialog_normal_content) + bean.getProp().getCnTitle() + "*" + bean.getProp().getNum()) .setContentView(imageView) .setOnDialogClickListener(new OnDialogClickListener() { @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreGreetConfigActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreGreetConfigActivity.java index 72eebd674..39dcd00a3 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreGreetConfigActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreGreetConfigActivity.java @@ -26,6 +26,7 @@ import com.yunbao.common.interfaces.ImageResultCallback; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import java.io.File; import java.util.ArrayList; @@ -53,7 +54,7 @@ public class MsgMoreGreetConfigActivity extends AbsOTOActivity { @Override protected void main(Bundle savedInstanceState) { - setTitle("打招呼設置"); + setTitle(WordUtil.getNewString(R.string.title_greet_config)); imageUtil = new ProcessImageUtil(this); recyclerView = findViewById(R.id.msg_recyclerView); msgSwitch = findViewById(R.id.msg_switch); diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java index f8a6bdeab..4716146b0 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java @@ -25,6 +25,7 @@ import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import java.io.File; @@ -105,7 +106,7 @@ public class AuthActivity extends AbsActivity { } }); initCamera(); - dialog = DialogUitl.loadingDialog(mContext, "上传中"); + dialog = DialogUitl.loadingDialog(mContext, WordUtil.getNewString(R.string.upload_in_progress)); getAuthInfo(); } @@ -127,14 +128,14 @@ public class AuthActivity extends AbsActivity { ImgLoader.display(mContext, data.getAuth_back(), image2); image11.setVisibility(View.GONE); image22.setVisibility(View.GONE); - submit.setText("審核中，請耐心等待"); + submit.setText(WordUtil.getNewString(R.string.title_audit_config)); submit.setEnabled(false); image1.setEnabled(false); image2.setEnabled(false); } else { ImgLoader.display(mContext, data.getAuth_front(), image1); ImgLoader.display(mContext, data.getAuth_back(), image2); - submit.setText("重新提交"); + submit.setText(WordUtil.getNewString(R.string.resubmit)); remake.setText(data.getAuth_remark()); submit.setEnabled(true); } @@ -166,7 +167,7 @@ public class AuthActivity extends AbsActivity { @Override public void onSuccess(AvatarBean data) { if (data != null) { - ToastUtil.show("上传成功"); + ToastUtil.show(WordUtil.getNewString(R.string.upload_success)); if (isFront) { imgUrl1 = data.getAvatar(); file1 = file; @@ -208,9 +209,9 @@ public class AuthActivity extends AbsActivity { @Override public void onSuccess(HttpCallbackModel data) { if (data.getCode() == 0) { - ToastUtil.show("已發起審核，請耐心等待審核結果"); + ToastUtil.show(R.string.title_audit_config2); submit.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); - submit.setText("審核中，請耐心等待"); + submit.setText(R.string.title_audit_config); imgUrl1 = null; imgUrl2 = null; } else { diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java index 6899e9129..78427f85d 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java @@ -40,6 +40,7 @@ import com.yunbao.common.utils.DialogUitl; import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CompleteInformationPopup; import java.io.File; @@ -86,7 +87,7 @@ public class AuthBloggerActivity extends AbsActivity { @Override protected void main() { - setTitle("上傳入駐資料"); + setTitle(WordUtil.getNewString(R.string.upload_enter_title)); sexLayoutMan = findViewById(R.id.sex_man); sexLayoutWoman = findViewById(R.id.sex_woman); sexImgMan = findViewById(R.id.sex_img_man); @@ -105,7 +106,7 @@ public class AuthBloggerActivity extends AbsActivity { } }); initCamera(); - dialog = DialogUitl.loadingDialog(mContext, "上传中"); + dialog = DialogUitl.loadingDialog(mContext, WordUtil.getNewString(R.string.upload_in_progress)); mRecyclerViewImage = findViewById(R.id.recyclerView_image); mRecyclerViewImage.setLayoutManager(new GridLayoutManager(mContext, 3, GridLayoutManager.VERTICAL, false)); @@ -261,9 +262,9 @@ public class AuthBloggerActivity extends AbsActivity { @Override public void onSuccess(HttpCallbackModel data) { if (data.getCode() == 0) { - ToastUtil.show("已發起審核，請耐心等待審核結果"); + ToastUtil.show(WordUtil.getNewString(R.string.title_audit_config2)); submit.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); - submit.setText("審核中，請耐心等待"); + submit.setText(WordUtil.getNewString(R.string.title_audit_config)); } else { ToastUtil.show(data.getMsg()); } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java index a7676e220..6dd79991b 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java @@ -18,6 +18,7 @@ import com.yunbao.common.activity.AbsActivity; import com.yunbao.common.http.base.HttpCallback; import com.yunbao.common.utils.Bus; import com.yunbao.common.utils.DialogUitl; +import com.yunbao.common.utils.WordUtil; /** * 達人認證入口 @@ -40,7 +41,7 @@ public class AuthBloggerInletActivity extends AbsActivity { @Override protected void main() { - setTitle("達人認證"); + setTitle(WordUtil.getNewString(R.string.user_authentication)); personLayout = findViewById(R.id.personLayout); sageLayout = findViewById(R.id.sageLayout); @@ -50,7 +51,7 @@ public class AuthBloggerInletActivity extends AbsActivity { perStatus = findViewById(R.id.personBt); sageStatus = findViewById(R.id.sageBt); - dialog = DialogUitl.loadingDialog(mContext, "查询中"); + dialog = DialogUitl.loadingDialog(mContext, WordUtil.getNewString(R.string.query)); getAuthInfo(); } @@ -71,17 +72,17 @@ public class AuthBloggerInletActivity extends AbsActivity { if (data.getName_auth() == 2) {//已通过 personLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_4)); personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_suc)); - perStatus.setText("已完成"); + perStatus.setText(R.string.complete); perStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3)); } else if (data.getName_auth() == 3) {//已提交 personLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail)); - perStatus.setText("審核中，請耐心等待"); + perStatus.setText(R.string.title_audit_config); perStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3)); } else if (data.getName_auth() == 4) { personLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail)); - perStatus.setText("審核失敗，去提交"); + perStatus.setText(R.string.title_audit_config3); perStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_5)); findViewById(R.id.personBt).setOnClickListener(new View.OnClickListener() { @Override @@ -92,7 +93,7 @@ public class AuthBloggerInletActivity extends AbsActivity { } else { personLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); personImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_suc)); - perStatus.setText("去上傳"); + perStatus.setText(R.string.to_upload); perStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_5)); findViewById(R.id.personBt).setOnClickListener(new View.OnClickListener() { @Override @@ -110,17 +111,17 @@ public class AuthBloggerInletActivity extends AbsActivity { if (data.getStatus() == 2) {//已通过 sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3)); sageImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_suc)); - sageStatus.setText("已完成"); + sageStatus.setText(R.string.complete2); sageStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3)); } else if (data.getStatus() == 3) {//已提交 sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); sageImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail)); - sageStatus.setText("審核中，請耐心等待"); + sageStatus.setText(R.string.title_audit_config); sageStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_3)); } else if (data.getStatus() == 4) { sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); sageImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail)); - sageStatus.setText("審核失敗，去提交"); + sageStatus.setText(R.string.title_audit_config3); sageStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_5)); findViewById(R.id.sageBt).setOnClickListener(new View.OnClickListener() { @Override @@ -131,7 +132,7 @@ public class AuthBloggerInletActivity extends AbsActivity { } else { sageLayout.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_1)); sageImg.setImageDrawable(getResources().getDrawable(R.mipmap.icon_fail)); - sageStatus.setText("去上傳"); + sageStatus.setText(R.string.to_upload); sageStatus.setBackground(getResources().getDrawable(R.drawable.bg_auth_submit_5)); findViewById(R.id.sageBt).setOnClickListener(new View.OnClickListener() { @Override diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java index 36c3cf8d6..8a6524123 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java @@ -47,6 +47,7 @@ import com.yunbao.common.utils.L; import com.yunbao.common.utils.ProcessImageUtil; import com.yunbao.common.utils.StringUtil; import com.yunbao.common.utils.ToastUtil; +import com.yunbao.common.utils.WordUtil; import com.yunbao.common.views.CompleteInformationPopup; import com.yunbao.common.views.UpdateSexPopup; @@ -157,7 +158,7 @@ public class EditProfileActivity extends AbsActivity { ImgLoader.display(mContext, file, mAvatar); //txtChoose.setVisibility(View.GONE); avatarUrl = data.getAvatar(); - ToastUtil.show("上传成功"); + ToastUtil.show(R.string.upload_success); OTONetManager.getInstance(EditProfileActivity.this).setFiled("avatar", avatarUrl, new com.yunbao.common.http.base.HttpCallback() { @Override @@ -187,7 +188,7 @@ public class EditProfileActivity extends AbsActivity { @Override public void onError(String error) { - ToastUtil.show("上传失败"); + ToastUtil.show(R.string.upload_failed); } }); } @@ -493,7 +494,7 @@ public class EditProfileActivity extends AbsActivity { }); } - }).setCancelText("生日").setSubmitColor(getResources().getColor(R.color.blue01)).setSubmitText("完成").setContentTextSize(20).setDate(selectedDate).build(); + }).setCancelText(WordUtil.getNewString(R.string.birthday)).setSubmitColor(getResources().getColor(R.color.blue01)).setSubmitText(WordUtil.getNewString(R.string.complete)).setContentTextSize(20).setDate(selectedDate).build(); pvTime.show(); } @@ -685,18 +686,18 @@ public class EditProfileActivity extends AbsActivity { public void onSuccess(AuthBean data) { authBean = data; if (data.getName_auth() == 2) {//已通过 - auth_status.setText("認證通過"); + auth_status.setText(R.string.title_audit_config5); auth_status.setTextColor(getResources().getColor(R.color.green_81c160)); auth_status.setVisibility(View.GONE); findViewById(R.id.img_auth_status).setVisibility(View.VISIBLE); } else if (data.getName_auth() == 3) {//已提交 - auth_status.setText("審核中"); + auth_status.setText(R.string.title_audit_config4); auth_status.setTextColor(getResources().getColor(R.color.gray1)); } else if (data.getName_auth() == 4) { - auth_status.setText("審核失敗重新提交"); + auth_status.setText(R.string.title_audit_config6); auth_status.setTextColor(getResources().getColor(R.color.red)); } else { - auth_status.setText("去認證"); + auth_status.setText(R.string.title_audit_config7); auth_status.setTextColor(getResources().getColor(R.color.black2)); } } diff --git a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java index a9393566c..cedce410b 100644 --- a/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java +++ b/OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java @@ -133,16 +133,16 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:text="請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例" + android:text="@string/layout_auth_tips2" android:textColor="@color/text_gray" android:textSize="14sp" /> @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="20dp" - android:text="身份證正面" + android:text="@string/layout_auth_tips3" android:textColor="@color/black2" android:textSize="18sp" android:textStyle="bold" /> @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="10dp" - android:text="身份證背面" + android:text="@string/layout_auth_tips4" android:textColor="@color/black2" android:textSize="18sp" android:textStyle="bold" /> @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginTop="10dp" - android:text="身份證背面" + android:text="@string/layout_auth_tips4" android:textColor="@color/red" android:textSize="14sp" android:visibility="gone" /> @@ -121,7 +121,7 @@ android:gravity="center" android:paddingTop="10dp" android:paddingBottom="10dp" - android:text="發起審核" + android:text="@string/layout_auth_tips5" android:textColor="@color/black2" android:textSize="16sp" android:textStyle="bold" /> diff --git a/OneToOne/src/main/res/layout/activity_auth_blogger.xml b/OneToOne/src/main/res/layout/activity_auth_blogger.xml index bf0089bf2..0d0adcaeb 100644 --- a/OneToOne/src/main/res/layout/activity_auth_blogger.xml +++ b/OneToOne/src/main/res/layout/activity_auth_blogger.xml @@ -14,7 +14,7 @@ android:layout_height="30dp" android:background="#FEE9EE" android:gravity="center" - android:text="带*为必填项,為保障您的利益，請如實填寫" + android:text="@string/layout_auth_blogger_tips1" android:textColor="#E26891" android:textSize="14sp" /> @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="性别" + android:text="@string/layout_auth_blogger_tips2" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -73,7 +73,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:text="男" + android:text="@string/layout_auth_blogger_tips3" android:textColor="@color/black2" android:textSize="16dp" /> @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:text="女" + android:text="@string/layout_auth_blogger_tips4" android:textColor="@color/black2" android:textSize="16dp" /> @@ -113,7 +113,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="真实姓名" + android:text="@string/layout_auth_blogger_tips5" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -134,7 +134,7 @@ android:layout_height="40dp" android:layout_marginTop="10dp" android:background="@drawable/bg_edit" - android:hint="請填寫您的真實姓名" + android:hint="@string/layout_auth_blogger_tips6" android:padding="10dp" android:textColor="@color/black2" android:textColorHint="#B5B5B5" @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="手机号码" + android:text="@string/layout_auth_blogger_tips7" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -170,7 +170,7 @@ android:layout_height="40dp" android:layout_marginTop="10dp" android:background="@drawable/bg_edit" - android:hint="請填寫您的手机号码" + android:hint="@string/layout_auth_blogger_tips8" android:padding="10dp" android:textColor="@color/black2" android:textColorHint="#B5B5B5" @@ -185,7 +185,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="身份证号码" + android:text="@string/layout_auth_blogger_tips9" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -206,7 +206,7 @@ android:layout_height="40dp" android:layout_marginTop="10dp" android:background="@drawable/bg_edit" - android:hint="請填寫您的身份证号码" + android:hint="@string/layout_auth_blogger_tips10" android:padding="10dp" android:textColor="@color/black2" android:textColorHint="#B5B5B5" @@ -221,7 +221,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="上传手持证件照" + android:text="@string/layout_auth_blogger_tips11" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -287,7 +287,7 @@ android:layout_centerVertical="true" android:layout_weight="1" android:gravity="center" - android:text="請將证件頭像朝向前方" + android:text="@string/layout_auth_blogger_tips12" android:textColor="@color/textColor" android:textSize="12sp" /> @@ -297,7 +297,7 @@ android:layout_centerVertical="true" android:layout_weight="1" android:gravity="center" - android:text="參考圖" + android:text="@string/layout_auth_blogger_tips13" android:textColor="@color/textColor" android:textSize="12sp" /> @@ -312,7 +312,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="上傳背景圖片" + android:text="@string/layout_auth_blogger_tips14" android:textColor="@color/textColor" android:textSize="16sp" android:textStyle="bold" /> @@ -343,7 +343,7 @@ android:gravity="center" android:paddingTop="10dp" android:paddingBottom="10dp" - android:text="發起審核" + android:text="@string/layout_auth_blogger_tips15" android:textColor="@color/black2" android:textSize="16sp" android:textStyle="bold" /> diff --git a/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml b/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml index 9e00dbf04..01ec94a47 100644 --- a/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml +++ b/OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" - android:text="真人說明" + android:text="@string/layout_auth_blogger_inlet_tips1" android:textColor="@color/black2" android:textSize="18sp" android:textStyle="bold" /> @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="10dp" - android:text="請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例" + android:text="@string/layout_auth_blogger_inlet_tips2" android:textColor="@color/text_gray" android:textSize="14sp" /> @@ -45,7 +45,7 @@ @@ -67,7 +67,7 @@ android:gravity="center" android:paddingLeft="40dp" android:paddingRight="40dp" - android:text="已完成" + android:text="@string/layout_auth_blogger_inlet_tips4" android:textColor="@color/white" android:textSize="18sp" /> @@ -107,7 +107,7 @@ android:gravity="center" android:paddingLeft="40dp" android:paddingRight="40dp" - android:text="去上傳" + android:text="@string/layout_auth_blogger_inlet_tips6" android:textColor="@color/white" android:textSize="18sp" /> diff --git a/OneToOne/src/main/res/layout/activity_call_audio.xml b/OneToOne/src/main/res/layout/activity_call_audio.xml index fa6f9ed36..f0f3e4b7c 100644 --- a/OneToOne/src/main/res/layout/activity_call_audio.xml +++ b/OneToOne/src/main/res/layout/activity_call_audio.xml @@ -57,7 +57,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:text="TextView" android:textColor="#333333" android:textSize="18sp" app:layout_constraintEnd_toEndOf="@+id/avatar" diff --git a/OneToOne/src/main/res/layout/activity_choose_label.xml b/OneToOne/src/main/res/layout/activity_choose_label.xml index 639f4500e..7fce6b30d 100644 --- a/OneToOne/src/main/res/layout/activity_choose_label.xml +++ b/OneToOne/src/main/res/layout/activity_choose_label.xml @@ -14,7 +14,7 @@ android:layout_gravity="right" android:layout_marginTop="15dp" android:padding="10dp" - android:text="跳过" + android:text="@string/layout_choose_label_tip1" android:textColor="@color/black2" android:textSize="14sp" /> @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:text="我的标签" + android:text="@string/layout_choose_label_tip2" android:textColor="@color/black2" android:textSize="18sp" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="5dp" - android:text="暂无标签" + android:text="@string/layout_choose_label_tip3" android:textColor="@color/gray1" android:textSize="14sp" /> @@ -70,7 +70,7 @@ android:layout_marginBottom="20dp" android:background="@drawable/bg_rect_round_tag_btn1" android:padding="10dp" - android:text="完成" + android:text="@string/layout_choose_label_tip4" android:textColor="@color/white" android:textSize="18sp" /> diff --git a/OneToOne/src/main/res/layout/activity_complete.xml b/OneToOne/src/main/res/layout/activity_complete.xml index 44dc1123e..a6291abe8 100644 --- a/OneToOne/src/main/res/layout/activity_complete.xml +++ b/OneToOne/src/main/res/layout/activity_complete.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginTop="120dp" android:gravity="center" - android:text="完善个人信息" + android:text="@string/layout_complete_tip1" android:textColor="#FFFFFF" android:textSize="33sp" android:textStyle="bold" /> @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="60dp" - android:text="昵称" + android:text="@string/layout_complete_tip3" android:textColor="#ff333333" android:textSize="16sp" /> @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="20dp" - android:text="性别" + android:text="@string/layout_complete_tip4" android:textColor="#ff333333" android:textSize="16sp" /> @@ -97,7 +97,7 @@ android:layout_weight="1" android:background="@mipmap/icon_user_sex_00" android:gravity="center" - android:text="女" + android:text="@string/layout_complete_tip5" android:textColor="#999999" android:textColorHint="#999999" android:textSize="14sp" /> @@ -111,7 +111,7 @@ android:layout_weight="1" android:background="@mipmap/icon_user_sex_00" android:gravity="center" - android:text="男" + android:text="@string/layout_complete_tip6" android:textColor="#999999" android:textColorHint="#999999" android:textSize="14sp" /> @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="15dp" android:layout_marginTop="20dp" - android:text="生日" + android:text="@string/layout_complete_tip7" android:textColor="#ff333333" android:textSize="16sp" /> @@ -148,7 +148,7 @@ android:layout_marginRight="30dp" android:background="@drawable/background_8f7cdf" android:gravity="center" - android:text="完成" + android:text="@string/layout_complete_tip8" android:textColor="@color/white" android:textSize="16sp" /> diff --git a/OneToOne/src/main/res/layout/activity_edit_name.xml b/OneToOne/src/main/res/layout/activity_edit_name.xml index 5ce46c0ca..87bfb1b7c 100644 --- a/OneToOne/src/main/res/layout/activity_edit_name.xml +++ b/OneToOne/src/main/res/layout/activity_edit_name.xml @@ -43,7 +43,7 @@ android:gravity="center" android:paddingLeft="15dp" android:paddingRight="15dp" - android:text="溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次" + android:text="@string/layout_edit_name_tip1" android:textSize="14sp" /> diff --git a/OneToOne/src/main/res/layout/activity_edit_profile.xml b/OneToOne/src/main/res/layout/activity_edit_profile.xml index 6a3d2044d..ffe6e5a0f 100644 --- a/OneToOne/src/main/res/layout/activity_edit_profile.xml +++ b/OneToOne/src/main/res/layout/activity_edit_profile.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="頭像" + android:text="@string/layout_edit_profile_tip1" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="暱稱" + android:text="@string/layout_edit_profile_tip2" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="簽名" + android:text="@string/layout_edit_profile_tip3" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -139,7 +139,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="生日" + android:text="@string/layout_edit_profile_tip4" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -190,7 +190,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="性別" + android:text="@string/layout_edit_profile_tip5" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -239,7 +239,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="所在地" + android:text="@string/layout_edit_profile_tip6" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -290,7 +290,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="綁定手機" + android:text="@string/layout_edit_profile_tip7" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -335,7 +335,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="真人認證" + android:text="@string/layout_edit_profile_tip8" android:textColor="@color/textColor" android:textSize="14sp" /> @@ -393,7 +393,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:text="興趣" + android:text="@string/layout_edit_profile_tip9" android:textColor="@color/textColor" android:textSize="14sp" /> diff --git a/OneToOne/src/main/res/layout/activity_find_pwd.xml b/OneToOne/src/main/res/layout/activity_find_pwd.xml index 234e59950..ace4ef04c 100644 --- a/OneToOne/src/main/res/layout/activity_find_pwd.xml +++ b/OneToOne/src/main/res/layout/activity_find_pwd.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginTop="80dp" android:gravity="center" - android:text="忘记密码" + android:text="@string/layout_find_pwd_tip1" android:textColor="#FFFFFF" android:textSize="33sp" android:textStyle="bold" /> diff --git a/OneToOne/src/main/res/layout/activity_login.xml b/OneToOne/src/main/res/layout/activity_login.xml index e5fe7553a..1bcd3a202 100644 --- a/OneToOne/src/main/res/layout/activity_login.xml +++ b/OneToOne/src/main/res/layout/activity_login.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginTop="80dp" android:gravity="center" - android:text="用户登录" + android:text="@string/layout_login_tip1" android:textColor="#FFFFFF" android:textSize="33sp" android:textStyle="bold" /> diff --git a/OneToOne/src/main/res/layout/activity_main_list.xml b/OneToOne/src/main/res/layout/activity_main_list.xml index b72e9df56..f2c474ff0 100644 --- a/OneToOne/src/main/res/layout/activity_main_list.xml +++ b/OneToOne/src/main/res/layout/activity_main_list.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="魅力榜" + android:text="@string/layout_main_list_tip1" android:textColor="#FFFFFF" android:textSize="16sp" /> @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="财富榜" + android:text="@string/layout_main_list_tip2" android:textColor="#FFFFFF" android:textSize="16sp" /> diff --git a/OneToOne/src/main/res/layout/activity_matching.xml b/OneToOne/src/main/res/layout/activity_matching.xml index 370a13fd4..f919744aa 100644 --- a/OneToOne/src/main/res/layout/activity_matching.xml +++ b/OneToOne/src/main/res/layout/activity_matching.xml @@ -96,7 +96,7 @@ android:id="@+id/tips" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="正在热聊中" + android:text="@string/layout_matching_tip1" android:textColor="#FFF" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@+id/num" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="18dp" - android:text="匹配中..." + android:text="@string/layout_matching_tip2" android:textColor="#FFFFFF" android:textSize="18sp" app:layout_constraintEnd_toEndOf="@+id/imageView6" @@ -132,7 +132,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:text="TA還在練習見面開場白，再給TA點時間吧~" + android:text="@string/layout_matching_tip3" android:textColor="#FFF" android:textSize="12sp" app:layout_constraintEnd_toEndOf="@+id/imageView6" @@ -146,7 +146,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="42dp" - android:text="灵魂速配" + android:text="@string/layout_matching_tip4" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/OneToOne/src/main/res/layout/activity_msg_message.xml b/OneToOne/src/main/res/layout/activity_msg_message.xml index 564f8cbd5..32171c672 100644 --- a/OneToOne/src/main/res/layout/activity_msg_message.xml +++ b/OneToOne/src/main/res/layout/activity_msg_message.xml @@ -34,7 +34,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="#8E7DDF" - android:text="聯繫客服" + android:text="@string/layout_msg_message_tip1" android:textColor="#FFFFFF" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/OneToOne/src/main/res/layout/activity_register.xml b/OneToOne/src/main/res/layout/activity_register.xml index b79367a21..ddc470aee 100644 --- a/OneToOne/src/main/res/layout/activity_register.xml +++ b/OneToOne/src/main/res/layout/activity_register.xml @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginTop="50dp" android:layout_marginBottom="25dp" - android:text="用户注册" + android:text="@string/layout_register_tip1" android:gravity="center" android:textColor="#FFFFFF" android:textStyle="bold" diff --git a/OneToOne/src/main/res/layout/activity_screen.xml b/OneToOne/src/main/res/layout/activity_screen.xml index ff0aa2e5e..1cc88e456 100644 --- a/OneToOne/src/main/res/layout/activity_screen.xml +++ b/OneToOne/src/main/res/layout/activity_screen.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="年龄" + android:text="@string/layout_screen_tip1" android:textColor="#333333" android:textSize="16sp" /> @@ -60,7 +60,7 @@ android:checked="true" android:gravity="center" android:tag="all" - android:text="全部" + android:text="@string/layout_screen_tip2" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -125,7 +125,7 @@ android:background="@drawable/bg_home_search_checked" android:button="@null" android:gravity="center" - android:text="40以上" + android:text="@string/layout_screen_tip3" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -149,7 +149,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="性别" + android:text="@string/layout_screen_tip4" android:textColor="#333333" android:textSize="16sp" /> @@ -178,7 +178,7 @@ android:checked="true" android:gravity="center" android:tag="all" - android:text="全部" + android:text="@string/layout_screen_tip1" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -191,7 +191,7 @@ android:button="@null" android:gravity="center" android:tag="1" - android:text="男" + android:text="@string/layout_screen_tip5" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -204,7 +204,7 @@ android:button="@null" android:gravity="center" android:tag="2" - android:text="女" + android:text="@string/layout_screen_tip6" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -227,7 +227,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:text="是否完成真人认证" + android:text="@string/layout_screen_tip7" android:textColor="#333333" android:textSize="16sp" /> @@ -257,7 +257,7 @@ android:checked="true" android:gravity="center" android:tag="all" - android:text="全部" + android:text="@string/layout_screen_tip2" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -269,7 +269,7 @@ android:background="@drawable/bg_home_search_checked" android:button="@null" android:gravity="center" - android:text="已完成" + android:text="@string/layout_screen_tip8" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -281,7 +281,7 @@ android:background="@drawable/bg_home_search_checked" android:button="@null" android:gravity="center" - android:text="未完成" + android:text="@string/layout_screen_tip9" android:textColor="@drawable/bg_home_search_text" android:textSize="14sp" /> @@ -296,7 +296,7 @@ android:layout_width="151dp" android:layout_height="45dp" android:background="@drawable/bg_home_search_btn" - android:text="确定" + android:text="@string/layout_screen_tip10" android:textColor="#FFFFFF" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/OneToOne/src/main/res/layout/activity_search.xml b/OneToOne/src/main/res/layout/activity_search.xml index 2a5fa6c38..83d226f5f 100644 --- a/OneToOne/src/main/res/layout/activity_search.xml +++ b/OneToOne/src/main/res/layout/activity_search.xml @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1.9" - android:text="猜你喜欢" + android:text="@string/layout_search_tip1" android:textColor="#333333" android:textSize="18sp" /> diff --git a/OneToOne/src/main/res/layout/activity_setting.xml b/OneToOne/src/main/res/layout/activity_setting.xml index 48bf58fa7..ea75a79a3 100644 --- a/OneToOne/src/main/res/layout/activity_setting.xml +++ b/OneToOne/src/main/res/layout/activity_setting.xml @@ -38,7 +38,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="個人設定" + android:text="@string/layout_setting_tip1" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -80,7 +80,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="修改密碼" + android:text="@string/layout_setting_tip2" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="黑名單" + android:text="@string/layout_setting_tip3" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="語言設定" + android:text="@string/layout_setting_tip4" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -196,7 +196,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="達人認證" + android:text="@string/layout_setting_tip5" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -224,7 +224,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="常見問題" + android:text="@string/layout_setting_tip6" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -252,7 +252,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="服務協議" + android:text="@string/layout_setting_tip7" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -281,7 +281,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="清除緩存" + android:text="@string/layout_setting_tip8" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -312,7 +312,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="刪除用戶" + android:text="@string/layout_setting_tip9" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -340,7 +340,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="關於我們" + android:text="@string/layout_setting_tip10" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -368,7 +368,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="版本號" + android:text="@string/layout_setting_tip11" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -401,7 +401,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="25dp" - android:text="檢查新版本" + android:text="@string/layout_setting_tip12" android:textColor="#1E1F20" android:textSize="16sp" /> @@ -427,7 +427,7 @@ android:layout_height="50dp" android:layout_marginTop="20dp" android:background="@color/white" - android:text="退出" + android:text="@string/layout_setting_tip13" android:textColor="@color/black2" android:textSize="16dp" /> diff --git a/OneToOne/src/main/res/layout/adapter_choose_label.xml b/OneToOne/src/main/res/layout/adapter_choose_label.xml index c1719820b..9df534582 100644 --- a/OneToOne/src/main/res/layout/adapter_choose_label.xml +++ b/OneToOne/src/main/res/layout/adapter_choose_label.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:text="我的标签" + android:text="@string/layout_choose_label_adapter_tip1" android:textColor="@color/black2" android:textSize="18sp" /> diff --git a/OneToOne/src/main/res/layout/adapter_item_tag.xml b/OneToOne/src/main/res/layout/adapter_item_tag.xml index f6781aa91..b263a6eff 100644 --- a/OneToOne/src/main/res/layout/adapter_item_tag.xml +++ b/OneToOne/src/main/res/layout/adapter_item_tag.xml @@ -15,7 +15,7 @@ android:paddingTop="5dp" android:paddingEnd="15dp" android:paddingBottom="5dp" - android:text="活泼" + android:text="@string/layout_item_tag" android:textColor="@color/black2" /> diff --git a/OneToOne/src/main/res/layout/dialog_bottom_list.xml b/OneToOne/src/main/res/layout/dialog_bottom_list.xml index b09685671..05b4426a8 100644 --- a/OneToOne/src/main/res/layout/dialog_bottom_list.xml +++ b/OneToOne/src/main/res/layout/dialog_bottom_list.xml @@ -34,6 +34,6 @@ app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/recyclerView" - android:text="取消" /> + android:text="@string/layout_bottom_list_tips1" /> \ No newline at end of file diff --git a/OneToOne/src/main/res/layout/dialog_end_call.xml b/OneToOne/src/main/res/layout/dialog_end_call.xml index eab0ce5b2..5ce5c9618 100644 --- a/OneToOne/src/main/res/layout/dialog_end_call.xml +++ b/OneToOne/src/main/res/layout/dialog_end_call.xml @@ -62,7 +62,7 @@ android:ellipsize="end" android:maxEms="6" android:singleLine="true" - android:text="小柒" + tools:text="小柒" android:textColor="#333333" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@+id/avatar" @@ -75,7 +75,7 @@ android:layout_height="23dp" android:layout_marginEnd="16dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_bend_call_tips1" android:textColor="#FFFFFF" android:textSize="10dp" app:layout_constraintBottom_toBottomOf="@+id/avatar" @@ -88,7 +88,7 @@ android:layout_width="125dp" android:layout_height="26dp" android:background="@drawable/bg_dialog_end_call_timer" - android:text="通话时长:01:06" + tools:text="通话时长:01:06" android:textColor="#4A4A4A" android:textSize="14dp" app:layout_constraintBottom_toBottomOf="parent" @@ -105,7 +105,7 @@ android:layout_marginTop="2dp" android:layout_marginEnd="14dp" android:gravity="center" - android:text="此次通话结束了快开启\n下一次通话吧" + android:text="@string/layout_bend_call_tips2" android:textColor="#000000" android:visibility="visible" /> @@ -125,7 +125,7 @@ android:layout_height="38dp" android:layout_marginEnd="36dp" android:background="@drawable/bg_dialog_end_call_cancel" - android:text="再次通话" + android:text="@string/layout_bend_call_tips3" android:textColor="#FFF" android:textSize="12sp" /> @@ -134,7 +134,7 @@ android:layout_width="70dp" android:layout_height="38dp" android:background="@drawable/bg_dialog_tip_apply" - android:text="去充值" + android:text="@string/layout_bend_call_tips4" android:textColor="#FFFFFF" android:textSize="12sp" /> diff --git a/OneToOne/src/main/res/layout/dialog_msg_more.xml b/OneToOne/src/main/res/layout/dialog_msg_more.xml index 6219e3100..240edb85e 100644 --- a/OneToOne/src/main/res/layout/dialog_msg_more.xml +++ b/OneToOne/src/main/res/layout/dialog_msg_more.xml @@ -28,7 +28,7 @@ android:layout_gravity="center" android:layout_marginStart="4dp" android:gravity="center" - android:text="打招呼设置" + android:text="@string/layout_msg_more_tips1" android:textColor="#333333" android:textSize="12sp" android:textStyle="bold" /> @@ -56,7 +56,7 @@ android:layout_gravity="center" android:layout_marginStart="4dp" android:gravity="center" - android:text="一键已读" + android:text="@string/layout_msg_more_tips2" android:textColor="#FF4A85" android:textSize="12sp" /> diff --git a/OneToOne/src/main/res/layout/dialog_tips1.xml b/OneToOne/src/main/res/layout/dialog_tips1.xml index f86e769b1..4fd5a15f3 100644 --- a/OneToOne/src/main/res/layout/dialog_tips1.xml +++ b/OneToOne/src/main/res/layout/dialog_tips1.xml @@ -58,7 +58,7 @@ android:layout_height="38dp" android:layout_marginEnd="36dp" android:background="@drawable/bg_dialog_tip_cancel" - android:text="離開" + tools:text="離開" android:textColor="#333333" android:textSize="12sp" /> @@ -67,7 +67,7 @@ android:layout_width="70dp" android:layout_height="38dp" android:background="@drawable/bg_dialog_tip_apply" - android:text="去充值" + tools:text="去充值" android:textColor="#FFFFFF" android:textSize="12sp" /> diff --git a/OneToOne/src/main/res/layout/fragment_friends.xml b/OneToOne/src/main/res/layout/fragment_friends.xml index 0795f3935..bd2829477 100644 --- a/OneToOne/src/main/res/layout/fragment_friends.xml +++ b/OneToOne/src/main/res/layout/fragment_friends.xml @@ -34,14 +34,14 @@ android:layout_width="wrap_content" android:textSize="16sp" android:layout_height="wrap_content" - android:text="推荐" /> + android:text="@string/layout_friends_tips1" /> + android:text="@string/layout_friends_tips2" /> diff --git a/OneToOne/src/main/res/layout/fragment_home_ranking.xml b/OneToOne/src/main/res/layout/fragment_home_ranking.xml index 88b17ae1b..7cb68ca50 100644 --- a/OneToOne/src/main/res/layout/fragment_home_ranking.xml +++ b/OneToOne/src/main/res/layout/fragment_home_ranking.xml @@ -151,7 +151,7 @@ android:layout_width="54dp" android:layout_height="23dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_home_ranking_tips1" android:textColor="#FFFFFF" android:layout_gravity="center" android:gravity="center" @@ -287,7 +287,7 @@ android:layout_width="54dp" android:layout_height="23dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_home_ranking_tips1" android:textColor="#FFFFFF" android:layout_gravity="center" android:gravity="center" @@ -421,7 +421,7 @@ android:layout_width="54dp" android:layout_height="23dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_home_ranking_tips1" android:textColor="#FFFFFF" android:layout_gravity="center" android:gravity="center" diff --git a/OneToOne/src/main/res/layout/fragment_msg.xml b/OneToOne/src/main/res/layout/fragment_msg.xml index 3198858ff..addcce31e 100644 --- a/OneToOne/src/main/res/layout/fragment_msg.xml +++ b/OneToOne/src/main/res/layout/fragment_msg.xml @@ -51,14 +51,14 @@ android:layout_width="wrap_content" android:textSize="16sp" android:layout_height="wrap_content" - android:text="消息" /> + android:text="@string/layout_f_msg_tips1" /> + android:text="@string/layout_f_msg_tips2" /> \ No newline at end of file diff --git a/OneToOne/src/main/res/layout/fragment_my.xml b/OneToOne/src/main/res/layout/fragment_my.xml index bdd748a84..e818674e0 100644 --- a/OneToOne/src/main/res/layout/fragment_my.xml +++ b/OneToOne/src/main/res/layout/fragment_my.xml @@ -116,7 +116,7 @@ android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="用戶名稱" + android:text="@string/layout_f_my_tips1" android:textColor="#D56FF0" android:textSize="19sp" android:textStyle="bold" /> @@ -129,7 +129,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="21dp" android:layout_marginTop="6dp" - android:text="这个人很懒，什么也没留下。" + android:text="@string/layout_f_my_tips2" android:textColor="@color/gray_cccccc" android:textSize="12sp" /> diff --git a/OneToOne/src/main/res/layout/item_home_rank.xml b/OneToOne/src/main/res/layout/item_home_rank.xml index f23bb9f99..55ff55ad2 100644 --- a/OneToOne/src/main/res/layout/item_home_rank.xml +++ b/OneToOne/src/main/res/layout/item_home_rank.xml @@ -75,7 +75,7 @@ android:id="@+id/user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="TextView" + tools:text="TextView" android:textColor="#333333" android:layout_gravity="center" android:textSize="16sp" @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="2dp" - android:text="LV.21" + tools:text="LV.21" android:textColor="#FFF" android:textSize="10sp" /> @@ -134,7 +134,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:text="139999992" + tools:text="139999992" android:textColor="#999999" android:textSize="12sp" /> @@ -148,7 +148,7 @@ android:layout_width="54dp" android:layout_height="23dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_home_ranking_tips1" android:textColor="#FFFFFF" android:layout_marginEnd="34dp" android:textSize="10dp" diff --git a/OneToOne/src/main/res/layout/item_home_recommend.xml b/OneToOne/src/main/res/layout/item_home_recommend.xml index 6b9378736..3d15c4425 100644 --- a/OneToOne/src/main/res/layout/item_home_recommend.xml +++ b/OneToOne/src/main/res/layout/item_home_recommend.xml @@ -61,7 +61,7 @@ android:id="@+id/user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="TextView" + tools:text="TextView" android:textColor="#333333" android:textSize="16sp" android:textStyle="bold" /> @@ -88,7 +88,7 @@ android:padding="2dp" android:paddingStart="5dp" android:paddingEnd="5dp" - android:text="21·水瓶座" + tools:text="21·水瓶座" android:textColor="#FF37C4" android:textSize="10sp" /> @@ -98,7 +98,7 @@ android:id="@+id/user_sign" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="TextView" + tools:text="TextView" android:textColor="#888888" android:textSize="12sp" /> diff --git a/OneToOne/src/main/res/layout/item_main_me_2.xml b/OneToOne/src/main/res/layout/item_main_me_2.xml index 6f3b7fd7a..87016109b 100644 --- a/OneToOne/src/main/res/layout/item_main_me_2.xml +++ b/OneToOne/src/main/res/layout/item_main_me_2.xml @@ -2,6 +2,7 @@ @@ -80,7 +81,7 @@ diff --git a/OneToOne/src/main/res/layout/rc_extension_input_panel.xml b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml index 3ba56fa14..2bc50e28d 100644 --- a/OneToOne/src/main/res/layout/rc_extension_input_panel.xml +++ b/OneToOne/src/main/res/layout/rc_extension_input_panel.xml @@ -28,7 +28,7 @@ android:layout_marginEnd="5dp" android:layout_marginBottom="10dp" android:background="@drawable/rc_ext_panel_editbox_background" - android:hint="輸入信息" + android:hint="@string/layout_call_input_tips1" android:maxLines="4" android:textColorHint="#BDBDBD" android:visibility="visible" diff --git a/OneToOne/src/main/res/layout/view_conversation_system_fragment.xml b/OneToOne/src/main/res/layout/view_conversation_system_fragment.xml index d7155b33e..c7418bdc4 100644 --- a/OneToOne/src/main/res/layout/view_conversation_system_fragment.xml +++ b/OneToOne/src/main/res/layout/view_conversation_system_fragment.xml @@ -117,7 +117,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:background="#8E7DDF" - android:text="聯繫客服" + android:text="@string/layout_f_system_tips1" android:textColor="#FFFFFF" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/OneToOne/src/main/res/layout/view_empty_list.xml b/OneToOne/src/main/res/layout/view_empty_list.xml index b4f0e3099..5f2567181 100644 --- a/OneToOne/src/main/res/layout/view_empty_list.xml +++ b/OneToOne/src/main/res/layout/view_empty_list.xml @@ -19,7 +19,7 @@ android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="没有找到匹配结果~" + android:text="@string/layout_v_empty_list_tips1" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/imageView3" /> diff --git a/OneToOne/src/main/res/layout/view_exchange_record_item_holder.xml b/OneToOne/src/main/res/layout/view_exchange_record_item_holder.xml index b4001ac52..93400fa3c 100644 --- a/OneToOne/src/main/res/layout/view_exchange_record_item_holder.xml +++ b/OneToOne/src/main/res/layout/view_exchange_record_item_holder.xml @@ -2,6 +2,7 @@ @@ -31,7 +32,7 @@ android:ellipsize="end" android:maxWidth="170dp" android:singleLine="true" - android:text="2023-08-10 15:30" + tools:text="2023-08-10 15:30" android:textColor="#ACA9A9" android:textSize="10sp" /> @@ -53,7 +54,7 @@ android:ellipsize="end" android:maxWidth="100dp" android:singleLine="true" - android:text="+1111111110.5" + tools:text="+1111111110.5" android:textColor="#333333" android:textSize="16sp" /> @@ -62,7 +62,7 @@ android:layout_gravity="center" android:layout_marginStart="6dp" android:background="@drawable/bg_gift_top_up" - android:text="充值" + android:text="@string/layout_d_send_gift_tips1" android:textColor="#FFF" android:textSize="10sp" /> diff --git a/OneToOne/src/main/res/layout/view_message_msg_bar.xml b/OneToOne/src/main/res/layout/view_message_msg_bar.xml index e915bfbd2..e8ba69c67 100644 --- a/OneToOne/src/main/res/layout/view_message_msg_bar.xml +++ b/OneToOne/src/main/res/layout/view_message_msg_bar.xml @@ -32,7 +32,7 @@ android:layout_height="23dp" android:layout_marginEnd="24dp" android:background="@drawable/bg_message_msg_bar_follow" - android:text="关注" + android:text="@string/layout_home_ranking_tips1" android:textColor="#FFFFFF" android:textSize="10dp" app:layout_constraintEnd_toStartOf="@+id/more" @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="99" + tools:text="99" android:textColor="#555555" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" @@ -124,7 +124,7 @@ android:id="@+id/user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="TextView" + tools:text="TextView" android:textColor="#333333" android:textSize="16sp" android:textStyle="bold" /> @@ -154,7 +154,7 @@ android:padding="3dp" android:paddingStart="5dp" android:paddingEnd="5dp" - android:text="心动值95%" + tools:text="心动值95%" android:textColor="#FFFFFF" android:textSize="10sp" /> @@ -179,7 +179,7 @@ android:layout_marginStart="4dp" android:layout_gravity="center" android:gravity="center" - android:text="TextView" + tools:text="TextView" android:textColor="#888888" android:textSize="12sp" /> @@ -194,7 +194,7 @@ android:gravity="center" android:paddingStart="14dp" android:paddingEnd="10dp" - android:text="查看主页" + android:text="@string/layout_d_msg_bar_tips1" android:textColor="#FFFFFF" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/OneToOne/src/main/res/layout/view_msg_greet_config_add.xml b/OneToOne/src/main/res/layout/view_msg_greet_config_add.xml index 10720b4df..f16ba8fb5 100644 --- a/OneToOne/src/main/res/layout/view_msg_greet_config_add.xml +++ b/OneToOne/src/main/res/layout/view_msg_greet_config_add.xml @@ -12,7 +12,7 @@ android:id="@+id/textView7" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="添加更多" + android:text="@string/layout_v_greet_config_add_tips1" app:layout_constraintBottom_toBottomOf="parent" android:textColor="#999999" android:textSize="14sp" diff --git a/OneToOne/src/main/res/layout/view_title_custom.xml b/OneToOne/src/main/res/layout/view_title_custom.xml index 7a4ad0812..fc1aa696d 100644 --- a/OneToOne/src/main/res/layout/view_title_custom.xml +++ b/OneToOne/src/main/res/layout/view_title_custom.xml @@ -64,7 +64,7 @@ android:onClick="onClick" android:paddingLeft="20dp" android:paddingRight="20dp" - android:text="保存" + android:text="@string/layout_v_custom_tips1" android:textColor="@color/black2" android:textSize="16sp" android:visibility="invisible" /> diff --git a/OneToOne/src/main/res/values-zh-rHK/strings.xml b/OneToOne/src/main/res/values-zh-rHK/strings.xml index f0e475dda..ba7ba87ce 100644 --- a/OneToOne/src/main/res/values-zh-rHK/strings.xml +++ b/OneToOne/src/main/res/values-zh-rHK/strings.xml @@ -34,4 +34,217 @@ 最多选 %1$s 张图片哦 暫無好友消息~ + 餘額不足 + 文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天 + + 與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天 + 離開 + 去充值 + 发起视频通话\n%s钻/分钟 + 发起语音通话\n%s钻/分钟 + 相册 + 拍照 + 图片信息 + 复制 + 删除 + 置顶 + 复制成功 + 上传中 + 上传成功 + 上传失败 + 年 + 月 + 日 + 生日 + 完成 + 完成 + 请填写昵称 + 请选择性别 + 请允许悬浮窗权限才能进行小窗 + 设置 + 取消 + 通话时长: + 通话将在%s秒后断\n开，请及时充值 + 首次匹配成功奖励 + 恭喜获得 + 打招呼設置 + 審核中，請耐心等待 + 已發起審核，請耐心等待審核結果 + 審核失敗，去提交 + 審核中 + 認證通過 + 審核失敗重新提交 + 去認證 + 重新提交 + 上傳入駐資料 + 達人認證 + 查询中 + 去上傳 + 請輸入內容 + 確定要退出靈魂速配嗎？ + 繼續匹配 + 徹底離開 + 当前等待时间较长，建议您先去观看动态哦，稍后再来哦~ + 繼續匹配 + 去看动态 + 余额不足，请充值后再进行尝试吧~ + 取消 + 前往充值 + [禮物] + [邀請認證] + 等待对方接受邀请… + 连接成功 + 需要获取您的权限 + 邀請對方完成真人認證，開通通話權限 + 待开通 + 對方邀請您完成真人認證，開通通話權限 + 去开通 + 送给TA + 送给你 + 确定 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 身份證正面 + 身份證背面 + 發起審核 + + 带*为必填项,為保障您的利益，請如實填寫 + 性别 + 男 + 女 + 真实姓名 + 請填寫您的真實姓名 + 手机号码 + 請填寫您的手机号码 + 身份证号码 + 請填寫您的身份证号码 + 上传手持证件照 + 請將证件頭像朝向前方 + 參考圖 + 上傳背景圖片 + 發起審核 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 條件一：完後真人認證 + 已完成 + 條件二：上傳入駐資料 + 已完成 + + 跳过 + 我的标签 + 暂无标签 + 完成 + + 完善个人信息 + 去选择 + 昵称 + 性别 + 女 + 男 + 生日 + 完成 + + 溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次 + + 頭像 + 暱稱 + 簽名 + 生日 + 性別 + 所在地 + 綁定手機 + 真人認證 + 興趣 + + 忘记密码 + + 用户登录 + + 魅力榜 + 财富榜 + + 正在热聊中 + 匹配中… + TA還在練習見面開場白，再給TA點時間吧~ + 灵魂速配 + + 聯繫客服 + + 用户注册 + + 年龄 + 全部 + 40以上 + 性别 + 男 + 女 + 是否完成真人认证 + 已完成 + 未完成 + 确定 + + 猜你喜欢 + + 個人設定 + 修改密碼 + 黑名單 + 語言設定 + 達人認證 + 常見問題 + 服務協議 + 清除緩存 + 刪除用戶 + 關於我們 + 版本號 + 檢查新版本 + 退出 + + 我的标签 + + 活泼 + + 取消 + + 关注 + 此次通话结束了快开启\n下一次通话吧 + 再次通话 + 去充值 + + 打招呼设置 + 一键已读 + + 推荐 + 热门 + + 关注 + + 消息 + 好友 + + 用戶名稱 + 这个人很懒，什么也没留下。 + + 请输入文案 + + 點擊查看 + + 輸入信息 + 聯繫客服 + 没有找到匹配结果~ + + 對方邀請您完成真人認證，開通通話權限 + 去开通 + + 送給你 + + 充值 + + 查看主页 + + 添加更多 + 保存 \ No newline at end of file diff --git a/OneToOne/src/main/res/values-zh-rTW/strings.xml b/OneToOne/src/main/res/values-zh-rTW/strings.xml index f0e475dda..ba7ba87ce 100644 --- a/OneToOne/src/main/res/values-zh-rTW/strings.xml +++ b/OneToOne/src/main/res/values-zh-rTW/strings.xml @@ -34,4 +34,217 @@ 最多选 %1$s 张图片哦 暫無好友消息~ + 餘額不足 + 文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天 + + 與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天 + 離開 + 去充值 + 发起视频通话\n%s钻/分钟 + 发起语音通话\n%s钻/分钟 + 相册 + 拍照 + 图片信息 + 复制 + 删除 + 置顶 + 复制成功 + 上传中 + 上传成功 + 上传失败 + 年 + 月 + 日 + 生日 + 完成 + 完成 + 请填写昵称 + 请选择性别 + 请允许悬浮窗权限才能进行小窗 + 设置 + 取消 + 通话时长: + 通话将在%s秒后断\n开，请及时充值 + 首次匹配成功奖励 + 恭喜获得 + 打招呼設置 + 審核中，請耐心等待 + 已發起審核，請耐心等待審核結果 + 審核失敗，去提交 + 審核中 + 認證通過 + 審核失敗重新提交 + 去認證 + 重新提交 + 上傳入駐資料 + 達人認證 + 查询中 + 去上傳 + 請輸入內容 + 確定要退出靈魂速配嗎？ + 繼續匹配 + 徹底離開 + 当前等待时间较长，建议您先去观看动态哦，稍后再来哦~ + 繼續匹配 + 去看动态 + 余额不足，请充值后再进行尝试吧~ + 取消 + 前往充值 + [禮物] + [邀請認證] + 等待对方接受邀请… + 连接成功 + 需要获取您的权限 + 邀請對方完成真人認證，開通通話權限 + 待开通 + 對方邀請您完成真人認證，開通通話權限 + 去开通 + 送给TA + 送给你 + 确定 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 身份證正面 + 身份證背面 + 發起審核 + + 带*为必填项,為保障您的利益，請如實填寫 + 性别 + 男 + 女 + 真实姓名 + 請填寫您的真實姓名 + 手机号码 + 請填寫您的手机号码 + 身份证号码 + 請填寫您的身份证号码 + 上传手持证件照 + 請將证件頭像朝向前方 + 參考圖 + 上傳背景圖片 + 發起審核 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 條件一：完後真人認證 + 已完成 + 條件二：上傳入駐資料 + 已完成 + + 跳过 + 我的标签 + 暂无标签 + 完成 + + 完善个人信息 + 去选择 + 昵称 + 性别 + 女 + 男 + 生日 + 完成 + + 溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次 + + 頭像 + 暱稱 + 簽名 + 生日 + 性別 + 所在地 + 綁定手機 + 真人認證 + 興趣 + + 忘记密码 + + 用户登录 + + 魅力榜 + 财富榜 + + 正在热聊中 + 匹配中… + TA還在練習見面開場白，再給TA點時間吧~ + 灵魂速配 + + 聯繫客服 + + 用户注册 + + 年龄 + 全部 + 40以上 + 性别 + 男 + 女 + 是否完成真人认证 + 已完成 + 未完成 + 确定 + + 猜你喜欢 + + 個人設定 + 修改密碼 + 黑名單 + 語言設定 + 達人認證 + 常見問題 + 服務協議 + 清除緩存 + 刪除用戶 + 關於我們 + 版本號 + 檢查新版本 + 退出 + + 我的标签 + + 活泼 + + 取消 + + 关注 + 此次通话结束了快开启\n下一次通话吧 + 再次通话 + 去充值 + + 打招呼设置 + 一键已读 + + 推荐 + 热门 + + 关注 + + 消息 + 好友 + + 用戶名稱 + 这个人很懒，什么也没留下。 + + 请输入文案 + + 點擊查看 + + 輸入信息 + 聯繫客服 + 没有找到匹配结果~ + + 對方邀請您完成真人認證，開通通話權限 + 去开通 + + 送給你 + + 充值 + + 查看主页 + + 添加更多 + 保存 \ No newline at end of file diff --git a/OneToOne/src/main/res/values/strings.xml b/OneToOne/src/main/res/values/strings.xml index b3105e1ac..6779c3750 100644 --- a/OneToOne/src/main/res/values/strings.xml +++ b/OneToOne/src/main/res/values/strings.xml @@ -35,4 +35,218 @@ 最多选 %1$s 张图片哦 friend empty + 餘額不足 + "文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天" + + + 與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天 + 聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天 + 離開 + 去充值 + 发起视频通话\n%s钻/分钟 + 发起语音通话\n%s钻/分钟 + 相册 + 拍照 + 图片信息 + 复制 + 删除 + 置顶 + 复制成功 + 上传中 + 上传成功 + 上传失败 + 年 + 月 + 日 + 生日 + 完成 + 完成 + 请填写昵称 + 请选择性别 + 请允许悬浮窗权限才能进行小窗 + 设置 + 取消 + 通话时长: + 通话将在%s秒后断\n开，请及时充值 + 首次匹配成功奖励 + 恭喜获得 + 打招呼設置 + 審核中，請耐心等待 + 已發起審核，請耐心等待審核結果 + 審核失敗，去提交 + 審核中 + 認證通過 + 審核失敗重新提交 + 去認證 + 重新提交 + 上傳入駐資料 + 達人認證 + 查询中 + 去上傳 + 請輸入內容 + 確定要退出靈魂速配嗎？ + 繼續匹配 + 徹底離開 + 当前等待时间较长，建议您先去观看动态哦，稍后再来哦~ + 繼續匹配 + 去看动态 + 余额不足，请充值后再进行尝试吧~ + 取消 + 前往充值 + [禮物] + [邀請認證] + 等待对方接受邀请… + 连接成功 + 需要获取您的权限 + 邀請對方完成真人認證，開通通話權限 + 待开通 + 對方邀請您完成真人認證，開通通話權限 + 去开通 + 送给TA + 送给你 + 确定 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 身份證正面 + 身份證背面 + 發起審核 + + 带*为必填项,為保障您的利益，請如實填寫 + 性别 + 男 + 女 + 真实姓名 + 請填寫您的真實姓名 + 手机号码 + 請填寫您的手机号码 + 身份证号码 + 請填寫您的身份证号码 + 上传手持证件照 + 請將证件頭像朝向前方 + 參考圖 + 上傳背景圖片 + 發起審核 + + 真人說明 + 請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例 + 條件一：完後真人認證 + 已完成 + 條件二：上傳入駐資料 + 已完成 + + 跳过 + 我的标签 + 暂无标签 + 完成 + + 完善个人信息 + 去选择 + 昵称 + 性别 + 女 + 男 + 生日 + 完成 + + 溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次 + + 頭像 + 暱稱 + 簽名 + 生日 + 性別 + 所在地 + 綁定手機 + 真人認證 + 興趣 + + 忘记密码 + + 用户登录 + + 魅力榜 + 财富榜 + + 正在热聊中 + 匹配中… + TA還在練習見面開場白，再給TA點時間吧~ + 灵魂速配 + + 聯繫客服 + + 用户注册 + + 年龄 + 全部 + 40以上 + 性别 + 男 + 女 + 是否完成真人认证 + 已完成 + 未完成 + 确定 + + 猜你喜欢 + + 個人設定 + 修改密碼 + 黑名單 + 語言設定 + 達人認證 + 常見問題 + 服務協議 + 清除緩存 + 刪除用戶 + 關於我們 + 版本號 + 檢查新版本 + 退出 + + 我的标签 + + 活泼 + + 取消 + + 关注 + 此次通话结束了快开启\n下一次通话吧 + 再次通话 + 去充值 + + 打招呼设置 + 一键已读 + + 推荐 + 热门 + + 关注 + + 消息 + 好友 + + 用戶名稱 + 这个人很懒，什么也没留下。 + + 请输入文案 + + 點擊查看 + + 輸入信息 + 聯繫客服 + 没有找到匹配结果~ + + 對方邀請您完成真人認證，開通通話權限 + 去开通 + + 送給你 + + 充值 + + 查看主页 + + 添加更多 + 保存 \ No newline at end of file diff --git a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java index 764297b5a..d2240037d 100644 --- a/common/src/main/java/com/yunbao/common/utils/ToastUtil.java +++ b/common/src/main/java/com/yunbao/common/utils/ToastUtil.java @@ -80,7 +80,7 @@ public class ToastUtil { } public static void showDebug(String s){ if(BuildConfig.DEBUG){ - show(s); + show("开发模式:"+s); } } public static void showDebug(int s){