修改有人加入聊天室

陈硕
1 parent 58f7b266
Showing 4 changed files with 68 additions and 84 deletions
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/LoGinActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
app/src/main/java/com/cnlive/im/util/ToStringUtils.java
@@ -52,7 +52,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private Button exit_chat1;
     private Button chat_info_mationBtn;
     public static String user_name_string;
-
+    int i=0;
+    private  boolean isUserLogin=false;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -71,8 +72,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         String user_id_string = intent.getStringExtra("user_id_string");
         if (user_name_string != null) {
             ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""), connectListener);
-        } else {
-            ChatUtil.logOut(connectListener);
         }
     }
@@ -106,11 +105,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onAttached(CNMessage cnMessage) {
-
             Log.v(TAG, "SendMessageListener onAttached" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName());
-
         }
-
         @Override
         public void onSuccess(final CNMessage cnMessage) {
             mHandler.post(new Runnable() {
@@ -132,7 +128,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             });
         }
-
         @Override
         public void onError(CNMessage cnMessage, int i, final String s) {
             Log.v(TAG, "SendMessageListener 失败 " + i + "    s" + s);
@@ -150,8 +145,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onConnectStatus(int i, String s) {
             Log.i(TAG, "连接状态监听" + i + "   " + s);
-
-
         }
     };
@@ -180,7 +173,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     }
                 }
             });
-
         }
     };
@@ -190,21 +182,15 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onJoining(String s) {
             Log.i(TAG, "chatRoomActionListener" + "   onJoining" + s);
-
         }
-
         @Override
         public void onJoined(String s) {
             Log.i(TAG, "chatRoomActionListener     " + "onJoined" + s);
-
-
         }
-
         @Override
         public void onQuited(String s) {
             Log.i(TAG, "chatRoomActionListener     " + "onQuited" + s);
         }
-
         @Override
         public void onError(String s, int i, String s1) {
             Log.i(TAG, "chatRoomActionListener     " + "onError" + s);
@@ -221,11 +207,9 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 @Override
                 public void run() {
                     Toast.makeText(ChatRoomActivity.this, extra, Toast.LENGTH_SHORT).show();
-
                 }
             });
         }
-
         @Override
         public void conByDevId(final int what, final String extra) {
             Log.e(TAG, what + " : " + extra);
@@ -277,9 +261,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
                 } else {
                     String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole(editText.getText().toString(), "1"));
-                    Log.v("objToJsonString", objToJsonString);
-
-
                     ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, objToJsonString, sendMessageListener);
                     editText.setText("");
                 }
@@ -311,7 +292,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         }
     }
-int i=0;
+
     private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
         @Override
@@ -337,6 +318,11 @@ int i=0;
     };
+
+
+
+
+
     public static class CNMessageInfo {
         CNMessage cnMessage;
         boolean sendMesageInfo;
@@ -46,7 +46,7 @@ public class LoGinActivity extends AppCompatActivity implements View.OnClickList
                 break;
             case R.id.user_logOut:
                 ChatUtil.disconnect(false);
-                finish();
+                LoGinActivity.this.finish();
                 break;
             case R.id.user_login:
                 Intent intent2 = new Intent(LoGinActivity.this, UserLoginActivity.class);
@@ -14,11 +14,16 @@ import android.widget.Toast;
 import com.cnlive.im.R;
 import com.cnlive.im.adapter.ChatListAdapter;
+import com.cnlive.im.mode.CNMessageModole;
+import com.cnlive.im.util.ToStringUtils;
 import com.cnlive.libs.util.chat.ChatUtil;
 import com.cnlive.libs.util.chat.base.IChat;
 import com.cnlive.libs.util.chat.model.CNMessage;
 import com.cnlive.libs.util.chat.model.CNUserInfo;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import static com.cnlive.im.R.id.opposite_id_edit;
@@ -68,7 +73,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private void initView() {
         opposite_name_edit = (EditText) findViewById(R.id.opposite_name_edit);
         chatListView = (ListView) findViewById(R.id.private_list_view);
-        chatListView.setAdapter(chatListAdapter);
+
         messageContent = (EditText) findViewById(R.id.message_content);
         sendMessageBtn = (Button) findViewById(R.id.send_message);
         sendMessageBtn.setOnClickListener(this);
@@ -88,7 +93,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         vistor_btn = (Button) findViewById(R.id.vistor_Btn);
         vistor_btn.setOnClickListener(this);
         chatListAdapter = new ChatListAdapter(this);
-
+        chatListView.setAdapter(chatListAdapter);
     }
@@ -109,7 +114,8 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                     if (messageContent.getText().toString().isEmpty()) {
                         Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
                     } else {
-                        ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, messageContent.getText().toString(), sendMessageListener);
+                        String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole(messageContent.getText().toString(), "4"));//私聊消息
+                        ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener);
                         messageContent.setText("");
                     }
@@ -137,16 +143,20 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                 break;
             case R.id.agree_btn:
-                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "同意", sendMessageListener);
+                String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole("同意", "3"));
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener);
                 agree_reject_lin.setVisibility(View.GONE);
                 break;
             case R.id.reject_btn:
-                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "拒绝", sendMessageListener);
+                String objToJsonStringDis = ToStringUtils.objToJsonString(new CNMessageModole("拒绝", "3"));//私聊
+
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonStringDis, sendMessageListener);
                 agree_reject_lin.setVisibility(View.GONE);
                 break;
             case R.id.vistor_Btn:
