优化demo代码，添加注释

王琳
1 parent 44327355
Showing 23 changed files with 335 additions and 179 deletions
.idea/vcs.xml
IMLib/build/intermediates/bundles/release/classes.jar
IMLib/build/intermediates/classes/release/io/rong/imlib/Chat.class
IMLib/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
IMLib/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
IMLib/build/intermediates/res/resources-debug-androidTest.ap_
IMLib/build/intermediates/transforms/proguard/release/jars/3/3/main.jar
IMLib/build/outputs/aar/IMLib-debug.aar
IMLib/build/outputs/aar/IMLib-release.aar
IMLib/build/outputs/mapping/release/dump.txt
IMLib/build/outputs/mapping/release/mapping.txt
IMLib/build/outputs/mapping/release/seeds.txt
IMLib/src/main/java/io.rong.imlib/Chat.java
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/chat/receiver/CNPushMessageReceiver.java
app/src/main/java/com/cnlive/chat/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/chat/ui/MainActivity.java
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
 \ No newline at end of file
-#Wed Feb 22 10:05:11 CST 2017
+#Wed Feb 22 15:18:03 CST 2017
-#Wed Feb 22 10:05:09 CST 2017
+#Wed Feb 22 15:18:02 CST 2017
-#Wed Feb 22 10:05:31 CST 2017
+#Wed Feb 22 15:18:18 CST 2017
-#Wed Feb 22 10:05:11 CST 2017
+#Wed Feb 22 15:18:03 CST 2017
-#Wed Feb 22 10:05:11 CST 2017
+#Wed Feb 22 15:18:03 CST 2017
@@ -6603,7 +6603,7 @@ Constant Pool (count = 426):
   + Methodref [android/util/Log.e (Ljava/lang/String;Ljava/lang/String;)I]
   + Methodref [io/rong/imlib/Chat.<init> ()V]
   + Methodref [io/rong/imlib/Chat.cnMessage (Lio/rong/imlib/model/Message;)Lio/rong/imlib/model/CNMessage;]
