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

common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java

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

common/src/main/java/com/yunbao/common/utils/LogUtil.java

@@ -251,7 +251,9 @@ public class LogUtil {
         body.put("appVersion", CommonAppConfig.getInstance().getVersion());
 
         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();
         client.newCall(request).enqueue(new Callback() {
             @Override