From f4fb164999c6d2463bf4a665357f4c3f0c3eb3d4 Mon Sep 17 00:00:00 2001 From: wzq Date: Thu, 12 Oct 2023 12:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=20=E5=85=AC=E5=B1=8F?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20=E5=9B=9E=E8=BD=A6=E9=94=AE=20?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yizhuan/erban/avroom/fragment/BaseRoomFragment.kt | 11 +++++++++++ .../res/layout/fragment_av_room_game.xml | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) 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?> : 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}" />