-  + Methodref [io/rong/imlib/Chat.getToken (Lio/rong/imlib/model/UserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
+  + Methodref [io/rong/imlib/Chat.getToken (Lio/rong/imlib/model/CNUserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
   + Methodref [io/rong/imlib/Chat.sendChatRoomMessage (Lio/rong/imlib/model/MessageContent;)V]
   + Methodref [io/rong/imlib/Chat.setChatRoomActionListener (Lio/rong/imlib/RongIMClient$ChatRoomActionListener;)V]
   + Methodref [io/rong/imlib/Chat.setConnectStatusListener (Lio/rong/imlib/RongIMClient$ConnectionStatusListener;)V]
@@ -6691,7 +6691,7 @@ Constant Pool (count = 426):
   + NameAndType [getName ()Ljava/lang/String;]
   + NameAndType [getPortraitUri ()Landroid/net/Uri;]
   + NameAndType [getRcHeader (Ljava/lang/String;Ljava/lang/String;)Lio/rong/imlib/network/HttpUtil$Header;]
-  + NameAndType [getToken (Lio/rong/imlib/model/UserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
+  + NameAndType [getToken (Lio/rong/imlib/model/CNUserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
   + NameAndType [getUserId ()Ljava/lang/String;]
   + NameAndType [getUserInfo ()Lio/rong/imlib/model/UserInfo;]
   + NameAndType [getUserName ()Ljava/lang/String;]
@@ -6760,12 +6760,12 @@ Constant Pool (count = 426):
   + Utf8 [(Lio/rong/imlib/base/IChat$OnResultListener;)V]
   + Utf8 [(Lio/rong/imlib/base/IChat$OnSendMessageListener;)V]
   + Utf8 [(Lio/rong/imlib/model/CNUserInfo;)V]
+  + Utf8 [(Lio/rong/imlib/model/CNUserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
   + Utf8 [(Lio/rong/imlib/model/Conversation$ConversationType;Ljava/lang/String;ILio/rong/imlib/RongIMClient$ResultCallback;)V]
   + Utf8 [(Lio/rong/imlib/model/Message;)Lio/rong/imlib/model/CNMessage;]
   + Utf8 [(Lio/rong/imlib/model/Message;Ljava/lang/String;Ljava/lang/String;Lio/rong/imlib/RongIMClient$SendMessageCallback;Lio/rong/imlib/RongIMClient$ResultCallback;)V]
   + Utf8 [(Lio/rong/imlib/model/MessageContent;)V]
   + Utf8 [(Lio/rong/imlib/model/UserInfo;)V]
-  + Utf8 [(Lio/rong/imlib/model/UserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
   + Utf8 [(Ljava/lang/Object;)Ljava/lang/StringBuilder;]
   + Utf8 [(Ljava/lang/String;)Landroid/net/Uri;]
   + Utf8 [(Ljava/lang/String;)Lio/rong/message/TextMessage;]
@@ -7098,7 +7098,7 @@ Methods (count = 37):
     Access flags: 0x1
       = public void connect(io.rong.imlib.model.CNUserInfo)
     Class member attributes (count = 1):
-    + Code attribute instructions (code length = 118, locals = 5, stack = 5):
+    + Code attribute instructions (code length = 116, locals = 5, stack = 5):
       [0] aload_1 v1
       [1] invokevirtual #116
         + Methodref [io/rong/imlib/model/CNUserInfo.getUserId ()Ljava/lang/String;]
@@ -7170,17 +7170,16 @@ Methods (count = 37):
         + Methodref [io/rong/imlib/model/UserInfo.<init> (Ljava/lang/String;Ljava/lang/String;Landroid/net/Uri;)V]
       [100] putstatic #64
         + Fieldref [io/rong/imlib/Chat.currentUser Lio/rong/imlib/model/UserInfo;]
-      [103] getstatic #64
-        + Fieldref [io/rong/imlib/Chat.currentUser Lio/rong/imlib/model/UserInfo;]
-      [106] new #12
+      [103] aload_1 v1
+      [104] new #12
         + Class [io/rong/imlib/Chat$1]
-      [109] dup
-      [110] aload_0 v0
-      [111] invokespecial #86
+      [107] dup
+      [108] aload_0 v0
+      [109] invokespecial #86
         + Methodref [io/rong/imlib/Chat$1.<init> (Lio/rong/imlib/Chat;)V]
-      [114] invokestatic #81
-        + Methodref [io/rong/imlib/Chat.getToken (Lio/rong/imlib/model/UserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
-      [117] return
+      [112] invokestatic #81
+        + Methodref [io/rong/imlib/Chat.getToken (Lio/rong/imlib/model/CNUserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
+      [115] return
       Code attribute exceptions (count = 0):
       Code attribute attributes (attribute count = 1):
       + Line number table attribute (count = 7)
@@ -7190,12 +7189,12 @@ Methods (count = 37):
         [52] -> line 74
         [86] -> line 75
         [103] -> line 76
-        [117] -> line 91
-  + Method:       getToken(Lio/rong/imlib/model/UserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V
+        [115] -> line 91
+  + Method:       getToken(Lio/rong/imlib/model/CNUserInfo;Lio/rong/imlib/network/HttpUtil$OnResponse;)V
     Access flags: 0x9
-      = public static void getToken(io.rong.imlib.model.UserInfo,io.rong.imlib.network.HttpUtil$OnResponse)
+      = public static void getToken(io.rong.imlib.model.CNUserInfo,io.rong.imlib.network.HttpUtil$OnResponse)
     Class member attributes (count = 1):
-    + Code attribute instructions (code length = 82, locals = 6, stack = 5):
+    + Code attribute instructions (code length = 85, locals = 6, stack = 5):
       [0] ldc #7
         + String [https://api.cn.ronghub.com/user/getToken.json]
       [2] astore_2 v2
@@ -7216,8 +7215,8 @@ Methods (count = 37):
       [22] invokevirtual #139
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;]
       [25] aload_0 v0
-      [26] invokevirtual #128
-        + Methodref [io/rong/imlib/model/UserInfo.getUserId ()Ljava/lang/String;]
+      [26] invokevirtual #116
+        + Methodref [io/rong/imlib/model/CNUserInfo.getUserId ()Ljava/lang/String;]
       [29] invokevirtual #139
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;]
       [32] ldc #3
@@ -7225,8 +7224,8 @@ Methods (count = 37):
       [34] invokevirtual #139
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;]
       [37] aload_0 v0
-      [38] invokevirtual #126
-        + Methodref [io/rong/imlib/model/UserInfo.getName ()Ljava/lang/String;]
+      [38] invokevirtual #117
+        + Methodref [io/rong/imlib/model/CNUserInfo.getUserName ()Ljava/lang/String;]
       [41] invokevirtual #139
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;]
       [44] ldc #4
@@ -7234,37 +7233,39 @@ Methods (count = 37):
       [46] invokevirtual #139
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/String;)Ljava/lang/StringBuilder;]
       [49] aload_0 v0
-      [50] invokevirtual #127
-        + Methodref [io/rong/imlib/model/UserInfo.getPortraitUri ()Landroid/net/Uri;]
-      [53] invokevirtual #138
+      [50] invokevirtual #115
+        + Methodref [io/rong/imlib/model/CNUserInfo.getHeadUrl ()Ljava/lang/String;]
+      [53] invokestatic #76
+        + Methodref [android/net/Uri.parse (Ljava/lang/String;)Landroid/net/Uri;]
+      [56] invokevirtual #138
         + Methodref [java/lang/StringBuilder.append (Ljava/lang/Object;)Ljava/lang/StringBuilder;]
-      [56] invokevirtual #140
+      [59] invokevirtual #140
         + Methodref [java/lang/StringBuilder.toString ()Ljava/lang/String;]
-      [59] astore v4
-      [61] new #50
+      [62] astore v4
+      [64] new #50
         + Class [io/rong/imlib/network/HttpUtil]
-      [64] dup
-      [65] invokespecial #129
+      [67] dup
+      [68] invokespecial #129
         + Methodref [io/rong/imlib/network/HttpUtil.<init> ()V]
-      [68] astore v5
-      [70] aload v5
-      [72] ldc #7
+      [71] astore v5
+      [73] aload v5
+      [75] ldc #7
         + String [https://api.cn.ronghub.com/user/getToken.json]
-      [74] aload_3 v3
-      [75] aload v4
-      [77] aload_1 v1
-      [78] invokevirtual #131
+      [77] aload_3 v3
+      [78] aload v4
+      [80] aload_1 v1
+      [81] invokevirtual #131
         + Methodref [io/rong/imlib/network/HttpUtil.post (Ljava/lang/String;Lio/rong/imlib/network/HttpUtil$Header;Ljava/lang/String;Lio/rong/imlib/network/HttpUtil$OnResponse;)V]
-      [81] return
+      [84] return
       Code attribute exceptions (count = 0):
       Code attribute attributes (attribute count = 1):
       + Line number table attribute (count = 6)
         [0] -> line 95
         [3] -> line 96
         [13] -> line 97
-        [61] -> line 98
-        [70] -> line 99
-        [81] -> line 100
+        [64] -> line 98
+        [73] -> line 99
+        [84] -> line 100
   + Method:       connect(Ljava/lang/String;)V
     Access flags: 0x1
       = public void connect(java.lang.String)
@@ -149,7 +149,7 @@ io.rong.imlib.Chat -&gt; io.rong.imlib.Chat:
     58:324:void <init>() -> <init>
     65:68:void init(android.content.Context,java.lang.String,java.lang.String) -> init
     71:91:void connect(io.rong.imlib.model.CNUserInfo) -> connect
-    95:100:void getToken(io.rong.imlib.model.UserInfo,io.rong.imlib.network.HttpUtil$OnResponse) -> getToken
+    95:100:void getToken(io.rong.imlib.model.CNUserInfo,io.rong.imlib.network.HttpUtil$OnResponse) -> getToken
     104:124:void connect(java.lang.String) -> connect
     128:130:void disconnect(boolean) -> disconnect
     134:148:void joinChatRoom(java.lang.String,int) -> joinChatRoom
@@ -149,7 +149,7 @@ io.rong.imlib.Chat: io.rong.imlib.Chat getInstance()
 io.rong.imlib.Chat: Chat()
 io.rong.imlib.Chat: void init(android.content.Context,java.lang.String,java.lang.String)
 io.rong.imlib.Chat: void connect(io.rong.imlib.model.CNUserInfo)
-io.rong.imlib.Chat: void getToken(io.rong.imlib.model.UserInfo,io.rong.imlib.network.HttpUtil$OnResponse)
+io.rong.imlib.Chat: void getToken(io.rong.imlib.model.CNUserInfo,io.rong.imlib.network.HttpUtil$OnResponse)
 io.rong.imlib.Chat: void connect(java.lang.String)
 io.rong.imlib.Chat: void disconnect(boolean)
 io.rong.imlib.Chat: void joinChatRoom(java.lang.String,int)
@@ -73,7 +73,7 @@ public class Chat implements IChat {
         String headUrl = cnUserInfo.getHeadUrl() == null ? "" : cnUserInfo.getHeadUrl();
         Log.e("DemoView", userId + " : " + userName + " : ");
         currentUser = new UserInfo(userId, userName, Uri.parse(headUrl));
-        getToken(currentUser, new HttpUtil.OnResponse() {
+        getToken(cnUserInfo, new HttpUtil.OnResponse() {
             @Override
             public void onResponse(int code, String body) {
                 if (code != 200) return;
@@ -91,10 +91,10 @@ public class Chat implements IChat {
     }
     //获得token
-    public static void getToken(UserInfo user, HttpUtil.OnResponse callback) {
+    public static void getToken(CNUserInfo user, HttpUtil.OnResponse callback) {
         final String HTTP_GET_TOKEN = "https://api.cn.ronghub.com/user/getToken.json";
         HttpUtil.Header header = HttpUtil.getRcHeader(APP_KEY, APP_SECRET);
-        String body = "userId=" + user.getUserId() + "&name=" + user.getName() + "&portraitUri=" + user.getPortraitUri();
+        String body = "userId=" + user.getUserId() + "&name=" + user.getUserName() + "&portraitUri=" + Uri.parse(user.getHeadUrl());
         HttpUtil httpUtil = new HttpUtil();
         httpUtil.post(HTTP_GET_TOKEN, header, body, callback);
     }
@@ -415,5 +415,4 @@ public class Chat implements IChat {
     public void setCurrentUser(UserInfo user) {
         currentUser = user;
     }
-
 }
@@ -18,11 +18,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.ChatRoomActivity" />
+        <activity
+            android:name=".ui.ChatRoomActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.PrivateChatActivity"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -13,11 +13,13 @@ public class CNPushMessageReceiver extends SealNotificationReceiver {
     @Override
     public boolean onNotificationMessageArrived(Context var1, CNNotificationMessage var2) {
+        //返回false，会弹出SDK默认的通知；返回true，SDK不会弹出通知，通知需要您自定义
         return false;
     }
     @Override
     public boolean onNotificationMessageClicked(Context var1, CNNotificationMessage var2) {
+        //返回false，会走SDK默认的处理逻辑，即点击该通知则会打开会话列表或会话界面；返回true，则由您自定义处理逻辑
         return false;
     }
 }
 package com.cnlive.chat.ui;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -15,24 +13,22 @@ import com.cnlive.chat.R;
 import com.cnlive.chat.adapter.ChatListAdapter;
 import java.util.ArrayList;
-import java.util.StringTokenizer;
-import io.rong.imlib.Chat;
 import io.rong.imlib.model.CNMessage;
 import io.rong.imlib.ChatUtil;
 import io.rong.imlib.base.IChat;
 import io.rong.imlib.model.CNUserInfo;
-import io.rong.imlib.model.UserInfo;
-public class ChatRoomActivity extends AppCompatActivity implements View.OnClickListener, IChat.OnMessageListener, IChat.OnConnectStatusListener, IChat.OnChatRoomActionListener {
+public class ChatRoomActivity extends AppCompatActivity implements View.OnClickListener {
     private static final String TAG = "ChatRoomActivity";
     private ListView chatListView;
     private EditText messageContent;
     private Button sendMessageBtn;
-    private Button changeUserInfo;
+//    private Button changeUserInfo;
     private String roomId;
+    private CNUserInfo userInfo;
     private ChatListAdapter chatListAdapter;
     private ArrayList<CNMessage> messageList = new ArrayList<>();
@@ -44,15 +40,21 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chat_room);
+
+        ChatUtil.setOnConnectionListener(onConnectListener);
+        userInfo = new CNUserInfo("2017010102", "J", "http://7xs9j5.com1.z0.glb.clouddn.com/liveapp/guojunwang.jpg");
+        //连接服务器
+        ChatUtil.connect(userInfo);
+
         mHandler = new Handler(this.getMainLooper());
         initView();
         ChatUtil.setOnSendMessageListener(onSendMessageListener);
         ChatUtil.setOnOperationListener(onOperationListener);
         ChatUtil.setOnResultListener(onResultListener);
         joinChatRoom();
-        ChatUtil.setOnMessageListener(this);
-        ChatUtil.setConnectStatusListener(this);
-        ChatUtil.setOnChatRoomActionListener(this);
+        ChatUtil.setOnMessageListener(onMessageListener);
+        ChatUtil.setConnectStatusListener(onConnectStatusListener);
+        ChatUtil.setOnChatRoomActionListener(onChatRoomActionListener);
     }
     private void initView() {
@@ -62,8 +64,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         messageContent = (EditText) findViewById(R.id.message_content);
         sendMessageBtn = (Button) findViewById(R.id.send_message);
         sendMessageBtn.setOnClickListener(this);
-        changeUserInfo = (Button) findViewById(R.id.change_user_info);
-        changeUserInfo.setOnClickListener(this);
+//        changeUserInfo = (Button) findViewById(R.id.change_user_info);
+//        changeUserInfo.setOnClickListener(this);
     }
     //加入聊天室
@@ -80,60 +82,26 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.send_message:
+                //发送聊天室消息
                 ChatUtil.sendChatRoomMessage(messageContent.getText().toString());
                 messageContent.setText("");
                 break;
-            case R.id.change_user_info:
-                ChatUtil.currentUser().setName("Ha");
-                break;
+//            case R.id.change_user_info:
+//                ChatUtil.currentUser().setName("Ha");
+//                break;
         }
     }
-    @Override
-    public void processMessage(final CNMessage message) {
-
-        Log.e("DemoView", message.getUserInfo().getUserName() + " : " + message.getContent());
-
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                messageList.add(message);
-                chatListAdapter.updateItems(messageList);
-                chatListAdapter.notifyDataSetChanged();
-            }
-        });
-    }
-
-    @Override
-    public void onConnectStatus(int what, String extra) {
-        Log.e(TAG, "status : what " + what + " extra : " + extra);
-    }
-
-    @Override
-    public void onJoining(String s) {
-        Log.e("DemoView", "onJoining + : " + s);
-    }
-
-    @Override
-    public void onJoined(String s) {
-        Log.e("DemoView", "onJoined + : " + s);
-    }
-
-    @Override
-    public void onQuited(String s) {
-        Log.e(TAG, "onQuited + : " + s);
-    }
-
-    @Override
-    public void onError(String s, int errorCode, String errorMessage) {
-        Log.e("DemoView", "onError + : " + s);
-    }
+    /**
+     * 发送消息监听
+     */
     private IChat.OnSendMessageListener onSendMessageListener = new IChat.OnSendMessageListener() {
         @Override
         public void onSuccess(Integer integer) {
             Log.i(TAG, "SendMessageListener SUCCESS");
             //聊天SDK屏蔽用户自己发送的消息，所以在发送消息成功的时候需要根据需要处理自己的消息
+            //本demo操作是在发送消息成功后，将发送消息结果监听中的message添加到listview中
             mHandler.post(new Runnable() {
                 @Override
@@ -151,6 +119,26 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         }
     };
+    /**
+     * 发送消息结果监听
+     * 在onSuccess中返回发送的消息体
+     */
+    private IChat.OnResultListener onResultListener = new IChat.OnResultListener() {
+        @Override
+        public void onSuccess(CNMessage message) {
+            Log.i(TAG, "ResultListener SUCCESS " + message.getContent());
+            cnMessage = message;
+        }
+
+        @Override
+        public void onError(int what, String extra) {
+            Log.e(TAG, "ResultListener errorCode : " + what + " errorMessage : " + extra);
+        }
+    };
+
+    /**
+     * 加入或退出聊天室监听
+     */
     private IChat.OnOperationListener onOperationListener = new IChat.OnOperationListener() {
         @Override
         public void onSuccess(int what, String extra) {
@@ -160,6 +148,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
                     break;
                 case IChat.SUCCESS_QUIT_CHATROOM:
                     Log.i(TAG, "退出聊天室成功");
+                    //断开连接
                     ChatUtil.disconnect(false);
                     break;
             }
@@ -171,16 +160,104 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         }
     };
-    private IChat.OnResultListener onResultListener = new IChat.OnResultListener() {
+    /**
+     * 接收消息监听
+     */
+    private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
         @Override
-        public void onSuccess(CNMessage message) {
-            Log.i(TAG, "ResultListener SUCCESS " + message.getContent());
-            cnMessage = message;
+        public void processMessage(final CNMessage message) {
+            Log.e(TAG, message.getUserInfo().getUserName() + " : " + message.getContent());
+
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    messageList.add(message);
+                    chatListAdapter.updateItems(messageList);
+                    chatListAdapter.notifyDataSetChanged();
+                }
+            });
+        }
+    };
+
+    /**
+     * 连接状态监听
+     */
+    private IChat.OnConnectStatusListener onConnectStatusListener = new IChat.OnConnectStatusListener() {
+        @Override
+        public void onConnectStatus(int what, String extra) {
+            Log.e(TAG, "errorCode : " + what + " errorMessage : " + extra);
+            switch (what) {
+                case IChat.CONNECTED:
+                    //连接成功
+                    break;
+                case IChat.CONNECTING:
+                    //连接中
+                    break;
+                case IChat.DISCONNECTED:
+                    //断开连接
+                    break;
+                case IChat.NETWORK_UNAVAILABLE:
+                    //网络不可以
+                    break;
+                case IChat.ERROR_TOKEN_INCORRECT:
+                    //Token错误
+                    break;
+                case IChat.SERVER_INVALID:
+                    //服务器无效
+                    break;
+                case IChat.KICKED_OFFLINE_BY_OTHER_CLIENT:
+                    //用户在其他设备登录，本机会被踢掉线
+                    break;
+            }
+        }
+    };
+
+    /**
+     * 聊天室动作监听
+     */
+    private IChat.OnChatRoomActionListener onChatRoomActionListener = new IChat.OnChatRoomActionListener() {
+        @Override
+        public void onJoining(String s) {
+            //加入中。。。
+            Log.i(TAG, s);
+        }
+
+        @Override
+        public void onJoined(String s) {
+            //成功加入聊天室
+            Log.i(TAG, s);
+        }
+
+        @Override
+        public void onQuited(String s) {
+            //退出聊天室
+            Log.i(TAG, s);
+        }
+
+        @Override
+        public void onError(String s, int errorCode, String errorMessage) {
+            Log.e(TAG, s + " errorCode : " + errorCode + " errorMessage : " + errorMessage);
+        }
+    };
+
+    /**
+     * 连接服务器监听
+     */
+    protected IChat.OnConnectListener onConnectListener = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect() {
+            //Token错误
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+        }
+
+        @Override
+        public void onSuccess(String s) {
+            Log.i(TAG, "ConnectListener " + s);
         }
         @Override
         public void onError(int what, String extra) {
-            Log.e(TAG, "ResultListener errorCode : " + what + " errorMessage : " + extra);
+            Log.e(TAG, "ConnectListener errorCode : " + what + " : errorMessage : " + extra);
         }
     };
@@ -192,6 +269,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     @Override
     public void onBackPressed() {
         super.onBackPressed();
+        //退出聊天室
         ChatUtil.quitChatRoom();
     }
 }
@@ -21,15 +21,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private Button chatRoom;
     private Button privateChat;
-    private CNUserInfo userInfo;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ChatUtil.setOnConnectionListener(onConnectListener);
-//        ChatUtil.connect("WAkcsLgCj23M30nGybKzncw4SBtlLkK9SlzzuzBtTglso17GA6CGh1e++CukcOkNsdtWdRpLlYwva7BX3uQS5g==");
-        userInfo = new CNUserInfo("2017010102", "J", "http://7xs9j5.com1.z0.glb.clouddn.com/liveapp/guojunwang.jpg");
         initView();
     }
@@ -45,8 +41,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.chat_room:
-                ChatUtil.connect(userInfo);
-
                 Intent intent = new Intent(this, ChatRoomActivity.class);
                 startActivity(intent);
                 break;
@@ -56,21 +50,4 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                 break;
         }
     }
-
-    protected IChat.OnConnectListener onConnectListener = new IChat.OnConnectListener() {
-        @Override
-        public void onTokenIncorrect() {
-            Log.e(TAG, "ConnectListener TokenIncorrect");
-        }
-
-        @Override
-        public void onSuccess(String s) {
-            Log.i(TAG, "ConnectListener " + s);
-        }
-
-        @Override
-        public void onError(int what, String extra) {
-            Log.e(TAG, "ConnectListener errorCode : " + what + " : errorMessage : " + extra);
-        }
-    };
 }
 package com.cnlive.chat.ui;
-import android.content.Intent;
-import android.net.Uri;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.ListViewCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -19,14 +16,12 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import io.rong.imlib.RongIMClient;
 import io.rong.imlib.model.CNMessage;
 import io.rong.imlib.ChatUtil;
 import io.rong.imlib.base.IChat;
 import io.rong.imlib.model.CNUserInfo;
-import io.rong.imlib.model.UserInfo;
-public class PrivateChatActivity extends AppCompatActivity implements View.OnClickListener, IChat.OnMessageListener, IChat.OnConnectStatusListener {
+public class PrivateChatActivity extends AppCompatActivity implements View.OnClickListener {
     private static final String TAG = "PrivateChatActivity";
     private ListView chatListView;
@@ -46,9 +41,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_chat_room);
+        setContentView(R.layout.activity_private_chat);
         userInfo = new CNUserInfo("2017010102", "J", "http://7xs9j5.com1.z0.glb.clouddn.com/liveapp/guojunwang.jpg");
+        //连接服务器
         ChatUtil.connect(userInfo);
         targetId = "2017010101";
@@ -56,17 +52,17 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         ChatUtil.setOnResultListener(onResultListener);
         ChatUtil.setOnSendMessageListener(onSendMessageListener);
         ChatUtil.setOnLatestMessageListener(latestMessageListener);
-        ChatUtil.getLatestMessages(targetId, 20);
         initView();
-        ChatUtil.setOnMessageListener(this);
-        ChatUtil.setConnectStatusListener(this);
+        ChatUtil.setOnMessageListener(onMessageListener);
+        ChatUtil.setConnectStatusListener(onConnectStatusListener);
+        ChatUtil.setOnConnectionListener(onConnectListener);
 //        Intent intent = getIntent();
 //        getPushMessage(intent);
     }
     private void initView() {
-        chatListView = (ListView) findViewById(R.id.chat_list_view);
+        chatListView = (ListView) findViewById(R.id.private_list_view);
         chatListAdapter = new ChatListAdapter(this);
         chatListView.setAdapter(chatListAdapter);
         messageContent = (EditText) findViewById(R.id.message_content);
@@ -84,22 +80,21 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.send_message:
+                //发送私聊消息，需要传入目标ID与发送的消息内容
                 ChatUtil.sendPrivateMessage(targetId, messageContent.getText().toString());
                 messageContent.setText("");
                 break;
         }
     }
-    @Override
-    public void onConnectStatus(int what, String extra) {
-        Log.e("DemoView", "errorCode : " + what + " errorMessage : " + extra);
-
-    }
-
+    /**
+     * 发送消息监听
+     */
     private IChat.OnSendMessageListener onSendMessageListener = new IChat.OnSendMessageListener() {
         @Override
         public void onSuccess(Integer integer) {
-
+            //聊天SDK屏蔽用户自己发送的消息，所以在发送消息成功的时候需要根据需要处理自己的消息
+            //本demo操作是在发送消息成功后，将发送消息结果监听中的message添加到listview中
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
@@ -108,7 +103,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                     chatListAdapter.notifyDataSetChanged();
                 }
             });
-            Log.i(TAG, "SendMessageListener SUCCESS");
         }
         @Override
@@ -117,6 +111,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         }
     };
+    /**
+     * 发送消息结果监听
+     * 在onSuccess中返回发送的消息体
+     */
     private IChat.OnResultListener onResultListener = new IChat.OnResultListener() {
         @Override
         public void onSuccess(CNMessage message) {
@@ -130,7 +128,9 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         }
     };
-    //单聊的历史消息，按照时间顺序从新到旧排列
+    /**
+     * 获取单聊的历史消息监听，消息按照时间顺序从新到旧排列
+     */
     private IChat.OnLatestMessageListener latestMessageListener = new IChat.OnLatestMessageListener() {
         @Override
         public void onSuccess(final List<CNMessage> messages) {
@@ -155,19 +155,79 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         }
     };
-    @Override
-    public void processMessage(final CNMessage message) {
-        Log.e("DemoView", message.getContent());
-
-        mHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                messageList.add(message);
-                chatListAdapter.updateItems(messageList);
-                chatListAdapter.notifyDataSetChanged();
+    /**
+     * 连接服务器监听
+     */
+    protected IChat.OnConnectListener onConnectListener = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect() {
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+        }
+
+        @Override
+        public void onSuccess(String s) {
+            Log.i(TAG, "ConnectListener " + s);
+            //聊天SDK若想获得聊天历史，需要调用此方法，需要传入目标ID与获取消息数量
+            ChatUtil.getLatestMessages(targetId, 20);
+        }
+
+        @Override
+        public void onError(int what, String extra) {
+            Log.e(TAG, "ConnectListener errorCode : " + what + " : errorMessage : " + extra);
+        }
+    };
+
+    /**
+     * 接收消息监听
+     */
+    private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
+        @Override
+        public void processMessage(final CNMessage message) {
+            Log.e(TAG, message.getContent());
+
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    messageList.add(message);
+                    chatListAdapter.updateItems(messageList);
+                    chatListAdapter.notifyDataSetChanged();
+                }
+            });
+        }
+    };
+
+    /**
+     * 连接状态监听
+     */
+    private IChat.OnConnectStatusListener onConnectStatusListener = new IChat.OnConnectStatusListener() {
+        @Override
+        public void onConnectStatus(int what, String extra) {
+            Log.e(TAG, "errorCode : " + what + " errorMessage : " + extra);
+            switch (what) {
+                case IChat.CONNECTED:
+                    //连接成功
+                    break;
+                case IChat.CONNECTING:
+                    //连接中
+                    break;
+                case IChat.DISCONNECTED:
+                    //断开连接
+                    break;
+                case IChat.NETWORK_UNAVAILABLE:
+                    //网络不可以
+                    break;
+                case IChat.ERROR_TOKEN_INCORRECT:
+                    //Token错误
+                    break;
+                case IChat.SERVER_INVALID:
+                    //服务器无效
+                    break;
+                case IChat.KICKED_OFFLINE_BY_OTHER_CLIENT:
+                    //用户在其他设备登录，本机会被踢掉线
+                    break;
             }
-        });
-    }
+        }
+    };
     @Override
     protected void onDestroy() {
@@ -191,6 +251,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     @Override
     public void onBackPressed() {
         super.onBackPressed();
+        //断开连接 传入true时，可以接收push消息；传入false时，不能接收push消息
         ChatUtil.disconnect(true);
     }
 }
