修改有人加入聊天室

陈硕
1 parent db523305
Showing 10 changed files with 299 additions and 183 deletions
app/libs/libcnliveutil.jar
app/src/main/java/com/cnlive/im/adapter/ChatListAdapter.java
app/src/main/java/com/cnlive/im/mode/CNMessageModole.java
app/src/main/java/com/cnlive/im/ui/ChatItemActivity.java
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
app/src/main/java/com/cnlive/im/util/ToStringUtils.java
app/src/main/res/layout/activity_groupchat.xml
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/msg_text_view.xml
 package com.cnlive.im.adapter;
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.cnlive.im.R;
-import com.cnlive.libs.util.chat.model.CNMessage;
+import com.cnlive.im.ui.ChatRoomActivity;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,12 +26,14 @@ import java.util.List;
 public class ChatListAdapter extends BaseAdapter {
-    private ArrayList<CNMessage> msgList;
+    private List<ChatRoomActivity.CNMessageInfo>  msgList;
     private LayoutInflater mInflater = null;
+    private final RelativeLayout.LayoutParams layoutParams;
     public ChatListAdapter(Context context) {
         msgList = new ArrayList<>();
         mInflater = LayoutInflater.from(context);
+        layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
     @Override
@@ -42,45 +51,65 @@ public class ChatListAdapter extends BaseAdapter {
         return 0;
     }
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         ViewHolder viewHolder;
         if (convertView == null) {
             viewHolder = new ViewHolder();
             convertView = mInflater.inflate(R.layout.msg_text_view, null);
+            viewHolder.mRelativeLayout = (RelativeLayout) convertView.findViewById(R.id.re_chat_room);
             viewHolder.userName = (TextView) convertView.findViewById(R.id.user_name);
             viewHolder.msgContent = (TextView) convertView.findViewById(R.id.msg_text);
             convertView.setTag(viewHolder);
         } else {
             viewHolder = (ViewHolder) convertView.getTag();
         }
-        viewHolder.userName.setText(msgList.get(position).getUserInfo().getUserName() == null ? "" : msgList.get(position).getUserInfo().getUserName() + " : ");
-        viewHolder.msgContent.setText(msgList.get(position).getContent() == null ? "" : msgList.get(position).getContent());
+
+        if (msgList.get(position).isSendMesageInfo()) {
+            viewHolder.msgContent.setText(msgList.get(position).getCnMessage().getUserInfo().getUserName() == null ? "" : " : " + msgList.get(position).getCnMessage().getUserInfo().getUserName());
+            try {
+                viewHolder.userName.setText(msgList.get(position).getCnMessage().getContent() == null ? "" :  (String) new JSONObject(msgList.get(position).getCnMessage().getContent()).get("message"));
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_END);
+            viewHolder.mRelativeLayout.setLayoutParams(layoutParams);
+            viewHolder.msgContent.setTextColor(Color.parseColor("#d61d0c"));
+            viewHolder.userName.setTextColor(Color.BLACK);
+        } else {
+            viewHolder.userName.setText(msgList.get(position).getCnMessage().getUserInfo().getUserName() == null ? "" : msgList.get(position).getCnMessage().getUserInfo().getUserName() + " : ");
+            try {
+                viewHolder.msgContent.setText(msgList.get(position).getCnMessage().getContent() == null ? "" : msgList.get(position).getCnMessage().getContent() == null ? "" :  (String) new JSONObject(msgList.get(position).getCnMessage().getContent()).get("message"));
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            viewHolder.mRelativeLayout.setLayoutParams(layoutParams);
+            layoutParams.removeRule(RelativeLayout.ALIGN_PARENT_END);
+            layoutParams.addRule(RelativeLayout.ALIGN_PARENT_START);
+            viewHolder.userName.setTextColor(Color.parseColor("#d61d0c"));
+            viewHolder.msgContent.setTextColor(Color.BLACK);
+        }
+
+
         return convertView;
     }
-    public void addMessage(CNMessage msg) {
-        if (msgList == null) return;
-        msgList.add(msg);
-    }
-    public void updateItems(List<CNMessage> items) {
+
+    public void updateItems(List<ChatRoomActivity.CNMessageInfo> items) {
         if (items == null) return;
         msgList.clear();
         msgList.addAll(items);
     }
+    private class ViewHolder {
+        TextView userName;
+        TextView msgContent;
+        RelativeLayout mRelativeLayout;
-
-
-
-
-
-
-    public class ViewHolder {
-        public TextView userName;
-        public TextView msgContent;
     }
 }
+package com.cnlive.im.mode;
+
+/**
+ * @author 陈硕
+ * @time 2017/3/28  10:27
+ * @desc ${TODD}
+ */
+public class CNMessageModole {
+
+
+    public CNMessageModole(String message, String type) {
+        this.message = message;
+        this.type = type;
+    }
+
+    /**
+     * message : Sass
+     * timestamp : 1.490085670463534E9
+     * type : 2
+     */
+
+    private String message;
+    private String type;
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
@@ -10,7 +10,6 @@ import android.widget.Button;
 import com.cnlive.im.R;
-
 /**
  * @author 陈硕
  * @time 2017/3/20  10:32
@@ -15,12 +15,20 @@ 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.CNChatRoomInfo;
+import com.cnlive.libs.util.chat.model.CNChatRoomMemberInfo;
 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 java.util.List;
 /**
@@ -30,22 +38,20 @@ import java.util.ArrayList;
  */
 public class ChatRoomActivity extends AppCompatActivity implements View.OnClickListener {
     private static final String TAG = "ChatRoomActivity";
-    private ArrayList<CNMessage> groupChatOneListMy, groupChatTwoListMy;
-    private String roomIdOne = "ChatRoom05", roomIdTwo = "ChatRoom06";
+    private ArrayList<CNMessageInfo> groupChatOneListMy;
+    private String roomIdOne = "ChatRoom05";
     private EditText editText;
-    private Button send_messageOneBtn, send_messageOneTwo;
+    private Button send_messageOneBtn;
     private ListView listViewOne;
-    private ChatListAdapter chatListAdapterOne, chatListAdapterTwo;
-    private ListView listViewTwo;
-    private Button  foundChatBtn;
-    private Button creatChat2Btn;
+    private ChatListAdapter chatListAdapterOne;
+    private Button foundChatBtn;
     private Handler mHandler;
     private RelativeLayout re_chat;
     private LinearLayout lin_user;
     private EditText user_id, user_name;
-    private CNUserInfo cnUser;
-    private Button exit_chat2;
     private Button exit_chat1;
+    private Button chat_info_mationBtn;
+    public static String user_name_string;
     @Override
@@ -61,46 +67,38 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
         Intent intent = getIntent();
-        String user_name_string = intent.getStringExtra("user_name_string");
+        user_name_string = intent.getStringExtra("user_name_string");
         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 {
+        if (user_name_string != null) {
+            ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""), connectListener);
+        } else {
             ChatUtil.logOut(connectListener);
         }
+
     }
     private void initUI() {
-        exit_chat2 = (Button) findViewById(R.id.exit_chat2);
+        chat_info_mationBtn = (Button) findViewById(R.id.chat_info_mation);
+        chat_info_mationBtn.setOnClickListener(this);
         exit_chat1 = (Button) findViewById(R.id.exit_chat1);
         user_id = (EditText) findViewById(R.id.user_ID);
         user_name = (EditText) findViewById(R.id.user_name);
         lin_user = (LinearLayout) findViewById(R.id.lin_user);
         re_chat = (RelativeLayout) findViewById(R.id.re_chat);
-        creatChat2Btn = (Button) findViewById(R.id.creatChat2);
         foundChatBtn = (Button) findViewById(R.id.creatChat);
         listViewOne = (ListView) findViewById(R.id.chat_list_viewOne);
-        listViewTwo = (ListView) findViewById(R.id.chat_list_viewTwo);
         editText = (EditText) findViewById(R.id.message_content);
         send_messageOneBtn = (Button) findViewById(R.id.send_messageOne);
-        send_messageOneTwo = (Button) findViewById(R.id.send_messageTwo);
         exit_chat1.setOnClickListener(this);
-        exit_chat2.setOnClickListener(this);
         foundChatBtn.setOnClickListener(this);
         send_messageOneBtn.setOnClickListener(this);
-        send_messageOneTwo.setOnClickListener(this);
-        creatChat2Btn.setOnClickListener(this);
         groupChatOneListMy = new ArrayList<>();
-        groupChatTwoListMy = new ArrayList<>();
         chatListAdapterOne = new ChatListAdapter(ChatRoomActivity.this);
-        chatListAdapterTwo = new ChatListAdapter(ChatRoomActivity.this);
         listViewOne.setAdapter(chatListAdapterOne);
-        listViewTwo.setAdapter(chatListAdapterTwo);
     }
-
     /**
      * 发送消息监听
      */
@@ -115,25 +113,20 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onSuccess(final CNMessage cnMessage) {
-
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
+                    try {
+                        if (((String) new JSONObject(cnMessage.getContent()).get("type")).equals("2"))
+                            return;
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
                     if ((roomIdOne).equals(cnMessage.getTargetId())) {
-                        groupChatOneListMy.add(cnMessage);
+                        groupChatOneListMy.add(new CNMessageInfo(cnMessage, true));
                         chatListAdapterOne.updateItems(groupChatOneListMy);
                         chatListAdapterOne.notifyDataSetChanged();
                     }
-                    Log.v(TAG, "SendMessageListener SUCCESSES" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName());
-
-                    /**
-                     * 连接两个聊天室30015 错误
-                     */
-                    if ((roomIdTwo).equals(cnMessage.getTargetId())) {
-                        groupChatTwoListMy.add(cnMessage);
-                        chatListAdapterTwo.updateItems(groupChatTwoListMy);
-                        chatListAdapterTwo.notifyDataSetChanged();
-                    }
                 }
             });
@@ -147,11 +140,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 @Override
                 public void run() {
                     Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
-
                 }
             });
