添加上传进度功能

谷俊
1 parent 22283030
Showing 10 changed files with 190 additions and 31 deletions
app/src/main/java/com/cnlive/im/adapter/ChatRoomAdpter.java
app/src/main/java/com/cnlive/im/mode/ImagMessage.java
app/src/main/java/com/cnlive/im/mode/UgcVideoMessage.java
app/src/main/java/com/cnlive/im/mode/VideoMessage.java
app/src/main/java/com/cnlive/im/mode/VoiceMessage.java
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateActivity.java
app/src/main/res/layout/imag_layout_item_user.xml
app/src/main/res/layout/video_layout_item_user.xml
app/src/main/res/layout/voice_layout_item_user.xml
@@ -202,12 +202,14 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
         private TextView ima_user_name;
         private ImageView img_content;
         private TextView status;
+        private TextView uploadProgress;
         public ImaMessageHolder(View itemView) {
             super(itemView);
             ima_user_name = (TextView) itemView.findViewById(R.id.img_user_name);
             img_content = (ImageView) itemView.findViewById(R.id.img_content);
             status = (TextView) itemView.findViewById(R.id.status);
+            uploadProgress = (TextView) itemView.findViewById(R.id.uploadProgress);
         }
         public void showMessage(final ImagMessage imagMessage) {
@@ -219,16 +221,24 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
                 case IChat.CN_MSG_STATUS_SENDING:
                     if (status != null)
                         status.setText("发送中");
+                    if (uploadProgress != null) {
+                        uploadProgress.setVisibility(View.VISIBLE);
+                        uploadProgress.setText("上传进度：" + imagMessage.getProgress() + "%");
+                    }
                     Glide.with(mContext).load(imagMessage.getCnImgMessage().getImagePath()).into(img_content);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_FAIL:
                     if (status != null)
                         status.setText("发送失败");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     Glide.with(mContext).load(imagMessage.getCnImgMessage().getImagePath()).into(img_content);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_SUCCESS:
                     if (status != null)
                         status.setText("发送成功");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     sendSuccess(imagMessage);
                     break;
             }
@@ -280,6 +290,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
         private TextView voice_duration;
         private View voice_none_read;
         private TextView status;
+        private TextView uploadProgress;
         public VoiceMessageHolder(View itemView) {
             super(itemView);
@@ -288,6 +299,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
             voice_duration = (TextView) itemView.findViewById(R.id.voice_duration);
             voice_none_read = itemView.findViewById(R.id.noneRead);
             status = (TextView) itemView.findViewById(R.id.status);
+            uploadProgress = (TextView) itemView.findViewById(R.id.uploadProgress);
         }
         public void showMessage(final VoiceMessage voiceMessage) {
@@ -298,14 +310,22 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
                 case IChat.CN_MSG_STATUS_SENDING:
                     if (status != null)
                         status.setText("发送中");
+                    if (uploadProgress != null) {
+                        uploadProgress.setVisibility(View.VISIBLE);
+                        uploadProgress.setText("上传进度：" + voiceMessage.getProgress() + "%");
+                    }
                     break;
                 case IChat.CN_MSG_STATUS_SEND_FAIL:
                     if (status != null)
                         status.setText("发送失败");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_SUCCESS:
                     if (status != null)
                         status.setText("发送成功");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     sendSuccess(voiceMessage);
                     break;
             }
@@ -332,6 +352,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
         private ImageView video_snapshot;
         private View videoLayout;
         private TextView status;
+        private TextView uploadProgress;
         public VideoMessageHolder(View itemView) {
             super(itemView);
@@ -339,6 +360,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
             video_snapshot = (ImageView) itemView.findViewById(R.id.img_content);
             videoLayout = itemView.findViewById(R.id.videoLayout);
             status = (TextView) itemView.findViewById(R.id.status);
+            uploadProgress = (TextView) itemView.findViewById(R.id.uploadProgress);
         }
         public void showMessage(final VideoMessage videoMessage) {
@@ -347,16 +369,24 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
                 case IChat.CN_MSG_STATUS_SENDING:
                     if (status != null)
                         status.setText("发送中");
+                    if (uploadProgress != null) {
+                        uploadProgress.setVisibility(View.VISIBLE);
+                        uploadProgress.setText("上传进度：" + videoMessage.getProgress() + "%");
+                    }
                     Glide.with(mContext).load(videoMessage.getCnVideoMessage().getSnapshotPath()).into(video_snapshot);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_FAIL:
                     if (status != null)
                         status.setText("发送失败");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     Glide.with(mContext).load(videoMessage.getCnVideoMessage().getSnapshotPath()).into(video_snapshot);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_SUCCESS:
                     if (status != null)
                         status.setText("发送成功");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     sendSuccess(videoMessage);
                     break;
             }