@@ -14,19 +14,13 @@
         android:id="@+id/chat_list_view"
         android:layout_width="match_parent"
         android:layout_height="300dp"
+        android:layout_above="@+id/edit_layout"
         android:divider="@null"
         android:scrollbars="none"
         android:transcriptMode="alwaysScroll" />
-    <Button
-        android:id="@+id/change_user_info"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/chat_list_view"
-        android:layout_marginTop="10dp"
-        android:text="更新用户信息" />
-
     <LinearLayout
+        android:id="@+id/edit_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -48,4 +42,11 @@
             android:text="发送" />
     </LinearLayout>
+    <!--<Button-->
+        <!--android:id="@+id/change_user_info"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:layout_above="@+id/chat_list_view"-->
+        <!--android:text="更新用户信息" />-->
+
 </RelativeLayout>
@@ -10,10 +10,36 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.cnlive.chat.ui.PrivateChatActivity">
-    <TextView
-        android:layout_width="wrap_content"
+    <ListView
+        android:id="@+id/private_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:layout_above="@+id/edit_layout"
+        android:divider="@null"
+        android:scrollbars="none"
+        android:transcriptMode="alwaysScroll" />
+
+    <LinearLayout
+        android:id="@+id/edit_layout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="我是单聊" />
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/message_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="0.7" />
+
+        <Button
+            android:id="@+id/send_message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="0.2"
+            android:text="发送" />
+    </LinearLayout>
 </RelativeLayout>