-
-
         }
     };
@@ -173,22 +163,21 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if (( roomIdOne).equals(cnMessage.getTargetId())) {
-                        groupChatOneListMy.add(cnMessage);
+                    try {
+                        JSONObject jsonObject = new JSONObject(cnMessage.getContent().toString());
+                        String type = (String) jsonObject.get("type");
+                        if ("2".equals(type)) {
+                            Toast.makeText(ChatRoomActivity.this, cnMessage.getUserInfo().getUserName()+"加入聊天室", Toast.LENGTH_SHORT).show();
+                            return;
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    {
+                        groupChatOneListMy.add(new CNMessageInfo(cnMessage, false));
                         chatListAdapterOne.updateItems(groupChatOneListMy);
                         chatListAdapterOne.notifyDataSetChanged();
                     }
-                    Log.v(TAG, "SendMessageListener SUCCESSES" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName());
-
-                    /**
-                     * 连接两个聊天室30015 错误
-                     */
-                    if (( roomIdTwo).equals(cnMessage.getTargetId())) {
-                        groupChatTwoListMy.add(cnMessage);
-                        chatListAdapterTwo.updateItems(groupChatTwoListMy);
-                        chatListAdapterTwo.notifyDataSetChanged();
-                    }
-
                 }
             });
@@ -259,6 +248,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
+                    if(i==0){
+                        String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole(user_name_string + "加入聊天室", "2"));
+                        ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, objToJsonString, sendMessageListener);
+                        ++i;
+                    }
                     Toast.makeText(ChatRoomActivity.this, extra, Toast.LENGTH_SHORT).show();
                 }
