diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
index 5b361a486..4c5578f70 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/BaseRoomFragment.kt
@@ -11,9 +11,12 @@ import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewStub
+import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import android.widget.ImageView
 import android.widget.RelativeLayout
@@ -184,6 +187,14 @@ open class BaseRoomFragment<V : IBaseRoomView?, P : BaseRoomPresenter<V>?> :
         bottomView = mView.findViewById(R.id.bottom_view)
         inputLayout = mView.findViewById(R.id.input_layout)
         inputEdit = mView.findViewById(R.id.input_edit)
+        inputEdit.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_UP) {
+                sendMsg()
+                return@setOnKeyListener true
+            }
+
+            false
+        }
         inputSend = mView.findViewById(R.id.input_send)
         microView = mView.findViewById(R.id.micro_view)
         mVsMusicPlayer = mView.findViewById(R.id.vs_music_player)
diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
index 4aff73551..52792c507 100644
--- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
+++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml
@@ -70,14 +70,14 @@
             android:layout_height="20dp"
             android:layout_alignTop="@id/micro_view"
             android:layout_alignParentEnd="true"
+            android:layout_marginTop="@dimen/dp_22"
+            android:layout_marginBottom="@dimen/dp_8"
             android:background="@drawable/bg_single_room_rank_entrance"
             android:drawablePadding="@dimen/dp_2"
             android:gravity="center"
             android:onClick="@{click}"
             android:paddingStart="@dimen/dp_8"
             android:paddingEnd="@dimen/dp_4"
-            android:layout_marginTop="@dimen/dp_22"
-            android:layout_marginBottom="@dimen/dp_8"
             android:text="@string/room_contribute_list"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_10"
@@ -342,8 +342,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/contribute_list"
-            android:layout_marginTop="80dp"
             android:layout_centerHorizontal="true"
+            android:layout_marginTop="80dp"
             android:visibility="@{(roomInfo.roomModeType==7) ? View.VISIBLE : View.GONE}" />
 
         <RelativeLayout
@@ -369,8 +369,8 @@
                     android:background="@android:color/white"
                     android:hint="@string/room_say_here"
                     android:paddingStart="10dp"
-                    android:paddingEnd="0dp"
                     android:paddingTop="10dp"
+                    android:paddingEnd="0dp"
                     android:paddingBottom="10dp"
                     android:textColor="#888889"
                     android:textColorHint="#c8c8c8"