From 2e14f6979d2c43f4a1ea2ce3538663c82360bc89 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Tue, 24 Oct 2023 18:28:06 +0800
Subject: [PATCH] update

---
 .../shayu/onetoone/activity/EndCallActivity.java   |  4 ++++
 .../com/shayu/onetoone/activity/MainActivity.java  | 14 +++++++++++++-
 .../fragments/message/MsgFriendFragment.java       |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/EndCallActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/EndCallActivity.java
index 8de0b7dbe..04dc40673 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/EndCallActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/EndCallActivity.java
@@ -91,4 +91,8 @@ public class EndCallActivity extends AbsOTOActivity {
                 });
     }
 
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+    }
 }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
index bdc3bae80..9d4ea000c 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/MainActivity.java
@@ -69,6 +69,7 @@ public class MainActivity extends AbsOTOActivity {
     List<BaseFragment> fragments = new ArrayList<>();
     private ViewPager2 viewPager;
     private DslTabLayout dslTabLayout;
+    private long mLastClickBackTime;//上次点击back键的时间
 
     @Override
     protected void onDestroy() {
@@ -220,7 +221,7 @@ public class MainActivity extends AbsOTOActivity {
                 for (OfficialNoticeBean datum : data) {
                     point += datum.getNum();
                 }
-                Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_SYSTEM,point + count));
+                Bus.get().post(new MessageMsgBusEvent(MessageMsgBusEvent.TYPE_UPDATE_SYSTEM, point + count));
                 //大于0则是通过会话未读监听器获取到的数，则不用再调用获取未读数接口了
                 if (count >= 0) {
                     updateUnreadCount(point + count);
@@ -256,6 +257,17 @@ public class MainActivity extends AbsOTOActivity {
         return R.layout.activity_main;
     }
 
+    @Override
+    public void onBackPressed() {
+        long curTime = System.currentTimeMillis();
+        if (curTime - mLastClickBackTime > 2000) {
+            mLastClickBackTime = curTime;
+            ToastUtil.show(R.string.main_click_next_exit);
+            return;
+        }
+        super.onBackPressed();
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void busEvent(MessageMsgBusEvent event) {
         if (event.getType() == MessageMsgBusEvent.TYPE_ALL_READ) {
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
index d32c1b935..88963f26b 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgFriendFragment.java
@@ -182,6 +182,9 @@ public class MsgFriendFragment extends BaseFragment implements BaseAdapter.OnIte
                         RongIMClient.getInstance().getConversation(Conversation.ConversationType.PRIVATE, item.getId() + "", new RongIMClient.ResultCallback<Conversation>() {
                             @Override
                             public void onSuccess(Conversation conversation) {
+                                if(conversation==null){
+                                    conversation=new Conversation();
+                                }
                                 SingleConversation singleConversation = new SingleConversation(mContext, conversation);
                                 if (StringUtil.isEmpty(singleConversation.mConversationContent.toString())) {
                                     singleConversation.mConversationContent = new SpannableString("你们什么都没聊");