@@ -406,6 +436,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
         private ImageView video_cover;
         private View videoLayout;
         private TextView status;
+        private TextView uploadProgress;
         public UgcVideoMessageHolder(View itemView) {
             super(itemView);
@@ -413,6 +444,7 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
             video_cover = (ImageView) itemView.findViewById(R.id.img_content);
             videoLayout = itemView.findViewById(R.id.videoLayout);
             status = (TextView) itemView.findViewById(R.id.status);
+            uploadProgress = (TextView) itemView.findViewById(R.id.uploadProgress);
         }
         public void showMessage(final UgcVideoMessage videoMessage) {
@@ -421,16 +453,24 @@ public class ChatRoomAdpter extends BaseRecyclerAdapter {
                 case IChat.CN_MSG_STATUS_SENDING:
                     if (status != null)
                         status.setText("发送中");
+                    if (uploadProgress != null) {
+                        uploadProgress.setVisibility(View.VISIBLE);
+                        uploadProgress.setText("上传进度：" + videoMessage.getProgress() + "%");
+                    }
                     Glide.with(mContext).load(videoMessage.getCnUgcMessage().getCoverPath()).into(video_cover);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_FAIL:
                     if (status != null)
                         status.setText("发送失败");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     Glide.with(mContext).load(videoMessage.getCnUgcMessage().getCoverPath()).into(video_cover);
                     break;
                 case IChat.CN_MSG_STATUS_SEND_SUCCESS:
                     if (status != null)
                         status.setText("发送成功");
+                    if (uploadProgress != null)
+                        uploadProgress.setVisibility(View.GONE);
                     sendSuccess(videoMessage);
                     break;
             }
@@ -13,6 +13,7 @@ public class ImagMessage {
     boolean isUserSend;
     private boolean isDownloading = false;
+    private int progress = 0;
     public String getType() {
@@ -52,4 +53,19 @@ public class ImagMessage {
         this.cnImgMessage = cnImgMessage;
         this.isUserSend = isUserSend;
     }
+
+    public ImagMessage(String type, CNImgMessage cnImgMessage, boolean isUserSend, int progress) {
+        this.type = type;
+        this.cnImgMessage = cnImgMessage;
+        this.isUserSend = isUserSend;
+        this.progress = progress;
+    }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
 }
@@ -12,6 +12,7 @@ public class UgcVideoMessage {
     boolean isUserSend;
     private boolean isDownloading = false;
+    private int progress = 0;
     public UgcVideoMessage(String type, CNUgcMessage cnUgcMessage, boolean isUserSend) {
         this.type = type;
@@ -19,6 +20,14 @@ public class UgcVideoMessage {
         this.isUserSend = isUserSend;
     }
+    public UgcVideoMessage(String type, CNUgcMessage cnUgcMessage, boolean isUserSend, int progress) {
+        this.type = type;
+        this.cnUgcMessage = cnUgcMessage;
+        this.isUserSend = isUserSend;
+        this.progress = progress;
+    }
+
+
     public String getType() {
         return type;
     }
@@ -50,5 +59,13 @@ public class UgcVideoMessage {
     public void setDownloading(boolean downloading) {
         isDownloading = downloading;
     }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
 }
@@ -13,6 +13,7 @@ public class VideoMessage {
     boolean isUserSend;
     private boolean isDownloading = false;
+    private int progress;
     public VideoMessage(String type, CNVideoMessage cnVideoMessage, boolean isUserSend) {
         this.type = type;
@@ -20,6 +21,14 @@ public class VideoMessage {
         this.isUserSend = isUserSend;
     }
+
+    public VideoMessage(String type, CNVideoMessage cnVideoMessage, boolean isUserSend, int progress) {
+        this.type = type;
+        this.cnVideoMessage = cnVideoMessage;
+        this.isUserSend = isUserSend;
+        this.progress = progress;
+    }
+
     public String getType() {
         return type;
     }
@@ -51,4 +60,12 @@ public class VideoMessage {
     public void setDownloading(boolean downloading) {
         isDownloading = downloading;
     }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
 }
@@ -12,12 +12,21 @@ public class VoiceMessage {
     private CNVoiceMessage cnVoiceMessage;
     boolean isUserSend;
+    private int progress;
+
     public VoiceMessage(String type, CNVoiceMessage cnVoiceMessage, boolean isUserSend) {
         this.type = type;
         this.cnVoiceMessage = cnVoiceMessage;
         this.isUserSend = isUserSend;
     }
+    public VoiceMessage(String type, CNVoiceMessage cnVoiceMessage, boolean isUserSend, int progress) {
+        this.type = type;
+        this.cnVoiceMessage = cnVoiceMessage;
+        this.isUserSend = isUserSend;
+        this.progress = progress;
+    }
+
     public String getType() {
         return type;
     }
@@ -41,4 +50,12 @@ public class VoiceMessage {
     public void setUserSend(boolean userSend) {
         isUserSend = userSend;
     }
+
+    public int getProgress() {
+        return progress;
+    }
+
+    public void setProgress(int progress) {
+        this.progress = progress;
+    }
 }
@@ -74,7 +74,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private final int CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE = 0x2001;
-    private ArrayList<String> groupChatOneListMy;
+    private ArrayList<String> msgIds = new ArrayList<>();
     private String roomIdOne = "ChatRoom10";
     private EditText editText;
     private Button send_messageOneBtn;
@@ -132,7 +132,8 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         mHandler = new Handler();
         ChatUtil.setOnConnectStatusListener(connectStatusListener);
         ChatUtil.setOnChatRoomActionListener(chatRoomActionListener);
-        ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
+        ChatUtil.setOnReceiveChatroomMessageListener(receiveMessageListener);
+        ChatUtil.setUploadProgressListener(uploadProgressListener);
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
         Intent intent = getIntent();
         user_name_string = intent.getStringExtra("user_name_string");
@@ -168,7 +169,6 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         exit_chat1.setOnClickListener(this);
         foundChatBtn.setOnClickListener(this);
         send_messageOneBtn.setOnClickListener(this);
-        groupChatOneListMy = new ArrayList<>();
         chatListAdapterOne = new ChatRoomAdpter(ChatRoomActivity.this, false);
         chatListAdapterOne.setonVoiceItemClickListener(this);
         listViewOne.setLayoutManager(new LinearLayoutManager(ChatRoomActivity.this));
@@ -200,12 +200,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onSuccess(final CNBaseMessage o) {
-            updateItem(o);
+            updateItem(o, -1);
         }
         @Override
         public void onError(CNBaseMessage o, int i, String s) {
-            updateItem(o);
+            updateItem(o, -1);
         }
     };
@@ -221,15 +221,25 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNBaseMessage o) {
+            if (!o.getTargetId().equals(roomIdOne)) return;
             showMessage(o);
         }
     };
+    private IChat.OnUploadProgressListener uploadProgressListener = new IChat.OnUploadProgressListener() {
+        @Override
+        public void onMessagesUpdate(CNBaseMessage message, int elemIdx, int taskId, int progress) {
+            if (!message.getTargetId().equals(roomIdOne)) return;
+            updateItem(message, progress);
+        }
+    };
+
+
     /**
      * 更新消息
      */
-    public void updateItem(CNBaseMessage o) {
-        int updateIndex = groupChatOneListMy.indexOf(o.getMessageId());
+    public void updateItem(CNBaseMessage o, int progress) {
+        int updateIndex = msgIds.indexOf(o.getMessageId());
         if (updateIndex < 0 || chatListAdapterOne.getItemCount() <= 0 || updateIndex > chatListAdapterOne.getItemCount() - 1)
             return;
         if (o.getMsgType() == IChat.CN_MSG_TYPE_TEXT) {
@@ -237,18 +247,18 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             chatListAdapterOne.updateItem(new StringMessage(MessageType.stringMessage, o1, o1.isSelf()), updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_IMAGE) {
             CNImgMessage o1 = (CNImgMessage) o;
-            chatListAdapterOne.updateItem(new ImagMessage(MessageType.imaMessage, o1, o1.isSelf()), updateIndex);
+            chatListAdapterOne.updateItem(new ImagMessage(MessageType.imaMessage, o1, o1.isSelf(), progress < 0 ? 0 : progress), updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VOICE) {
             CNVoiceMessage o1 = (CNVoiceMessage) o;
-            VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf());
+            VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapterOne.updateItem(voiceMessage, updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VIDEO) {
             CNVideoMessage ol = (CNVideoMessage) o;
-            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf());
+            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapterOne.updateItem(videoMessage, updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_UGC) {
             CNUgcMessage ol = (CNUgcMessage) o;
-            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf());
+            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapterOne.updateItem(ugcVideoMessage, updateIndex);
         }
     }
@@ -259,7 +269,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
      * @param o
      */
     private void showMessage(CNBaseMessage o) {
-        groupChatOneListMy.add(o.getMessageId());
+        msgIds.add(o.getMessageId());
         if (o.getMsgType() == IChat.CN_MSG_TYPE_TEXT) {
             CNMessage o1 = (CNMessage) o;
             chatListAdapterOne.addItem(new StringMessage(MessageType.stringMessage, o1, o1.isSelf()));
@@ -271,12 +281,12 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
             VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf());
             chatListAdapterOne.addItem(voiceMessage);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VIDEO) {
-            CNVideoMessage ol = (CNVideoMessage) o;
-            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf());
+            CNVideoMessage o1 = (CNVideoMessage) o;
+            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, o1, o1.isSelf());
             chatListAdapterOne.addItem(videoMessage);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_UGC) {
-            CNUgcMessage ol = (CNUgcMessage) o;
-            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf());
+            CNUgcMessage o1 = (CNUgcMessage) o;
+            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, o1, o1.isSelf());
             chatListAdapterOne.addItem(ugcVideoMessage);
         }
         if (chatListAdapterOne.getItemCount() > 0)
@@ -817,7 +827,10 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        ChatUtil.removeUploadProgressListener(uploadProgressListener);
         ChatUtil.removeReceiveMessageListener(receiveMessageListener);
         ChatUtil.removeConnectListener(connectListener);
+        ChatUtil.removeConnectStatusListener(connectStatusListener);
     }
+
 }
