YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改礼物墙

Browse Source 
添加工会显示
This commit is contained in:
梁小江
2025-08-21 19:19:54 +08:00
parent de0ee12e06
commit 97d0e52f32
4 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modulemain/src/main/AndroidManifest.xml
View File

@@ -12,7 +12,6 @@
android:name=".activity.MainActivity" android:name=".activity.MainActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="true" android:exported="true"
android:taskAffinity="com.qxcm.modulemain.main"
> >
</activity> </activity>
</application> </application>

72
moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
View File

@@ -1,6 +1,7 @@
package com.example.moduleroom.dialog; package com.example.moduleroom.dialog;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
@@ -127,7 +128,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if (type == 0) { if (type == 0) {
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
} else { } else {
mBinding.roomDian.setVisibility(View.VISIBLE); mBinding.roomDian.setVisibility(VISIBLE);
} }
@@ -379,19 +380,22 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
close_type=4; close_type=4;
} }
if (user_id.equals(SpUtil.getUserId()+"")){ // if (user_id.equals(SpUtil.getUserId()+"")){
mBinding.tvGh.setVisibility(GONE); // mBinding.tvGh.setVisibility(GONE);
}else { // }else {
if (userInfo!=null) { if (userInfo!=null) {
if (userInfo.getRed_status().equals("1")) { mBinding.tvGh.setVisibility(VISIBLE);
mBinding.tvGh.setVisibility(View.VISIBLE); mBinding.tvGh.setText("所属公会："+((userInfo.getGuild()!=null && !userInfo.getGuild().isEmpty()) ? userInfo.getGuild() : "无"));
} else {
mBinding.tvGh.setVisibility(GONE); // if (userInfo.getRed_status().equals("1")) {
} // mBinding.tvGh.setVisibility(View.VISIBLE);
// } else {
// mBinding.tvGh.setVisibility(GONE);
// }
}else { }else {
mBinding.tvGh.setVisibility(GONE); mBinding.tvGh.setVisibility(GONE);
} }
} // }
mBinding.tvTs.setText(String.format("90天内累计收到 %s 个礼物", userInfo.getGift_num())); mBinding.tvTs.setText(String.format("90天内累计收到 %s 个礼物", userInfo.getGift_num()));
updateUIBasedOnTypeAndUser(); updateUIBasedOnTypeAndUser();
@@ -453,7 +457,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// isSelf=false; // isSelf=false;
// } // }
if (userInfo.getIs_in_pit() == 1){ if (userInfo.getIs_in_pit() == 1){
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
}else { }else {
mBinding.roomMCz.setVisibility(GONE); mBinding.roomMCz.setVisibility(GONE);
} }
@@ -463,94 +467,94 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
switch (type) { switch (type) {
case 1: // 房主 case 1: // 房主
mBinding.roomDian.setVisibility(View.VISIBLE); mBinding.roomDian.setVisibility(VISIBLE);
mBinding.roomJb.setVisibility(View.GONE); mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE); mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
if (isSelf){ if (isSelf){
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE); mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE); mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE); mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
break; break;
case 2://管理员 case 2://管理员
if (close_type==1){ //管理员查看房主信息 if (close_type==1){ //管理员查看房主信息
mBinding.roomDian.setVisibility(View.GONE); mBinding.roomDian.setVisibility(View.GONE);
mBinding.roomJb.setVisibility(View.VISIBLE); mBinding.roomJb.setVisibility(VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE); mBinding.roomLh.setVisibility(VISIBLE);
mBinding.roomBo.setVisibility(View.GONE); mBinding.roomBo.setVisibility(View.GONE);
mBinding.roomMCz.setVisibility(GONE); mBinding.roomMCz.setVisibility(GONE);
}else { }else {
mBinding.roomDian.setVisibility(View.VISIBLE); mBinding.roomDian.setVisibility(VISIBLE);
mBinding.roomJb.setVisibility(GONE); mBinding.roomJb.setVisibility(GONE);
mBinding.roomLh.setVisibility(GONE); mBinding.roomLh.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
// if (isNum==1){ // if (isNum==1){
// mBinding.roomMCz.setVisibility(View.VISIBLE); // mBinding.roomMCz.setVisibility(View.VISIBLE);
// }else { // }else {
// mBinding.roomMCz.setVisibility(GONE); // mBinding.roomMCz.setVisibility(GONE);
// } // }
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
if (isSelf){ if (isSelf){
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE); mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE); mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE); mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
break; break;
case 3: case 3:
if (close_type==1 ||close_type==2){ //主持查看房主或者管理员信息 if (close_type==1 ||close_type==2){ //主持查看房主或者管理员信息
mBinding.roomDian.setVisibility(View.GONE); mBinding.roomDian.setVisibility(View.GONE);
mBinding.roomJb.setVisibility(View.VISIBLE); mBinding.roomJb.setVisibility(VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE); mBinding.roomLh.setVisibility(VISIBLE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
mBinding.roomMCz.setVisibility(GONE); mBinding.roomMCz.setVisibility(GONE);
}else { }else {
mBinding.roomDian.setVisibility(View.VISIBLE); mBinding.roomDian.setVisibility(VISIBLE);
mBinding.roomJb.setVisibility(GONE); mBinding.roomJb.setVisibility(GONE);
mBinding.roomLh.setVisibility(GONE); mBinding.roomLh.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
// if (isNum==1){ // if (isNum==1){
// mBinding.roomMCz.setVisibility(View.VISIBLE); // mBinding.roomMCz.setVisibility(View.VISIBLE);
// }else { // }else {
// mBinding.roomMCz.setVisibility(GONE); // mBinding.roomMCz.setVisibility(GONE);
// } // }
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
if (isSelf){ if (isSelf){
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE); mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE); mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE); mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
break; break;
case 4: case 4:
if (close_type==1 ||close_type==2 ||close_type==3) { if (close_type==1 ||close_type==2 ||close_type==3) {
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.VISIBLE); mBinding.roomJb.setVisibility(VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE); mBinding.roomLh.setVisibility(VISIBLE);
mBinding.roomMCz.setVisibility(GONE); mBinding.roomMCz.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
}else { }else {
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.VISIBLE); mBinding.roomJb.setVisibility(VISIBLE);
mBinding.roomLh.setVisibility(View.VISIBLE); mBinding.roomLh.setVisibility(VISIBLE);
mBinding.roomMCz.setVisibility(GONE); mBinding.roomMCz.setVisibility(GONE);
mBinding.roomBo.setVisibility(View.VISIBLE); mBinding.roomBo.setVisibility(VISIBLE);
} }
if (isSelf){ if (isSelf){
mBinding.roomDian.setVisibility(GONE); mBinding.roomDian.setVisibility(GONE);
mBinding.roomJb.setVisibility(View.GONE); mBinding.roomJb.setVisibility(View.GONE);
mBinding.roomLh.setVisibility(View.GONE); mBinding.roomLh.setVisibility(View.GONE);
mBinding.roomBo.setVisibility(GONE); mBinding.roomBo.setVisibility(GONE);
mBinding.roomMCz.setVisibility(View.VISIBLE); mBinding.roomMCz.setVisibility(VISIBLE);
} }
break; break;
default: default:

