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

fix : 替换资源

Browse Source
This commit is contained in:
eggmanQQQ
2025-01-02 11:11:52 +08:00
parent 9e4646c28a
commit 27f488b66c
11 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,22 +151,29 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
RoomInfo.ROOMTYPE_HOME_PARTY,
RoomInfo.ROOMTYPE_PARTY,
RoomInfo.ROOMTYPE_REVELRY,
RoomInfo.ROOMTYPE_20_ROOM,
RoomInfo.ROOMTYPE_19_ROOM,
RoomInfo.ROOMTYPE_20_ROOM
)
val typeNArr = arrayOf(
R.drawable.ic_room_mic_type_9_n,
R.drawable.ic_room_mic_type_10_n,
R.drawable.ic_room_mic_type_15_n,
R.drawable.ic_room_mic_type_19_n,
R.drawable.ic_room_mic_type_20_n,
R.drawable.ic_room_mic_type_19_n,
)
val typeSArr = arrayOf(
R.drawable.ic_room_mic_type_9_s,
R.drawable.ic_room_mic_type_10_s,
R.drawable.ic_room_mic_type_15_s,
R.drawable.ic_room_mic_type_19_s,
R.drawable.ic_room_mic_type_20_s,
R.drawable.ic_room_mic_type_19_s,
)
val nameArr = arrayOf(
R.string.roomType9,
R.string.roomType10,
R.string.roomType15,
R.string.roomType20,
R.string.roomType19,
)
val typeData = mutableListOf<RoomMicDress>()
typeArr.filterIndexed { index, micType ->
@@ -176,6 +183,7 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
isSelect = micType == mCurrentMicType
normalRes = typeNArr[index]
selectRes = typeSArr[index]
name = nameArr[index].getString()
})
}
mMicTypeAdapter.setNewData(typeData as List<RoomMicDress>?)
@@ -316,6 +324,10 @@ class RoomTypeSwitchActivity : BaseViewBindingActivity<RoomTypeSwitchActivityBin
helper?.binding?.let { binding ->
binding.bg.changeStrikeColor(if (item.isSelect) "#ff8c03".toColor() else "#1b1b1d".toColor())
binding.bg.changeSoildColor(if (item.isSelect) "#261800".toColor() else "#1b1b1d".toColor())
binding.tvName.alpha = (if (item.isSelect) 1f else 0.5f)
binding.tvName.setVis(item.dressType == RoomMicDress.RoomDressType.T_Type)
binding.tvName.text = item.name
binding.ivType.setVis(false)
binding.ivSkins.setVis(false)
binding.ivEffect.setVis(false)

5
app/src/main/java/com/chwl/app/avroom/adapter/UpMicAdapter.java
View File

@@ -76,12 +76,11 @@ public class UpMicAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
if (roomQueueInfo.mChatRoomMember == null
&& (!AvRoomDataManager.get().isLeaveMode() || position != 0)
&& (!AvRoomDataManager.get().isDatingMode() || AvRoomDataManager.get().isManager(String.valueOf(upUid)) || position != 0)) {
imageView.setImageResource(position == 0 ? R.drawable.icon_up_mic_ture : R.drawable.icon_up_mic_ture);
imageView.setImageResource((position == 0 && AvRoomDataManager.get().is19Room()) ? R.drawable.icon_room_up_micro_king : R.drawable.icon_up_mic_ture);
helper.itemView.setClickable(true);
helper.itemView.setOnClickListener(v -> Single.just(position).subscribe(consumer));
} else {
imageView.setImageResource(position == 0 ? R.drawable.icon_up_mic_false : R.drawable.icon_up_mic_false);
imageView.setImageResource(R.drawable.icon_up_mic_false);
helper.itemView.setClickable(false);
}

3
app/src/main/java/com/chwl/app/pay/activity/GiveGoldActivity.kt
View File

@@ -142,8 +142,7 @@ class GiveGoldActivity : BaseViewBindingActivity<ActivityGiveGoldBinding>() {
for (i in 0 until 5) {
val star = ImageView(context)
star.setViewWH(15, 15)
//todo do 待完善: 信誉等级 星星图片
star.setImageResource( if (i < it.starLevel) R.drawable.c_draw_focused else R.drawable.c_draw_un)
star.setImageResource( if (i < it.starLevel) R.drawable.icon_star_s else R.drawable.icon_star_n)
binding.starLayout.addView(star)
}
}

BIN
app/src/main/res/drawable-xhdpi/icon_room_up_micro_king.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_star_n.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 562 B

BIN
app/src/main/res/drawable-xhdpi/icon_star_s.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 686 B

2
app/src/main/res/layout/fragment_chatroom_game_main.xml
View File

@@ -53,7 +53,7 @@
android:id="@+id/btnFold"
android:layout_width="@dimen/dp_32"
android:src="@drawable/icon_fold_up"
android:layout_marginBottom="@dimen/dp_14"
android:layout_marginBottom="10dp"
android:layout_height="@dimen/dp_32"/>
<LinearLayout

34
app/src/main/res/layout/item_room_mode.xml
View File

@@ -3,34 +3,33 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="87dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="3.5dp"
android:layout_marginBottom="7dp"
tools:background="@color/black">
<!-- ff8c03 -->
<com.chwl.library.widget.text.DrawableTextView
android:id="@+id/bg"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="87dp"
app:dt_drawableType="shape"
app:dt_radius="15dp"
app:dt_strikeColor="#1b1b1d"
app:dt_soildColor="#1b1b1d"
app:dt_strikeWidth="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<FrameLayout
android:id="@+id/drees"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/bg"
app:layout_constraintEnd_toEndOf="@+id/bg"
app:layout_constraintStart_toStartOf="@+id/bg"
app:layout_constraintTop_toTopOf="@+id/bg"
tools:background="@color/red_font">
<ImageView
@@ -55,4 +54,17 @@
</FrameLayout>
<TextView
android:id="@+id/tvName"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bg"
android:layout_marginTop="4dp"
android:textSize="13sp"
android:visibility="gone"
tools:visibility="visible"
android:textColor="@color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/room_type_switch_activity.xml
View File

@@ -53,7 +53,7 @@
app:layout_constraintTop_toTopOf="parent"
app:riv_corner_radius="8dp" />
<TextView
Ω<TextView
android:id="@+id/nick"
android:layout_width="0dp"
android:layout_height="wrap_content"

6
app/src/main/res/values/strings.xml
View File

@@ -5394,6 +5394,12 @@ You cannot join again within 24 hours after leaving</string>
<string name="Unique">Unique</string>
<string name="roomLevelErrorTips">房间等级错误</string>
<string name="roomType9">9</string>
<string name="roomType10">10</string>
<string name="roomType15">15</string>
<string name="roomType20">20</string>
<string name="roomType19">19</string>
</resources>

1
core/src/main/java/com/chwl/core/gift/bean/RoomMicDress.java
View File

@@ -11,6 +11,7 @@ public class RoomMicDress {
public String normalMicLockUrl;
public String bossMicUrl;
public String bossMicLockUrl;
public String name;
public boolean isSelect;
public @interface RoomDressType{