@@ -282,41 +276,42 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                 if (editText.getText().toString().isEmpty()) {
                     Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
                 } else {
-                    ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, editText.getText().toString(), sendMessageListener);
-                    editText.setText("");
-                }
-                break;
-            // 向聊天室2发送消息
-            case R.id.send_messageTwo:
-                //发送聊天室消息
-                if (editText.getText().toString().isEmpty()) {
-                    Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
-                } else {
-                    ChatUtil.sendMessage(IChat.CHATROOM, roomIdTwo, editText.getText().toString(), sendMessageListener);
+                    String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole(editText.getText().toString(), "1"));
+                    Log.v("objToJsonString", objToJsonString);
+
+
+                    ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, objToJsonString, sendMessageListener);
                     editText.setText("");
                 }
                 break;
-
             case R.id.creatChat:
                 ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
-                //加入聊天室2
-            case R.id.creatChat2:
-               // ChatUtil.joinChatRoom(roomIdTwo, -1, onOperationListener);
-                break;
-
-            case R.id.exit_chat2:
-                ChatUtil.quitChatRoom(roomIdTwo, onOperationListener);
                 break;
-
             case R.id.exit_chat1:
                 ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
                 break;
+            case R.id.chat_info_mation:
+                ChatUtil.getChatRoomInfo(roomIdOne, 30, CNChatRoomInfo.ChatRoomMemberOrder.RC_CHAT_ROOM_MEMBER_ASC, new IChat.CNResultCallback<CNChatRoomInfo>() {
+                    @Override
+                    public void onSuccess(CNChatRoomInfo cnChatRoomInfo) {
+                        List<CNChatRoomMemberInfo> memberInfos = cnChatRoomInfo.getMemberInfo();
+                        for (CNChatRoomMemberInfo memberInfo : memberInfos) {
+                            String userId = memberInfo.getUserId();
+                            Log.v("userId", userId);
+                        }
+                    }
-        }
-    }
-
+                    @Override
+                    public void onError(int i, String s) {
+                        Log.v("userId", i + "" + s);
+                    }
+                });
+                break;
+        }
+    }
+int i=0;
     private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
         @Override
