修复消息页面头像显示不正常/无法点进聊天页的问题

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) {
+        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) {
             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

config.gradle

@@ -4,8 +4,8 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 23,
             targetSdkVersion : 33,
-            versionCode      : 516,
+            versionCode      : 523,
-            versionName      : "6.6.6",
+            versionName      : "6.6.7",
             namespace        : "com.pandoralive.shayu"
     ]
     manifestPlaceholders = [

main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java

@@ -51,6 +51,7 @@ import com.yunbao.common.bean.LiveBean;
 import com.yunbao.common.bean.NewLevelModel;
 import com.yunbao.common.bean.UserHomeImgBean;
 import com.yunbao.common.dialog.ImagePreviewDialog;
+import com.yunbao.common.event.LiveRoomChangeEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpUtil;
 import com.yunbao.common.http.LiveHttpUtil;
@@ -61,6 +62,7 @@ import com.yunbao.common.manager.NewLevelManager;
 import com.yunbao.common.upload.UploadBean;
 import com.yunbao.common.upload.UploadCallback;
 import com.yunbao.common.upload.UploadQnImpl;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.FilesUtils;
 import com.yunbao.common.utils.L;
@@ -627,7 +629,15 @@ public class UserHomeActivity extends AbsActivity {
                             new LiveRoomCheckLivePresenter(mContext, liveBean.getUid(), liveBean.getStream(), new LiveRoomCheckLivePresenter.NewActionListener() {
                                 @Override
                                 public void onLiveRoomChanged(String liveUid, String stream, int liveType, String liveTypeVal, String liveSdk) {
-                                    RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveSdk), Integer.parseInt(liveTypeVal));
+                                    if (StringUtil.isEmpty(liveUid)) {
+                                        return;
+                                    }
+                                    finish();
+                                    if (AppManager.getInstance().getLiveActivity() != null) {
+                                        EventBus.getDefault().post(new LiveRoomChangeEvent(liveBean, liveType, Integer.parseInt(liveTypeVal)).setLiveEnd(true));
+                                    } else {
+                                        RouteUtil.forwardLiveAudienceActivity(liveBean, liveType, Integer.parseInt(liveTypeVal), Integer.parseInt(liveSdk));
+                                    }
                                 }
 
                                 @Override

main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java

@@ -31,6 +31,7 @@ import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.http.LiveHttpUtil;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.DialogUitl;
 import com.yunbao.common.utils.PluginManager;
 import com.yunbao.common.utils.ProcessResultUtil;
@@ -305,6 +306,7 @@ public class MainStartDialogFragment extends AbsDialogFragment implements View.O
             if (isWifiProxy(mContext) || checkVPN((ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE))) {
                 ToastUtil.show(WordUtil.isNewZh()?"檢測開啓了VPN或者代理，請先關閉VPN或者代理再開播。":
                         "It is detected that VPN or proxy is turned on. Please turn off VPN or proxy before starting the broadcast.");
+                AppManager.runDebugCode(() -> mCallback.onLiveClick());
             } else {
                 if (mCallback != null) {
                     MobclickAgent.onEvent(mContext, "home_page_broadcast", "点击开播按钮");