CNLive Android Team / CNChatSDK · Commits

Commit 0d324f2357e93b403f8dc9bd6f0dbec514374cc5

Authored by 王琳
1 parent 0ebbd99a

修改加入聊天室监听名称

Inline Side-by-side
Showing 12 changed files with 18 additions and 17 deletions
IMLib/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
  View file @0d324f2
1   -#Wed Mar 01 11:56:09 CST 2017
  1 +#Wed Mar 01 16:14:59 CST 2017
... ...
IMLib/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
  View file @0d324f2
1   -#Wed Mar 01 11:56:08 CST 2017
  1 +#Wed Mar 01 16:14:58 CST 2017
... ...
IMLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
  View file @0d324f2
1   -#Wed Mar 01 11:56:09 CST 2017
  1 +#Wed Mar 01 16:14:59 CST 2017
... ...
IMLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
  View file @0d324f2
1   -#Wed Mar 01 11:56:10 CST 2017
  1 +#Wed Mar 01 16:15:00 CST 2017
... ...
IMLib/build/intermediates/res/resources-debug-androidTest.ap_
View file @0d324f2
No preview for this file type
IMLib/build/outputs/aar/IMLib-debug.aar
View file @0d324f2
No preview for this file type
IMLib/build/outputs/aar/IMLib-release.aar
View file @0d324f2
No preview for this file type
IMLib/src/main/java/io.rong.imlib/Chat.java
  View file @0d324f2
... ... @@ -43,7 +43,7 @@ public class Chat implements IChat {
43 43  
44 44  
45 45 private OnConnectStatusListener mConnectStatusListener;
46   - private OnMessageListener mOnMessageListener;
  46 + private OnReceiveMessageListener mOnMessageListener;
47 47 private OnChatRoomActionListener mOnChatRoomActionListener;
48 48  
49 49 private OnSendMessageListener mOnSendMessageListener;
... ... @@ -432,7 +432,7 @@ public class Chat implements IChat {
432 432 setChatRoomActionListener(chatRoomActionListener);
433 433 }
434 434  
435   - public void setOnMessageListener(OnMessageListener listener) {
  435 + public void setOnReceiveMessageListener(OnReceiveMessageListener listener) {
436 436 this.mOnMessageListener = listener;
437 437 setOnReceiveMessageListener(onReceiveMessageListener);
438 438 }
... ...
IMLib/src/main/java/io.rong.imlib/ChatUtil.java
  View file @0d324f2
... ... @@ -48,8 +48,8 @@ public class ChatUtil {
48 48 Chat.getInstance().setConnectStatusListener(listener);
49 49 }
50 50  
51   - public static void setOnMessageListener(IChat.OnMessageListener listener) {
52   - Chat.getInstance().setOnMessageListener(listener);
  51 + public static void setOnReceiveMessageListener(IChat.OnReceiveMessageListener listener) {
  52 + Chat.getInstance().setOnReceiveMessageListener(listener);
53 53 }
54 54  
55 55 public static void setOnChatRoomActionListener(IChat.OnChatRoomActionListener listener) {
... ...
IMLib/src/main/java/io.rong.imlib/base/IChat.java
  View file @0d324f2
... ... @@ -79,7 +79,7 @@ public interface IChat {
79 79 void setConnectStatusListener(OnConnectStatusListener listener);
80 80  
81 81 //接收消息监听
82   - void setOnMessageListener(OnMessageListener listener);
  82 + void setOnReceiveMessageListener(OnReceiveMessageListener listener);
83 83  
84 84 //聊天室操作
85 85 void setOnChatRoomActionListener(OnChatRoomActionListener listener);
... ... @@ -106,7 +106,7 @@ public interface IChat {
106 106 void onConnectStatus(int what, String extra);
107 107 }
108 108  
109   - interface OnMessageListener {
  109 + interface OnReceiveMessageListener {
110 110 void processMessage(CNMessage message);
111 111 }
112 112  
... ...
app/src/main/java/com/cnlive/chat/ui/ChatRoomActivity.java
  View file @0d324f2
... ... @@ -46,6 +46,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
46 46 protected void onCreate(Bundle savedInstanceState) {
47 47 super.onCreate(savedInstanceState);
48 48 setContentView(R.layout.activity_chat_room);
  49 + initView();
49 50  
50 51 ChatUtil.setOnConnectionListener(onConnectListener);
51 52  
... ... @@ -56,12 +57,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
56 57 // ChatUtil.connect(null);
57 58  
58 59 mHandler = new Handler(this.getMainLooper());
59   - initView();
60 60 ChatUtil.setOnSendMessageListener(onSendMessageListener);
61 61 ChatUtil.setOnOperationListener(onOperationListener);
62 62 ChatUtil.setOnResultListener(onResultListener);
63   - joinChatRoom();
64   - ChatUtil.setOnMessageListener(onMessageListener);
  63 +// joinChatRoom();
  64 + ChatUtil.setOnReceiveMessageListener(onMessageListener);
65 65 ChatUtil.setConnectStatusListener(onConnectStatusListener);
66 66 ChatUtil.setOnChatRoomActionListener(onChatRoomActionListener);
67 67 }
... ... @@ -85,7 +85,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
85 85 }
86 86  
87 87 private void joinChatRoom(final String roomId) {
88   - ChatUtil.joinExistChatRoom(roomId, 20);
  88 + ChatUtil.joinExistChatRoom(roomId, 2);
89 89 }
90 90  
91 91 @Override
... ... @@ -179,7 +179,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
179 179 /**
180 180 * 接收消息监听
181 181 */
182   - private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
  182 + private IChat.OnReceiveMessageListener onMessageListener = new IChat.OnReceiveMessageListener() {
183 183 @Override
184 184 public void processMessage(final CNMessage message) {
185 185 Log.e(TAG, message.getUserInfo().getUserId() + " : " + message.getUserInfo().getUserName() + " : " + message.getContent());
... ... @@ -275,6 +275,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
275 275 @Override
276 276 public void onSuccess(String s) {
277 277 Log.i(TAG, "ConnectListener " + s);
  278 + joinChatRoom();
278 279 }
279 280  
280 281 @Override
... ...
app/src/main/java/com/cnlive/chat/ui/PrivateChatActivity.java
  View file @0d324f2
... ... @@ -54,7 +54,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
54 54 ChatUtil.setOnSendMessageListener(onSendMessageListener);
55 55 ChatUtil.setOnLatestMessageListener(latestMessageListener);
56 56 initView();
57   - ChatUtil.setOnMessageListener(onMessageListener);
  57 + ChatUtil.setOnReceiveMessageListener(onMessageListener);
58 58 ChatUtil.setConnectStatusListener(onConnectStatusListener);
59 59 ChatUtil.setOnConnectionListener(onConnectListener);
60 60 // Intent intent = getIntent();
... ... @@ -185,7 +185,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
185 185 /**
186 186 * 接收消息监听
187 187 */
188   - private IChat.OnMessageListener onMessageListener = new IChat.OnMessageListener() {
  188 + private IChat.OnReceiveMessageListener onMessageListener = new IChat.OnReceiveMessageListener() {
189 189 @Override
190 190 public void processMessage(final CNMessage message) {
191 191 Log.e(TAG, message.getContent());
... ...