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

修复测试反馈问题

Browse Source
This commit is contained in:
zlzw
2023-10-26 18:06:46 +08:00
parent aa6c06927b
commit 430c24db05
13 changed files with 173 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
@Route(path = RouteManager.ACTIVITY_MATCHING)
public class MatchingActivity extends AbsOTOActivity {
@@ -81,31 +82,17 @@ public class MatchingActivity extends AbsOTOActivity {
imageViewList.add(user4);
imageViewList.add(user5);
back.setOnClickListener(v -> {
new TipsDialog(mContext)
.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) {
super.onCancel(dialog);
task.cancel();
task = null;
MatchingActivity.this.finish();
}
}).showDialog();
onBack();
});
Bundle bundle = getIntent().getExtras();
if (bundle != null) {
String data = bundle.getString("data");
bundle.putInt("type",ChatActivity.CALL_CHAT_TYPE_MATCH);
bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
if (data != null) {
SendConsumeBean bean = JSONObject.parseObject(data, SendConsumeBean.class);
bean = JSONObject.parseObject(data, SendConsumeBean.class);
if (bean != null) {
new Handler(Looper.getMainLooper()).postDelayed(() -> {
ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
MatchingActivity.this.finish();
}, 5000);
MatchingActivity.this.bundle=bundle;
new Handler(Looper.getMainLooper()).postDelayed(toCallRunnable, 5000);
return false;
}
}
@@ -113,6 +100,26 @@ public class MatchingActivity extends AbsOTOActivity {
return true;
}
private void onBack() {
new TipsDialog(mContext)
.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) {
super.onCancel(dialog);
bean = null;
handler.removeCallbacks(toCallRunnable);
if (task != null) {
task.cancel();
task = null;
}
MatchingActivity.this.finish();
}
}).showDialog();
}
private void initData() {
OTONetManager.getInstance(mContext)
.getMatchingInfo(new HttpCallback<MatchingInfoBean>() {
@@ -132,20 +139,32 @@ public class MatchingActivity extends AbsOTOActivity {
});
}
private Bundle bundle;
private Runnable toCallRunnable = new Runnable() {
@Override
public void run() {
if (bean == null) {
return;
}
ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
MatchingActivity.this.finish();
}
};
SendConsumeBean bean;
private void call() {
handler.post(() -> ToastUtil.showDebug("匹配"));
SendMessageManager.matching(new OnSendMessageListener() {
@Override
public void onSuccess(String token, SendConsumeBean bean) {
super.onSuccess(token, bean);
public void onSuccess(String token, SendConsumeBean b) {
super.onSuccess(token, b);
bean = b;
task.cancel();
new Handler(Looper.getMainLooper()).postDelayed(() -> {
Bundle bundle = new Bundle();
bundle.putInt("type",ChatActivity.CALL_CHAT_TYPE_MATCH);
bundle.putString("data", JSONObject.toJSONString(bean));
ConversationUtils.startConversation(mContext, bean.getMateUser().getUser().getId() + "", bundle);
MatchingActivity.this.finish();
}, 5000);
Bundle bundle = new Bundle();
bundle.putInt("type", ChatActivity.CALL_CHAT_TYPE_MATCH);
bundle.putString("data", JSONObject.toJSONString(bean));
MatchingActivity.this.bundle = bundle;
handler.postDelayed(toCallRunnable, 5000);
}
@Override
@@ -153,7 +172,7 @@ public class MatchingActivity extends AbsOTOActivity {
super.onError(status, msg, bean);
if (bean.getCode() == 503) {
handler.post(() -> ToastUtil.showDebug("没人，继续"));
}else if(status==OnSendMessageListener.STATUS_NOT_PRICE){
} else if (status == OnSendMessageListener.STATUS_NOT_PRICE) {
task.cancel();
handler.post(() -> ToastUtil.showDebug("价格不足"));
MatchingActivity.this.finish();
@@ -186,6 +205,8 @@ public class MatchingActivity extends AbsOTOActivity {
@Override
public void onApply(Dialog dialog) {
super.onApply(dialog);
bean = null;
handler.removeCallbacks(toCallRunnable);
task.cancel();
task = null;
MatchingActivity.this.finish();
@@ -203,4 +224,9 @@ public class MatchingActivity extends AbsOTOActivity {
return super.cancel();
}
}
@Override
public void onBackPressed() {
onBack();
}
}