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

14
MainModule/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
View File

@@ -3947,20 +3947,6 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
ConstraintLayout.LayoutParams.MATCH_PARENT,
ConstraintLayout.LayoutParams.WRAP_CONTENT
)
// params.dimensionRatio = "W,1:0.85"
// when (mRoomInfoResp?.room_info?.type_id) {
// "1", "3", "4", "8" ->
// if (mRoomInfoResp?.room_info?.label_id == "1")
// params.dimensionRatio = "W,1:0.88"
// else
// params.dimensionRatio = "W,1:0.82"
//
// "2" -> params.dimensionRatio = "W,1:0.85"
// "6" -> params.dimensionRatio = "W,1:1"
// "7" -> params.dimensionRatio = "W,1:0.88"
// "9" -> params.dimensionRatio = "W,1:0.85"
// "10" -> params.dimensionRatio = "W,1:0.88"
// }
vpRoomPager.layoutParams = params
// if (mRoomInfoResp?.room_info?.type_id == "1" || mRoomInfoResp?.room_info?.type_id == "3" || mRoomInfoResp?.room_info?.type_id == "4"
// || mRoomInfoResp?.room_info?.type_id == "8"

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomMentorShipFragment.kt
View File

@@ -285,7 +285,7 @@ class RoomMentorShipFragment(var mRoomInfo: RoomInfoResp?) :
setIvForMai(0)
}
if (mRoomInfo?.user_info?.pit_number == 9 && !mSignPitBean?.user_id.equals("0")) {
if (viewList[0].pitBean.user_id.equals(mRoomInfo?.user_info?.user_id.toString())){
mBinding.tvTimeLeft.visibility = View.VISIBLE
} else {
mBinding.tvTimeLeft.visibility = View.GONE

4
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
View File

@@ -229,11 +229,11 @@ public class UserHomepageFragment extends BaseMvpFragment<UserHomepagePresenter,
mBinding.headerInfo.tvGsSx.setOnClickListener(this::onClick);
mBinding.headerInfo.ivRightAvatar.setOnClickListener(this::onClick);
refreshView();
if (userInfo.getGuild() == null || userInfo.getGuild().isEmpty()) {
if (userInfo.getGuild_name() == null || userInfo.getGuild_name().isEmpty()) {
mBinding.headerInfo.ctlGuild.setVisibility(View.GONE);
} else {
mBinding.headerInfo.ctlGuild.setVisibility(View.VISIBLE);
mBinding.headerInfo.tvGH.setText(userInfo.getGuild());
mBinding.headerInfo.tvGH.setText(userInfo.getGuild_name());
}
showCp();

2
MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
View File

@@ -192,7 +192,7 @@ public class VocalRangeFragment extends BaseMvpFragment<MePresenter, FragmentVoc
startActivity(intent);
} else if (id==R.id.ll_me_guild){
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(),""));
intent.putExtra("title", "公会");
startActivity(intent);
}else if (id==R.id.ll_my_shopping){

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);
});