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-10-24 17:20:38 +08:00
parent 07f7a28d0a
commit 06f0e59c70
71 changed files with 944 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OneToOne/src/main/java/com/shayu/onetoone/activity/HomeScreenActivity.java
View File

@ -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();

2
OneToOne/src/main/java/com/shayu/onetoone/activity/HomeSearchActivity.java
View File

@ -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)

20
OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
View File

@ -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);
}

22
OneToOne/src/main/java/com/shayu/onetoone/activity/MatchingActivity.java
View File

@ -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();
}
}

2
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/MyFragment.java
View File

@ -158,7 +158,7 @@ public class MyFragment extends BaseFragment implements OnItemClickListener<User
public void onClick(View v) {
ClipboardManager cm = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
cm.setText(mID.getText() + "");
Toast.makeText(mContext, "複製成功", Toast.LENGTH_SHORT).show();
Toast.makeText(mContext, R.string.copy_success, Toast.LENGTH_SHORT).show();
}
});
mRecyclerView = (RecyclerView) itemView.findViewById(R.id.recyclerView);

53
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
View File

@ -149,8 +149,8 @@ public class ChatMessageFragment extends AbsConversationFragment {
super.onError(status, msg);
if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
new TipsDialog(mContext)
.setTitle("餘額不足")
.setContent(String.format("文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天", msg))
.setTitle(WordUtil.getNewString(R.string.not_money))
.setContent(String.format(WordUtil.getNewString(R.string.not_money_tips), msg))
.setOnDialogClickListener(new OnDialogClickListener() {
@Override
@ -261,16 +261,15 @@ public class ChatMessageFragment extends AbsConversationFragment {
public void onError(int status, String msg) {
super.onError(status, msg);
new TipsDialog(mContext)
.setTitle("餘額不足")
.setContent("與TA視頻聊天每分鐘續消耗" + configBean.getVideoPrice()
+ "鑽石，您可通過充值獲取更多鑽石，以便繼續聊天")
.setCancelText("離開")
.setApplyText("去充值")
.setTitle(WordUtil.getNewString(R.string.not_money))
.setContent(String.format(WordUtil.getNewString(R.string.not_money_video_tips),configBean.getVideoPrice()))
.setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip))
.setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip))
.showDialog();
}
});
}
}).setStrings(Collections.singletonList("发起视频通话\n" + configBean.getVideoPrice() + "钻/分钟"))
}).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_video_tips),configBean.getVideoPrice())))
.showDialog();
@ -309,17 +308,16 @@ public class ChatMessageFragment extends AbsConversationFragment {
public void onError(int status, String msg) {
super.onError(status, msg);
new TipsDialog(mContext)
.setTitle("餘額不足")
.setContent("與TA语音聊天每分鐘續消耗" + configBean.getMp3Price()
+ "鑽石，您可通過充值獲取更多鑽石，以便繼續聊天")
.setCancelText("離開")
.setApplyText("去充值")
.setTitle(WordUtil.getNewString(R.string.not_money))
.setContent(String.format(WordUtil.getNewString(R.string.not_money_audio_tips),configBean.getMp3Price()))
.setCancelText(WordUtil.getNewString(R.string.dialog_cancel_tip))
.setApplyText(WordUtil.getNewString(R.string.dialog_to_money_tip))
.showDialog();
}
});
}
}).setStrings(Collections.singletonList("发起语音通话\n" + configBean.getMp3Price() + "钻/分钟"))
}).setStrings(Collections.singletonList(String.format(WordUtil.getNewString(R.string.chat_audio_tips),configBean.getMp3Price())))
.showDialog();
}
@ -332,13 +330,13 @@ public class ChatMessageFragment extends AbsConversationFragment {
});
img.setOnClickListener(v -> {
new BottomListDialog(mContext)
.setStrings(Arrays.asList("相册", "拍照"))
.setStrings(Arrays.asList(WordUtil.getNewString(R.string.album), WordUtil.getNewString(R.string.camera)))
.setSelect(new OnItemClickListener<String>() {
@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<Message>() {
@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<String>() {
@Override
public void onItemClick(String bean, int position) {
if (bean.equals("複製")) {
if (bean.equals(WordUtil.getNewString(R.string.copy))) {
copyText(data);
} else {
delete(data);

5
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
View File

@ -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);

4
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
View File

@ -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);

37
OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
View File

@ -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<HttpCallbackModel>() {

18
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallAudioActivity.java
View File

@ -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<String>() {
@Override
public void onItemClick(String bean, int position) {

12
OneToOne/src/main/java/com/shayu/onetoone/activity/message/CallVideoActivity.java
View File

@ -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<String>() {
@Override
public void onItemClick(String bean, int position) {

5
OneToOne/src/main/java/com/shayu/onetoone/activity/message/ChatActivity.java
View File

@ -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

3
OneToOne/src/main/java/com/shayu/onetoone/activity/message/MsgMoreGreetConfigActivity.java
View File

@ -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);

13
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthActivity.java
View File

@ -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 {

9
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerActivity.java
View File

@ -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());
}

21
OneToOne/src/main/java/com/shayu/onetoone/activity/user/AuthBloggerInletActivity.java
View File

@ -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

15
OneToOne/src/main/java/com/shayu/onetoone/activity/user/EditProfileActivity.java
View File

@ -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<HttpCallbackModel>() {
@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));
}
}

8
OneToOne/src/main/java/com/shayu/onetoone/adapter/HomeRecommendListAdapter.java
View File

@ -133,16 +133,16 @@ public class HomeRecommendListAdapter extends RecyclerView.Adapter<HomeRecommend
super.onError(status, msg, bean);
if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
new TipsDialog(mContext)
.setTitle("余额不足，请充值后再进行尝试吧~")
.setApplyText("前往充值")
.setTitle(WordUtil.getNewString(R.string.money_title))
.setApplyText(WordUtil.getNewString(R.string.money_apply))
.setOnDialogClickListener(new OnDialogClickListener() {
@Override
public void onApply(Dialog dialog) {
super.onApply(dialog);
ToastUtil.show("跳充值页面");
ToastUtil.showDebug("跳充值页面");
}
})
.setApplyText("确定")
.setCancelText(WordUtil.getNewString(R.string.money_cancel))
.showDialog();
}else{
new TipsDialog(mContext)

6
OneToOne/src/main/java/com/shayu/onetoone/adapter/MsgMessageRecyclerViewAdapter.java
View File

@ -2,9 +2,11 @@ package com.shayu.onetoone.adapter;
import android.text.SpannableString;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.MessageChatAuthContent;
import com.shayu.onetoone.bean.MessageChatGiftContent;
import com.yanzhenjie.recyclerview.SwipeRecyclerView;
import com.yunbao.common.utils.WordUtil;
import androidx.annotation.NonNull;
@ -66,9 +68,9 @@ public class MsgMessageRecyclerViewAdapter extends ConversationListAdapter {
}
if (datum.mCore.getConversationType() == Conversation.ConversationType.PRIVATE || datum.mCore.getConversationType() == Conversation.ConversationType.SYSTEM) {
if(datum.mCore.getLatestMessage() instanceof MessageChatGiftContent){
datum.mConversationContent=new SpannableString("[禮物]");
datum.mConversationContent=new SpannableString(WordUtil.getNewString(R.string.gift));
}else if(datum.mCore.getLatestMessage() instanceof MessageChatAuthContent){
datum.mConversationContent=new SpannableString("[邀請認證]");
datum.mConversationContent=new SpannableString(WordUtil.getNewString(R.string.authentication));
}
if (datum.mCore.isTop()) {
top.add(datum);

11
OneToOne/src/main/java/com/shayu/onetoone/manager/CallClientManager.java
View File

@ -8,6 +8,7 @@ import android.text.TextUtils;
import android.view.SurfaceView;
import com.blankj.utilcode.util.PermissionUtils;
import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.SendConsumeBean;
import com.shayu.onetoone.listener.OnCallStatusListener;
import com.shayu.onetoone.listener.OnSendMessageListener;
@ -109,7 +110,7 @@ public class CallClientManager {
for (OnCallStatusListener listener : listeners) {
listener.onCallWait(localVideo);
}
ToastUtil.show("等待对方接受邀请...");
ToastUtil.show(R.string.call_tips1);
}
@Override
@ -117,7 +118,7 @@ public class CallClientManager {
for (OnCallStatusListener listener : listeners) {
listener.onCallStart(userId, remoteVideo);
}
ToastUtil.show("连接成功");
ToastUtil.show(R.string.call_tips2);
startTimer(targetId);
}
@ -148,7 +149,7 @@ public class CallClientManager {
for (OnCallStatusListener listener : listeners) {
listener.onCallWait(localVideo);
}
ToastUtil.show("等待对方接受邀请...");
ToastUtil.show(R.string.call_tips1);
}
@Override
@ -156,7 +157,7 @@ public class CallClientManager {
for (OnCallStatusListener listener : listeners) {
listener.onCallStart(userId, remoteVideo);
}
ToastUtil.show("连接成功");
ToastUtil.show(R.string.call_tips2);
startTimer(targetId);
}
@ -361,7 +362,7 @@ public class CallClientManager {
@Override
public void onCheckPermission(RongCallSession callSession) {
ToastUtil.show("权限申请");
ToastUtil.show(R.string.permission_request_title);
PermissionUtils.permission(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO).callback(new PermissionUtils.SimpleCallback() {
@Override
public void onGranted() {

9
OneToOne/src/main/java/com/shayu/onetoone/provider/MessageChatAutoItemProvider.java
View File

@ -10,6 +10,7 @@ import com.shayu.onetoone.R;
import com.shayu.onetoone.bean.MessageChatAuthContent;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.util.List;
@ -50,12 +51,12 @@ public class MessageChatAutoItemProvider extends BaseMessageItemProvider<Message
if (uiMessage.getMessage().getMessageDirection() == Message.MessageDirection.SEND) {
holder.getView(R.id.btn).setBackgroundResource(R.drawable.background_d9d9d9);
holder.getView(R.id.btn).setEnabled(false);
holder.setText(R.id.tips,"邀請對方完成真人認證，開通通話權限");
((Button)holder.getView(R.id.btn)).setText("待开通");
holder.setText(R.id.tips, WordUtil.getNewString(R.string.request_authentication_tips1));
((Button)holder.getView(R.id.btn)).setText(WordUtil.getNewString(R.string.request_authentication_tips2));
} else {
holder.getView(R.id.btn).setBackgroundResource(R.drawable.background_8f7cdf);
((Button)holder.getView(R.id.btn)).setText("去开通");
holder.setText(R.id.tips,"對方邀請您完成真人認證，開通通話權限");
holder.setText(R.id.tips,WordUtil.getNewString(R.string.request_authentication_tips3));
((Button)holder.getView(R.id.btn)).setText(WordUtil.getNewString(R.string.request_authentication_tips4));
holder.getView(R.id.btn).setEnabled(true);
}
holder.setOnClickListener(R.id.btn, new View.OnClickListener() {

5
OneToOne/src/main/java/com/shayu/onetoone/provider/MessageChatReceiveGiftItemProvider.java
View File

@ -15,6 +15,7 @@ import com.shayu.onetoone.bean.MessageChatGiftContent;
import com.yunbao.common.glide.ImgLoader;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.util.List;
@ -61,10 +62,10 @@ public class MessageChatReceiveGiftItemProvider extends BaseMessageItemProvider<
if (messageChatGiftContent.getSendUid().equals(IMLoginManager.get(mContext).getUserInfo().getId() + "")) {
params.gravity = Gravity.END;
uiMessage.setMessageDirection(Message.MessageDirection.SEND);
holder.setText(R.id.title,"送给TA");
holder.setText(R.id.title, WordUtil.getNewString(R.string.gift_send_ta));
} else {
uiMessage.setMessageDirection(Message.MessageDirection.RECEIVE);
holder.setText(R.id.title,"送给你");
holder.setText(R.id.title,WordUtil.getNewString(R.string.gift_send_you));
params.gravity = Gravity.START;
}
try {

5
OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForAudio.java
View File

@ -19,6 +19,7 @@ import com.shayu.onetoone.listener.OnDialogClickListener;
import com.shayu.onetoone.listener.OnSendMessageListener;
import com.shayu.onetoone.manager.SendMessageManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.lang.reflect.Field;
@ -131,8 +132,8 @@ public class MsgInputPanelForAudio extends AbsInputPanel {
super.onError(status, msg);
if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
new TipsDialog(mContext)
.setTitle("餘額不足")
.setContent(String.format("聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天", msg))
.setTitle(WordUtil.getNewString(R.string.not_money))
.setContent(String.format(WordUtil.getNewString(R.string.not_money_text_tips), msg))
.setOnDialogClickListener(new OnDialogClickListener() {
@Override

4
OneToOne/src/main/java/com/shayu/onetoone/view/MsgInputPanelForGift.java
View File

@ -25,6 +25,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import java.util.ArrayList;
import java.util.List;
@ -88,7 +89,8 @@ public class MsgInputPanelForGift extends AbsInputPanel {
public void onError(int status, String msg) {
super.onError(status, msg);
new TipsDialog(mContext)
.setTitle("餘額不足")
.setTitle(WordUtil.getNewString(R.string.not_money))
.setApplyText(WordUtil.getNewString(R.string.dialog_apply))
.showDialog();
}
});

12
OneToOne/src/main/res/layout/activity_auth.xml
View File

@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text="真人說明"
android:text="@string/layout_auth_tips1"
android:textColor="@color/black2"
android:textSize="18sp"
android:textStyle="bold" />
@ -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" />

30
OneToOne/src/main/res/layout/activity_auth_blogger.xml
View File

@ -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" />

10
OneToOne/src/main/res/layout/activity_auth_blogger_inlet.xml
View File

@ -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 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="條件一：完後真人認證 "
android:text="@string/layout_auth_blogger_inlet_tips3"
android:textColor="@color/white"
android:textSize="16sp" />
@ -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" />

1
OneToOne/src/main/res/layout/activity_call_audio.xml
View File

@ -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"

8
OneToOne/src/main/res/layout/activity_choose_label.xml
View File

@ -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" />

14
OneToOne/src/main/res/layout/activity_complete.xml
View File

@ -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" />
</LinearLayout>

2
OneToOne/src/main/res/layout/activity_edit_name.xml
View File

@ -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" />
</RelativeLayout>

18
OneToOne/src/main/res/layout/activity_edit_profile.xml
View File

@ -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" />

2
OneToOne/src/main/res/layout/activity_find_pwd.xml
View File

@ -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" />

2
OneToOne/src/main/res/layout/activity_login.xml
View File

@ -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" />

4
OneToOne/src/main/res/layout/activity_main_list.xml
View File

@ -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" />
</com.angcyo.tablayout.DslTabLayout>

8
OneToOne/src/main/res/layout/activity_matching.xml
View File

@ -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" />

2
OneToOne/src/main/res/layout/activity_msg_message.xml
View File

@ -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"

2
OneToOne/src/main/res/layout/activity_register.xml
View File

@ -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"

24
OneToOne/src/main/res/layout/activity_screen.xml
View File

@ -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"

2
OneToOne/src/main/res/layout/activity_search.xml
View File

@ -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" />

26
OneToOne/src/main/res/layout/activity_setting.xml
View File

@ -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" />

2
OneToOne/src/main/res/layout/adapter_choose_label.xml
View File

@ -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" />

2
OneToOne/src/main/res/layout/adapter_item_tag.xml
View File

@ -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" />
</LinearLayout>

2
OneToOne/src/main/res/layout/dialog_bottom_list.xml
View File

@ -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" />
</androidx.constraintlayout.widget.ConstraintLayout>

12
OneToOne/src/main/res/layout/dialog_end_call.xml
View File

@ -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" />
</LinearLayout>

4
OneToOne/src/main/res/layout/dialog_msg_more.xml
View File

@ -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" />
</LinearLayout>

4
OneToOne/src/main/res/layout/dialog_tips1.xml
View File

@ -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" />
</LinearLayout>

4
OneToOne/src/main/res/layout/fragment_friends.xml
View File

@ -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" />
<TextView
android:gravity="center"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="热门" />
android:text="@string/layout_friends_tips2" />
</com.angcyo.tablayout.DslTabLayout>

6
OneToOne/src/main/res/layout/fragment_home_ranking.xml
View File

@ -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"

4
OneToOne/src/main/res/layout/fragment_msg.xml
View File

@ -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" />
<TextView
android:gravity="center"
android:textSize="16sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="好友" />
android:text="@string/layout_f_msg_tips2" />
</com.angcyo.tablayout.DslTabLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
OneToOne/src/main/res/layout/fragment_my.xml
View File

@ -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" />

8
OneToOne/src/main/res/layout/item_home_rank.xml
View File

@ -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" />
</LinearLayout>
@ -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"

6
OneToOne/src/main/res/layout/item_home_recommend.xml
View File

@ -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" />
</LinearLayout>

3
OneToOne/src/main/res/layout/item_main_me_2.xml
View File

@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:layout_marginTop="12dp"
android:gravity="left|center"
android:layout_marginBottom="12dp"
@ -17,7 +18,7 @@
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="sdsdsdsd"
tools:text="sdsdsdsd"
android:gravity="center"
android:layout_marginLeft="5dp"
android:textColor="#333333"

2
OneToOne/src/main/res/layout/item_msg_greet_config.xml
View File

@ -15,7 +15,7 @@
android:background="#00FFFFFF"
android:ems="10"
android:inputType="text"
android:hint="请输入文案"
android:hint="@string/layout_i_greet_config_tips1"
android:textColor="#333333"
android:textColorHint="#BEBDBD"
android:textSize="14sp"

5
OneToOne/src/main/res/layout/item_sys_msg.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -19,7 +20,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="65dp"
android:text="通知標題標題通知標題標題"
tools:text="通知標題標題通知標題標題"
android:textColor="#ff161616"
android:textSize="16sp" />
@ -80,7 +81,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="點擊查看"
android:text="@string/layout_i_sys_msg_tips1"
android:textColor="#ffaaaaaa"
android:textSize="12sp" />

2
OneToOne/src/main/res/layout/rc_extension_input_panel.xml
View File

@ -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"

2
OneToOne/src/main/res/layout/view_conversation_system_fragment.xml
View File

@ -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"

2
OneToOne/src/main/res/layout/view_empty_list.xml
View File

@ -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" />

7
OneToOne/src/main/res/layout/view_exchange_record_item_holder.xml
View File

@ -2,6 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="60dp"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical">
<LinearLayout
@ -18,7 +19,7 @@
android:ellipsize="end"
android:maxWidth="170dp"
android:singleLine="true"
android:text="收到×××的×××禮物"
tools:text="收到×××的×××禮物"
android:textColor="#333333"
android:textSize="14sp" />
@ -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" />
<TextView

4
OneToOne/src/main/res/layout/view_message_chat_auth.xml
View File

@ -14,7 +14,7 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="8dp"
android:maxWidth="261dp"
android:text="對方邀請您完成真人認證，開通通話權限"
android:text="@string/layout_d_msg_chat_auth_tips1"
android:textColor="#333333"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
@ -27,7 +27,7 @@
android:layout_height="23dp"
android:layout_marginBottom="10dp"
android:background="@drawable/background_8f7cdf"
android:text="去开通"
android:text="@string/layout_d_msg_chat_auth_tips2"
android:textColor="#FFF"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"

2
OneToOne/src/main/res/layout/view_message_chat_receive_gift.xml
View File

@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="11dp"
android:text="送給你"
android:text="@string/layout_d_msg_gift_tips1"
android:textColor="#333333"
android:textSize="12sp"
app:layout_constraintStart_toStartOf="parent"

2
OneToOne/src/main/res/layout/view_message_chat_tip.xml
View File

@ -14,7 +14,7 @@
android:padding="5dp"
android:paddingStart="11dp"
android:paddingEnd="11dp"
android:text="【安全提示】為保障您的權益，慶提高警惕，不要輕易添加或提供第三方聯繫方式"
tools:text="【安全提示】為保障您的權益，慶提高警惕，不要輕易添加或提供第三方聯繫方式"
android:textColor="#76777B"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"

4
OneToOne/src/main/res/layout/view_message_input_gift.xml
View File

@ -51,7 +51,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" />
@ -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" />
</LinearLayout>

12
OneToOne/src/main/res/layout/view_message_msg_bar.xml
View File

@ -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" />
</LinearLayout>
@ -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"

2
OneToOne/src/main/res/layout/view_msg_greet_config_add.xml
View File

@ -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"

2
OneToOne/src/main/res/layout/view_title_custom.xml
View File

@ -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" />

213
OneToOne/src/main/res/values-zh-rHK/strings.xml
View File

@ -34,4 +34,217 @@
<string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
<string name="view_friend_empty_text">暫無好友消息~</string>
<string name="not_money">餘額不足</string>
<string name="not_money_tips">文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="dialog_cancel_tip">離開</string>
<string name="dialog_to_money_tip">去充值</string>
<string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
<string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
<string name="album">相册</string>
<string name="camera">拍照</string>
<string name="photo_info">图片信息</string>
<string name="copy">复制</string>
<string name="delete">删除</string>
<string name="top">置顶</string>
<string name="copy_success">复制成功</string>
<string name="upload_in_progress">上传中</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">上传失败</string>
<string name="year">年</string>
<string name="month">月</string>
<string name="day">日</string>
<string name="birthday">生日</string>
<string name="complete">完成</string>
<string name="complete2">完成</string>
<string name="nickname_hint">请填写昵称</string>
<string name="gender_hint">请选择性别</string>
<string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
<string name="permission_setting">设置</string>
<string name="permission_cancel">取消</string>
<string name="call_time">通话时长:</string>
<string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
<string name="dialog_normal_title">首次匹配成功奖励</string>
<string name="dialog_normal_content">恭喜获得</string>
<string name="title_greet_config">打招呼設置</string>
<string name="title_audit_config">審核中，請耐心等待</string>
<string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
<string name="title_audit_config3">審核失敗，去提交</string>
<string name="title_audit_config4">審核中</string>
<string name="title_audit_config5">認證通過</string>
<string name="title_audit_config6">審核失敗重新提交</string>
<string name="title_audit_config7">去認證</string>
<string name="resubmit">重新提交</string>
<string name="upload_enter_title">上傳入駐資料</string>
<string name="user_authentication">達人認證</string>
<string name="query">查询中</string>
<string name="to_upload">去上傳</string>
<string name="search_empty">請輸入內容</string>
<string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
<string name="matching_quit_cancel">繼續匹配</string>
<string name="matching_quit_apply">徹底離開</string>
<string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
<string name="matching_wait_cancel">繼續匹配</string>
<string name="matching_wait_apply">去看动态</string>
<string name="money_title">余额不足，请充值后再进行尝试吧~</string>
<string name="money_cancel">取消</string>
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="call_tips1">等待对方接受邀请…</string>
<string name="call_tips2">连接成功</string>
<string name="permission_request_title">需要获取您的权限</string>
<string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
<string name="request_authentication_tips2">待开通</string>
<string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
<string name="request_authentication_tips4">去开通</string>
<string name="gift_send_ta">送给TA</string>
<string name="gift_send_you">送给你</string>
<string name="dialog_apply">确定</string>
<string name="layout_auth_tips1">真人說明</string>
<string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_tips3">身份證正面</string>
<string name="layout_auth_tips4">身份證背面</string>
<string name="layout_auth_tips5">發起審核</string>
<string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
<string name="layout_auth_blogger_tips2">性别</string>
<string name="layout_auth_blogger_tips3">男</string>
<string name="layout_auth_blogger_tips4">女</string>
<string name="layout_auth_blogger_tips5">真实姓名</string>
<string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
<string name="layout_auth_blogger_tips7">手机号码</string>
<string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
<string name="layout_auth_blogger_tips9">身份证号码</string>
<string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
<string name="layout_auth_blogger_tips11">上传手持证件照</string>
<string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
<string name="layout_auth_blogger_tips13">參考圖</string>
<string name="layout_auth_blogger_tips14">上傳背景圖片</string>
<string name="layout_auth_blogger_tips15">發起審核</string>
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
<string name="layout_choose_label_tip1">跳过</string>
<string name="layout_choose_label_tip2">我的标签</string>
<string name="layout_choose_label_tip3">暂无标签</string>
<string name="layout_choose_label_tip4">完成</string>
<string name="layout_complete_tip1">完善个人信息</string>
<string name="layout_complete_tip2">去选择</string>
<string name="layout_complete_tip3">昵称</string>
<string name="layout_complete_tip4">性别</string>
<string name="layout_complete_tip5">女</string>
<string name="layout_complete_tip6">男</string>
<string name="layout_complete_tip7">生日</string>
<string name="layout_complete_tip8">完成</string>
<string name="layout_edit_name_tip1">溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次</string>
<string name="layout_edit_profile_tip1">頭像</string>
<string name="layout_edit_profile_tip2">暱稱</string>
<string name="layout_edit_profile_tip3">簽名</string>
<string name="layout_edit_profile_tip4">生日</string>
<string name="layout_edit_profile_tip5">性別</string>
<string name="layout_edit_profile_tip6">所在地</string>
<string name="layout_edit_profile_tip7">綁定手機</string>
<string name="layout_edit_profile_tip8">真人認證</string>
<string name="layout_edit_profile_tip9">興趣</string>
<string name="layout_find_pwd_tip1">忘记密码</string>
<string name="layout_login_tip1">用户登录</string>
<string name="layout_main_list_tip1">魅力榜</string>
<string name="layout_main_list_tip2">财富榜</string>
<string name="layout_matching_tip1">正在热聊中</string>
<string name="layout_matching_tip2">匹配中…</string>
<string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
<string name="layout_matching_tip4">灵魂速配</string>
<string name="layout_msg_message_tip1">聯繫客服</string>
<string name="layout_register_tip1">用户注册</string>
<string name="layout_screen_tip1">年龄</string>
<string name="layout_screen_tip2">全部</string>
<string name="layout_screen_tip3">40以上</string>
<string name="layout_screen_tip4">性别</string>
<string name="layout_screen_tip5">男</string>
<string name="layout_screen_tip6">女</string>
<string name="layout_screen_tip7">是否完成真人认证</string>
<string name="layout_screen_tip8">已完成</string>
<string name="layout_screen_tip9">未完成</string>
<string name="layout_screen_tip10">确定</string>
<string name="layout_search_tip1">猜你喜欢</string>
<string name="layout_setting_tip1">個人設定</string>
<string name="layout_setting_tip2">修改密碼</string>
<string name="layout_setting_tip3">黑名單</string>
<string name="layout_setting_tip4">語言設定</string>
<string name="layout_setting_tip5">達人認證</string>
<string name="layout_setting_tip6">常見問題</string>
<string name="layout_setting_tip7">服務協議</string>
<string name="layout_setting_tip8">清除緩存</string>
<string name="layout_setting_tip9">刪除用戶</string>
<string name="layout_setting_tip10">關於我們</string>
<string name="layout_setting_tip11">版本號</string>
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_choose_label_adapter_tip1">我的标签</string>
<string name="layout_item_tag">活泼</string>
<string name="layout_bottom_list_tips1">取消</string>
<string name="layout_bend_call_tips1">关注</string>
<string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
<string name="layout_bend_call_tips3">再次通话</string>
<string name="layout_bend_call_tips4">去充值</string>
<string name="layout_msg_more_tips1">打招呼设置</string>
<string name="layout_msg_more_tips2">一键已读</string>
<string name="layout_friends_tips1">推荐</string>
<string name="layout_friends_tips2">热门</string>
<string name="layout_home_ranking_tips1">关注</string>
<string name="layout_f_msg_tips1">消息</string>
<string name="layout_f_msg_tips2">好友</string>
<string name="layout_f_my_tips1">用戶名稱</string>
<string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
<string name="layout_i_greet_config_tips1">请输入文案</string>
<string name="layout_i_sys_msg_tips1">點擊查看</string>
<string name="layout_call_input_tips1">輸入信息</string>
<string name="layout_f_system_tips1">聯繫客服</string>
<string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
<string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
<string name="layout_d_msg_chat_auth_tips2">去开通</string>
<string name="layout_d_msg_gift_tips1">送給你</string>
<string name="layout_d_send_gift_tips1">充值</string>
<string name="layout_d_msg_bar_tips1">查看主页</string>
<string name="layout_v_greet_config_add_tips1">添加更多</string>
<string name="layout_v_custom_tips1">保存</string>
</resources>

213
OneToOne/src/main/res/values-zh-rTW/strings.xml
View File

@ -34,4 +34,217 @@
<string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
<string name="view_friend_empty_text">暫無好友消息~</string>
<string name="not_money">餘額不足</string>
<string name="not_money_tips">文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="dialog_cancel_tip">離開</string>
<string name="dialog_to_money_tip">去充值</string>
<string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
<string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
<string name="album">相册</string>
<string name="camera">拍照</string>
<string name="photo_info">图片信息</string>
<string name="copy">复制</string>
<string name="delete">删除</string>
<string name="top">置顶</string>
<string name="copy_success">复制成功</string>
<string name="upload_in_progress">上传中</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">上传失败</string>
<string name="year">年</string>
<string name="month">月</string>
<string name="day">日</string>
<string name="birthday">生日</string>
<string name="complete">完成</string>
<string name="complete2">完成</string>
<string name="nickname_hint">请填写昵称</string>
<string name="gender_hint">请选择性别</string>
<string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
<string name="permission_setting">设置</string>
<string name="permission_cancel">取消</string>
<string name="call_time">通话时长:</string>
<string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
<string name="dialog_normal_title">首次匹配成功奖励</string>
<string name="dialog_normal_content">恭喜获得</string>
<string name="title_greet_config">打招呼設置</string>
<string name="title_audit_config">審核中，請耐心等待</string>
<string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
<string name="title_audit_config3">審核失敗，去提交</string>
<string name="title_audit_config4">審核中</string>
<string name="title_audit_config5">認證通過</string>
<string name="title_audit_config6">審核失敗重新提交</string>
<string name="title_audit_config7">去認證</string>
<string name="resubmit">重新提交</string>
<string name="upload_enter_title">上傳入駐資料</string>
<string name="user_authentication">達人認證</string>
<string name="query">查询中</string>
<string name="to_upload">去上傳</string>
<string name="search_empty">請輸入內容</string>
<string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
<string name="matching_quit_cancel">繼續匹配</string>
<string name="matching_quit_apply">徹底離開</string>
<string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
<string name="matching_wait_cancel">繼續匹配</string>
<string name="matching_wait_apply">去看动态</string>
<string name="money_title">余额不足，请充值后再进行尝试吧~</string>
<string name="money_cancel">取消</string>
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="call_tips1">等待对方接受邀请…</string>
<string name="call_tips2">连接成功</string>
<string name="permission_request_title">需要获取您的权限</string>
<string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
<string name="request_authentication_tips2">待开通</string>
<string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
<string name="request_authentication_tips4">去开通</string>
<string name="gift_send_ta">送给TA</string>
<string name="gift_send_you">送给你</string>
<string name="dialog_apply">确定</string>
<string name="layout_auth_tips1">真人說明</string>
<string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_tips3">身份證正面</string>
<string name="layout_auth_tips4">身份證背面</string>
<string name="layout_auth_tips5">發起審核</string>
<string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
<string name="layout_auth_blogger_tips2">性别</string>
<string name="layout_auth_blogger_tips3">男</string>
<string name="layout_auth_blogger_tips4">女</string>
<string name="layout_auth_blogger_tips5">真实姓名</string>
<string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
<string name="layout_auth_blogger_tips7">手机号码</string>
<string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
<string name="layout_auth_blogger_tips9">身份证号码</string>
<string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
<string name="layout_auth_blogger_tips11">上传手持证件照</string>
<string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
<string name="layout_auth_blogger_tips13">參考圖</string>
<string name="layout_auth_blogger_tips14">上傳背景圖片</string>
<string name="layout_auth_blogger_tips15">發起審核</string>
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
<string name="layout_choose_label_tip1">跳过</string>
<string name="layout_choose_label_tip2">我的标签</string>
<string name="layout_choose_label_tip3">暂无标签</string>
<string name="layout_choose_label_tip4">完成</string>
<string name="layout_complete_tip1">完善个人信息</string>
<string name="layout_complete_tip2">去选择</string>
<string name="layout_complete_tip3">昵称</string>
<string name="layout_complete_tip4">性别</string>
<string name="layout_complete_tip5">女</string>
<string name="layout_complete_tip6">男</string>
<string name="layout_complete_tip7">生日</string>
<string name="layout_complete_tip8">完成</string>
<string name="layout_edit_name_tip1">溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次</string>
<string name="layout_edit_profile_tip1">頭像</string>
<string name="layout_edit_profile_tip2">暱稱</string>
<string name="layout_edit_profile_tip3">簽名</string>
<string name="layout_edit_profile_tip4">生日</string>
<string name="layout_edit_profile_tip5">性別</string>
<string name="layout_edit_profile_tip6">所在地</string>
<string name="layout_edit_profile_tip7">綁定手機</string>
<string name="layout_edit_profile_tip8">真人認證</string>
<string name="layout_edit_profile_tip9">興趣</string>
<string name="layout_find_pwd_tip1">忘记密码</string>
<string name="layout_login_tip1">用户登录</string>
<string name="layout_main_list_tip1">魅力榜</string>
<string name="layout_main_list_tip2">财富榜</string>
<string name="layout_matching_tip1">正在热聊中</string>
<string name="layout_matching_tip2">匹配中…</string>
<string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
<string name="layout_matching_tip4">灵魂速配</string>
<string name="layout_msg_message_tip1">聯繫客服</string>
<string name="layout_register_tip1">用户注册</string>
<string name="layout_screen_tip1">年龄</string>
<string name="layout_screen_tip2">全部</string>
<string name="layout_screen_tip3">40以上</string>
<string name="layout_screen_tip4">性别</string>
<string name="layout_screen_tip5">男</string>
<string name="layout_screen_tip6">女</string>
<string name="layout_screen_tip7">是否完成真人认证</string>
<string name="layout_screen_tip8">已完成</string>
<string name="layout_screen_tip9">未完成</string>
<string name="layout_screen_tip10">确定</string>
<string name="layout_search_tip1">猜你喜欢</string>
<string name="layout_setting_tip1">個人設定</string>
<string name="layout_setting_tip2">修改密碼</string>
<string name="layout_setting_tip3">黑名單</string>
<string name="layout_setting_tip4">語言設定</string>
<string name="layout_setting_tip5">達人認證</string>
<string name="layout_setting_tip6">常見問題</string>
<string name="layout_setting_tip7">服務協議</string>
<string name="layout_setting_tip8">清除緩存</string>
<string name="layout_setting_tip9">刪除用戶</string>
<string name="layout_setting_tip10">關於我們</string>
<string name="layout_setting_tip11">版本號</string>
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_choose_label_adapter_tip1">我的标签</string>
<string name="layout_item_tag">活泼</string>
<string name="layout_bottom_list_tips1">取消</string>
<string name="layout_bend_call_tips1">关注</string>
<string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
<string name="layout_bend_call_tips3">再次通话</string>
<string name="layout_bend_call_tips4">去充值</string>
<string name="layout_msg_more_tips1">打招呼设置</string>
<string name="layout_msg_more_tips2">一键已读</string>
<string name="layout_friends_tips1">推荐</string>
<string name="layout_friends_tips2">热门</string>
<string name="layout_home_ranking_tips1">关注</string>
<string name="layout_f_msg_tips1">消息</string>
<string name="layout_f_msg_tips2">好友</string>
<string name="layout_f_my_tips1">用戶名稱</string>
<string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
<string name="layout_i_greet_config_tips1">请输入文案</string>
<string name="layout_i_sys_msg_tips1">點擊查看</string>
<string name="layout_call_input_tips1">輸入信息</string>
<string name="layout_f_system_tips1">聯繫客服</string>
<string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
<string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
<string name="layout_d_msg_chat_auth_tips2">去开通</string>
<string name="layout_d_msg_gift_tips1">送給你</string>
<string name="layout_d_send_gift_tips1">充值</string>
<string name="layout_d_msg_bar_tips1">查看主页</string>
<string name="layout_v_greet_config_add_tips1">添加更多</string>
<string name="layout_v_custom_tips1">保存</string>
</resources>

214
OneToOne/src/main/res/values/strings.xml
View File

@ -35,4 +35,218 @@
<string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
<string name="view_friend_empty_text">friend empty</string>
<string name="not_money">餘額不足</string>
<string name="not_money_tips">"文字聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天"</string>
<string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s鑽石，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多鑽石，以便繼續聊天</string>
<string name="dialog_cancel_tip">離開</string>
<string name="dialog_to_money_tip">去充值</string>
<string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
<string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
<string name="album">相册</string>
<string name="camera">拍照</string>
<string name="photo_info">图片信息</string>
<string name="copy">复制</string>
<string name="delete">删除</string>
<string name="top">置顶</string>
<string name="copy_success">复制成功</string>
<string name="upload_in_progress">上传中</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">上传失败</string>
<string name="year">年</string>
<string name="month">月</string>
<string name="day">日</string>
<string name="birthday">生日</string>
<string name="complete">完成</string>
<string name="complete2">完成</string>
<string name="nickname_hint">请填写昵称</string>
<string name="gender_hint">请选择性别</string>
<string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
<string name="permission_setting">设置</string>
<string name="permission_cancel">取消</string>
<string name="call_time">通话时长:</string>
<string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
<string name="dialog_normal_title">首次匹配成功奖励</string>
<string name="dialog_normal_content">恭喜获得</string>
<string name="title_greet_config">打招呼設置</string>
<string name="title_audit_config">審核中，請耐心等待</string>
<string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
<string name="title_audit_config3">審核失敗，去提交</string>
<string name="title_audit_config4">審核中</string>
<string name="title_audit_config5">認證通過</string>
<string name="title_audit_config6">審核失敗重新提交</string>
<string name="title_audit_config7">去認證</string>
<string name="resubmit">重新提交</string>
<string name="upload_enter_title">上傳入駐資料</string>
<string name="user_authentication">達人認證</string>
<string name="query">查询中</string>
<string name="to_upload">去上傳</string>
<string name="search_empty">請輸入內容</string>
<string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
<string name="matching_quit_cancel">繼續匹配</string>
<string name="matching_quit_apply">徹底離開</string>
<string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
<string name="matching_wait_cancel">繼續匹配</string>
<string name="matching_wait_apply">去看动态</string>
<string name="money_title">余额不足，请充值后再进行尝试吧~</string>
<string name="money_cancel">取消</string>
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="call_tips1">等待对方接受邀请…</string>
<string name="call_tips2">连接成功</string>
<string name="permission_request_title">需要获取您的权限</string>
<string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
<string name="request_authentication_tips2">待开通</string>
<string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
<string name="request_authentication_tips4">去开通</string>
<string name="gift_send_ta">送给TA</string>
<string name="gift_send_you">送给你</string>
<string name="dialog_apply">确定</string>
<string name="layout_auth_tips1">真人說明</string>
<string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_tips3">身份證正面</string>
<string name="layout_auth_tips4">身份證背面</string>
<string name="layout_auth_tips5">發起審核</string>
<string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
<string name="layout_auth_blogger_tips2">性别</string>
<string name="layout_auth_blogger_tips3">男</string>
<string name="layout_auth_blogger_tips4">女</string>
<string name="layout_auth_blogger_tips5">真实姓名</string>
<string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
<string name="layout_auth_blogger_tips7">手机号码</string>
<string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
<string name="layout_auth_blogger_tips9">身份证号码</string>
<string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
<string name="layout_auth_blogger_tips11">上传手持证件照</string>
<string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
<string name="layout_auth_blogger_tips13">參考圖</string>
<string name="layout_auth_blogger_tips14">上傳背景圖片</string>
<string name="layout_auth_blogger_tips15">發起審核</string>
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
<string name="layout_choose_label_tip1">跳过</string>
<string name="layout_choose_label_tip2">我的标签</string>
<string name="layout_choose_label_tip3">暂无标签</string>
<string name="layout_choose_label_tip4">完成</string>
<string name="layout_complete_tip1">完善个人信息</string>
<string name="layout_complete_tip2">去选择</string>
<string name="layout_complete_tip3">昵称</string>
<string name="layout_complete_tip4">性别</string>
<string name="layout_complete_tip5">女</string>
<string name="layout_complete_tip6">男</string>
<string name="layout_complete_tip7">生日</string>
<string name="layout_complete_tip8">完成</string>
<string name="layout_edit_name_tip1">溫馨提示：可以免費修改昵稱一次，之後修改需要鑽石600一次</string>
<string name="layout_edit_profile_tip1">頭像</string>
<string name="layout_edit_profile_tip2">暱稱</string>
<string name="layout_edit_profile_tip3">簽名</string>
<string name="layout_edit_profile_tip4">生日</string>
<string name="layout_edit_profile_tip5">性別</string>
<string name="layout_edit_profile_tip6">所在地</string>
<string name="layout_edit_profile_tip7">綁定手機</string>
<string name="layout_edit_profile_tip8">真人認證</string>
<string name="layout_edit_profile_tip9">興趣</string>
<string name="layout_find_pwd_tip1">忘记密码</string>
<string name="layout_login_tip1">用户登录</string>
<string name="layout_main_list_tip1">魅力榜</string>
<string name="layout_main_list_tip2">财富榜</string>
<string name="layout_matching_tip1">正在热聊中</string>
<string name="layout_matching_tip2">匹配中…</string>
<string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
<string name="layout_matching_tip4">灵魂速配</string>
<string name="layout_msg_message_tip1">聯繫客服</string>
<string name="layout_register_tip1">用户注册</string>
<string name="layout_screen_tip1">年龄</string>
<string name="layout_screen_tip2">全部</string>
<string name="layout_screen_tip3">40以上</string>
<string name="layout_screen_tip4">性别</string>
<string name="layout_screen_tip5">男</string>
<string name="layout_screen_tip6">女</string>
<string name="layout_screen_tip7">是否完成真人认证</string>
<string name="layout_screen_tip8">已完成</string>
<string name="layout_screen_tip9">未完成</string>
<string name="layout_screen_tip10">确定</string>
<string name="layout_search_tip1">猜你喜欢</string>
<string name="layout_setting_tip1">個人設定</string>
<string name="layout_setting_tip2">修改密碼</string>
<string name="layout_setting_tip3">黑名單</string>
<string name="layout_setting_tip4">語言設定</string>
<string name="layout_setting_tip5">達人認證</string>
<string name="layout_setting_tip6">常見問題</string>
<string name="layout_setting_tip7">服務協議</string>
<string name="layout_setting_tip8">清除緩存</string>
<string name="layout_setting_tip9">刪除用戶</string>
<string name="layout_setting_tip10">關於我們</string>
<string name="layout_setting_tip11">版本號</string>
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_choose_label_adapter_tip1">我的标签</string>
<string name="layout_item_tag">活泼</string>
<string name="layout_bottom_list_tips1">取消</string>
<string name="layout_bend_call_tips1">关注</string>
<string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
<string name="layout_bend_call_tips3">再次通话</string>
<string name="layout_bend_call_tips4">去充值</string>
<string name="layout_msg_more_tips1">打招呼设置</string>
<string name="layout_msg_more_tips2">一键已读</string>
<string name="layout_friends_tips1">推荐</string>
<string name="layout_friends_tips2">热门</string>
<string name="layout_home_ranking_tips1">关注</string>
<string name="layout_f_msg_tips1">消息</string>
<string name="layout_f_msg_tips2">好友</string>
<string name="layout_f_my_tips1">用戶名稱</string>
<string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
<string name="layout_i_greet_config_tips1">请输入文案</string>
<string name="layout_i_sys_msg_tips1">點擊查看</string>
<string name="layout_call_input_tips1">輸入信息</string>
<string name="layout_f_system_tips1">聯繫客服</string>
<string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
<string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
<string name="layout_d_msg_chat_auth_tips2">去开通</string>
<string name="layout_d_msg_gift_tips1">送給你</string>
<string name="layout_d_send_gift_tips1">充值</string>
<string name="layout_d_msg_bar_tips1">查看主页</string>
<string name="layout_v_greet_config_add_tips1">添加更多</string>
<string name="layout_v_custom_tips1">保存</string>
</resources>

2
common/src/main/java/com/yunbao/common/utils/ToastUtil.java
View File

@ -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){