@@ -329,6 +324,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onSuccess(String s) {
             Log.e(TAG, "ConnectListener 连接监听" + s);
+
             Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
         }
@@ -341,4 +337,31 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     };
+    public static class CNMessageInfo {
+        CNMessage cnMessage;
+        boolean sendMesageInfo;
+
+        public CNMessage getCnMessage() {
+            return cnMessage;
+        }
+
+        public void setCnMessage(CNMessage cnMessage) {
+            this.cnMessage = cnMessage;
+        }
+
+        public boolean isSendMesageInfo() {
+            return sendMesageInfo;
+        }
+
+        public void setSendMesageInfo(boolean sendMesageInfo) {
+            this.sendMesageInfo = sendMesageInfo;
+        }
+
+        public CNMessageInfo(CNMessage cnMessage, boolean sendMesageInfo) {
+            this.cnMessage = cnMessage;
+            this.sendMesageInfo = sendMesageInfo;
+        }
+    }
+
+
 }
@@ -37,7 +37,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     private EditText messageContent;
     private Button sendMessageBtn;
     private ChatListAdapter chatListAdapter;
-    private ArrayList<CNMessage> messageList = new ArrayList<>();
+    private ArrayList<ChatRoomActivity.CNMessageInfo> messageList = new ArrayList<>();
     private CNMessage cnMessage;
     private LinearLayout linearLayoutUseID;
     private EditText user_id_edit;
@@ -68,7 +68,6 @@ 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);
-        chatListAdapter = new ChatListAdapter(this);
         chatListView.setAdapter(chatListAdapter);
         messageContent = (EditText) findViewById(R.id.message_content);
         sendMessageBtn = (Button) findViewById(R.id.send_message);
@@ -88,6 +87,8 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         agree_reject_lin = (LinearLayout) findViewById(R.id.agree_reject_lin);
         vistor_btn = (Button) findViewById(R.id.vistor_Btn);
         vistor_btn.setOnClickListener(this);
+        chatListAdapter = new ChatListAdapter(this);
+
     }
