From ca4d9ea20af1aa31277d1c805f1416d8003473ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Fri, 9 Jan 2026 16:46:34 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E6=94=B9=E8=B6=A3=E5=91=B3=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E6=8D=A2=E8=A1=8C=E5=92=8C=E9=87=8C=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=8C=A4=E5=8E=8B=E4=BA=86=202=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=98=B5=E7=A7=B0=E5=9C=A8=E8=BE=93=E5=85=A5=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=BE=93=E5=85=A5=E7=A9=BA?= =?UTF-8?q?=E6=88=96=E8=80=85=E5=88=B6=E8=A1=A8=E7=AC=A6=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/activity/ChangeNicknameActivity.java | 6 +- .../main/res/layout/activity_room_details.xml | 4 +- .../main/res/layout/dialog_emotion_picker.xml | 84 +++++++++---------- .../src/main/res/layout/item_emotion.xml | 1 + 4 files changed, 49 insertions(+), 46 deletions(-) diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java index 8b7317b9..961d3f88 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java @@ -15,6 +15,8 @@ import com.xscm.moduleutil.utils.SpUtil; import org.greenrobot.eventbus.EventBus; +import java.util.Objects; + /** *@author qx *@data 2025/5/21 @@ -33,8 +35,10 @@ public class ChangeNicknameActivity extends BaseMvpActivity { - if (!TextUtils.isEmpty(mBinding.edNickName.getText().toString())){ + if (!TextUtils.isEmpty(Objects.requireNonNull(mBinding.edNickName.getText()).toString().trim())){ MvpPre.editUserInfo(mBinding.edNickName.getText().toString(),"","","","","",""); + }else { + ToastUtils.showShort("请输入有效的昵称"); } }); userInfo= SpUtil.getUserInfo(); diff --git a/MainModule/src/main/res/layout/activity_room_details.xml b/MainModule/src/main/res/layout/activity_room_details.xml index 503f68f5..4d03db3c 100644 --- a/MainModule/src/main/res/layout/activity_room_details.xml +++ b/MainModule/src/main/res/layout/activity_room_details.xml @@ -122,7 +122,7 @@ android:layout_marginTop="@dimen/dp_5" android:drawableLeft="@mipmap/im_zs" android:drawablePadding="@dimen/dp_5" - android:text="10000" + tools:text="10000" android:textColor="@color/color_FF333333" android:textSize="23sp" /> @@ -146,7 +146,7 @@ android:layout_marginTop="@dimen/dp_3" android:paddingBottom="@dimen/dp_3" android:drawableLeft="@mipmap/jinb" - android:text="10000" + tools:text="10000" android:textColor="@color/color_FF333333" android:textSize="14sp" /> diff --git a/MainModule/src/main/res/layout/dialog_emotion_picker.xml b/MainModule/src/main/res/layout/dialog_emotion_picker.xml index 0043e643..7dfa91cf 100644 --- a/MainModule/src/main/res/layout/dialog_emotion_picker.xml +++ b/MainModule/src/main/res/layout/dialog_emotion_picker.xml @@ -1,62 +1,60 @@ + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/bg_rounded_top_white"> + android:id="@+id/tab_layout" + android:layout_width="match_parent" + android:layout_height="48dp" + android:layout_marginHorizontal="@dimen/dp_16" + android:layout_marginTop="16dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tabIndicatorColor="@color/white" + app:tabIndicatorHeight="2dp" + app:tabMode="scrollable" + app:tabSelectedTextColor="@color/white" + app:tabTextAppearance="@style/CustomTextAppearanceTab" + app:tabTextColor="#999999" /> + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16" + android:background="#2C2A38" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tab_layout" /> + android:id="@+id/swipe_refresh_layout" + android:layout_width="match_parent" + android:layout_height="300dp" + android:paddingStart="@dimen/dp_28" + android:paddingEnd="@dimen/dp_28" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/divider" + app:srlEnableLoadMore="false" + app:srlEnableRefresh="false"> + android:id="@+id/rv_emotions" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:overScrollMode="never" /> diff --git a/MainModule/src/main/res/layout/item_emotion.xml b/MainModule/src/main/res/layout/item_emotion.xml index 8c97ed19..32908721 100644 --- a/MainModule/src/main/res/layout/item_emotion.xml +++ b/MainModule/src/main/res/layout/item_emotion.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="@dimen/dp_60" android:layout_height="@dimen/dp_85" + android:layout_marginVertical="@dimen/dp_5" xmlns:tools="http://schemas.android.com/tools" >