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