修改加入聊天室监听名称

王琳
1 parent 0ebbd99a
Showing 12 changed files with 18 additions and 17 deletions
IMLib/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
IMLib/build/intermediates/incremental/mergeDebugResources/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/outputs/aar/IMLib-debug.aar
IMLib/build/outputs/aar/IMLib-release.aar
IMLib/src/main/java/io.rong.imlib/Chat.java
IMLib/src/main/java/io.rong.imlib/ChatUtil.java
IMLib/src/main/java/io.rong.imlib/base/IChat.java
app/src/main/java/com/cnlive/chat/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/chat/ui/PrivateChatActivity.java
-#Wed Mar 01 11:56:09 CST 2017
+#Wed Mar 01 16:14:59 CST 2017
-#Wed Mar 01 11:56:08 CST 2017
+#Wed Mar 01 16:14:58 CST 2017
-#Wed Mar 01 11:56:09 CST 2017
+#Wed Mar 01 16:14:59 CST 2017
-#Wed Mar 01 11:56:10 CST 2017
+#Wed Mar 01 16:15:00 CST 2017
@@ -43,7 +43,7 @@ public class Chat implements IChat {
     private OnConnectStatusListener mConnectStatusListener;
-    private OnMessageListener mOnMessageListener;
+    private OnReceiveMessageListener mOnMessageListener;
     private OnChatRoomActionListener mOnChatRoomActionListener;
     private OnSendMessageListener mOnSendMessageListener;
@@ -432,7 +432,7 @@ public class Chat implements IChat {
         setChatRoomActionListener(chatRoomActionListener);
     }
-    public void setOnMessageListener(OnMessageListener listener) {
+    public void setOnReceiveMessageListener(OnReceiveMessageListener listener) {
         this.mOnMessageListener = listener;
         setOnReceiveMessageListener(onReceiveMessageListener);
     }
@@ -48,8 +48,8 @@ public class ChatUtil {
         Chat.getInstance().setConnectStatusListener(listener);
     }
-    public static void setOnMessageListener(IChat.OnMessageListener listener) {
-        Chat.getInstance().setOnMessageListener(listener);
+    public static void setOnReceiveMessageListener(IChat.OnReceiveMessageListener listener) {
+        Chat.getInstance().setOnReceiveMessageListener(listener);
     }
     public static void setOnChatRoomActionListener(IChat.OnChatRoomActionListener listener) {
@@ -79,7 +79,7 @@ public interface IChat {
     void setConnectStatusListener(OnConnectStatusListener listener);
     //接收消息监听
-    void setOnMessageListener(OnMessageListener listener);
+    void setOnReceiveMessageListener(OnReceiveMessageListener listener);
     //聊天室操作
     void setOnChatRoomActionListener(OnChatRoomActionListener listener);
@@ -106,7 +106,7 @@ public interface IChat {
         void onConnectStatus(int what, String extra);
     }
-    interface OnMessageListener {
+    interface OnReceiveMessageListener {
         void processMessage(CNMessage message);
     }
@@ -46,6 +46,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chat_room);
+        initView();
         ChatUtil.setOnConnectionListener(onConnectListener);
@@ -56,12 +57,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
 //        ChatUtil.connect(null);
         mHandler = new Handler(this.getMainLooper());
-        initView();
         ChatUtil.setOnSendMessageListener(onSendMessageListener);
         ChatUtil.setOnOperationListener(onOperationListener);
         ChatUtil.setOnResultListener(onResultListener);
-        joinChatRoom();
-        ChatUtil.setOnMessageListener(onMessageListener);
+//        joinChatRoom();
+        ChatUtil.setOnReceiveMessageListener(onMessageListener);
         ChatUtil.setConnectStatusListener(onConnectStatusListener);
         ChatUtil.setOnChatRoomActionListener(onChatRoomActionListener);
     }
@@ -85,7 +85,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     }
     private void joinChatRoom(final String roomId) {
-        ChatUtil.joinExistChatRoom(roomId, 20);
+        ChatUtil.joinExistChatRoom(roomId, 2);
     }
     @Override
@@ -179,7 +179,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     /**
      * 接收消息监听
      */
-    private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
+    private IChat.OnReceiveMessageListener onMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNMessage message) {
             Log.e(TAG, message.getUserInfo().getUserId() + " : " + message.getUserInfo().getUserName() + " : " + message.getContent());
@@ -275,6 +275,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onSuccess(String s) {
             Log.i(TAG, "ConnectListener " + s);
+            joinChatRoom();
         }
         @Override
@@ -54,7 +54,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
         ChatUtil.setOnSendMessageListener(onSendMessageListener);
         ChatUtil.setOnLatestMessageListener(latestMessageListener);
         initView();
-        ChatUtil.setOnMessageListener(onMessageListener);
+        ChatUtil.setOnReceiveMessageListener(onMessageListener);
         ChatUtil.setConnectStatusListener(onConnectStatusListener);
         ChatUtil.setOnConnectionListener(onConnectListener);
 //        Intent intent = getIntent();
@@ -185,7 +185,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
     /**
      * 接收消息监听
      */
-    private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
+    private IChat.OnReceiveMessageListener onMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNMessage message) {
             Log.e(TAG, message.getContent());