-                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, "你好我们可以进行私聊吗", sendMessageListener);
+                String objToJsonStringInvt = ToStringUtils.objToJsonString(new CNMessageModole("你好我们可以进行私聊吗", "3"));//私聊
+                ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonStringInvt, sendMessageListener);
                 break;
         }
@@ -177,8 +187,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     };
-
-
     /**
      * 发送消息监听
      */
@@ -193,22 +201,32 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         @Override
         public void onSuccess(final CNMessage cnMessage) {
-            if(View.VISIBLE==vistor_btn.getVisibility()){
+            if (View.VISIBLE == vistor_btn.getVisibility()) {
                 vistor_btn.setVisibility(View.GONE);
             }
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(PrivateChatActivity.this, "发送消息成功", Toast.LENGTH_SHORT).show();
-                    if (messageList.size() == 0 && cnMessage.getContent().equals("你好我们可以进行私聊吗")) {
-                        sendInfo = 2;
-                        Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show();
-                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("拒绝")) {
-                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("同意")) {
-                    } else {
-                        messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage,true));
-                        chatListAdapter.updateItems(messageList);
-                        chatListAdapter.notifyDataSetChanged();
+                    JSONObject jsonObject = null;
+                    try {
+                        jsonObject = new JSONObject(cnMessage.getContent().toString());
+                        String type = (String) jsonObject.get("type");
+                        String message = (String) jsonObject.get("message");
+                        Toast.makeText(PrivateChatActivity.this, "发送消息成功", Toast.LENGTH_SHORT).show();
+                        if ("3".equals(type) && message.equals("你好我们可以进行私聊吗")) {
+                            sendInfo = 2;
+                            Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show();
+                        } else if ("3".equals(type) && message.equals("拒绝")) {
+                        } else if ("3".equals(type) && message.equals("同意")) {
+                        } else if("4".equals(type)) {
+                            messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, true));
+                            chatListAdapter.updateItems(messageList);
+                            chatListAdapter.notifyDataSetChanged();
+                        }
+
+                    } catch (JSONException e) {
+
+
                     }
                 }
@@ -247,25 +265,33 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNMessage cnMessage) {
-            Log.v(TAG, "私聊receiveMessageListener" + "   " + cnMessage.getTargetId() + "   " + cnMessage.getContent());
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    vistor_btn.setVisibility(View.GONE);
-                    if (messageList.size() == 0 && cnMessage.getContent().equals("你好我们可以进行私聊吗")) {
-                        agree_reject_lin.setVisibility(View.VISIBLE);
-                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("拒绝")) {
-                        sendInfo = 4;
-                        Toast.makeText(PrivateChatActivity.this, "对方已经决绝了您", Toast.LENGTH_SHORT).show();
-                    } else if (messageList.size() == 0 && cnMessage.getContent().equals("同意")) {
-                        Toast.makeText(PrivateChatActivity.this, "对方已经同意了您", Toast.LENGTH_SHORT).show();
-                        sendInfo = 5;
-                    } else {
-                        messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage,false));
-                        chatListAdapter.updateItems(messageList);
-                        chatListAdapter.notifyDataSetChanged();
+
+                    JSONObject jsonObject = null;
+                    try {
+                        jsonObject = new JSONObject(cnMessage.getContent().toString());
+                        String type = (String) jsonObject.get("type");
+                        if ("3".equals(type) && "你好我们可以进行私聊吗".equals(jsonObject.get("message"))) {
+                            vistor_btn.setVisibility(View.GONE);
+                            agree_reject_lin.setVisibility(View.VISIBLE);
+                        } else if ("3".equals(type) && "同意".equals(jsonObject.get("message"))) {
+                            sendInfo = 1;
+                        } else if ("3".equals(type) && "拒绝".equals(jsonObject.get("message"))) {
+                            sendInfo = 4;
+                        }else if("4".equals(type) ){
+                            Log.v(TAG,cnMessage.getContent().toString());
+                            messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, false));
+                            chatListAdapter.updateItems(messageList);
+                            chatListAdapter.notifyDataSetChanged();
+                        }
+
+                    } catch (JSONException e) {
+                        e.printStackTrace();
                     }
+
                 }
             });
@@ -2,9 +2,6 @@ package com.cnlive.im.util;
 import com.cnlive.im.mode.CNMessageModole;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 /**
  * @author 陈硕
  * @time 2017/3/28  10:20
@@ -25,47 +22,22 @@ public class ToStringUtils {
         StringBuilder buff = new StringBuilder();
         buff.append("{");
-
-
         buff.append("message");
         buff.append(":");
         buff.append("\"");
         buff.append(cnMessageModole.getMessage() == null ? "" : cnMessageModole.getMessage());
         buff.append("\"");
         buff.append(",");
-
-
         buff.append("type");
         buff.append(":");
         buff.append("\"");
         buff.append(cnMessageModole.getType() == null ? "" : cnMessageModole.getType());
         buff.append("\"");
-
         buff.append("}");
         json = buff.toString();
-
-
-
-
-
         return json;
     }
-
-
-
-    public static CNMessageModole JsonStringToobj(String CNMessagejson) throws JSONException {
-
-
-        JSONObject jsonObj = new JSONObject(CNMessagejson);
-        return  new CNMessageModole(jsonObj.get("message").toString(), jsonObj.get("type").toString());
-
-
-
-
-    }
-
-
 }