@@ -99,7 +99,7 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
     private EditText messageContent;
     private Button sendMessageBtn;
     private ChatRoomAdpter chatListAdapter;
-    private ArrayList<String> messageList = new ArrayList<>();
+    private ArrayList<String> msgIds = new ArrayList<>();
     //    private CNMessage cnMessage;
     private LinearLayout linearLayoutUseID;
     private EditText user_id_edit;
@@ -144,6 +144,7 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
         mHandler = new Handler();
         ChatUtil.setOnConnectStatusListener(connectStatusListener);
         ChatUtil.setOnReceivePrivateMessageListener(receiveMessageListener);
+        ChatUtil.setUploadProgressListener(uploadProgressListener);
         requestPermission();
     }
@@ -414,12 +415,12 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
         @Override
         public void onSuccess(final CNBaseMessage o) {
-            updateItem(o);
+            updateItem(o, -1);
         }
         @Override
         public void onError(CNBaseMessage o, int i, String s) {
-            updateItem(o);
+            updateItem(o, -1);
         }
     };
@@ -436,15 +437,24 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNBaseMessage o) {
+            if (!o.getTargetId().equals(oppositeID)) return;
             showMessage(o, true);
         }
     };
+    private IChat.OnUploadProgressListener uploadProgressListener = new IChat.OnUploadProgressListener() {
+        @Override
+        public void onMessagesUpdate(CNBaseMessage message, int elemIdx, int taskId, int progress) {
+            if (!message.getTargetId().equals(oppositeID)) return;
+            updateItem(message, progress);
+        }
+    };
+
     /**
      * 更新消息
      */
