diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeWithMeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeWithMeFragment.kt index c04d96700..27bb2890e 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeWithMeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeWithMeFragment.kt @@ -12,6 +12,7 @@ import com.chwl.app.home.HomeMeViewModel import com.chwl.app.home.helper.OpenRoomHelper import com.chwl.app.support.FragmentVisibleStateHelper import com.chwl.app.ui.user.adapter.HomeRecommendIndicatorAdapter +import com.chwl.app.ui.utils.load import com.chwl.app.ui.utils.loadAvatar import com.chwl.app.ui.utils.loadImage import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper @@ -84,8 +85,8 @@ class HomeWithMeFragment : BaseViewBindingFragment() { private fun updateRoomInfo(roomInfo: HomeRoomCardInfo?) { binding.tvRoomName.text = roomInfo?.title - binding.tvRoomTopic.text = roomInfo?.introduction - binding.ivRoomCover.loadImage(roomInfo?.avatar ?: "") + binding.tvRoomTopic.text = roomInfo?.roomDesc + binding.ivRoomCover.load(roomInfo?.avatar ?: "") binding.tvOnlineNumber.text = roomInfo?.onlineNum?.toString() ?: "0" loadRoomUsers(roomInfo?.micUsers) } diff --git a/app/src/main/res/layout/activity_room_title_edit.xml b/app/src/main/res/layout/activity_room_title_edit.xml index c261f43a5..6162e0887 100644 --- a/app/src/main/res/layout/activity_room_title_edit.xml +++ b/app/src/main/res/layout/activity_room_title_edit.xml @@ -39,6 +39,7 @@ android:maxLines="1" android:paddingStart="13dp" android:paddingEnd="13dp" + android:gravity="center_vertical" android:singleLine="true" android:textColor="@color/text_normal_c6c6e9" android:textColorHint="@color/text_hint_555574" diff --git a/core/src/main/java/com/chwl/core/home/bean/HomeRoomCardInfo.kt b/core/src/main/java/com/chwl/core/home/bean/HomeRoomCardInfo.kt index f6a60cade..c1654a3db 100644 --- a/core/src/main/java/com/chwl/core/home/bean/HomeRoomCardInfo.kt +++ b/core/src/main/java/com/chwl/core/home/bean/HomeRoomCardInfo.kt @@ -5,7 +5,7 @@ import androidx.annotation.Keep @Keep data class HomeRoomCardInfo( val avatar: String?, - val introduction: String?, + val roomDesc: String?, val micUserCount: Long?, val micUsers: List?, val onlineNum: Long?, diff --git a/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java index f689819ea..a8fe70926 100644 --- a/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java @@ -753,7 +753,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel { .flatMap(new Function>() { @Override public SingleSource apply(UserInfo userInfo) throws Exception { - String tmpTitle = userInfo.getNick() + ResUtil.getString(R.string.room_model_roombasemodel_014); + String tmpTitle = String.format(ResUtil.getString(R.string.room_model_roombasemodel_014), userInfo.getNick()); return mRoomService.openRoom(userInfo.getUid(), AuthModel.get().getTicket(), type, tmpTitle, roomDesc, backPic, rewardId, gameId) .subscribeOn(Schedulers.io()) diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index 21f2b2353..aa0ee4c8a 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -429,7 +429,7 @@ فشل التحديث تحديث غير طبيعي كود الخطأ: - %s الغرفة + غرفة %s معلومات الغرفة الحالية فارغة تم إرسال الدعوة بنجاح تم فتح الغرفة بنجاح diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 46b8ea43f..4b42429ba 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -418,7 +418,7 @@ 更新失敗 更新異常 錯誤碼: - 的房間 + %s的房間 當前房間信息為null 邀請成功 開啟成功 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 921372e2d..251e7887a 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -418,7 +418,7 @@ Update failed Update abnormal Error code: - &s Room + %s\'s Room Current room information is null Invitation sent successfully Opened successfully