@@ -205,7 +206,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                     } else if (messageList.size() == 0 && cnMessage.getContent().equals("拒绝")) {
                     } else if (messageList.size() == 0 && cnMessage.getContent().equals("同意")) {
                     } else {
-                        messageList.add(cnMessage);
+                        messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage,true));
                         chatListAdapter.updateItems(messageList);
                         chatListAdapter.notifyDataSetChanged();
                     }
@@ -242,7 +243,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         }
     };
-    private boolean isvistor = false;
     //接收消息监听
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
@@ -261,16 +261,17 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                         Toast.makeText(PrivateChatActivity.this, "对方已经同意了您", Toast.LENGTH_SHORT).show();
                         sendInfo = 5;
                     } else {
-                        messageList.add(cnMessage);
+                        messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage,false));
                         chatListAdapter.updateItems(messageList);
                         chatListAdapter.notifyDataSetChanged();
                     }
-
                 }
             });
         }
     };
+
+
 }
+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
+ * @desc ${TODD}
+ */
+public class ToStringUtils {
+
+
+
+    public static String objToJsonString(CNMessageModole cnMessageModole) {
+
+        // 初始化返回值
+        String json = "str_empty";
+
+        if (cnMessageModole == null) {
+            return json;
+        }
+
+        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());
+
+
+
+
+    }
+
+
+}
@@ -20,16 +20,10 @@
             android:orientation="horizontal">
             <LinearLayout
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
                 android:orientation="vertical">
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="聊天室一" />
                 <ListView
                     android:id="@+id/chat_list_viewOne"
@@ -40,38 +34,9 @@
                     android:divider="@null"
                     android:scrollbars="none"
                     android:transcriptMode="alwaysScroll" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="聊天室二" />
-
-                <ListView
-                    android:id="@+id/chat_list_viewTwo"
-                    android:layout_width="match_parent"
-                    android:layout_height="150dp"
-                    android:layout_above="@+id/edit_layout"
-                    android:layout_alignParentTop="true"
-                    android:layout_toRightOf="@id/chat_list_viewOne"
-                    android:divider="@null"
-                    android:scrollbars="none"
-                    android:transcriptMode="alwaysScroll" />
-
             </LinearLayout>
-
-
         </LinearLayout>
-
         <LinearLayout
             android:id="@+id/edit_layout"
             android:layout_width="match_parent"
@@ -92,17 +57,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="0.2"
-                android:text="聊天室1发送" />
+                android:text="发送" />
-
-            <Button
-                android:id="@+id/send_messageTwo"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="0.2"
-                android:text="聊天室2发送" />
-        </LinearLayout>
+    </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
@@ -119,44 +76,30 @@
                     android:id="@+id/creatChat"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="加入聊天室1" />
+                    android:text="加入聊天室" />
                 <Button
-                    android:id="@+id/creatChat2"
+                    android:id="@+id/chat_info_mation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="获取聊天室信息" />
+                <Button
+                    android:id="@+id/exit_chat1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="加入聊天室2" />
+                    android:text="退出聊天室" />
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-            </LinearLayout>
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-                <Button
-                    android:id="@+id/exit_chat1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="退出聊天室1" />
-                <Button
-                    android:id="@+id/exit_chat2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="退出聊天室2" />
-            </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
@@ -8,6 +8,7 @@
    <Button
        android:id="@+id/connected"
+       android:background="#e41212"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_centerInParent="true"
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal">
-    <TextView
-        android:id="@+id/user_name"
+    <RelativeLayout
+        android:id="@+id/re_chat_room"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:textColor="#3ce1ff"
-        android:textSize="14sp" />
+        android:layout_height="wrap_content">
-    <TextView
-        android:id="@+id/msg_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        android:textSize="15sp" />
-</LinearLayout>
 \ No newline at end of file
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:textColor="#d61d0c"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/msg_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@id/user_name"
+            android:textColor="@android:color/black"
+            android:textSize="15sp" />
+    </RelativeLayout>
+
+</RelativeLayout>
 \ No newline at end of file