Commit d868c01317cc9e06cc03ac2c023f433464d4a20a
1 parent
55e73a5e
去掉多余的代码
Showing
2 changed files
with
1 additions
and
103 deletions
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
| @@ -138,47 +138,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -138,47 +138,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 138 | } | 138 | } |
| 139 | }; | 139 | }; |
| 140 | 140 | ||
| 141 | - /* private IChat.OnSendMessageListener sendMessageListener = new IChat.OnSendMessageListener() { | ||
| 142 | - | ||
| 143 | - @Override | ||
| 144 | - public void onAttached(CNMessage cnMessage) { | ||
| 145 | - Log.v(TAG, "SendMessageListener onAttached" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName()); | ||
| 146 | - } | ||
| 147 | - | ||
| 148 | - @Override | ||
| 149 | - public void onSuccess(final CNMessage cnMessage) { | ||
| 150 | - mHandler.post(new Runnable() { | ||
| 151 | - @Override | ||
| 152 | - public void run() { | ||
| 153 | - try { | ||
| 154 | - if (((String) new JSONObject(cnMessage.getContent()).get("type")).equals("2")) | ||
| 155 | - return; | ||
| 156 | - } catch (JSONException e) { | ||
| 157 | - e.printStackTrace(); | ||
| 158 | - } | ||
| 159 | - if ((roomIdOne).equals(cnMessage.getTargetId())) { | ||
| 160 | - groupChatOneListMy.add(new CNMessageInfo(cnMessage, true)); | ||
| 161 | - chatListAdapterOne.updateItems(groupChatOneListMy); | ||
| 162 | - chatListAdapterOne.notifyDataSetChanged(); | ||
| 163 | - } | ||
| 164 | - | ||
| 165 | - } | ||
| 166 | - }); | ||
| 167 | - | ||
| 168 | - } | ||
| 169 | - | ||
| 170 | - @Override | ||
| 171 | - public void onError(CNMessage cnMessage, int i, final String s) { | ||
| 172 | - Log.v(TAG, "SendMessageListener 失败 " + i + " s" + s); | ||
| 173 | - mHandler.post(new Runnable() { | ||
| 174 | - @Override | ||
| 175 | - public void run() { | ||
| 176 | - Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show(); | ||
| 177 | - } | ||
| 178 | - }); | ||
| 179 | - } | ||
| 180 | - }; | ||
| 181 | - */ | 141 | + |
| 182 | //连接状态监听 | 142 | //连接状态监听 |
| 183 | private IChat.OnConnectStatusListener connectStatusListener = new IChat.OnConnectStatusListener() { | 143 | private IChat.OnConnectStatusListener connectStatusListener = new IChat.OnConnectStatusListener() { |
| 184 | @Override | 144 | @Override |
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
| @@ -246,68 +246,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | @@ -246,68 +246,6 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli | ||
| 246 | }; | 246 | }; |
| 247 | 247 | ||
| 248 | 248 | ||
| 249 | - /*private IChat.OnSendMessageListener sendMessageListener = new IChat.OnSendMessageListener() { | ||
| 250 | - | ||
| 251 | - @Override | ||
| 252 | - public void onAttached(CNMessage cnMessage) { | ||
| 253 | - Log.v(TAG, "私聊SendMessageListener onAttached" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName()); | ||
| 254 | - | ||
| 255 | - } | ||
| 256 | - | ||
| 257 | - @Override | ||
| 258 | - public void onSuccess(final CNMessage cnMessage) { | ||
| 259 | - | ||
| 260 | - if (View.VISIBLE == vistor_btn.getVisibility()) { | ||
| 261 | - vistor_btn.setVisibility(View.GONE); | ||
| 262 | - } | ||
| 263 | - mHandler.post(new Runnable() { | ||
| 264 | - @Override | ||
| 265 | - public void run() { | ||
| 266 | - JSONObject jsonObject = null; | ||
| 267 | - try { | ||
| 268 | - jsonObject = new JSONObject(cnMessage.getContent().toString()); | ||
| 269 | - String type = (String) jsonObject.get("type"); | ||
| 270 | - String message = (String) jsonObject.get("message"); | ||
| 271 | - Toast.makeText(PrivateChatActivity.this, "发送消息成功", Toast.LENGTH_SHORT).show(); | ||
| 272 | - if ("3".equals(type) && message.equals("你好我们可以进行私聊吗")) { | ||
| 273 | - sendInfo = 2; | ||
| 274 | - Toast.makeText(PrivateChatActivity.this, "申请已发送等待对方验证", Toast.LENGTH_SHORT).show(); | ||
| 275 | - } else if ("3".equals(type) && message.equals("拒绝")) { | ||
| 276 | - sendInfo=5; | ||
| 277 | - } else if ("3".equals(type) && message.equals("同意")) { | ||
| 278 | - sendInfo=1; | ||
| 279 | - } else if ("4".equals(type)) { | ||
| 280 | - messageList.add(new ChatRoomActivity.CNMessageInfo(cnMessage, true)); | ||
| 281 | - chatListAdapter.updateItems(messageList); | ||
| 282 | - chatListAdapter.notifyDataSetChanged(); | ||
| 283 | - } | ||
| 284 | - } catch (JSONException e) { | ||
| 285 | - | ||
| 286 | - | ||
| 287 | - } | ||
| 288 | - | ||
| 289 | - } | ||
| 290 | - }); | ||
| 291 | - | ||
| 292 | - Log.v(TAG, "私聊SendMessageListener SUCCESSES" + cnMessage.getTargetId() + cnMessage.getUserInfo().getUserName()); | ||
| 293 | - | ||
| 294 | - | ||
| 295 | - } | ||
| 296 | - | ||
| 297 | - @Override | ||
| 298 | - public void onError(CNMessage cnMessage, int i, String s) { | ||
| 299 | - Log.v(TAG, "私聊SendMessageListener 失败 " + i + " s" + s); | ||
| 300 | - mHandler.post(new Runnable() { | ||
| 301 | - @Override | ||
| 302 | - public void run() { | ||
| 303 | - Toast.makeText(PrivateChatActivity.this, "发送消息失败", Toast.LENGTH_SHORT).show(); | ||
| 304 | - vistor_btn.setText("重新邀请"); | ||
| 305 | - | ||
| 306 | - } | ||
| 307 | - }); | ||
| 308 | - | ||
| 309 | - } | ||
| 310 | - };*/ | ||
| 311 | 249 | ||
| 312 | //连接状态监听 | 250 | //连接状态监听 |
| 313 | private IChat.OnConnectStatusListener connectStatusListener = new IChat.OnConnectStatusListener() { | 251 | private IChat.OnConnectStatusListener connectStatusListener = new IChat.OnConnectStatusListener() { |