Commit 9e2d8d74 by 王文龙

[update]更新群发功能

parent 5723863a
......@@ -94,7 +94,7 @@ dependencies {
implementation 'com.android.support:multidex:1.0.3'
implementation("com.offcn.live:titleview:1.1.0-s1")
implementation("com.offcn.live:imsdk-kit:1.0.0.4")
implementation("com.offcn.live:imsdk-kit:1.0.0.9")
// DB
implementation 'org.greenrobot:greendao:3.2.2'
......
......@@ -4,6 +4,7 @@ import android.content.Context;
import com.jyall.base.util.EventBusCenter;
import com.jyall.base.util.EventBusUtil;
import com.jyall.base.util.ValidateUtils;
import com.offcn.imclient.bean.UserBean;
import com.offcn.imclient.util.Constants;
import com.offcn.imclient.util.LoginManager;
......@@ -49,6 +50,9 @@ public class MyApp extends MultiDexApplication {
OIMSDK.getInstance().setUserInfoProvider(new OIMCallback.OnUserInfoProvider() {
@Override
public OIMUserInfo getUserInfo(String s) {
if(ValidateUtils.isEmpty(s)){
return null;
}
// 当前登录用户
UserBean destUserBean;
if (s.equals(LoginManager.getUserId(getApplicationContext()))) {
......
......@@ -24,11 +24,13 @@ import com.offcn.imclient.util.UserBeanDaoManager;
import com.offcn.imclient.util.Utils;
import com.offcn.imclient.view.AnimatedExpandableListView;
import com.offcn.live.im.OIMSDK;
import com.offcn.live.im.bean.OIMSendTypeEnum;
import com.offcn.live.im.util.ZGLLogUtils;
import com.offcn.live.im.util.ZGLParseUtils;
import org.json.JSONObject;
import java.sql.SQLInvalidAuthorizationSpecException;
import java.util.ArrayList;
import java.util.List;
......@@ -62,8 +64,29 @@ public class ContactListFragment extends BaseFragment {
@Override
public boolean onChildClick(ExpandableListView parent, View v, int groupPosition, int childPosition, long id) {
UserBean userBean = friends.get(groupPosition).getList().get(childPosition);
ServerContactBean contactBean = friends.get(groupPosition);
if (userBean != null) {
OIMSDK.getInstance().startChat(getActivity(), userBean.getUser_id(), userBean.getName(), 0);
if (childPosition == 0) {
// 群发消息。收集当前群所有用户id,传给聊天页
String title = "";
String toId = "";
if (contactBean != null) {
title = contactBean.getKey();
}
StringBuilder stringBuilder = new StringBuilder();
List<UserBean> tmpList = contactBean.getList();
if (!ValidateUtils.isEmpty(tmpList)) {
for (UserBean bean : tmpList) {
stringBuilder.append(bean.getUser_id());
stringBuilder.append(",");
}
toId = stringBuilder.toString();
}
OIMSDK.getInstance().startChat(getActivity(), OIMSendTypeEnum.GROUP, toId, title, 0);
} else {
OIMSDK.getInstance().startChat(getActivity(), OIMSendTypeEnum.PRIVATE, userBean.getUser_id(), userBean.getName(), 0);
}
}
return true;
......@@ -138,9 +161,8 @@ public class ContactListFragment extends BaseFragment {
friends.clear();
showEmptyView();
}
} else if (rtnCode == 1) {
} else if (rtnCode == 1 || rtnCode == 2) {
// {"code":1,"msg":"登陆过期,请重新登陆","params":{"im_token":"0XR5YOS6dg7x2lirfeX3CbjRLqPWmesaFbdsr\/M4IRZS4mYYyZILI82FT8dgqybCA4W+MxfjJDY=@ip6c.cn.rongnav.com;ip6c.cn.rongcfg.com"}}
// TODO: 2020/12/11
Utils.logout(getActivity());
startActivity(new Intent(getActivity(), LoginActivity.class));
getActivity().finish();
......@@ -172,6 +194,9 @@ public class ContactListFragment extends BaseFragment {
private void exeContactList() {
if (!ValidateUtils.isEmpty(friends)) {
showNormalContent();
for (ServerContactBean serverContactBean : friends) {
serverContactBean.getList().add(0, new UserBean("", "群发消息", ""));
}
mAdapter.setData(friends);
List<UserBean> userBeanList = new ArrayList<>();
for (ServerContactBean contactBean : friends) {
......
......@@ -86,6 +86,7 @@ public class LoginActivity extends BaseActivity {
ZGLLogUtils.e(TAG, userBean.toString());
LoginManager.login(LoginActivity.this, userBean);
startActivity(new Intent(LoginActivity.this, MainActivity.class));
finish();
} else {
CommonUtils.showToast(LoginActivity.this, "用户信息获取失败");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment