moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复首页-我的-房间卡片 展示bug

Browse Source
This commit is contained in:
max
2024-06-20 15:56:10 +08:00
parent bf3ea4b437
commit 4eed4c0cfb
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/chwl/app/home/fragment/HomeWithMeFragment.kt
View File

@@ -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<HomeMeFragmentBinding>() {
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)
}

1
app/src/main/res/layout/activity_room_title_edit.xml
View File

@@ -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"

2
core/src/main/java/com/chwl/core/home/bean/HomeRoomCardInfo.kt
View File

@@ -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<MicUsersBean>?,
val onlineNum: Long?,

2
core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java
View File

@@ -753,7 +753,7 @@ public class RoomBaseModel extends BaseModel implements IRoomBaseModel {
.flatMap(new Function<UserInfo, SingleSource<RoomResult>>() {
@Override
public SingleSource<RoomResult> 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())

2
core/src/main/res/values-ar/strings.xml
View File

@@ -429,7 +429,7 @@
<string name="room_model_roombasemodel_011">فشل التحديث</string>
<string name="room_model_roombasemodel_012">تحديث غير طبيعي</string>
<string name="room_model_roombasemodel_013">كود الخطأ:</string>
<string name="room_model_roombasemodel_014">%s الغرفة</string>
<string name="room_model_roombasemodel_014">غرفة %s</string>
<string name="room_model_roomcontributelistmodel_01">معلومات الغرفة الحالية فارغة</string>
<string name="room_model_roomsettingmodel_01">تم إرسال الدعوة بنجاح</string>
<string name="room_model_roomsettingmodel_02">تم فتح الغرفة بنجاح</string>

2
core/src/main/res/values-zh-rTW/strings.xml
View File

@@ -418,7 +418,7 @@
<string name="room_model_roombasemodel_011">更新失敗</string>
<string name="room_model_roombasemodel_012">更新異常</string>
<string name="room_model_roombasemodel_013">錯誤碼:</string>
<string name="room_model_roombasemodel_014">的房間</string>
<string name="room_model_roombasemodel_014">%s的房間</string>
<string name="room_model_roomcontributelistmodel_01">當前房間信息為null</string>
<string name="room_model_roomsettingmodel_01">邀請成功</string>
<string name="room_model_roomsettingmodel_02">開啟成功</string>

2
core/src/main/res/values/strings.xml
View File

@@ -418,7 +418,7 @@
<string name="room_model_roombasemodel_011">Update failed</string>
<string name="room_model_roombasemodel_012">Update abnormal</string>
<string name="room_model_roombasemodel_013">Error code:</string>
<string name="room_model_roombasemodel_014">&#038;s Room</string>
<string name="room_model_roombasemodel_014">%s\'s Room</string>
<string name="room_model_roomcontributelistmodel_01">Current room information is null</string>
<string name="room_model_roomsettingmodel_01">Invitation sent successfully</string>
<string name="room_model_roomsettingmodel_02">Opened successfully</string>