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

---
 OneToOne/src/main/AndroidManifest.xml                         | 4 ++++
 .../activity/fragments/message/ChatMessageFragment.java       | 2 +-
 .../java/com/shayu/onetoone/bean/MessageChatGiftContent.java  | 2 +-
 .../shayu/onetoone/provider/CustomConversationProvider.java   | 1 +
 .../src/main/java/com/shayu/onetoone/utils/MsgCheckUtils.java | 2 +-
 .../yunbao/common/manager/imrongcloud/RongcloudIMManager.java | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 1bf6231b3..6eb771fbf 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -143,6 +143,7 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.WebViewActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
@@ -175,11 +176,14 @@
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.message.CallVideoActivity"
+            android:launchMode="singleTask"
             android:hardwareAccelerated="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.message.CallAudioActivity"
+            android:launchMode="singleTask"
+            android:hardwareAccelerated="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
index 73089a492..739ed9135 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
@@ -725,7 +725,7 @@ public class ChatMessageFragment extends AbsConversationFragment {
                             public void onItemClick(String bean, int position) {
                                 if (bean.equals(WordUtil.getNewString(R.string.copy))) {
                                     copyText(data);
-                                } else {
+                                } else if(bean.equals(WordUtil.getNewString(R.string.delete))){
                                     delete(data);
                                 }
                             }
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/bean/MessageChatGiftContent.java b/OneToOne/src/main/java/com/shayu/onetoone/bean/MessageChatGiftContent.java
index ec328d242..61a4af382 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/bean/MessageChatGiftContent.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/bean/MessageChatGiftContent.java
@@ -15,7 +15,7 @@ import io.rong.common.ParcelUtils;
 import io.rong.imlib.MessageTag;
 import io.rong.imlib.model.MessageContent;
 
-@MessageTag(value = "MessageChatGiftContent", flag = MessageTag.ISPERSISTED)
+@MessageTag(value = "MessageChatGiftContent", flag = MessageTag.ISCOUNTED)
 public class MessageChatGiftContent extends MessageContent implements Parcelable {
     private String gift;
     private String number;
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java b/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
index 67be22a27..2159dfd8a 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/provider/CustomConversationProvider.java
@@ -40,6 +40,7 @@ public class CustomConversationProvider extends BaseConversationProvider {
                 }
             } catch (Exception e) {
                 e.printStackTrace();
+
                 holder.getView(R.id.sex).setVisibility(View.GONE);
             }
 
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/utils/MsgCheckUtils.java b/OneToOne/src/main/java/com/shayu/onetoone/utils/MsgCheckUtils.java
index bb8fe87bd..f833596d4 100644
--- a/OneToOne/src/main/java/com/shayu/onetoone/utils/MsgCheckUtils.java
+++ b/OneToOne/src/main/java/com/shayu/onetoone/utils/MsgCheckUtils.java
@@ -32,7 +32,7 @@ public class MsgCheckUtils {
                     @Override
                     public void onSuccess(UserBean data) {
                         if (data.getInfo().getName_auth() == 2) {
-                            listener.onSuccess("", null);
+                            //listener.onSuccess("", null);
                         } else if (data.getInfo().getName_auth() == 3) {
                             listener.onError(data.getInfo().getName_auth(), "當前正在審核中，請耐心等待");
                         }else {
diff --git a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
index 706e17bea..cc955e14f 100644
--- a/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
+++ b/common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
@@ -76,7 +76,7 @@ public class RongcloudIMManager {
         mListener = listener;
         IMCenter.getInstance().addOnReceiveMessageListener(listener);
         //设置消息拦截器
-        IMCenter.getInstance().setMessageInterceptor(new PDMessageInterceptor());
+        //IMCenter.getInstance().setMessageInterceptor(new PDMessageInterceptor());
     }
 
     /**