送礼物动画位置计算方式修改

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java

@@ -368,6 +368,6 @@ public class UriProvider {
      * @return
      */
     public static String getDatingRule() {
-        return JAVA_WEB_URL.concat("/accompany/modules/rules/dating-rule.html");
+        return JAVA_WEB_URL.concat("/accompany/modules/rule/dating.html");
     }
 }

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java

@@ -156,6 +156,7 @@ import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
 import com.yizhuan.xchat_android_core.user.UserModel;
 import com.yizhuan.xchat_android_core.user.bean.BaseInfo;
 import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.yizhuan.xchat_android_core.utils.LogUtils;
 import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
 import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
 import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
@@ -1587,7 +1588,7 @@ public final class IMNetEaseManager {
             // 1----房间信息更新   2-----麦序信息更新
             // 3----更新房间信息和麦序信息(排麦模式)
             int type = (int) extension.get("type");
-            LogUtil.print("chatRoomInfoUpdate type =" + type);
+            LogUtils.d("chatRoomInfoUpdate type =" + type);
             if (type == 2) {
                 roomQueueMicUpdate(extension);
             } else if (type == 1) {
@@ -1608,7 +1609,7 @@ public final class IMNetEaseManager {
     private void roomInfoUpdate(Map<String, Object> extension) {
         String roomInfoStr = (String) extension.get("roomInfo");
         if (!TextUtils.isEmpty(roomInfoStr)) {
-            LogUtil.print(roomInfoStr);
+            LogUtils.d(roomInfoStr);
             RoomInfo roomInfo = gson.fromJson(roomInfoStr, RoomInfo.class);
             if (roomInfo != null) {
                 AvRoomDataManager.get().mCurrentRoomInfo = roomInfo;
@@ -1621,7 +1622,7 @@ public final class IMNetEaseManager {
         ChatRoomQueueChangeAttachment roomQueueChangeAttachment = (ChatRoomQueueChangeAttachment) msg.getAttachment();
         //麦上成员信息（uid...）  key:坑位 ，content:{"nick":"行走的老者","uid":90972,"gender":1,"avatar":"https://image.zhongjialx.com/Fmtbprx5cGc3KABKjDxs_udJZb3O?imageslim"}
         String content = roomQueueChangeAttachment.getContent();
-        LogUtil.print(content);
+        LogUtils.d(content);
         String key = roomQueueChangeAttachment.getKey();
         switch (roomQueueChangeAttachment.getChatRoomQueueChangeType()) {
             case DROP:

core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java

@@ -0,0 +1,124 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by Fernflower decompiler)
+//
+
+package com.yizhuan.xchat_android_core.utils;
+
+import android.util.Log;
+
+
+import com.yizhuan.xchat_android_core.BuildConfig;
+
+import java.util.Locale;
+
+public class LogUtils {
+    public static boolean DEBUG = BuildConfig.DEBUG;
+    private static final int INDEX = 4;
+
+    public LogUtils() {
+    }
+
+    private static String getPrefix() {
+        StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[4];
+        String className = stackTraceElement.getClassName();
+        int classNameStartIndex = className.lastIndexOf(".") + 1;
+        className = className.substring(classNameStartIndex);
+        String methodName = stackTraceElement.getMethodName();
+        int methodLine = stackTraceElement.getLineNumber();
+        String format = "%s-%s(L:%d)";
+        return String.format(Locale.CHINESE, format, className, methodName, methodLine);
+    }
+
+    public static void v(String content) {
+        if (DEBUG) {
+            Log.v(getPrefix(), content);
+        }
+
+    }
+
+    public static void v(String content, Throwable tr) {
+        if (DEBUG) {
+            Log.v(getPrefix(), content, tr);
+        }
+
+    }
+
+    public static void d(String content) {
+        if (DEBUG) {
+            Log.d(getPrefix(), content);
+        }
+
+    }
+
+    public static void d(String tag, String content) {
+        if (DEBUG) {
+            Log.d(tag, content);
+        }
+    }
+
+    public static void d(String content, Throwable tr) {
+        if (DEBUG) {
+            Log.d(getPrefix(), content, tr);
+        }
+
+    }
+
+    public static void i(String content) {
+        if (DEBUG) {
+            Log.i(getPrefix(), content);
+        }
+
+    }
+
+    public static void i(String content, Throwable tr) {
+        if (DEBUG) {
+            Log.i(getPrefix(), content, tr);
+        }
+
+    }
+
+    public static void w(String content) {
+        if (DEBUG) {
+            Log.e(getPrefix(), content);
+        }
+
+    }
+
+    public static void w(String content, Throwable tr) {
+        if (DEBUG) {
+            Log.w(getPrefix(), content, tr);
+        }
+
+    }
+
+    public static void e(String content) {
+        if (DEBUG) {
+            Log.e(getPrefix(), content);
+        }
+
+    }
+
+    public static void e(String content, Throwable tr) {
+        if (DEBUG) {
+            Log.e(getPrefix(), content, tr);
+        }
+
+    }
+
+    public static String showAllElementsInfo() {
+        String print = "";
+        int count = 0;
+        StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+        StackTraceElement[] var3 = stackTraceElements;
+        int var4 = stackTraceElements.length;
+
+        for(int var5 = 0; var5 < var4; ++var5) {
+            StackTraceElement stackTraceElement = var3[var5];
+            ++count;
+            print = print + String.format("ClassName:%s \nMethodName:%s \nMethodLine:%d \n当前是第%d个 \n---------------------------- \n ", stackTraceElement.getClassName(), stackTraceElement.getMethodName(), stackTraceElement.getLineNumber(), count);
+        }
+
+        return print;
+    }
+}