fix user receipt issue

Author: siqiii

chat/kit/src/main/java/cn/wildfire/chat/kit/conversation/message/viewholder/NormalMessageContentViewHolder.java

@@ -289,7 +289,7 @@ protected void setSendStatus(Message item) {
             return;
         }
 
-        if (!ChatManager.Instance().isReceiptEnabled() && !ChatManager.Instance().isUserEnableReceipt()) {
+        if (!ChatManager.Instance().isReceiptEnabled() || !ChatManager.Instance().isUserEnableReceipt()) {
             return;
         }
 

chat/kit/src/main/java/cn/wildfire/chat/kit/settings/MessageNotifySettingActivity.java

@@ -1,6 +1,5 @@
 package cn.wildfire.chat.kit.settings;
 
-import android.widget.CompoundButton;
 import android.widget.Toast;
 
 import com.kyleduo.switchbutton.SwitchButton;
@@ -31,7 +30,6 @@ protected void afterViews() {
         switchMsgNotification.setChecked(!ChatManager.Instance().isGlobalSilent());
         switchShowMsgDetail.setChecked(!ChatManager.Instance().isHiddenNotificationDetail());
 
-
         switchMsgNotification.setOnCheckedChangeListener((buttonView, isChecked) -> {
             ChatManager.Instance().setGlobalSilent(!isChecked, new GeneralCallback() {
                 @Override
@@ -60,21 +58,17 @@ public void onFail(int errorCode) {
             });
         });
 
-        switchUserReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        switchUserReceipt.setChecked(ChatManager.Instance().isUserEnableReceipt());
+        switchUserReceipt.setOnCheckedChangeListener((compoundButton, b) -> ChatManager.Instance().setUserEnableReceipt(b, new GeneralCallback() {
             @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                ChatManager.Instance().setUserEnableReceipt(b, new GeneralCallback() {
-                    @Override
-                    public void onSuccess() {
-
-                    }
-
-                    @Override
-                    public void onFail(int errorCode) {
-                        Toast.makeText(MessageNotifySettingActivity.this, "网络错误", Toast.LENGTH_SHORT);
-                    }
-                });
+            public void onSuccess() {
+
             }
-        });
+
+            @Override
+            public void onFail(int errorCode) {
+                Toast.makeText(MessageNotifySettingActivity.this, "网络错误", Toast.LENGTH_SHORT);
+            }
+        }));
     }
 }

chat/kit/src/main/res/layout/conversation_item_message_container_send.xml

@@ -72,6 +72,7 @@
             android:layout_gravity="bottom"
             android:layout_marginBottom="2dp"
             android:scaleType="center"
+            android:tint="@color/gray"
             android:src="@mipmap/receipt"
             tools:visibility="visible"
             android:visibility="gone" />

client/src/main/java/cn/wildfirechat/remote/ChatManager.java

@@ -2548,7 +2548,7 @@ public String getGroupMemberDisplayName(String groupId, String memberId) {
         return "<" + memberId + ">";
     }
 
-    public String getGroupMemberDisplayName(UserInfo userInfo){
+    public String getGroupMemberDisplayName(UserInfo userInfo) {
         if (!TextUtils.isEmpty(userInfo.groupAlias)) {
             return userInfo.groupAlias;
         } else if (!TextUtils.isEmpty(userInfo.friendAlias)) {
@@ -4676,7 +4676,7 @@ public boolean isUserEnableReceipt() {
 
         try {
             boolean disable = "1".equals(mClient.getUserSetting(UserSettingScope.DisableReceipt, ""));
-            userReceiptStatus  = disable ? 0 : 1;
+            userReceiptStatus = disable ? 0 : 1;
             return !disable;
         } catch (RemoteException e) {
             e.printStackTrace();
@@ -4703,7 +4703,10 @@ public void setUserEnableReceipt(boolean enable, final GeneralCallback callback)
                 @Override
                 public void onSuccess() throws RemoteException {
                     if (callback != null) {
-                        mainHandler.post(() -> callback.onSuccess());
+                        mainHandler.post(() -> {
+                            userReceiptStatus = enable ? 1 : 0;
+                            callback.onSuccess();
+                        });
                     }
                 }