修改3.0demo

谷俊
1 parent 34477381
Showing 2 changed files with 186 additions and 293 deletions
app/src/main/java/com/cnlive/im/ui/ChatRoom3Activity.java
app/src/main/java/com/cnlive/im/ui/Private3Activity.java
@@ -37,7 +37,6 @@ import android.widget.Toast;
 import com.cnlive.im.R;
 import com.cnlive.im.adapter.ChatRoom3Adpter;
-import com.cnlive.im.adapter.ChatRoomAdpter;
 import com.cnlive.im.adapter.base.ItemClickListener;
 import com.cnlive.im.mode.ImagMessage;
 import com.cnlive.im.mode.StringMessage;
@@ -75,6 +74,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
     private ArrayList<String> msgIds = new ArrayList<>();
     private String roomIdOne = "ChatRoom05";
+
     private EditText editText;
     private Button send_messageOneBtn;
     private RecyclerView listViewOne;
@@ -87,7 +87,6 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
     private ImageView ima_send;
     private Button sendVoice;
-    private Context context;
     private AudioRecordUtil mAudioRecordUtil;
     private PopupWindowFactory mPop;
     private ImageView mImageView;
@@ -118,14 +117,12 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         super.onCreate(savedInstanceState);
         //取消状态栏
         setContentView(R.layout.activity_groupchat_3);
-        context = this;
         initUI();
         mAudioRecordUtil = new AudioRecordUtil();
         mAudioRecordUtil.setOnAudioStatusUpdateListener(onAudioStatusUpdateListener);
         //设置监听
         mHandler = new Handler();
         ChatUtil.setOnConnectStatusListener(connectStatusListener);
-        ChatUtil.setOnChatRoomActionListener(chatRoomActionListener);
         ChatUtil.setOnReceiveChatroomMessageListener(receiveMessageListener);
         ChatUtil.setUploadProgressListener(uploadProgressListener);
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
@@ -136,12 +133,10 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""), connectListener);
         else ChatUtil.logOut(connectListener);
         requestPermission();
-
     }
     private void initUI() {
-
         final View view = View.inflate(this, R.layout.layout_microphone, null);
         mPop = new PopupWindowFactory(this, view);
         mImageView = (ImageView) view.findViewById(R.id.iv_recording_icon);
@@ -150,9 +145,6 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         cancelSendLayout = (LinearLayout) view.findViewById(R.id.cancel_send_layout);
         ima_send = (ImageView) findViewById(R.id.ima_send);
         exit_chat1 = (Button) findViewById(R.id.exit_chat1);
-//        user_id = (EditText) findViewById(R.id.user_ID);
-//        user_name = (EditText) findViewById(R.id.user_name);
-//        lin_user = (LinearLayout) findViewById(R.id.lin_user);
         re_chat = (RelativeLayout) findViewById(R.id.re_chat);
         foundChatBtn = (Button) findViewById(R.id.creatChat);
         listViewOne = (RecyclerView) findViewById(R.id.chat_list_viewOne);
@@ -167,25 +159,18 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         chatListAdapterOne.setonVoiceItemClickListener(this);
         listViewOne.setLayoutManager(new LinearLayoutManager(ChatRoom3Activity.this));
         listViewOne.setAdapter(chatListAdapterOne);
-
         sendVoice = (Button) findViewById(R.id.send_voice);
         re_chat = (RelativeLayout) findViewById(R.id.activity_chat_room);
         keybordBtn = (ImageView) findViewById(R.id.keybord);
         keybordBtn.setOnClickListener(this);
-
         findViewById(R.id.videoBtn).setOnClickListener(this);
         findViewById(R.id.ugcVideoBtn).setOnClickListener(this);
-
         StartListener();
-
-
     }
-    /**
-     * 发送消息监听
-     */
+    //发送消息监听
     private IChat.OnSendMessageListener sendMessageListener = new IChat.OnSendMessageListener() {
         @Override
         public void onAttached(CNBaseMessage o) {
@@ -211,7 +196,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         }
     };
