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

Merge branch 'dev_改版主分支-升级融云SDK&AGP8' into 新潘多拉

Browse Source
This commit is contained in:
zlzw 2024-05-06 16:36:15 +08:00
commit dc652050ac
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package com.yunbao.common.manager;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.util.Log;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
@ -39,13 +40,18 @@ public class InstructorRemarkManager extends BaseCacheManager {
* @return * @return
*/ */
public Map<String, String> getInstructorRemark() { public Map<String, String> getInstructorRemark() {
if (null == instructorRemarkMap) { try {
String string = getString(KEY_INSTRUCTOR_REMARK); if (null == instructorRemarkMap) {
if (!StringUtil.isEmpty(string)) { String string = getString(KEY_INSTRUCTOR_REMARK);
instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() { if (!StringUtil.isEmpty(string)) {
instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() {
}); });
}
} }
}catch (Exception e){
Log.i("remark", "getInstructorRemark: "+getString(KEY_INSTRUCTOR_REMARK));
e.printStackTrace();
} }
if (instructorRemarkMap == null) { if (instructorRemarkMap == null) {
instructorRemarkMap = new HashMap<>(); instructorRemarkMap = new HashMap<>();

4
common/src/main/java/com/yunbao/common/utils/LogUtil.java
View File

@ -251,7 +251,9 @@ public class LogUtil {
body.put("appVersion", CommonAppConfig.getInstance().getVersion()); body.put("appVersion", CommonAppConfig.getInstance().getVersion());
OkHttpClient client = new OkHttpClient.Builder().connectTimeout(3, TimeUnit.SECONDS).build(); OkHttpClient client = new OkHttpClient.Builder().connectTimeout(3, TimeUnit.SECONDS).build();
Request request = new Request.Builder().url("https://newht.yaoulive.com/index.php/api/error_log/report") //无法接受文件 Request request = new Request.Builder()
.url("https://tools.yutou233.cn/public/file/request.do")//临时上报地址，可接受文件
//.url("https://newht.yaoulive.com/index.php/api/error_log/report") //无法接受文件
.post(requestBody).build(); .post(requestBody).build();
client.newCall(request).enqueue(new Callback() { client.newCall(request).enqueue(new Callback() {
@Override @Override