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

1:修改去上一个房间出现的im未连接的问题

Browse Source 
2：修改房间点击用户主页更改pitnumber判断问题
This commit is contained in:
梁小江
2025-12-19 09:23:05 +08:00
parent 471a0453fa
commit 3fde4df00f
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
View File

@@ -115,7 +115,7 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
@Override
protected void initData() {
mBinding.editQuery.setText(SpUtil.getMusicName());
// mBinding.editQuery.setText(SpUtil.getMusicName());
mBinding.editQuery.addTextChangedListener(new TextWatcher() {
@Override
@@ -130,8 +130,10 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
@Override
public void afterTextChanged(Editable s) {
input = s.toString();
SpUtil.setMusicName( input);
AgoraManager.getInstance().searchMusic(input, 1);
// SpUtil.setMusicName( input);
if (!input.isEmpty()) {
AgoraManager.getInstance().searchMusic(input, 1);
}
}
});
}

2
MainModule/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
View File

@@ -18,6 +18,7 @@ import com.xscm.moduleutil.dialog.ConfirmDialog;
import com.xscm.moduleutil.http.APIException;
import com.xscm.moduleutil.http.BaseObserver;
import com.xscm.moduleutil.http.RetrofitClient;
import com.xscm.moduleutil.listener.MessageListenerSingleton;
import com.xscm.moduleutil.presenter.BasePresenter;
import com.xscm.moduleutil.rtc.AgoraManager;
import com.xscm.moduleutil.utils.SpUtil;
@@ -102,6 +103,7 @@ public class RoomPresenter extends BasePresenter<RoomContacts.View> implements R
CommonAppContext.getInstance().playId.equals(roomId) ?"取消":"在想想",
v -> {
// 点击“确认”按钮时执行删除操作
MessageListenerSingleton.getInstance().joinGroup(roomId);
getRoomIn(roomId,"");
},
v -> {

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

@@ -15,6 +15,7 @@ import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.FragmentManager;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -119,7 +120,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
LogUtils.e("roomId:" + room_id+",userId:"+user_id);
LogUtils.e("roomId:" + room_id + ",userId:" + user_id);
MvpPre.getRoomUserInfo(room_id, user_id);
}
@@ -269,8 +270,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
MvpPre.clearUserCharm(room_id, user_id);
} else if (id == R.id.im_gs) {
RoomManager.getInstance().fetchRoomDataAndEnter(getActivity(), room_id, "", null);
}else if (id == R.id.iv_right_avatar){
if(userInfo.getMaster()!=null && userInfo.getMaster().getUser_id()!=null) {
} else if (id == R.id.iv_right_avatar) {
if (userInfo.getMaster() != null && userInfo.getMaster().getUser_id() != null) {
ARouter.getInstance().build(ARouteConstants.USER_HOME_PAGE).withString("userId", userInfo.getMaster().getUser_id() + "").navigation();
dismiss();
}
@@ -283,7 +284,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
} catch (Exception e) {
viewName = "未知View ID: " + id;
}
LogUtils.e("roomUserInfoFragment","点击了" + viewName );
LogUtils.e("roomUserInfoFragment", "点击了" + viewName);
}
/**
@@ -472,10 +473,10 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
mBinding.tvName.setShineType(0);
}
if(userInfo.getMaster()!=null){
if (userInfo.getMaster() != null) {
mBinding.ivRightAvatar.setVisibility(VISIBLE);
mBinding.ivRightAvatar.setMaster(userInfo.getMaster().getAvatar());
}else {
} else {
mBinding.ivRightAvatar.setVisibility(GONE);
}
@@ -495,7 +496,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
// mBinding.imRoomGz.setImageDrawable(getResources().getDrawable(com.xscm.moduleutil.R.mipmap.room_gz));
mBinding.imRoomGz.setText("+ 关注");
mBinding.imRoomGz.setBackgroundTintList(ColorStateList.valueOf(Color.parseColor("#ff52FF96")));
}
}
if (userInfo.getIs_room_owner().equals("1")) {
close_type = 1;
@@ -513,9 +514,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
if (userInfo.getGuild_name() == null || userInfo.getGuild_name().isEmpty()) {
mBinding.tvGh.setText("所属公会：无");
} else {
if (userInfo.getUser_id() == SpUtil.getUserId()){
if (userInfo.getUser_id() == SpUtil.getUserId()) {
mBinding.tvJoinGuild.setVisibility(GONE);
}else if (userInfo.getMe_guild_name() == null || userInfo.getMe_guild_name().isEmpty()){
} else if (userInfo.getMe_guild_name() == null || userInfo.getMe_guild_name().isEmpty()) {
mBinding.tvJoinGuild.setVisibility(VISIBLE);
}
mBinding.tvGh.setText("所属公会：" + userInfo.getGuild_name());
@@ -541,9 +542,9 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
private void showCp() {
if (userInfo.getUser_id() == SpUtil.getUserId()){
if (userInfo.getUser_id() == SpUtil.getUserId()) {
mBinding.imRoomGz.setVisibility(GONE);
}else {
} else {
mBinding.imRoomGz.setVisibility(VISIBLE);
}
@@ -584,7 +585,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void onClick(View v) {
Intent intent = new Intent(ActivityUtils.getTopActivity(), HeartCpActivity.class);
intent.putExtra("userId",userInfo.getUser_id());
intent.putExtra("userId", userInfo.getUser_id());
startActivity(intent);
}
});
@@ -659,8 +660,8 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID;
break;
}
}catch (NullPointerException e){
LogUtils.e("挂件位置异常"+e.toString());
} catch (NullPointerException e) {
LogUtils.e("挂件位置异常" + e.toString());
}
mBinding.llCpAnimAvatar.setLayoutParams(params);
}
@@ -727,7 +728,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
} else {
mBinding.roomMCz.setVisibility(GONE);
}
if (paim == 1 && pit_number != null && (pit_number.equals("888") || pit_number.equals("111") || pit_number.equals("222") || pit_number.equals("333"))) {
if (paim == 1 && !TextUtils.isEmpty(pit_number) && (pit_number.equals("888") || pit_number.equals("111") || pit_number.equals("222") || pit_number.equals("333"))) {
mBinding.roomMCz.setVisibility(GONE);
}
@@ -923,7 +924,7 @@ public class RoomUserInfoFragment extends BaseMvpDialogFragment<RoomUserPresente
@Override
public void userGuanzSuccess(String s) {
LogUtils.e("userGuanzSuccess :"+userInfo.getIs_follow());
LogUtils.e("userGuanzSuccess :" + userInfo.getIs_follow());
if (userInfo.getIs_follow() == 1) {
userInfo.setIs_follow(0);
mBinding.imRoomGz.setText("+ 关注");

1
MainModule/src/main/java/com/xscm/modulemain/manager/RoomManager.java
View File

@@ -399,6 +399,7 @@ public class RoomManager {
CommonAppContext.getInstance().playId.equals(roomId) ?"":"去上一个房间",
CommonAppContext.getInstance().playId.equals(roomId) ?"取消":"在想想",
v -> {
MessageListenerSingleton.getInstance().joinGroup(roomId);
// 点击“确认”按钮时执行删除操作
fetchAndJoinRoom(ActivityUtils.getTopActivity(),roomId,"",taskId);
},