diff --git a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
index 25a8e22da..bfffdb1d5 100644
--- a/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
+++ b/common/src/main/java/com/yunbao/common/views/InputCustomPopup.java
@@ -12,6 +12,7 @@ import com.lxj.xpopup.animator.PopupAnimator;
 import com.lxj.xpopup.core.CenterPopupView;
 import com.yunbao.common.R;
 import com.yunbao.common.utils.ToastUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
 /**
  * 输入弹窗
@@ -54,15 +55,21 @@ public class InputCustomPopup extends CenterPopupView {
         findViewById(R.id.btn_confirm).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                String textContent = content.getText().toString();
-                if (TextUtils.isEmpty(textContent)) {
-                    ToastUtil.show("输入内容不可为空");
-                    return;
-                }
-                if (listener != null) {
-                    listener.onConfirm(textContent);
-                }
-                dismiss(); // 关闭弹窗
+                ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
+                    @Override
+                    public void onViewClicks() {
+                        String textContent = content.getText().toString();
+                        if (TextUtils.isEmpty(textContent)) {
+                            ToastUtil.show("输入内容不可为空");
+                            return;
+                        }
+                        if (listener != null) {
+                            listener.onConfirm(textContent);
+                        }
+                        dismiss(); // 关闭弹窗
+                    }
+                });
+
             }
         });
     }
diff --git a/live/src/main/res/layout/view_live_ready.xml b/live/src/main/res/layout/view_live_ready.xml
index 20e7118f0..afcff57aa 100644
--- a/live/src/main/res/layout/view_live_ready.xml
+++ b/live/src/main/res/layout/view_live_ready.xml
@@ -32,12 +32,11 @@
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="20dp"
         android:layout_marginTop="50dp"
+        android:layout_marginRight="20dp"
         android:padding="5dp"
         android:src="@mipmap/icon_live_ready_close"
-        android:tint="@color/white"
-        />
+        android:tint="@color/white" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
index 90e130428..cb22473fe 100644
--- a/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
+++ b/main/src/main/java/com/yunbao/main/activity/LoginActivity.java
@@ -52,6 +52,7 @@ import com.yunbao.common.manager.imrongcloud.RongcloudIMManager;
 import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
+import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.http.LiveHttpUtil;
 import com.yunbao.live.presenter.LiveRoomCheckLivePresenter;
 import com.yunbao.main.R;
@@ -168,18 +169,24 @@ public class LoginActivity extends AbsActivity {
 
 
     public void loginClick(View v) {
-        int i = v.getId();
-        if (i == R.id.btn_login) {
-            login();
+        ViewClicksAntiShake.clicksAntiShake(v, new ViewClicksAntiShake.ViewClicksCallBack() {
+            @Override
+            public void onViewClicks() {
+                int i = v.getId();
+                if (i == R.id.btn_login) {
+                    login();
 
-        } else if (i == R.id.btn_register) {
-            register();
-        } else if (i == R.id.btn_forget_pwd) {
-            forgetPwd();
+                } else if (i == R.id.btn_register) {
+                    register();
+                } else if (i == R.id.btn_forget_pwd) {
+                    forgetPwd();
+
+                } else if (i == R.id.btn_tip) {
+                    forwardTip();
+                }
+            }
+        });
 
-        } else if (i == R.id.btn_tip) {
-            forwardTip();
-        }
     }
 
     //注册