Commit 05cf7b9ea5d0813315332d4d652dcc84d5057fac
1 parent
c17ddedd
优化代码
Showing
2 changed files
with
15 additions
and
4 deletions
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
| @@ -66,6 +66,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -66,6 +66,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 66 | ChatUtil.setConnectStatusListener(connectStatusListener); | 66 | ChatUtil.setConnectStatusListener(connectStatusListener); |
| 67 | ChatUtil.setOnChatRoomActionListener(chatRoomActionListener); | 67 | ChatUtil.setOnChatRoomActionListener(chatRoomActionListener); |
| 68 | ChatUtil.setOnReceiveMessageListener(receiveMessageListener); | 68 | ChatUtil.setOnReceiveMessageListener(receiveMessageListener); |
| 69 | + | ||
| 69 | ChatUtil.setKickedOfflineListener(onKickedOfflineListener); | 70 | ChatUtil.setKickedOfflineListener(onKickedOfflineListener); |
| 70 | Intent intent = getIntent(); | 71 | Intent intent = getIntent(); |
| 71 | user_name_string = intent.getStringExtra("user_name_string"); | 72 | user_name_string = intent.getStringExtra("user_name_string"); |
| @@ -155,9 +156,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -155,9 +156,11 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 155 | @Override | 156 | @Override |
| 156 | public void processMessage(final CNMessage cnMessage) { | 157 | public void processMessage(final CNMessage cnMessage) { |
| 157 | Log.v(TAG, "receiveMessageListener" + " " + cnMessage.getTargetId() + " " + cnMessage.getContent()); | 158 | Log.v(TAG, "receiveMessageListener" + " " + cnMessage.getTargetId() + " " + cnMessage.getContent()); |
| 159 | + | ||
| 158 | mHandler.post(new Runnable() { | 160 | mHandler.post(new Runnable() { |
| 159 | @Override | 161 | @Override |
| 160 | public void run() { | 162 | public void run() { |
| 163 | + | ||
| 161 | try { | 164 | try { |
| 162 | JSONObject jsonObject = new JSONObject(cnMessage.getContent().toString()); | 165 | JSONObject jsonObject = new JSONObject(cnMessage.getContent().toString()); |
| 163 | String type = (String) jsonObject.get("type"); | 166 | String type = (String) jsonObject.get("type"); |
| @@ -179,6 +182,14 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -179,6 +182,14 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 179 | }; | 182 | }; |
| 180 | 183 | ||
| 181 | 184 | ||
| 185 | + | ||
| 186 | + | ||
| 187 | + | ||
| 188 | + | ||
| 189 | + | ||
| 190 | + | ||
| 191 | + | ||
| 192 | + | ||
| 182 | //聊天室操作 | 193 | //聊天室操作 |
| 183 | private IChat.OnChatRoomActionListener chatRoomActionListener = new IChat.OnChatRoomActionListener() { | 194 | private IChat.OnChatRoomActionListener chatRoomActionListener = new IChat.OnChatRoomActionListener() { |
| 184 | @Override | 195 | @Override |
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
| @@ -118,11 +118,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | @@ -118,11 +118,10 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | ||
| 118 | ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener); | 118 | ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener); |
| 119 | messageContent.setText(""); | 119 | messageContent.setText(""); |
| 120 | } | 120 | } |
| 121 | - | ||
| 122 | - | ||
| 123 | } | 121 | } |
| 124 | 122 | ||
| 125 | break; | 123 | break; |
| 124 | + | ||
| 126 | case R.id.userId_btn_top: | 125 | case R.id.userId_btn_top: |
| 127 | //发送私聊消息,需要传入目标ID与发送的消息内容 | 126 | //发送私聊消息,需要传入目标ID与发送的消息内容 |
| 128 | if (user_id_edit.getText().toString().isEmpty()) { | 127 | if (user_id_edit.getText().toString().isEmpty()) { |
| @@ -223,7 +222,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | @@ -223,7 +222,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | ||
| 223 | chatListAdapter.updateItems(messageList); | 222 | chatListAdapter.updateItems(messageList); |
| 224 | chatListAdapter.notifyDataSetChanged(); | 223 | chatListAdapter.notifyDataSetChanged(); |
| 225 | } | 224 | } |
| 226 | - | ||
| 227 | } catch (JSONException e) { | 225 | } catch (JSONException e) { |
| 228 | 226 | ||
| 229 | 227 | ||
| @@ -265,10 +263,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | @@ -265,10 +263,12 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | ||
| 265 | private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() { | 263 | private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() { |
| 266 | @Override | 264 | @Override |
| 267 | public void processMessage(final CNMessage cnMessage) { | 265 | public void processMessage(final CNMessage cnMessage) { |
| 266 | + | ||
| 267 | + | ||
| 268 | mHandler.post(new Runnable() { | 268 | mHandler.post(new Runnable() { |
| 269 | @Override | 269 | @Override |
| 270 | public void run() { | 270 | public void run() { |
| 271 | - | 271 | + Log.v("cnMessage", cnMessage.getTargetId() + "," + cnMessage.getUserInfo().getUserId()); |
| 272 | JSONObject jsonObject = null; | 272 | JSONObject jsonObject = null; |
| 273 | try { | 273 | try { |
| 274 | jsonObject = new JSONObject(cnMessage.getContent().toString()); | 274 | jsonObject = new JSONObject(cnMessage.getContent().toString()); |