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:
eggmanQQQ
2025-01-08 16:32:21 +08:00
parent 8fa3310236
commit 4089cd2d4e
7 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/chwl/app/avroom/activity/RoomTypeSwitchActivity.kt
View File

@@ -148,6 +148,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
binding.proExp.max = 1
binding.proExp.progress = 1
binding.nextLevel.text = R.string.LV_s.getString(it.currentLevel)
binding.currentLevel.text = R.string.LV_s.getString(it.currentLevel-1)
}
@@ -155,7 +156,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
mCurrentMicEffects = it.usedMicEffectId
mCurrentLevel = it.currentLevel
val typeArr = arrayOf(
val typeArr = mutableListOf(
RoomInfo.ROOMTYPE_HOME_PARTY,
RoomInfo.ROOMTYPE_PARTY,
RoomInfo.ROOMTYPE_REVELRY,
@@ -183,6 +184,13 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
R.string.Celebration,
R.string.Unique,
)
if (!it.isHasUnique) {
typeArr.remove(RoomInfo.ROOMTYPE_19_ROOM)
typeArr.remove(RoomInfo.ROOMTYPE_20_ROOM)
}
val typeData = mutableListOf<RoomMicDress>()
typeArr.filterIndexed { index, micType ->
typeData.add(RoomMicDress().apply {
@@ -382,7 +390,6 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
@GET("/room/level/info")
fun getBoomLevelInfo(@Query("roomUid") roomUid: Long): Single<ServiceResult<RoomLevelInfo>>
}

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

@@ -18,6 +18,7 @@ import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.chwl.app.utils.HomeUIManager
import com.chwl.core.DemoCache
import com.chwl.core.auth.AuthModel
import com.netease.nim.uikit.impl.cache.NimUserInfoCache
import com.netease.nimlib.sdk.RequestCallbackWrapper
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo
@@ -48,7 +49,9 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), View.OnClic
//自动登录
// AuthModel.get().autoLogin()
// .doOnError { throwable: Throwable? -> }
// .doOnError { throwable: Throwable? ->
//
// }
// .subscribe()
// NimUserInfoCache.getInstance().getUserInfoFromRemote(

3
app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java
View File

@@ -1097,12 +1097,13 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe
dialog.setMActionCallBack(new BaseDialogFragment.Action() {
@Override
public void onAction(int type, @Nullable Object data) {
dismiss();
// dismiss();
}
});
dialog.setTargetUser(userInfo);
dialog.setHomePartyModel(homePartyModel);
dialog.show(context);
dismiss();
});
}

12
app/src/main/res/layout/nim_recent_contact_list_item_new.xml
View File

@@ -26,7 +26,7 @@
<RelativeLayout
<FrameLayout
android:id="@+id/rl_user_avatar"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -37,17 +37,17 @@
android:id="@+id/img_head"
android:layout_width="47dp"
android:layout_height="47dp"
android:layout_centerInParent="true"
android:layout_gravity="center"
tools:src="@drawable/default_avatar" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/noble_head_wear"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_centerInParent="true"
android:layout_gravity="center"
tools:src="@mipmap/ic_user_avatar_level_king" />
</RelativeLayout>
</FrameLayout>
<LinearLayout
android:id="@+id/contentLayout"
@@ -63,7 +63,7 @@
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_gravity="center_vertical|start"
android:gravity="center_vertical">
@@ -153,7 +153,7 @@
android:textColor="#7b7b7d"
android:textSize="13sp"
tools:ignore="SpUsage"
tools:text="@string/layout_nim_recent_contact_list_item_new_03" />
tools:text="123" />
</LinearLayout>