diff --git a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
index 11bbd58b7..e4fe86da6 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/dialog/MicQueueDialog.java
@@ -131,28 +131,26 @@ public class MicQueueDialog extends BaseDialog implements
         rvMicQueue.addItemDecoration(new ColorDecoration(Color.TRANSPARENT, 0, Utils.dip2px(getContext(), 5), true));
 
         adapter = new MicQueueAdapter(dataList);
-        adapter.setOnUpMicListener(new MicQueueAdapter.OnUpMicListener() {
-            @Override
-            public void onUpMic(QueuingMicMemeberInfo member, final int itemPos) {
-                long targetUid = member.getUid();
-                if (AvRoomDataManager.get().isOnMic(member.getUid())) {
-                    toast("TA已经在麦上了");
-                    return;
-                }
-                AvRoomDataManager.get().checkMemberInRoomById(targetUid)
-                        .subscribe(new BeanObserver<ChatRoomMember>() {
-                            @Override
-                            public void onErrorMsg(String error) {
-                                toast(error);
-                            }
-
-                            @Override
-                            public void onSuccess(ChatRoomMember mem) {
-                                inviteToMic(member, itemPos);
-                            }
-                        });
-
+        adapter.setOnUpMicListener((member, itemPos) -> {
+            long targetUid = member.getUid();
+            if (AvRoomDataManager.get().isOnMic(member.getUid())) {
+                toast("TA已经在麦上了");
+                return;
             }
+            AvRoomDataManager.get().checkMemberInRoomById(targetUid)
+                    .subscribe(new BeanObserver<ChatRoomMember>() {
+                        @Override
+                        public void onErrorMsg(String error) {
+                            toast(error);
+                            MicQueueModel.get().cancelApplyForQueuing(AvRoomDataManager.get().getRoomUid(), targetUid).subscribe();
+                        }
+
+                        @Override
+                        public void onSuccess(ChatRoomMember mem) {
+                            inviteToMic(member, itemPos);
+                        }
+                    });
+
         });
         rvMicQueue.setAdapter(adapter);
 
@@ -242,7 +240,7 @@ public class MicQueueDialog extends BaseDialog implements
                 return;
             }
             //抱别人上麦
-            model.inviteMicroPhone(new BaseInfo(targetUid, member.getNick(),member.getGroupType()), micPosition)
+            model.inviteMicroPhone(new BaseInfo(targetUid, member.getNick(), member.getGroupType()), micPosition)
                     .subscribe();
 
         } else {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
index 4664b3b28..35f526e5d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
@@ -107,7 +107,7 @@ public class AddUserInfoFragment extends BaseFragment
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.ok_btn:
-                if (TextUtils.isEmpty(tvNick.getText())) {
+                if (TextUtils.isEmpty(tvNick.getText().toString().trim())) {
                     toast("昵称不能为空！");
                     return;
                 }