feat:调整部分模块包目录

core/build.gradle

@@ -30,7 +30,6 @@ android {
         main {
             java.srcDirs = [
                     'src/main/java',
-                    'src/diff_src_erban/java',
                     'src/model_smscode/java',
                     'src/model_public_chat_hall/java',
                     'src/model_pay/java',
@@ -45,7 +44,6 @@ android {
                     'src/model_treasure_box/java',
                     'src/model_community/java',
                     'src/model_channel_page/java'
-
             ]
             jniLibs.srcDirs = ['libs', 'umeng-app-libs/jniLibs']
         }

core/src/main/java/com/chwl/core/Constants.java

@@ -1,6 +1,5 @@
 package com.chwl.core;
 
-import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.chwl.library.common.application.Env;
 import com.chwl.library.utils.config.BasicConfig;
 import com.chwl.library.utils.pref.CommonPref;
@@ -14,9 +13,9 @@ import java.util.List;
  * Created by Administrator on 2017/11/9.
  */
 public class Constants {
-    public static final String ERBAN_DIR_NAME = XChatConstants.XCHAT_DIR_NAME;
+    public static final String ERBAN_DIR_NAME = XConstants.XCHAT_DIR_NAME;
     public static final String nimAppKey = Env.isDebug() ?
-            XChatConstants.getNimKeyDebug() : XChatConstants.getNimKeyRelease();
+            XConstants.getNimKeyDebug() : XConstants.getNimKeyRelease();
     public static final String nimAppSecret = "da03b83af84a";
     /**
      * 百度统计
@@ -91,14 +90,14 @@ public class Constants {
     public static final int CLIENT_ROLE_BROADCASTER = 1;
     public static final int CLIENT_ROLE_AUDIENCE = 2;
 
-    public static final int DRAGON_BAR_ID = XChatConstants.DRAGON_BALL_ID;
+    public static final int DRAGON_BAR_ID = XConstants.DRAGON_BALL_ID;
 
     public static final byte TYPE_JOINED = 1;
     public static final byte TYPE_RECOMMEND = 2;
     public static final byte TYPE_ALL = 0;
 
     public static final String WXPAY_REFERER = (BuildConfig.DEBUG && CommonPref.instance(BasicConfig.INSTANCE.getAppContext()).getInt(Env.KEY_ENVIRONMENT) == Env.EnvType.Debug.code) ?
-            XChatConstants.KEY_REFERER_DEBUG : XChatConstants.KEY_REFERER_RELEASE;
+            XConstants.KEY_REFERER_DEBUG : XConstants.KEY_REFERER_RELEASE;
 
     //相亲模式男神坑位下标
     public static final List<Integer> maleIndex = Arrays.asList(0, 1, 4, 5);

core/src/main/java/com/chwl/core/DemoCache.java

@@ -7,7 +7,6 @@ import androidx.annotation.Nullable;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.netease.nimlib.sdk.StatusBarNotificationConfig;
-import com.yizhuan.xchat_android_constants.XChatConstants;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.auth.entity.AccountInfo;
 import com.chwl.core.auth.entity.TicketInfo;
@@ -320,7 +319,7 @@ public class DemoCache {
         Map<String, Long> map = readKickOutRoom();
         if (map == null) map = new HashMap<>();
         for (Iterator<Map.Entry<String, Long>> it = map.entrySet().iterator(); it.hasNext(); ) {
-            if (CurrentTimeUtils.getCurrentTime() - it.next().getValue() > XChatConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME) {
+            if (CurrentTimeUtils.getCurrentTime() - it.next().getValue() > XConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME) {
                 it.remove();
             }
         }

core/src/main/java/com/chwl/core/XConstants.java

@@ -1,7 +1,5 @@
-package com.yizhuan.xchat_android_constants;
+package com.chwl.core;
 
-import com.chwl.core.BuildConfig;
-import com.chwl.core.R;
 import com.chwl.library.utils.ResUtil;
 import com.chwl.library.utils.codec.DESUtils;
 
@@ -9,7 +7,7 @@ import com.chwl.library.utils.codec.DESUtils;
  * Created by MadisonRong on 09/08/2018.
  */
 
-public class XChatConstants {
+public class XConstants {
 
     /**
      * 包名(各種緩存目錄的根目錄)

core/src/main/java/com/chwl/core/manager/AvRoomDataManager.java

@@ -23,7 +23,7 @@ import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
 import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
 import com.netease.nimlib.sdk.msg.constant.NotificationType;
 import com.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
 import com.chwl.core.DemoCache;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.bean.RoomQueueInfo;
@@ -1310,7 +1310,7 @@ public final class AvRoomDataManager {
     public boolean isLimitEnterRoom(String roomUid) {
         initKickOutRoomUids();
         Long limitTime = kickOutRoomUids.get(roomUid);
-        return limitTime != null && CurrentTimeUtils.getCurrentTime() - limitTime < XChatConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME;
+        return limitTime != null && CurrentTimeUtils.getCurrentTime() - limitTime < XConstants.KICK_OUT_ROOM_LIMIT_ENTER_TIME;
     }
 
     public void addCurrentRoomLimitEnter() {

core/src/main/java/com/chwl/core/manager/IMNetEaseManager.java

@@ -1,6 +1,6 @@
 package com.chwl.core.manager;
 
-import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION;
+import static com.chwl.core.XConstants.SELECT_ANIM_DURATION;
 import static com.chwl.core.im.custom.bean.CustomAttachment.*;
 
 import android.annotation.SuppressLint;
@@ -59,7 +59,7 @@ import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption;
 import com.netease.nimlib.sdk.util.Entry;
 import com.netease.nimlib.sdk.util.api.RequestResult;
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
 import com.chwl.core.BuildConfig;
 import com.chwl.core.Constants;
 import com.chwl.core.R;
@@ -99,7 +99,6 @@ import com.chwl.core.im.custom.bean.MonsterHuntingResultAttachment;
 import com.chwl.core.im.custom.bean.MonsterStatusAttachment;
 import com.chwl.core.im.custom.bean.MultiGiftAttachment;
 import com.chwl.core.im.custom.bean.NobleAttachment;
-import com.chwl.core.im.custom.bean.RedPackageAttachment;
 import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment;
 import com.chwl.core.im.custom.bean.RoomFreeGiftAttachment;
 import com.chwl.core.im.custom.bean.RoomFreeGiftMsgBean;
@@ -1787,7 +1786,7 @@ public final class IMNetEaseManager {
     }
 
     public ChatRoomMessage getFirstMessageContent() {
-        String content = XChatConstants.MESSAGE_VIEW_FIRST_MSG;
+        String content = XConstants.MESSAGE_VIEW_FIRST_MSG;
         ChatRoomMessage message = ChatRoomMessageBuilder.createTipMessage(content);
         message.setContent(content);
         return message;
@@ -1953,7 +1952,7 @@ public final class IMNetEaseManager {
             atProxy.reset();
         }
         NIMAntiSpamOption antiSpamOption = new NIMAntiSpamOption();
-        antiSpamOption.antiSpamConfigId = XChatConstants.CHAT_ROOM_ANTI_SPAM_CONFIG_ID;
+        antiSpamOption.antiSpamConfigId = XConstants.CHAT_ROOM_ANTI_SPAM_CONFIG_ID;
         chatRoomMessage.setNIMAntiSpamOption(antiSpamOption);
         if (AntiSpamUtil.checkLocalAntiSpam(chatRoomMessage)) {
             EventBus.getDefault().post(new AntiSpamEvent());
@@ -2774,7 +2773,7 @@ public final class IMNetEaseManager {
                             public Publisher<?> apply(Throwable throwable) throws Exception {
                                 String error = throwable.getMessage();
                                 if (TextUtils.isEmpty(error)) {
-                                    error = XChatConstants.UNKOWN_ERROR;
+                                    error = XConstants.UNKOWN_ERROR;
                                 }
                                 if (listener != null) {
                                     listener.onFailed(retryChatRoomMessage.getRetryCount(), error);
@@ -3507,7 +3506,7 @@ public final class IMNetEaseManager {
                     addMessagesImmediately(message);
                 }
 
-                content = XChatConstants.ROOM_INTRODUCTION;
+                content = XConstants.ROOM_INTRODUCTION;
                 message = ChatRoomMessageBuilder.createTipMessage(content);
                 message.setContent(content);
                 addMessagesImmediately(message);

core/src/main/java/com/chwl/core/manager/agora/RtcEngineManager.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.orhanobut.logger.Logger;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
 import com.chwl.core.manager.BaseEngine;
 import com.chwl.core.music.db.bean.LocalMusicBean;
 import com.chwl.core.music.model.PlayerModel;
@@ -55,7 +55,7 @@ public class RtcEngineManager extends BaseEngine {
         Logger.t(TAG).d("enterChannel channelId:%d", channelId);
         if (mRtcEngine == null) {
             try {
-                mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.getAgoraKey(), mEngineEventHandler);
+                mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XConstants.getAgoraKey(), mEngineEventHandler);
             } catch (Exception e) {
                 throw new RuntimeException(
                         "NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));

core/src/main/java/com/chwl/core/pay/PayModel.java

@@ -6,7 +6,7 @@ import android.content.Context;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonObject;
-import com.yizhuan.xchat_android_constants.XChatConstants;
+import com.chwl.core.XConstants;
 import com.chwl.core.R;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.base.BaseModel;
@@ -463,7 +463,7 @@ public class PayModel extends BaseModel implements IPayModel {
                     if (result.isSuccess()) {
                         return Single.just(result.getData() == null ? "" : result.getData());
                     }
-                    if (result.getCode() == XChatConstants.CODE_IGNORE_TOAST) {
+                    if (result.getCode() == XConstants.CODE_IGNORE_TOAST) {
                         return Single.error(new IgnoreException(ResUtil.getString(R.string.xchat_android_core_pay_paymodel_03)));
                     }
                     return Single.error(new Throwable(result.getMessage()));

core/src/main/java/com/chwl/core/share/ShareModel.java

@@ -1,18 +1,10 @@
 package com.chwl.core.share;
 
 import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.util.Log;
 
-import com.netease.nim.uikit.common.util.sys.ClipboardUtil;
 import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 import com.chwl.core.R;
-import com.yizhuan.xchat_android_constants.XChatConstants;
-import com.chwl.core.UriProvider;
-import com.chwl.core.auth.AuthModel;
 import com.chwl.core.base.BaseModel;
 import com.chwl.core.bean.response.result.ShareRedPacketResult;
 import com.chwl.core.im.custom.bean.CustomAttachment;
@@ -23,22 +15,16 @@ import com.chwl.core.room.bean.RoomInfo;
 import com.chwl.core.share.bean.ShareCommonInfo;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.user.bean.UserInfo;
-import com.chwl.core.utils.Logger;
 import com.chwl.core.web.bean.WebJsBeanInfo;
 import com.chwl.library.net.rxnet.RxNet;
 import com.chwl.library.utils.ResUtil;
 import com.chwl.library.utils.SingleToastUtil;
 
-import java.net.URLEncoder;
-import java.util.HashMap;
-
 import cn.sharesdk.framework.Platform;
 import io.reactivex.Single;
 import io.reactivex.SingleEmitter;
 import io.reactivex.SingleOnSubscribe;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.functions.Consumer;
-import io.reactivex.schedulers.Schedulers;
 import retrofit2.http.POST;
 import retrofit2.http.Query;