From 4298ff2dae9317dbdbb3a3e98e509234442b45dc Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 6 May 2024 16:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8/=E6=97=A0=E6=B3=95=E7=82=B9=E8=BF=9B=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E9=A1=B5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/manager/InstructorRemarkManager.java  | 16 +++++++++++-----
 .../java/com/yunbao/common/utils/LogUtil.java    |  4 +++-
 config.gradle                                    |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java b/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
index 2b81e5e09..3fc229e58 100644
--- a/common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
+++ b/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,13 +40,18 @@ public class InstructorRemarkManager extends BaseCacheManager {
      * @return
      */
     public Map<String, String> getInstructorRemark() {
-        if (null == instructorRemarkMap) {
-            String string = getString(KEY_INSTRUCTOR_REMARK);
-            if (!StringUtil.isEmpty(string)) {
-                instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() {
+        try {
+            if (null == instructorRemarkMap) {
+                String string = getString(KEY_INSTRUCTOR_REMARK);
+                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) {
             instructorRemarkMap = new HashMap<>();
diff --git a/common/src/main/java/com/yunbao/common/utils/LogUtil.java b/common/src/main/java/com/yunbao/common/utils/LogUtil.java
index d94e6e365..7515ca027 100644
--- a/common/src/main/java/com/yunbao/common/utils/LogUtil.java
+++ b/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
diff --git a/config.gradle b/config.gradle
index 869da516c..9b39b1316 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,8 +4,8 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 33,
-            versionCode      : 516,
-            versionName      : "6.6.6",
+            versionCode      : 523,
+            versionName      : "6.6.7",
             namespace        : "com.pandoralive.shayu"
     ]
     manifestPlaceholders = [