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

fix bugs.3

Browse Source
This commit is contained in:
骆召亮
2025-12-05 18:42:55 +08:00
parent 6e9ba920d1
commit efadb819b9
10 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainModule/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
View File

@@ -508,14 +508,14 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if (userInfo != null) {
mBinding.tvGh.setVisibility(VISIBLE);
mBinding.tvJoinGuild.setVisibility(GONE);
if (userInfo.getGuild().isEmpty()) {
if (userInfo.getGuild_name() == null ||userInfo.getGuild_name().isEmpty()) {
mBinding.tvGh.setText("所属公会：无");
} else {
if (userInfo.getUser_id() != SpUtil.getUserId() && !userInfo.getGuild().equals(SpUtil.getUserInfo().getGuild())) {
if (userInfo.getUser_id() != SpUtil.getUserId() || (userInfo.getMe_guild_name() != null && !userInfo.getMe_guild_name().isEmpty())) {
mBinding.tvJoinGuild.setVisibility(VISIBLE);
}
mBinding.tvGh.setText("所属公会：" + userInfo.getGuild());
mBinding.tvGh.setText("所属公会：" + userInfo.getGuild_name());
}
} else {
mBinding.tvGh.setVisibility(GONE);
@@ -526,7 +526,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.tvJoinGuild.setOnClickListener(v -> {
//跳转加入公会
Intent intent = new Intent(getContext(), WebViewActivity.class);
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(), SpUtil.getToken()));
intent.putExtra("url", String.format(WebUrlConstants.INSTANCE.getWEB_GUILD_URL(), SpUtil.getToken(), userInfo.getGuild_id()));
intent.putExtra("title", "公会");
startActivity(intent);
});