5
modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
View File

@@ -1,5 +1,8 @@
package com.example.modulevocal.adapter; package com.example.modulevocal.adapter;
import android.graphics.Color;
import android.media.Ringtone;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
@@ -28,6 +31,7 @@ public class UserGiftWallAdapter extends BaseQuickAdapter<CombinedGiftBean, Base
ImageLoader.loadImage(mContext, helper.getView(R.id.iv_gift_pic), item.getBase_image()); ImageLoader.loadImage(mContext, helper.getView(R.id.iv_gift_pic), item.getBase_image());
if (item.is_liang()) { if (item.is_liang()) {
helper.getView(R.id.cl_iv_down_on).setBackgroundColor(Color.parseColor("#E6E6E6"));
// 点亮的礼物显示高亮和送礼物的用户 // 点亮的礼物显示高亮和送礼物的用户
helper.setText(R.id.tv_number, "x" + item.getTop_users_count()); helper.setText(R.id.tv_number, "x" + item.getTop_users_count());
helper.setVisible(R.id.tv_number, true); helper.setVisible(R.id.tv_number, true);
@@ -38,6 +42,7 @@ public class UserGiftWallAdapter extends BaseQuickAdapter<CombinedGiftBean, Base
recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false)); recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
TopUsersAdapter topUsersAdapter = new TopUsersAdapter(item.getTop_users()); TopUsersAdapter topUsersAdapter = new TopUsersAdapter(item.getTop_users());
recyclerView.setAdapter(topUsersAdapter); recyclerView.setAdapter(topUsersAdapter);
} else { } else {
// 未点亮的礼物只显示图片、名称和金额，不高亮 // 未点亮的礼物只显示图片、名称和金额，不高亮
helper.setVisible(R.id.tv_number, false); helper.setVisible(R.id.tv_number, false);

1
modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
View File

@@ -6,6 +6,7 @@
android:layout_height="@dimen/dp_129" android:layout_height="@dimen/dp_129"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:background="@mipmap/gift_bj" android:background="@mipmap/gift_bj"
android:id="@+id/cl"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">