-    public void updateItem(CNBaseMessage o) {
-        int updateIndex = messageList.indexOf(o.getMessageId());
+    public void updateItem(CNBaseMessage o, int progress) {
+        int updateIndex = msgIds.indexOf(o.getMessageId());
         if (updateIndex < 0 || chatListAdapter.getItemCount() <= 0 || updateIndex > chatListAdapter.getItemCount() - 1)
             return;
         if (o.getMsgType() == IChat.CN_MSG_TYPE_TEXT) {
@@ -452,18 +462,18 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
             chatListAdapter.updateItem(new StringMessage(MessageType.stringMessage, o1, o1.isSelf()), updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_IMAGE) {
             CNImgMessage o1 = (CNImgMessage) o;
-            chatListAdapter.updateItem(new ImagMessage(MessageType.imaMessage, o1, o1.isSelf()), updateIndex);
+            chatListAdapter.updateItem(new ImagMessage(MessageType.imaMessage, o1, o1.isSelf(), progress < 0 ? 0 : progress), updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VOICE) {
             CNVoiceMessage o1 = (CNVoiceMessage) o;
-            VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf());
+            VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapter.updateItem(voiceMessage, updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VIDEO) {
             CNVideoMessage ol = (CNVideoMessage) o;
-            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf());
+            VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapter.updateItem(videoMessage, updateIndex);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_UGC) {
             CNUgcMessage ol = (CNUgcMessage) o;
-            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf());
+            UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf(), progress < 0 ? 0 : progress);
             chatListAdapter.updateItem(ugcVideoMessage, updateIndex);
         }
     }
