user message receipt

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()) {
+        if (!ChatManager.Instance().isReceiptEnabled() && !ChatManager.Instance().isUserEnableReceipt()) {
             return;
         }
 

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

@@ -1,6 +1,6 @@
 package cn.wildfire.chat.kit.settings;
 
-import android.widget.Switch;
+import android.widget.CompoundButton;
 import android.widget.Toast;
 
 import com.kyleduo.switchbutton.SwitchButton;
@@ -16,14 +16,14 @@ public class MessageNotifySettingActivity extends WfcBaseActivity {
     SwitchButton switchMsgNotification;
     @BindView(R.id.switchShowMsgDetail)
     SwitchButton switchShowMsgDetail;
+    @BindView(R.id.switchUserReceipt)
+    SwitchButton switchUserReceipt;
 
     @Override
     protected int contentLayout() {
         return R.layout.activity_msg_notify_settings;
     }
 
-
-
     @Override
     protected void afterViews() {
         super.afterViews();
@@ -59,5 +59,22 @@ public void onFail(int errorCode) {
                 }
             });
         });
+
+        switchUserReceipt.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @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);
+                    }
+                });
+            }
+        });
     }
 }

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

@@ -34,15 +34,11 @@
 
         </FrameLayout>
 
-        <View style="@style/Line" />
-
         <View
             android:layout_width="match_parent"
             android:layout_height="10dp"
             android:background="@color/gray5" />
 
-        <View style="@style/Line" />
-
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="50dp"
@@ -64,7 +60,27 @@
 
         </FrameLayout>
 
-        <View style="@style/Line" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:paddingLeft="@dimen/item_margin_left_and_right"
+            android:paddingRight="@dimen/item_margin_left_and_right">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="消息回执"
+                android:textColor="@color/black1"
+                android:textSize="16sp" />
+
+            <com.kyleduo.switchbutton.SwitchButton
+                android:id="@+id/switchUserReceipt"
+                style="@style/IosSwitch"
+                android:layout_gravity="center_vertical|right" />
+
+        </FrameLayout>
+
 
     </LinearLayout>
 </LinearLayout>

chat/src/main/res/layout/main_fragment_me.xml

@@ -74,7 +74,7 @@
         android:background="@drawable/selector_common_item"
         app:show_arrow_indicator="true"
         app:start_src="@mipmap/ic_notification"
-        app:title="消息通知" />
+        app:title="消息与通知" />
 
     <cn.wildfire.chat.kit.widget.OptionItemView
         android:id="@+id/passwordOptionItemView"

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

@@ -119,6 +119,7 @@ public class ChatManager {
     private boolean startLog;
     private int connectionStatus;
     private int receiptStatus = -1; // 1, enable
+    private int userReceiptStatus = -1; //1, enable
 
     private boolean isBackground = true;
     private List<OnReceiveMessageListener> onReceiveMessageListeners = new ArrayList<>();
@@ -4669,9 +4670,13 @@ public boolean isUserEnableReceipt() {
         if (!checkRemoteService()) {
             return false;
         }
+        if (userReceiptStatus != -1) {
+            return userReceiptStatus == 1;
+        }
 
         try {
             boolean disable = "1".equals(mClient.getUserSetting(UserSettingScope.DisableReceipt, ""));
+            userReceiptStatus  = disable ? 0 : 1;
             return !disable;
         } catch (RemoteException e) {
             e.printStackTrace();