-
+    //接收消息监听
     private IChat.OnReceiveMessageListener receiveMessageListener = new IChat.OnReceiveMessageListener() {
         @Override
         public void processMessage(final CNBaseMessage o) {
@@ -220,6 +205,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         }
     };
+    //更新上传进度
     private IChat.OnUploadProgressListener uploadProgressListener = new IChat.OnUploadProgressListener() {
         @Override
         public void onMessagesUpdate(CNBaseMessage message, int elemIdx, int taskId, int progress) {
@@ -228,6 +214,51 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         }
     };
+    //被踢下线状态
+    private IChat.OnKickedOfflineListener onKickedOfflineListener = new IChat.OnKickedOfflineListener() {
+        @Override
+        public void disconnected(int what, final String extra) {
+            Log.e(TAG, what + " : " + extra);
+            Toast.makeText(ChatRoom3Activity.this, extra, Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void conByDevId(final int what, final String extra) {
+            Log.e(TAG, what + " : " + extra);
+            Toast.makeText(ChatRoom3Activity.this, extra, Toast.LENGTH_SHORT).show();
+        }
+    };
+
+    // 加入聊天室监听
+    private IChat.OnOperationListener onOperationListener = new IChat.OnOperationListener() {
+        @Override
+        public void onSuccess(int what, final String extra) {
+            Log.v(TAG, +what + extra);
+        }
+
+        @Override
+        public void onError(int what, String extra) {
+            Log.v(TAG, "加入聊天室" + what + extra);
+        }
+    };
+
+    //连接监听
+    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
+        @Override
+        public void onTokenIncorrect(String s) {
+            Log.e(TAG, "ConnectListener TokenIncorrect");
+        }
+
+        @Override
+        public void onSuccess(final String s) {
+            Log.e(TAG, "ConnectListener 连接监听" + s);
+        }
+
+        @Override
+        public void onError(int i, final String s) {
+            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
+        }
+    };
     /**
      * 更新消息
@@ -288,205 +319,6 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
     }
-    //聊天室操作
-    private IChat.OnChatRoomActionListener chatRoomActionListener = new IChat.OnChatRoomActionListener() {
-        @Override
-        public void onJoining(String s) {
-            Log.i(TAG, "chatRoomActionListener" + "   onJoining" + s);
-        }
-
-        @Override
-        public void onJoined(String s) {
-            Log.i(TAG, "chatRoomActionListener     " + "onJoined" + s);
-        }
-
-        @Override
-        public void onQuited(String s) {
-            Log.i(TAG, "chatRoomActionListener     " + "onQuited" + s);
-        }
-
-        @Override
-        public void onError(String s, int i, String s1) {
-            Log.i(TAG, "chatRoomActionListener     " + "onError" + s);
-
-        }
-    };
-
-    //被踢下线状态
-    private IChat.OnKickedOfflineListener onKickedOfflineListener = new IChat.OnKickedOfflineListener() {
-        @Override
-        public void disconnected(int what, final String extra) {
-            Log.e(TAG, what + " : " + extra);
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(ChatRoom3Activity.this, extra, Toast.LENGTH_SHORT).show();
-                }
-            });
-        }
-
-        @Override
-        public void conByDevId(final int what, final String extra) {
-            Log.e(TAG, what + " : " + extra);
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(ChatRoom3Activity.this, extra, Toast.LENGTH_SHORT).show();
-
-                }
-            });
-        }
-    };
-
-
-    // 加入聊天室监听
-    private IChat.OnOperationListener onOperationListener = new IChat.OnOperationListener() {
-        @Override
-        public void onSuccess(int what, final String extra) {
-            Log.v(TAG, +what + extra);
-
-
-        }
-
-        @Override
-        public void onError(int what, String extra) {
-            Log.v(TAG, "加入聊天室" + what + extra);
-
-        }
-    };
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            //向聊天室1发送消息
-            case R.id.send_messageOne:
-                //发送聊天室消息
-                if (editText.getText().toString().isEmpty()) {
-                    Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
-                } else {
-                    ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, editText.getText().toString(), sendMessageListener);
-                    editText.setText("");
-                }
-                break;
-            case R.id.creatChat:
-                ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
-                break;
-            case R.id.exit_chat1:
-                ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
-                break;
-            case R.id.ima_send:
-                fromPicture();
-                break;
-            case R.id.keybord:
-                if (!isVoiceBtnVisible) {
-                    editText.setVisibility(View.GONE);
-                    sendVoice.setVisibility(View.VISIBLE);
-                    keybordBtn.setImageResource(R.drawable.keybord);
-                    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
-                    isVoiceBtnVisible = true;
-                } else {
-                    sendVoice.setVisibility(View.GONE);
-                    editText.setVisibility(View.VISIBLE);
-                    keybordBtn.setImageResource(R.drawable.voice);
-                    isVoiceBtnVisible = false;
-                }
-                break;
-            case R.id.videoBtn:
-                openSystemRecorder();
-                break;
-            case R.id.ugcVideoBtn:
-                openSystemRecorder();
-                break;
-        }
-    }
-
-    private void openSystemRecorder() {
-        // 创建拍照Intent并将控制权返回给调用的程序
-        Intent intent = new Intent();
-        intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE);
-        intent.addCategory(Intent.CATEGORY_DEFAULT);
-
-        // 保存录像到指定的路径
-        File file = new File("/sdcard/video.mp4");
-        Uri uri = Uri.fromFile(file);
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-
-        // 启动图像捕获Intent
-        startActivityForResult(intent, CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE);
-    }
-
-
-    public void fromPicture() {
-        if (Build.VERSION.SDK_INT >= 23) {
-            int checkCallPhonePermission = ContextCompat.checkSelfPermission(ChatRoom3Activity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
-            if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, PICTURE_REQUEST_CODE);
-                return;
-            } else {
-                toIntentPicture();
-            }
-        } else {
-            toIntentPicture();
-        }
-    }
-
-
-    private void toIntentPicture() {
-        Intent intent = new Intent();
-        intent.setType("image/*");
-        intent.setAction(Intent.ACTION_PICK);
-        startActivityForResult(Intent.createChooser(intent, "Complete action using"), IMG_FROM_PICTURE);
-    }
-
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == Activity.RESULT_OK) {
-            switch (requestCode) {
-                case IMG_FROM_PICTURE:
-                    Uri selectedImage = data.getData();
-                    String picturePath = UploadImageUtils.getPath(this, selectedImage);
-                    Uri uri = Uri.parse("file://" + picturePath);
-                    ChatUtil.sendImaMessage(IChat.CHATROOM, roomIdOne, uri, uri, sendMessageListener);
-                    break;
-                case CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE:
-                    String videoPath = data.getData().getPath();
-                    Bitmap bitmap = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Images.Thumbnails.FULL_SCREEN_KIND);
-                    String imgPath = FileUtil.createFile(bitmap, System.currentTimeMillis() + "");
-                    ChatUtil.sendVideoMessage(IChat.CHATROOM, roomIdOne, videoPath, imgPath, MediaUtil.getInstance().getDuration(videoPath), sendMessageListener);
-                    break;
-                default:
-                    break;
-            }
-        }
-    }
-
-
-    private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
-
-
-        @Override
-        public void onTokenIncorrect(String s) {
-            Log.e(TAG, "ConnectListener TokenIncorrect");
-
-        }
-
-        @Override
-        public void onSuccess(final String s) {
-            Log.e(TAG, "ConnectListener 连接监听" + s);
-
-        }
-
-        @Override
-        public void onError(int i, final String s) {
-            Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
-
-
-        }
-    };
-
     /**
      * 播放语音文件
      *
@@ -525,13 +357,13 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             if (FileUtil.isCacheFileExist(voiceUuid)) {
                 File file = new File(voicePath);
                 if (file.length() < voiceMessage.getCnVoiceMessage().getDataSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 startVoice(voicePath, animationDrawable);
             } else {
                 if (voiceMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     voiceMessage.setDownloading(true);
                     voiceMessage.getCnVoiceMessage().getVoice(voicePath, new IChat.OnDownloadListener() {
@@ -563,7 +395,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             if (FileUtil.isCacheFileExist(videoUuid)) {
                 File file = new File(videoPath);
                 if (file.length() < videoMessage.getCnVideoMessage().getVideo().getSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(ChatRoom3Activity.this, VideoActivity.class);
@@ -571,7 +403,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
                 startActivity(intent);
             } else {
                 if (videoMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     videoMessage.setDownloading(true);
                     videoMessage.getCnVideoMessage().getVideo().getVideo(videoPath, new IChat.OnDownloadListener() {
@@ -606,7 +438,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             if (FileUtil.isCacheFileExist(videoUuid)) {
                 File file = new File(videoPath);
                 if (file.length() < ugcVideoMessage.getCnUgcMessage().getVideo().getSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(ChatRoom3Activity.this, VideoActivity.class);
@@ -614,7 +446,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
                 startActivity(intent);
             } else {
                 if (ugcVideoMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     ugcVideoMessage.setDownloading(true);
                     ugcVideoMessage.getCnUgcMessage().getVideo().getVideo(videoPath, new IChat.OnDownloadListener() {
@@ -648,7 +480,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             if (FileUtil.isCacheFileExist(remoteUuid)) {
                 File file = new File(imagePath);
                 if (file.length() < imagMessage.getCnImgMessage().getRemoteSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(ChatRoom3Activity.this, ImageViewActivity.class);
@@ -656,7 +488,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
                 startActivity(intent);
             } else {
                 if (imagMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     imagMessage.setDownloading(true);
                     imagMessage.getCnImgMessage().getRemoteImage(imagePath, new IChat.OnDownloadListener() {
@@ -671,7 +503,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
                         @Override
                         public void onError(int i, String s) {
                             imagMessage.setDownloading(false);
-                            Toast.makeText(context, "下载失败", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(ChatRoom3Activity.this, "下载失败", Toast.LENGTH_SHORT).show();
                         }
                     });
                 }
@@ -679,6 +511,112 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
         }
     }
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            //向聊天室1发送消息
+            case R.id.send_messageOne:
+                //发送聊天室消息
+                if (editText.getText().toString().isEmpty()) {
+                    Toast.makeText(this, "不能发送空消息呦~", Toast.LENGTH_SHORT).show();
+                } else {
+                    ChatUtil.sendMessage(IChat.CHATROOM, roomIdOne, editText.getText().toString(), sendMessageListener);
+                    editText.setText("");
+                }
+                break;
+            case R.id.creatChat:
+                ChatUtil.joinChatRoom(roomIdOne, -1, onOperationListener);
+                break;
+            case R.id.exit_chat1:
+                ChatUtil.quitChatRoom(roomIdOne, onOperationListener);
+                break;
+            case R.id.ima_send:
+                fromPicture();
+                break;
+            case R.id.keybord:
+                if (!isVoiceBtnVisible) {
+                    editText.setVisibility(View.GONE);
+                    sendVoice.setVisibility(View.VISIBLE);
+                    keybordBtn.setImageResource(R.drawable.keybord);
+                    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+                    isVoiceBtnVisible = true;
+                } else {
+                    sendVoice.setVisibility(View.GONE);
+                    editText.setVisibility(View.VISIBLE);
+                    keybordBtn.setImageResource(R.drawable.voice);
+                    isVoiceBtnVisible = false;
+                }
+                break;
+            case R.id.videoBtn:
+                openSystemRecorder();
+                break;
+            case R.id.ugcVideoBtn:
+                openSystemRecorder();
+                break;
+        }
+    }
+
+    private void openSystemRecorder() {
+        // 创建拍照Intent并将控制权返回给调用的程序
+        Intent intent = new Intent();
+        intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        // 保存录像到指定的路径
+        File file = new File("/sdcard/video.mp4");
+        Uri uri = Uri.fromFile(file);
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+        // 启动图像捕获Intent
+        startActivityForResult(intent, CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE);
+    }
+
+
+    public void fromPicture() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            int checkCallPhonePermission = ContextCompat.checkSelfPermission(ChatRoom3Activity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, PICTURE_REQUEST_CODE);
+                return;
+            } else {
+                toIntentPicture();
+            }
+        } else {
+            toIntentPicture();
+        }
+    }
+
+
+    private void toIntentPicture() {
+        Intent intent = new Intent();
+        intent.setType("image/*");
+        intent.setAction(Intent.ACTION_PICK);
+        startActivityForResult(Intent.createChooser(intent, "Complete action using"), IMG_FROM_PICTURE);
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == Activity.RESULT_OK) {
+            switch (requestCode) {
+                case IMG_FROM_PICTURE:
+                    Uri selectedImage = data.getData();
+                    String picturePath = UploadImageUtils.getPath(this, selectedImage);
+                    Uri uri = Uri.parse("file://" + picturePath);
+                    ChatUtil.sendImaMessage(IChat.CHATROOM, roomIdOne, uri, uri, sendMessageListener);
+                    break;
+                case CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE:
+                    String videoPath = data.getData().getPath();
+                    Bitmap bitmap = ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Images.Thumbnails.FULL_SCREEN_KIND);
+                    String imgPath = FileUtil.createFile(bitmap, System.currentTimeMillis() + "");
+                    ChatUtil.sendVideoMessage(IChat.CHATROOM, roomIdOne, videoPath, imgPath, MediaUtil.getInstance().getDuration(videoPath), sendMessageListener);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
     /**************************************************************************/
@@ -687,18 +625,18 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
      */
     private void requestPermission() {
         //判断是否开启摄像头权限
-        if ((ContextCompat.checkSelfPermission(context,
+        if ((ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) &&
-                (ContextCompat.checkSelfPermission(context,
+                (ContextCompat.checkSelfPermission(this,
                         Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
-                && (ContextCompat.checkSelfPermission(context,
+                && (ContextCompat.checkSelfPermission(this,
                 Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED)) {
             StartListener();
             //判断是否开启语音权限
         } else {
             //请求获取摄像头权限
-            ActivityCompat.requestPermissions((Activity) context,
+            ActivityCompat.requestPermissions(this,
                     new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA}, VOICE_REQUEST_CODE);
         }
     }
@@ -710,7 +648,7 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
             if ((grantResults[0] == PackageManager.PERMISSION_GRANTED) && (grantResults[1] == PackageManager.PERMISSION_GRANTED)) {
                 StartListener();
             } else {
-                Toast.makeText(context, "已拒绝权限！", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, "已拒绝权限！", Toast.LENGTH_SHORT).show();
             }
         }
     }
@@ -738,7 +676,6 @@ public class ChatRoom3Activity extends AppCompatActivity implements View.OnClick
                         case MotionEvent.ACTION_DOWN:
                             mPop.showAtLocation(re_chat, Gravity.CENTER, 0, 0);
-
                             sendVoice.setText("松开发送");
                             mAudioRecordUtil.startRecord();
                             downX = event.getX();
@@ -38,7 +38,6 @@ import android.widget.Toast;
 import com.cnlive.im.R;
 import com.cnlive.im.adapter.ChatRoom3Adpter;
-import com.cnlive.im.adapter.ChatRoomAdpter;
 import com.cnlive.im.adapter.base.ItemClickListener;
 import com.cnlive.im.mode.CNMessageModole;
 import com.cnlive.im.mode.ImagMessage;
@@ -88,7 +87,6 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     };
     public static final int IMG_FROM_PICTURE = 0x1001;
-    public static final int VOICE = 0x1002;
     public static final int PICTURE_REQUEST_CODE = 0x1003;
     public static final int VOICE_REQUEST_CODE = 0x1004;
@@ -96,12 +94,12 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     public static final String STRING_MESSAGE = "string_message";
     public static final String VOICE_MESSAGE = "voice_message";
+    private ArrayList<String> msgIds = new ArrayList<>();
+
     private RecyclerView chatListView;
     private EditText messageContent;
     private Button sendMessageBtn;
     private ChatRoom3Adpter chatListAdapter;
-    private ArrayList<String> msgIds = new ArrayList<>();
-    //    private CNMessage cnMessage;
     private LinearLayout linearLayoutUseID;
     private EditText user_id_edit;
     private Button userId_btn_top;
@@ -115,7 +113,6 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     private Button agree_btn;
     private Button reject_btn;
     private LinearLayout agree_reject_lin;
-    boolean isCanSendMeaasge = false;
     private Button vistor_btn;
     private ImageView keybordBtn;
@@ -132,13 +129,11 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     private boolean isVoiceBtnVisible = false;
     private int duration;
-    private Context context;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_private_chat_3);
-        context = this;
         initView();
         mAudioRecordUtil = new AudioRecordUtil();
         mAudioRecordUtil.setOnAudioStatusUpdateListener(onAudioStatusUpdateListener);
@@ -150,19 +145,15 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     }
     private void initView() {
-
         final View view = View.inflate(this, R.layout.layout_microphone, null);
         mPop = new PopupWindowFactory(this, view);
         sendMsgLayout = (LinearLayout) view.findViewById(R.id.send_layout);
         cancelSendLayout = (LinearLayout) view.findViewById(R.id.cancel_send_layout);
         mTextView = (TextView) view.findViewById(R.id.tv_recording_time);
         mImageView = (ImageView) view.findViewById(R.id.iv_recording_icon);
-
         opposite_name_edit = (EditText) findViewById(R.id.opposite_name_edit);
         chatListView = (RecyclerView) findViewById(R.id.private_list_view);
-
         privateLayout = (RelativeLayout) findViewById(R.id.activity_private_chat);
-
         messageContent = (EditText) findViewById(R.id.message_content);
         messageContent.addTextChangedListener(textWatcher);
         sendMessageBtn = (Button) findViewById(R.id.send_message);
@@ -182,20 +173,15 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
         agree_reject_lin = (LinearLayout) findViewById(R.id.agree_reject_lin);
         vistor_btn = (Button) findViewById(R.id.vistor_Btn);
         vistor_btn.setOnClickListener(this);
-
         keybordBtn = (ImageView) findViewById(R.id.keybord);
         keybordBtn.setOnClickListener(this);
-
         ima_send = (ImageView) findViewById(R.id.ima_send);
         ima_send.setOnClickListener(this);
-
         sendVoice = (Button) findViewById(R.id.send_voice);
-
         chatListAdapter = new ChatRoom3Adpter(this, true);
         chatListAdapter.setonVoiceItemClickListener(this);
         chatListView.setLayoutManager(new LinearLayoutManager(Private3Activity.this));
         chatListView.setAdapter(chatListAdapter);
-
         findViewById(R.id.videoBtn).setOnClickListener(this);
         findViewById(R.id.ugcVideoBtn).setOnClickListener(this);
@@ -204,13 +190,10 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     @Override
     public void onClick(View v) {
-
         switch (v.getId()) {
             case R.id.send_message:
                 sendMessage(STRING_MESSAGE);
-
                 break;
-
             case R.id.userId_btn_top:
                 //发送私聊消息，需要传入目标ID与发送的消息内容
                 if (user_id_edit.getText().toString().isEmpty()) {
@@ -218,36 +201,28 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                 } else if (opposite_name_edit.getText().toString().isEmpty()) {
                     Toast.makeText(this, "对方name不能为空", Toast.LENGTH_SHORT).show();
                 } else {
-
                     oppositeID = user_id_edit.getText().toString();
                     linearLayoutUseID.setVisibility(View.INVISIBLE);
                     edit_layout.setVisibility(View.VISIBLE);
                     chatListView.setVisibility(View.VISIBLE);
                     CNUserInfo cnName = new CNUserInfo(user_id_string, user_name_string, "");
                     ChatUtil.login(cnName, connectListener);
-
                 }
-
                 break;
-
             case R.id.agree_btn:
                 String objToJsonString = ToStringUtils.objToJsonString(new CNMessageModole("同意", "3"));
                 ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonString, sendMessageListener);
                 agree_reject_lin.setVisibility(View.GONE);
                 break;
-
             case R.id.reject_btn:
                 String objToJsonStringDis = ToStringUtils.objToJsonString(new CNMessageModole("拒绝", "3"));//私聊
-
                 ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonStringDis, sendMessageListener);
                 agree_reject_lin.setVisibility(View.GONE);
                 break;
             case R.id.vistor_Btn:
                 String objToJsonStringInvt = ToStringUtils.objToJsonString(new CNMessageModole("你好我们可以进行私聊吗", "3"));//私聊
                 ChatUtil.sendMessage(IChat.PRIVATE, oppositeID, objToJsonStringInvt, sendMessageListener);
-
                 break;
-
             case R.id.keybord:
                 if (!isVoiceBtnVisible) {
                     messageContent.setVisibility(View.GONE);
@@ -280,12 +255,10 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
         Intent intent = new Intent();
         intent.setAction(MediaStore.ACTION_VIDEO_CAPTURE);
         intent.addCategory(Intent.CATEGORY_DEFAULT);
-
         // 保存录像到指定的路径
         File file = new File("/sdcard/video.mp4");
         Uri uri = Uri.fromFile(file);
         intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-
         // 启动图像捕获Intent
         startActivityForResult(intent, CAPTURE_VIDEO_ACTIVITY_REQUEST_CODE);
     }
@@ -294,10 +267,8 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     private void sendMessage(String type) {
         if (sendInfo == 2) {
             Toast.makeText(this, "等待对方接受邀请", Toast.LENGTH_SHORT).show();
-
         } else if (sendInfo == 4) {
             Toast.makeText(this, "对方已经拒绝不能发送", Toast.LENGTH_SHORT).show();
-
         } else if (sendInfo == 3) {
             Toast.makeText(this, "还没有邀请对方呦~", Toast.LENGTH_SHORT).show();
         } else if (sendInfo == 5) {
@@ -315,7 +286,6 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                 fromPicture();
             } else if (type.equals(VOICE_MESSAGE)) {
                 mPop.showAtLocation(privateLayout, Gravity.CENTER, 0, 0);
-
                 sendVoice.setText("松开发送");
                 mAudioRecordUtil.startRecord();
             }
@@ -351,18 +321,13 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
         if (resultCode == Activity.RESULT_OK) {
             switch (requestCode) {
                 case IMG_FROM_PICTURE:
-//                    String localImagePath = "/sdcard/test.png";
-//                    Uri selectedImage = Uri.parse("file://" + localImagePath);
                     Uri selectedImage = data.getData();
                     String[] filePathColumn = {MediaStore.Images.Media.DATA};
-
                     Cursor cursor = getContentResolver().query(selectedImage,
                             filePathColumn, null, null, null);
                     cursor.moveToFirst();
-
                     int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
                     final String picturePath = cursor.getString(columnIndex);
-
                     Uri uri = Uri.parse("file://" + picturePath);
                     ChatUtil.sendImaMessage(IChat.PRIVATE, oppositeID, uri, uri, sendMessageListener);
                     break;
@@ -372,7 +337,6 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                     String imgPath = FileUtil.createFile(bitmap, System.currentTimeMillis() + "");
                     ChatUtil.sendVideoMessage(IChat.PRIVATE, oppositeID, videoPath, imgPath, MediaUtil.getInstance().getDuration(videoPath), sendMessageListener);
                     break;
-
                 default:
                     break;
             }
@@ -381,8 +345,6 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
     //连接监听
     private IChat.OnConnectListener connectListener = new IChat.OnConnectListener() {
-
-
         @Override
         public void onTokenIncorrect(String s) {
             Log.e(TAG, "ConnectListener TokenIncorrect");
@@ -393,21 +355,16 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
         public void onSuccess(String s) {
             Log.e(TAG, "ConnectListener 连接监听" + s);
             Toast.makeText(Private3Activity.this, s, Toast.LENGTH_SHORT).show();
-
         }
         @Override
         public void onError(int i, String s) {
             Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
             Toast.makeText(Private3Activity.this, s, Toast.LENGTH_SHORT).show();
-
         }
     };
-
-    /**
-     * 发送消息监听
-     */
+    //发送消息监听
     private IChat.OnSendMessageListener sendMessageListener = new IChat.OnSendMessageListener() {
         @Override
         public void onAttached(CNBaseMessage o) {
@@ -558,18 +515,17 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
      */
     private void requestPermission() {
         //判断是否开启摄像头权限
-        if ((ContextCompat.checkSelfPermission(context,
+        if ((ContextCompat.checkSelfPermission(this,
                 Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) &&
-                (ContextCompat.checkSelfPermission(context,
+                (ContextCompat.checkSelfPermission(this,
                         Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED)
-                && (ContextCompat.checkSelfPermission(context,
+                && (ContextCompat.checkSelfPermission(this,
                 Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED)) {
             StartListener();
-
             //判断是否开启语音权限
         } else {
             //请求获取摄像头权限
-            ActivityCompat.requestPermissions((Activity) context,
+            ActivityCompat.requestPermissions(this,
                     new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA}, VOICE_REQUEST_CODE);
         }
     }
@@ -581,7 +537,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
             if ((grantResults[0] == PackageManager.PERMISSION_GRANTED) && (grantResults[1] == PackageManager.PERMISSION_GRANTED)) {
                 StartListener();
             } else {
-                Toast.makeText(context, "已拒绝权限！", Toast.LENGTH_SHORT).show();
+                Toast.makeText(this, "已拒绝权限！", Toast.LENGTH_SHORT).show();
             }
         }
     }
@@ -750,13 +706,13 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
             if (FileUtil.isCacheFileExist(voiceUuid)) {
                 File file = new File(voicePath);
                 if (file.length() < voiceMessage.getCnVoiceMessage().getDataSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 startVoice(voicePath, animationDrawable);
             } else {
                 if (voiceMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     voiceMessage.setDownloading(true);
                     voiceMessage.getCnVoiceMessage().getVoice(voicePath, new IChat.OnDownloadListener() {
@@ -788,7 +744,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
             if (FileUtil.isCacheFileExist(videoUuid)) {
                 File file = new File(videoPath);
                 if (file.length() < videoMessage.getCnVideoMessage().getVideo().getSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(Private3Activity.this, VideoActivity.class);
@@ -796,7 +752,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                 startActivity(intent);
             } else {
                 if (videoMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     videoMessage.setDownloading(true);
                     videoMessage.getCnVideoMessage().getVideo().getVideo(videoPath, new IChat.OnDownloadListener() {
@@ -831,7 +787,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
             if (FileUtil.isCacheFileExist(videoUuid)) {
                 File file = new File(videoPath);
                 if (file.length() < ugcVideoMessage.getCnUgcMessage().getVideo().getSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(Private3Activity.this, VideoActivity.class);
@@ -839,7 +795,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                 startActivity(intent);
             } else {
                 if (ugcVideoMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     ugcVideoMessage.setDownloading(true);
                     ugcVideoMessage.getCnUgcMessage().getVideo().getVideo(videoPath, new IChat.OnDownloadListener() {
@@ -873,7 +829,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
             if (FileUtil.isCacheFileExist(remoteUuid)) {
                 File file = new File(imagePath);
                 if (file.length() < imagMessage.getCnImgMessage().getRemoteSize()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                     return;
                 }
                 Intent intent = new Intent(Private3Activity.this, ImageViewActivity.class);
@@ -881,7 +837,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                 startActivity(intent);
             } else {
                 if (imagMessage.isDownloading()) {
-                    Toast.makeText(context, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
+                    Toast.makeText(this, "请稍等，正在下载...", Toast.LENGTH_SHORT).show();
                 } else {
                     imagMessage.setDownloading(true);
                     imagMessage.getCnImgMessage().getRemoteImage(imagePath, new IChat.OnDownloadListener() {
@@ -896,7 +852,7 @@ public class Private3Activity extends AppCompatActivity implements View.OnClickL
                         @Override
                         public void onError(int i, String s) {
                             imagMessage.setDownloading(false);
-                            Toast.makeText(context, "下载失败", Toast.LENGTH_SHORT).show();
+                            Toast.makeText(Private3Activity.this, "下载失败", Toast.LENGTH_SHORT).show();
                         }
                     });
                 }