yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复缺少的接口请求

Browse Source 
修复消息列表数组下标越界问题
This commit is contained in:
zlzw 2024-07-27 11:14:30 +08:00
parent 05f1bc6e20
commit 5f107fef25
5 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/com/yunbao/common/fragment/AbsMainMessageChatListFragment.java
View File

@ -46,9 +46,9 @@ import io.rong.imlib.model.UserInfo;
public abstract class AbsMainMessageChatListFragment extends Fragment { public abstract class AbsMainMessageChatListFragment extends Fragment {
private static final String TAG = "全部聊天"; private static final String TAG = "全部聊天";
public RecyclerView recyclerView; public RecyclerView recyclerView;
public MainConversationListAdapter mAdapter; public MainConversationListAdapter mAdapter;
public SmartRefreshLayout refreshLayout; public SmartRefreshLayout refreshLayout;
public void setAdapter(MainConversationListAdapter mAdapter) { public void setAdapter(MainConversationListAdapter mAdapter) {
this.mAdapter = mAdapter; this.mAdapter = mAdapter;
@ -136,7 +136,7 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
}); });
} }
public void loadLiveOnlineStatus(List<BaseUiConversation> srcList, OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener){ public void loadLiveOnlineStatus(List<BaseUiConversation> srcList, OnRecyclerListRefreshListener<List<BaseUiConversation>> onRefreshListener) {
List<String> uids = new ArrayList<>(); List<String> uids = new ArrayList<>();
isNet = true; isNet = true;
for (BaseUiConversation conversation : srcList) { for (BaseUiConversation conversation : srcList) {
@ -148,10 +148,17 @@ public abstract class AbsMainMessageChatListFragment extends Fragment {
CommonHttpUtil.getUserOnline(String.join(",", uids), new com.yunbao.common.http.HttpCallback() { CommonHttpUtil.getUserOnline(String.join(",", uids), new com.yunbao.common.http.HttpCallback() {
@Override @Override
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
if(code==0&&info!=null){ if (code == 0 && info != null) {
List<MsgOnlineStatusBean> listUserBean = JSON.parseArray(Arrays.toString(info), MsgOnlineStatusBean.class); List<MsgOnlineStatusBean> listUserBean = JSON.parseArray(Arrays.toString(info), MsgOnlineStatusBean.class);
for (int i = 0; i <srcList.size(); i++) { for (int i = 0; i < srcList.size(); i++) {
srcList.get(i).mCore.setDraft(listUserBean.get(i).getOnline()); for (int j = 0; j < listUserBean.size(); j++) {
if (!StringUtil.isEmpty(srcList.get(i).mCore.getTargetId()) &&
srcList.get(i).mCore.getTargetId().equals(listUserBean.get(j).getId())) {
srcList.get(i).mCore.setDraft(listUserBean.get(j).getOnline());
break;
}
}
} }
onRefreshListener.onFinish(srcList); onRefreshListener.onFinish(srcList);
isNet = false; isNet = false;

6
common/src/main/java/com/yunbao/common/http/CommonHttpUtil.java
View File

@ -705,6 +705,12 @@ public class CommonHttpUtil {
.params("behavior_type","5") .params("behavior_type","5")
.execute(callback); .execute(callback);
} }
public static void sayHi(String toUid,String type,HttpCallback callback) {
HttpClient.getInstance().get("Pdluser.liveCall", "Pdluser.liveCall")
.params("target_uid",toUid)
.params("behavior_type",type)
.execute(callback);
}
/** /**
*获取聊天列表用户在线状态 *获取聊天列表用户在线状态

2
config.gradle
View File

@ -4,7 +4,7 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 23, minSdkVersion : 23,
targetSdkVersion : 34, targetSdkVersion : 34,
versionCode : 538, versionCode : 539,
versionName : "6.7.2", versionName : "6.7.2",
namespace : "com.pandoralive.shayu" namespace : "com.pandoralive.shayu"
] ]

7
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@ -762,6 +762,13 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
showMsgError(); showMsgError();
return; return;
} }
boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
CommonHttpUtil.sayHi(mToUid, isAnchor ? "6" : "7",new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
}
});
EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(mToUid)); EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(mToUid));
} }
} }

15
main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java
View File

@ -589,7 +589,7 @@ public class UserHomeActivity extends AbsActivity {
communityRecyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER); communityRecyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
msgLayout = findViewById(R.id.msgLayout); msgLayout = findViewById(R.id.msgLayout);
msgLayout.setVisibility(uid.equals(CommonAppConfig.getInstance().getUid())?View.GONE:View.VISIBLE); msgLayout.setVisibility(uid.equals(CommonAppConfig.getInstance().getUid()) ? View.GONE : View.VISIBLE);
msgLayout.setOnClickListener(new View.OnClickListener() { msgLayout.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -610,6 +610,13 @@ public class UserHomeActivity extends AbsActivity {
showMsgError(); showMsgError();
return; return;
} }
boolean isAnchor = CommonAppConfig.getInstance().getUserBean().getUsers_type().equals("C");
CommonHttpUtil.sayHi(String.valueOf(userInfo.getUserHomeTopInfo().getUser_id()), isAnchor ? "6" : "7", new com.yunbao.common.http.HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
}
});
EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(String.valueOf(userInfo.getUserHomeTopInfo().getUser_id()))); EventBus.getDefault().post(new MainHomeCommunityToChatEvent().setTargetId(String.valueOf(userInfo.getUserHomeTopInfo().getUser_id())));
} }
}); });
@ -655,7 +662,7 @@ public class UserHomeActivity extends AbsActivity {
liveBean.setParams(gotoRoomKey); liveBean.setParams(gotoRoomKey);
new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() { new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
@Override @Override
public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk,boolean isSw) { public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk, boolean isSw) {
if (StringUtil.isEmpty(liveUid)) { if (StringUtil.isEmpty(liveUid)) {
return; return;
} }
@ -663,7 +670,7 @@ public class UserHomeActivity extends AbsActivity {
if (AppManager.getInstance().getLiveActivity() != null) { if (AppManager.getInstance().getLiveActivity() != null) {
EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true)); EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
} else { } else {
RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk),isSw); RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk), isSw);
} }
} }
@ -843,7 +850,7 @@ public class UserHomeActivity extends AbsActivity {
} }
public void showMsgError() { public void showMsgError() {
ToastUtil.show(WordUtil.isNewZh()?"無法聊天,待開發":"Unable to chat, awaiting development"); ToastUtil.show(WordUtil.isNewZh() ? "無法聊天,待開發" : "Unable to chat, awaiting development");
} }