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

Merge branch 'master' into 6.5.3

Browse Source
This commit is contained in:
zlzw
2023-06-29 14:09:33 +08:00
parent 195035c456 6889828c00
commit fb7551f7d0
11 changed files with 288 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java
View File

@@ -30,7 +30,6 @@ public class SystemMessageActivity extends AbsActivity {
public static String type;//-1=单聊消息,1=系统消息,2=互动消息,3=猜你喜欢,-2=web页面打开
public static String type2 = "0";//判断是否注册监听
public static String nowUid, nowTitle, mowHeadImg;
// public static int mowMsgId;
public static void forward(Context context, String type, String uid, String title, String headImg) {
context.startActivity(new Intent(context, SystemMessageActivity.class)

85
live/src/main/java/com/yunbao/live/adapter/SystemMessageNewAdapter.java Normal file
View File

@@ -0,0 +1,85 @@
package com.yunbao.live.adapter;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.yunbao.common.adapter.RefreshAdapter;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.live.R;
import com.yunbao.live.activity.ZhuangBanActivity;
import com.yunbao.live.bean.SystemMessageBean;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* Created by cxf on 2018/11/24.
*/
public class SystemMessageNewAdapter extends RefreshAdapter<SystemMessageBean> {
public SystemMessageNewAdapter(Context context) {
super(context);
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new Vh(mInflater.inflate(R.layout.item_sys_msg_new, parent, false));
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder vh, int position) {
((Vh) vh).setData(mList.get(position));
}
class Vh extends RecyclerView.ViewHolder {
TextView messageContext, messageTime;
LinearLayout layoutMore;
public Vh(View itemView) {
super(itemView);
messageContext = itemView.findViewById(R.id.message_context);
layoutMore = itemView.findViewById(R.id.layout_more);
messageTime = itemView.findViewById(R.id.message_time);
}
void setData(SystemMessageBean bean) {
SimpleDateFormat sdf = new SimpleDateFormat("MM-dd HH:mm");
Date currenTimeZone = new Date(Long.parseLong(bean.getAddtime() + "000"));
messageTime.setText(sdf.format(currenTimeZone));
messageContext.setText(bean.getContent());
layoutMore.setVisibility(TextUtils.isEmpty(bean.getLink()) ? View.GONE : View.VISIBLE);
layoutMore.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (bean.getLink() != null && !bean.getLink().equals("")) {
IMLoginModel userInfo = IMLoginManager.get(mContext).getUserInfo();
StringBuffer urlBuffer = new StringBuffer();
urlBuffer.append(bean.getLink())
.append("&uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
mContext.startActivity(
new Intent(mContext, ZhuangBanActivity.class)
.putExtra("url", urlBuffer.toString()));
}
}
});
}
}
}

69
live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
View File

@@ -1,5 +1,7 @@
package com.yunbao.live.views;
import static io.rong.imlib.RongIMClient.BlacklistStatus.NOT_IN_BLACK_LIST;
import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
@@ -59,6 +61,7 @@ import com.yunbao.live.activity.EditNameRemarksActivity;
import com.yunbao.live.activity.SystemMessageActivity;
import com.yunbao.live.adapter.InteractionMessageAdapter;
import com.yunbao.live.adapter.SystemMessageAdapter;
import com.yunbao.live.adapter.SystemMessageNewAdapter;
import com.yunbao.live.adapter.YouLikeMessageAdapter;
import com.yunbao.live.bean.SearchUserBean;
import com.yunbao.live.bean.SystemMessageBean;
@@ -89,8 +92,6 @@ import io.rong.message.RecallNotificationMessage;
import io.rong.message.SightMessage;
import io.rong.message.TextMessage;
import static io.rong.imlib.RongIMClient.BlacklistStatus.NOT_IN_BLACK_LIST;
/**
* Created by Chen Haoxuan on 2022/4/10.修改
*/
@@ -339,67 +340,11 @@ public class SystemMessageViewHolder extends AbsViewHolder implements View.OnCli
}
});
// RongIMClient.getInstance().getRemoteHistoryMessages(conversationType, SystemMessageActivity.nowUid, dateTime, 20,
// new RongIMClient.ResultCallback<List<Message>>() {
// /**
// * 成功时回调
// * @param messages 获取的消息列表
// */
// @Override
// public void onSuccess(List<Message> messages) {
// if (messages.size() > 0) {
// if (messages.size() < 10) {
// moretext = false;
// } else {
// moretext = true;
// }
// dateTime = messages.get(messages.size() - 1).getSentTime();
// oldestMessageId = messages.get(messages.size() - 1).getMessageId();
// if (messagesList.size() == 0) {
// Message messageNo = new Message();
// messageNo.setSenderUserId("-1");
// messagesList.add(messageNo);
//
// messagesList.addAll(messages);
// } else {
// if (moretext) {
// messagesList.get(0).setSenderUserId("-1");
// } else {
// messagesList.get(0).setSenderUserId("-2");
// }
// messagesList.addAll(1, messages);
// }
// setData(messagesList.size());
// } else {
// moretext = false;
// if (messagesList.size() == 0) {
// Message messageNo = new Message();
// messageNo.setSenderUserId("-1");
// messagesList.add(messageNo);
//
// messagesList.addAll(messages);
// } else {
// messagesList.addAll(1, messages);
// }
// messagesList.get(0).setSenderUserId("-2");
// setData(messagesList.size());
// }
// }
//
// /**
// * 错误时回调。
// * @param e 错误码
// */
// @Override
// public void onError(RongIMClient.ErrorCode e) {
// ToastUtil.show("消息获取失败");
// }
// });
}
//非单聊列表适配
private void setSysApt() {
if (SystemMessageActivity.type.equals("1")) {
if (SystemMessageActivity.type.equals("1") || SystemMessageActivity.type.equals("4")) {
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_sys);
} else if (SystemMessageActivity.type.equals("2")) {
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_mess);
@@ -407,14 +352,16 @@ public class SystemMessageViewHolder extends AbsViewHolder implements View.OnCli
mRefreshView.setEmptyLayoutId(R.layout.view_no_data_sys_msg);
}
mRefreshView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false));
if (SystemMessageActivity.type.equals("1") || SystemMessageActivity.type.equals("2")) {
if (SystemMessageActivity.type.equals("1") || SystemMessageActivity.type.equals("2") || SystemMessageActivity.type.equals("4")) {
mRefreshView.setDataHelper(new CommonRefreshView.DataHelper<SystemMessageBean>() {
@Override
public RefreshAdapter<SystemMessageBean> getAdapter() {
if (mAdapter == null && SystemMessageActivity.type.equals("1")) {
if (mAdapter == null && (SystemMessageActivity.type.equals("1"))) {
mAdapter = new SystemMessageAdapter(mContext);
} else if (mAdapter == null && SystemMessageActivity.type.equals("2")) {
mAdapter = new InteractionMessageAdapter(mContext, SystemMessageViewHolder.this);
} else if (mAdapter == null && SystemMessageActivity.type.equals("4")) {
mAdapter = new SystemMessageNewAdapter(mContext);
}
return mAdapter;
}