From 357393d5ccceca45cf544fa84d65f21bf6a39d45 Mon Sep 17 00:00:00 2001 From: huangjian Date: Mon, 19 Sep 2022 19:01:18 +0800 Subject: [PATCH] =?UTF-8?q?SuperAdmin=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0=E6=AD=A3=E7=A1=AE=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mango/core/super_admin}/SaConstant.java | 0 .../mango/core/super_admin}/SuperAdminDataMrg.java | 8 ++++---- .../super_admin}/attachment/SuperAdminOpAttachment.java | 0 .../mango/core/super_admin}/bean/KickOutExtBean.java | 0 .../mango/core/super_admin}/bean/SaOpInfo.java | 0 .../mango/core/super_admin}/model/ISuperAdminModel.java | 0 .../mango/core/super_admin}/model/SuperAdminModel.java | 0 .../model/exception/SAdminCannotGameException.java | 0 .../mango/core/super_admin}/util/SAdminOptUtil.java | 4 ++-- .../mango/core/super_admin}/util/SaAttachmentFactory.java | 4 ++-- .../mango/core/super_admin}/util/SaMsgUtil.java | 0 .../mango/core/super_admin}/util/SuperAdminUtil.java | 6 +++--- 12 files changed, 11 insertions(+), 11 deletions(-) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/SaConstant.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/SuperAdminDataMrg.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/attachment/SuperAdminOpAttachment.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/bean/KickOutExtBean.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/bean/SaOpInfo.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/model/ISuperAdminModel.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/model/SuperAdminModel.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/model/exception/SAdminCannotGameException.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/util/SAdminOptUtil.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/util/SaAttachmentFactory.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/util/SaMsgUtil.java (100%) rename core/src/model_super_admin/java/{com.yizhuan.xchat_android_core.super_admin => com/mango/core/super_admin}/util/SuperAdminUtil.java (100%) diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java b/core/src/model_super_admin/java/com/mango/core/super_admin/SaConstant.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/SaConstant.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java b/core/src/model_super_admin/java/com/mango/core/super_admin/SuperAdminDataMrg.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/SuperAdminDataMrg.java index 3fdd539e1..d65f6a038 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java +++ b/core/src/model_super_admin/java/com/mango/core/super_admin/SuperAdminDataMrg.java @@ -3,10 +3,6 @@ package com.mango.core.super_admin; import android.annotation.SuppressLint; import android.text.TextUtils; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.mango.core.manager.AvRoomDataManager; import com.mango.core.room.model.AvRoomModel; import com.mango.core.room.model.RoomBaseModel; @@ -14,6 +10,10 @@ import com.mango.core.super_admin.util.SuperAdminUtil; import com.mango.core.utils.ExtensionUtil; import com.mango.core.utils.net.DontWarnObserver; import com.mango.xchat_android_library.utils.ListUtils; +import com.netease.nim.uikit.common.util.log.LogUtil; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import java.util.ArrayList; import java.util.List; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java b/core/src/model_super_admin/java/com/mango/core/super_admin/attachment/SuperAdminOpAttachment.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/attachment/SuperAdminOpAttachment.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java b/core/src/model_super_admin/java/com/mango/core/super_admin/bean/KickOutExtBean.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/bean/KickOutExtBean.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java b/core/src/model_super_admin/java/com/mango/core/super_admin/bean/SaOpInfo.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/bean/SaOpInfo.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java b/core/src/model_super_admin/java/com/mango/core/super_admin/model/ISuperAdminModel.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/model/ISuperAdminModel.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java b/core/src/model_super_admin/java/com/mango/core/super_admin/model/SuperAdminModel.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/model/SuperAdminModel.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java b/core/src/model_super_admin/java/com/mango/core/super_admin/model/exception/SAdminCannotGameException.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/model/exception/SAdminCannotGameException.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SAdminOptUtil.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/util/SAdminOptUtil.java index 83c0300df..e5cc0a896 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java +++ b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SAdminOptUtil.java @@ -1,7 +1,5 @@ package com.mango.core.super_admin.util; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.mango.core.auth.AuthModel; import com.mango.core.kick.KickModel; import com.mango.core.manager.AvRoomDataManager; @@ -11,6 +9,8 @@ import com.mango.core.super_admin.bean.KickOutExtBean; import com.mango.core.utils.net.DontWarnObserver; import com.mango.xchat_android_library.utils.JavaUtil; import com.mango.xchat_android_library.utils.SingleToastUtil; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import java.util.Map; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SaAttachmentFactory.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/util/SaAttachmentFactory.java index 7095a30b0..1a53467d7 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java +++ b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SaAttachmentFactory.java @@ -1,13 +1,13 @@ package com.mango.core.super_admin.util; -import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.mango.core.auth.AuthModel; import com.mango.core.im.custom.bean.CustomAttachment; import com.mango.core.manager.AvRoomDataManager; import com.mango.core.super_admin.attachment.SuperAdminOpAttachment; import com.mango.core.super_admin.bean.SaOpInfo; import com.mango.core.user.UserModel; +import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; /** * create by lvzebiao @2019/8/22 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SaMsgUtil.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/util/SaMsgUtil.java diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SuperAdminUtil.java similarity index 100% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java rename to core/src/model_super_admin/java/com/mango/core/super_admin/util/SuperAdminUtil.java index 642c035e2..21dd6f657 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java +++ b/core/src/model_super_admin/java/com/mango/core/super_admin/util/SuperAdminUtil.java @@ -2,12 +2,12 @@ package com.mango.core.super_admin.util; import android.text.TextUtils; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.mango.core.user.UserModel; import com.mango.core.user.bean.UserInfo; import com.mango.core.utils.ExtensionUtil; +import com.netease.nim.uikit.common.util.log.LogUtil; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; +import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import java.util.Map;