@@ -490,7 +500,7 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
                         sendInfo = 4;
                     } else if ("4".equals(type)) {
                         Log.v(TAG, o1.getContent().toString());
-                        messageList.add(o.getMessageId());
+                        msgIds.add(o.getMessageId());
                         chatListAdapter.addItem(new StringMessage(MessageType.stringMessage, o1, false));
                     }
                 } catch (JSONException e) {
@@ -512,28 +522,28 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
                     } else if ("3".equals(type) && message.equals("同意")) {
                         sendInfo = 1;
                     } else if ("4".equals(type)) {
-                        messageList.add(o.getMessageId());
+                        msgIds.add(o.getMessageId());
                         chatListAdapter.addItem(new StringMessage(MessageType.stringMessage, o1, true));
                     }
                 } catch (JSONException e) {
                 }
             }
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_IMAGE) {
-            messageList.add(o.getMessageId());
+            msgIds.add(o.getMessageId());
             CNImgMessage o1 = (CNImgMessage) o;
             chatListAdapter.addItem(new ImagMessage(MessageType.imaMessage, o1, o1.isSelf()));
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VOICE) {
-            messageList.add(o.getMessageId());
+            msgIds.add(o.getMessageId());
             CNVoiceMessage o1 = (CNVoiceMessage) o;
             VoiceMessage voiceMessage = new VoiceMessage(MessageType.voiceMessage, o1, o1.isSelf());
             chatListAdapter.addItem(voiceMessage);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_VIDEO) {
-            messageList.add(o.getMessageId());
+            msgIds.add(o.getMessageId());
             CNVideoMessage ol = (CNVideoMessage) o;
             VideoMessage videoMessage = new VideoMessage(MessageType.videoMessage, ol, ol.isSelf());
             chatListAdapter.addItem(videoMessage);
         } else if (o.getMsgType() == IChat.CN_MSG_TYPE_UGC) {
-            messageList.add(o.getMessageId());
+            msgIds.add(o.getMessageId());
             CNUgcMessage ol = (CNUgcMessage) o;
             UgcVideoMessage ugcVideoMessage = new UgcVideoMessage(MessageType.ugcVideoMessage, ol, ol.isSelf());
             chatListAdapter.addItem(ugcVideoMessage);
@@ -874,7 +884,9 @@ public class PrivateActivity extends AppCompatActivity implements View.OnClickLi
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        ChatUtil.removeUploadProgressListener(uploadProgressListener);
         ChatUtil.removeReceiveMessageListener(receiveMessageListener);
         ChatUtil.removeConnectListener(connectListener);
+        ChatUtil.removeConnectStatusListener(connectStatusListener);
     }
 }
@@ -13,6 +13,15 @@
         android:orientation="horizontal">
         <TextView
+            android:id="@+id/uploadProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="5dp"
+            android:gravity="center"
+            android:textColor="@android:color/black" />
+
+        <TextView
             android:id="@+id/status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -13,6 +13,15 @@
         android:layout_alignParentRight="true">
         <TextView
+            android:id="@+id/uploadProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="5dp"
+            android:gravity="center"
+            android:textColor="@android:color/black" />
+
+        <TextView
             android:id="@+id/status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -11,6 +11,15 @@
         android:layout_alignParentRight="true">
         <TextView
+            android:id="@+id/uploadProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="5dp"
+            android:gravity="center"
+            android:textColor="@android:color/black" />
+
+        <TextView
             android:id="@+id/status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"