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

Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

Browse Source
This commit is contained in:
hch
2024-03-26 17:51:47 +08:00
parent c7a4c9f501 210d3a5184
commit e352e5692c
8 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java
View File

@@ -77,9 +77,9 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow {
@Override
protected void onDismiss() {
super.onDismiss();
/*if (onDismissListener != null) {
if (onDismissListener != null) {
onDismissListener.onItemClick(userInfoBean.getUser().getId() + "", isSayHi ? 2 : 1);
}*/
}
}
boolean isSayHi = false;
@@ -98,7 +98,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow {
sendMsg(userInfoBean.getSayHiMsg());
dismiss();
});
/* avatar = findViewById(R.id.avatar);
avatar = findViewById(R.id.avatar);
anchorName = findViewById(R.id.anchorName);
ImgLoader.display(mContext, userInfoBean.getUser().getAvatar(), avatar);
anchorName.setText(userInfoBean.getUser().getUserNicename());
@@ -110,7 +110,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow {
,WordUtil.isNewZh()?"歲":"years old"
)
);
showTag();*/
showTag();
}
private void showTag() {

8
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@@ -8,15 +8,18 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.lzf.easyfloat.EasyFloat;
import com.lzy.okgo.model.Response;
import com.umeng.analytics.MobclickAgent;
import com.yunbao.common.CommonAppContext;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.event.DataUserInfoEvent;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.JsonBean;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.base.BaseCacheManager;
import com.yunbao.common.manager.imrongcloud.MessageIMManager;
@@ -439,6 +442,11 @@ public class IMLoginManager extends BaseCacheManager {
//兼容老模块(之后要把用户维护的类更换掉）
SpUtil.getInstance().setStringValue(SpUtil.USER_INFO, new Gson().toJson(userInfo));
}
@Override
public void onError(Response<JsonBean> response) {
super.onError(response);
}
});
}

21
common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
View File

@@ -4,12 +4,16 @@ import android.content.Context;
import android.os.Handler;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.TypeReference;
import com.google.gson.Gson;
import com.lzy.okgo.model.Response;
import com.yunbao.common.bean.IMLoginModel;
import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.http.HttpClient;
import com.yunbao.common.http.JsonBean;
import com.yunbao.common.manager.base.BaseCacheManager;
import com.yunbao.common.utils.StringUtil;
import java.util.HashMap;
import java.util.Map;
@@ -36,8 +40,12 @@ public class InstructorRemarkManager extends BaseCacheManager {
*/
public Map<String, String> getInstructorRemark() {
if (null == instructorRemarkMap) {
instructorRemarkMap = JSON.parseObject(getString(KEY_INSTRUCTOR_REMARK), new TypeReference<Map<String, String>>() {
});
String string = getString(KEY_INSTRUCTOR_REMARK);
if (!StringUtil.isEmpty(string)) {
instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() {
});
}
}
if (instructorRemarkMap == null) {
instructorRemarkMap = new HashMap<>();
@@ -103,8 +111,8 @@ public class InstructorRemarkManager extends BaseCacheManager {
public void run() {
IMLoginModel userInfo = IMLoginManager.get(context).getUserInfo();
HttpClient.getInstance().get("User.getInstructorRemark", "getInstructorRemark")
.params("uid", userInfo.getId(),true)
.params("token", userInfo.getToken(),true)
.params("uid", userInfo.getId(), true)
.params("token", userInfo.getToken(), true)
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
@@ -116,6 +124,11 @@ public class InstructorRemarkManager extends BaseCacheManager {
}
}
@Override
public void onError(Response<JsonBean> response) {
super.onError(response);
}
});