影响打包的同名类调整 - Utils.java

2023-11-29 07:19:09 +08:00
parent 6b98da175d
commit 07417877f7
36 changed files with 36 additions and 443 deletions
--- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
+++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java
@@ -72,7 +72,7 @@ import com.chwl.app.avroom.redpackage.RedPackageHandler;
 import com.chwl.app.avroom.view.IAvRoomView;
 import com.chwl.app.avroom.widget.VerticalViewPagerAdapter;
 import com.chwl.app.base.BaseMvpActivity;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.common.widget.CircleImageView;
 import com.chwl.app.common.widget.CustomImageSpan;
 import com.chwl.app.common.widget.dialog.DialogManager;
--- a/app/src/main/java/com/chwl/app/avroom/activity/RecordForPKActivity.java
+++ b/app/src/main/java/com/chwl/app/avroom/activity/RecordForPKActivity.java
@@ -16,7 +16,7 @@ import com.chwl.app.avroom.adapter.RecordForPKAdapter;
 import com.chwl.app.avroom.presenter.RecordForPKPresenter;
 import com.chwl.app.avroom.view.IRecordForPKView;
 import com.chwl.app.base.BaseMvpActivity;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
 import com.chwl.core.room.pk.bean.PKRecordInfo;
 import com.chwl.library.base.factory.CreatePresenter;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/MicQueueDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/MicQueueDialog.java
@@ -23,7 +23,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.chwl.app.R;
 import com.chwl.app.avroom.adapter.MicQueueAdapter;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.home.helper.LoadPageDataHelper;
 import com.chwl.app.ui.widget.dialog.BaseDialog;
 import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/PKMicQueueDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKMicQueueDialog.java
@@ -25,7 +25,7 @@ import com.chwl.app.avroom.adapter.PKMicQueueAdapter;
 import com.chwl.app.home.helper.LoadPageDataHelper;
 import com.chwl.app.ui.widget.dialog.BaseDialog;
 import com.chwl.app.ui.widget.dialog.CommonLoadingDialog;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
 import com.chwl.core.Constants;
 import com.chwl.core.auth.AuthModel;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/PKResultDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKResultDialog.java
@@ -21,7 +21,7 @@ import com.netease.nim.uikit.support.glide.GlideApp;
 import com.chwl.app.R;
 import com.chwl.app.common.widget.CircleImageView;
 import com.chwl.app.ui.widget.dialog.BaseDialog;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.room.pk.bean.PKTeamInfo;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/PKSelectPeopleDialog.java
@@ -18,7 +18,7 @@ import com.netease.nim.uikit.support.glide.GlideApp;
 import com.chwl.app.R;
 import com.chwl.app.common.widget.CircleImageView;
 import com.chwl.app.ui.widget.dialog.BaseDialog;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.core.bean.RoomQueueInfo;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.room.pk.bean.PKMemberInfo;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomImposeDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomImposeDialog.java
@@ -19,7 +19,7 @@ import com.chwl.app.avroom.activity.CpRoomInviteActivity;
 import com.chwl.app.avroom.widget.EditRoomTitleDialog;
 import com.chwl.app.databinding.DialogRoomImposeBinding;
 import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.core.auth.AuthModel;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.room.bean.RoomInfo;
--- a/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java
+++ b/app/src/main/java/com/chwl/app/avroom/dialog/RoomOperationDialog.java
@@ -26,7 +26,7 @@ import com.chwl.app.avroom.anotherroompk.RoomPKCreateActivity;
 import com.chwl.app.avroom.giftvalue.GiftValueDialogUiHelper;
 import com.chwl.app.avroom.room_album.RoomAlbumActivity;
 import com.chwl.app.avroom.singleroompk.SingleRoomPKCreateActivity;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.common.widget.dialog.DialogManager;
 import com.chwl.app.ui.widget.ButtonItem;
 import com.chwl.app.ui.widget.recyclerview.decoration.ColorDecoration;
--- a/app/src/main/java/com/chwl/app/avroom/redpackage/send/TabIndicatorAdapter.java
+++ b/app/src/main/java/com/chwl/app/avroom/redpackage/send/TabIndicatorAdapter.java
@@ -9,7 +9,7 @@ import android.widget.FrameLayout;
 import androidx.appcompat.widget.AppCompatTextView;

 import com.chwl.app.R;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
--- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java
@@ -75,7 +75,7 @@ import com.chwl.app.UIHelper;
 import com.chwl.app.avroom.activity.AVRoomActivity;
 import com.chwl.app.avroom.dialog.PKResultDialog;
 import com.chwl.app.avroom.room_album.UnlockRoomAlbumPhotoDialog;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.common.widget.CustomAutoWidthImageSpan;
 import com.chwl.app.common.widget.CustomImageSpan;
 import com.chwl.app.common.widget.OriginalDrawStatusClickSpan;
--- a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java
+++ b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java
@@ -10,7 +10,7 @@ import com.chwl.app.R;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;

 import java.util.List;

--- a/app/src/main/java/com/chwl/app/common/util/DialogFragmentUtils.java
+++ b/app/src/main/java/com/chwl/app/common/util/DialogFragmentUtils.java
@@ -1,227 +0,0 @@
-package com.chwl.app.common.util;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-
-import com.chwl.app.base.BaseActivity;
-import com.chwl.core.utils.CoreLogger;
-
-import java.util.List;
-
-import com.chwl.library.common.base.BaseDialogFragment;
-import com.chwl.library.common.util.ActivityHelper;
-import com.chwl.library.common.util.ReflectionUtils;
-
-
-/**
- * User: wukai
- * Date: 2017/04/06
- * Description:
- */
-public class DialogFragmentUtils {
-
-    private static final String TAG = "DialogFragmentUtils";
-
-    public static final String KEY_DIALOG_TAG = "dialog_tag";
-    private static int mFragmentIndex = 0;
-
-    public static String getFragmentTag(String tag, boolean appendIndexTag) {
-        if (appendIndexTag) {
-            return String.format("%s_%d", tag, mFragmentIndex++);
-        }
-        return tag;
-    }
-
-    public static String getTag(Bundle bundle) {
-        return bundle.getString(KEY_DIALOG_TAG);
-    }
-
-    public static boolean isShowing(String fragmentTag, Activity activity) {
-        if (activity == null) {
-            CoreLogger.debug(TAG, "check isShowing  activity is null return");
-            return false;
-        }
-        if (activity.isFinishing()) {
-            CoreLogger.debug(TAG, "check isShowing  activity isFinishing return");
-            return false;
-        }
-
-        if (activity.isDestroyed()) {
-            CoreLogger.debug(TAG, "check isShowing activity is isDestroyed");
-            return false;
-        }
-
-        if (!(activity instanceof BaseActivity)) {
-            CoreLogger.error(TAG, "check isShowing activity fail, activity is not BaseActivity");
-            return false;
-        }
-
-        FragmentManager fragmentManager = ((BaseActivity) activity).getSupportFragmentManager();
-
-        Fragment fragmentByTag = fragmentManager.findFragmentByTag(fragmentTag);
-        if (fragmentByTag == null) {
-            return false;
-        }
-
-        if (fragmentByTag instanceof DialogFragment) {
-            DialogFragment dialogFragment = (DialogFragment) fragmentByTag;
-            return dialogFragment.getDialog() != null && dialogFragment.getDialog().isShowing();
-        } else return fragmentByTag.isVisible();
-
-    }
-
-    public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz, Bundle bundle, boolean appendIndexTag) {
-        try {
-            BaseDialogFragment baseDialogFragment = clazz.newInstance();
-            return show(fragmentTag, activity, baseDialogFragment, bundle, appendIndexTag);
-        } catch (Exception e1) {
-            CoreLogger.error(TAG, String.valueOf(e1));
-        }
-        return null;
-    }
-
-    public static BaseDialogFragment show(String fragmentTag, Activity activity, BaseDialogFragment baseDialogFragment, Bundle bundle, boolean appendIndexTag) {
-        if (TextUtils.isEmpty(fragmentTag)) {
-            CoreLogger.error(TAG, "show dialog failure, fragmentTag = null");
-            return null;
-        }
-
-        if (!ActivityHelper.isCanUse(activity)) {
-            CoreLogger.error(TAG, "show dialog failure, activity is not can use");
-            return null;
-        }
-
-        if (!(activity instanceof BaseActivity)) {
-            CoreLogger.error(TAG, "show dialog activity fail, activity is not BaseActivity");
-            return null;
-        }
-
-        FragmentManager fragmentManager = ((BaseActivity) activity).getSupportFragmentManager();
-
-        if (bundle == null) {
-            bundle = new Bundle();
-        }
-
-        String newFragmentTag = DialogFragmentUtils.getFragmentTag(fragmentTag, appendIndexTag);
-        CoreLogger.debug(TAG, "showDialog: " + newFragmentTag);
-
-        Fragment fragment = fragmentManager.findFragmentByTag(newFragmentTag);
-        if (fragment == null) {
-            bundle.putString(KEY_DIALOG_TAG, newFragmentTag);
-            baseDialogFragment.setArguments(bundle);
-        } else {
-            if (ActivityHelper.isCanUse(activity)) {
-                baseDialogFragment = ((BaseDialogFragment) fragment);
-                baseDialogFragment.dismissAllowingStateLoss();
-            }
-        }
-
-        if (ActivityHelper.isCanUse(activity) && baseDialogFragment != null) {
-            try {
-                doShow(fragmentManager, baseDialogFragment, newFragmentTag);
-            } catch (Exception e) {
-                CoreLogger.error(TAG, String.valueOf(e));
-            }
-        } else {
-            return null;
-        }
-        return baseDialogFragment;
-    }
-
-
-    public static void doShow(final FragmentManager fragmentManager, final BaseDialogFragment dialogFragment, final String tag) {
-        PauseWorkerHandler.instance().post(new Runnable() {
-            @Override
-            public void run() {
-                if (!fragmentManager.isStateSaved()) {  // 保证只有在activity存在的时候弹出dialog，防止崩溃
-                    // Fix 快速显示同一个弹窗报 Fragment already added: 异常
-                    if (isInvokeShow(dialogFragment)) {
-                        CoreLogger.error(TAG, "Already has fragment=" + dialogFragment.getTag());
-                        return;
-                    }
-                    dialogFragment.show(fragmentManager, tag);
-                }
-            }
-        });
-    }
-
-    public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz, Bundle bundle) {
-        return show(fragmentTag, activity, clazz, bundle, true);
-    }
-
-    public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz) {
-        return show(fragmentTag, activity, clazz, null, true);
-    }
-
-    public static void dismiss(String fragmentTag, Activity activity) {
-        if (TextUtils.isEmpty(fragmentTag)) {
-            CoreLogger.error(TAG, "dismiss dialog failure, fragmentTag = null");
-            return;
-        }
-        if (activity == null) {
-            CoreLogger.error(TAG, "dismiss %s dialog failure, Activity = null, tag=" + fragmentTag);
-            return;
-        }
-        if (activity.isFinishing()) {
-            CoreLogger.error(TAG, "dismiss %s dialog failure, Activity is finish, tag=" + fragmentTag);
-            return;
-        }
-        if (activity.isDestroyed()) {
-            CoreLogger.error(TAG, "dismiss %s dialog failure, Activity is null, tag=" + fragmentTag);
-            return;
-        }
-        if (!(activity instanceof BaseActivity)) {
-            CoreLogger.error(TAG, "dismiss %s dialog failure, Activity is not BaseActivity, tag=" + fragmentTag);
-            return;
-        }
-        FragmentManager manager = ((BaseActivity) activity).getSupportFragmentManager();
-        Utils.executePendingTransactionsSafely(fragmentTag, manager);
-        Fragment fragment = manager.findFragmentByTag(fragmentTag);
-        if (fragment == null) {
-            CoreLogger.error(TAG, "dismiss %s dialog failure, Fragment = null, tag="+fragmentTag);
-            tryCleanDialogFragment(fragmentTag, manager);
-        } else {
-            CoreLogger.debug(TAG, "closeDialog=" + fragmentTag);
-            ((DialogFragment) fragment).dismissAllowingStateLoss();
-        }
-    }
-
-    public static void tryCleanDialogFragment(String fragmentTag, FragmentManager fragmentManager) {
-        List<Fragment> fragmentList = fragmentManager.getFragments();
-        int sizeChildFrgList = fragmentList.size();
-        for (int i = sizeChildFrgList - 1; i >= 0; i--) {
-            Fragment brotherFragment = fragmentList.get(i);
-            if (brotherFragment == null) {
-                continue;
-            }
-            Bundle arguments = brotherFragment.getArguments();
-            if (arguments == null) {
-                continue;
-            }
-            String findTag = getTag(arguments);
-            if (!TextUtils.isEmpty(findTag) &&
-                    brotherFragment instanceof DialogFragment && findTag.equals(fragmentTag)) {
-                CoreLogger.debug(TAG, "closeDialog " + fragmentTag + "by tryCleanDialogFragment");
-                ((DialogFragment) brotherFragment).dismissAllowingStateLoss();
-                break;
-            }
-        }
-    }
-
-    private static boolean isInvokeShow(DialogFragment dialogFragment) {
-        Object value = ReflectionUtils.getFieldValue(dialogFragment, "mShownByMe");
-        if (value == null) {
-            CoreLogger.error(TAG, "isInvokeShow value is null");
-            return false;
-        }
-        boolean isShown = (boolean) value;
-        CoreLogger.debug(TAG, "isInvokeShow isShown=" + isShown);
-        return isShown;
-    }
-
-}
--- a/app/src/main/java/com/chwl/app/common/util/Utils.java
+++ b/app/src/main/java/com/chwl/app/common/util/Utils.java
@@ -1,180 +0,0 @@
-package com.chwl.app.common.util;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.WindowManager;
-
-import androidx.fragment.app.FragmentManager;
-
-import com.chwl.core.utils.CoreLogger;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
-/**
- * author: wushaocheng
- * time: 2022/11/15
- * desc: 转换帮助类
- */
-public class Utils {
-
-    public static <T> boolean notEmpty(List<T> list) {
-        return !isEmpty(list);
-    }
-
-    public static <T> boolean isEmpty(List<T> list) {
-        if (list == null || list.size() == 0) {
-            return true;
-        }
-        return false;
-    }
-
-    public static int getNavigationBarHeight(Context context) {
-        int statusBarHeight = 0;
-        int resourceId = context.getResources().getIdentifier("config_showNavigationBar", "bool", "android");
-        if (resourceId != 0) {
-            resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
-            //根据资源ID获取响应的尺寸值
-            statusBarHeight = context.getResources().getDimensionPixelSize(resourceId);
-        }
-        return statusBarHeight;
-    }
-
-
-    /**
-     * 判断底部navigator是否已经显示
-     */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    public static boolean hasSoftKeys(Context context) {
-        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display d = windowManager.getDefaultDisplay();
-
-
-        DisplayMetrics realDisplayMetrics = new DisplayMetrics();
-        d.getRealMetrics(realDisplayMetrics);
-
-
-        int realHeight = realDisplayMetrics.heightPixels;
-        int realWidth = realDisplayMetrics.widthPixels;
-
-
-        DisplayMetrics displayMetrics = new DisplayMetrics();
-        d.getMetrics(displayMetrics);
-
-
-        int displayHeight = displayMetrics.heightPixels;
-        int displayWidth = displayMetrics.widthPixels;
-
-
-        return (realWidth - displayWidth) > 0 || (realHeight - displayHeight) > 0;
-    }
-
-    // 将px值转换为dip或dp值
-    public static int px2dip(Context context, float pxValue) {
-        final float scale = context.getResources().getDisplayMetrics().density;
-        return (int) (pxValue / scale + 0.5f);
-    }
-
-    // 将dip或dp值转换为px值
-    public static int dip2px(Context context, float dipValue) {
-        final float scale = context.getResources().getDisplayMetrics().density;
-        return (int) (dipValue * scale + 0.5f);
-    }
-
-    // 将px值转换为sp值
-    public static int px2sp(Context context, float pxValue) {
-        final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
-        return (int) (pxValue / fontScale + 0.5f);
-    }
-
-    // 将sp值转换为px值
-    public static int sp2px(Context context, float spValue) {
-        final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
-        return (int) (spValue * fontScale + 0.5f);
-    }
-
-    // 屏幕宽度（像素）
-    public static int getWindowWidth(Context context) {
-        DisplayMetrics dm = context.getApplicationContext().getResources().getDisplayMetrics();
-        return dm.widthPixels;
-    }
-
-    // 屏幕高度（像素）
-    public static int getWindowHeight(Context context) {
-        DisplayMetrics dm = context.getApplicationContext().getResources().getDisplayMetrics();
-        return dm.heightPixels;
-    }
-
-    // 根据Unicode编码判断中文汉字和符号
-    private static boolean isChinese(char c) {
-        Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
-        if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
-                || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B
-                || ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
-                || ub == Character.UnicodeBlock.GENERAL_PUNCTUATION) {
-            return true;
-        }
-        return false;
-    }
-
-    // 判断中文汉字和符号
-    public static boolean isChinese(String strName) {
-        char[] ch = strName.toCharArray();
-        for (int i = 0; i < ch.length; i++) {
-            char c = ch[i];
-            if (isChinese(c)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static int getScreenPxWidth(Context context) {
-        WindowManager wm = (WindowManager) context
-                .getSystemService(Context.WINDOW_SERVICE);
-        DisplayMetrics outMetrics = new DisplayMetrics();
-        wm.getDefaultDisplay().getMetrics(outMetrics);
-        return outMetrics.widthPixels;
-    }
-
-    public static int getScreenDpWidth(Context context) {
-        int pxWidth = getScreenPxWidth(context);
-        return (int) px2dip(context, pxWidth);
-    }
-
-    public static int getScreenPxHeight(Context context) {
-        WindowManager wm = (WindowManager) context
-                .getSystemService(Context.WINDOW_SERVICE);
-        DisplayMetrics outMetrics = new DisplayMetrics();
-        wm.getDefaultDisplay().getMetrics(outMetrics);
-        return outMetrics.heightPixels;
-    }
-
-    public static int getScreenDpHeight(Context context) {
-        int pxHeight = getScreenPxHeight(context);
-        return (int) px2dip(context, pxHeight);
-    }
-
-    public static void executePendingTransactionsSafely(String TAG, FragmentManager fragmentManager) {
-        if (fragmentManager == null) {
-            CoreLogger.error(TAG, "executePendingTransactionsSafely fragmentManager == null");
-            return;
-        }
-        try {
-            fragmentManager.executePendingTransactions();
-        } catch (Exception e) {
-            CoreLogger.error(TAG, String.valueOf(e));
-            try {
-                Field mExecutingActions = fragmentManager.getClass().getDeclaredField("mExecutingActions");
-                mExecutingActions.setAccessible(true);
-                mExecutingActions.set(fragmentManager, false);
-            } catch (Exception e1) {
-                CoreLogger.error(TAG, "set field value fail", e1);
-            }
-        }
-    }
-
-}
--- a/app/src/main/java/com/chwl/app/common/widget/CircleImageSpan.java
+++ b/app/src/main/java/com/chwl/app/common/widget/CircleImageSpan.java
@@ -15,7 +15,7 @@ import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.gift.widget.GlideCircleTransform;
 import com.chwl.library.utils.config.BasicConfig;

--- a/app/src/main/java/com/chwl/app/common/widget/CustomAutoWidthImageSpan.java
+++ b/app/src/main/java/com/chwl/app/common/widget/CustomAutoWidthImageSpan.java
@@ -16,7 +16,7 @@ import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.library.utils.config.BasicConfig;

 import java.lang.ref.WeakReference;
--- a/app/src/main/java/com/chwl/app/common/widget/CustomImageSpan.java
+++ b/app/src/main/java/com/chwl/app/common/widget/CustomImageSpan.java
@@ -19,7 +19,7 @@ import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
 import com.chwl.library.utils.SizeUtils;
 import com.chwl.library.utils.config.BasicConfig;
--- a/app/src/main/java/com/chwl/app/common/widget/dialog/CommonPopupDialog.java
+++ b/app/src/main/java/com/chwl/app/common/widget/dialog/CommonPopupDialog.java
@@ -16,7 +16,7 @@ import android.widget.TextView;
 import com.example.lib_core.component.SuperBottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.chwl.app.R;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.ButtonItem;

 import java.util.List;
--- a/app/src/main/java/com/chwl/app/family/view/activity/FamilyHomeActivity.java
+++ b/app/src/main/java/com/chwl/app/family/view/activity/FamilyHomeActivity.java
@@ -24,7 +24,7 @@ import com.trello.rxlifecycle3.android.ActivityEvent;
 import com.chwl.app.R;
 import com.chwl.app.base.BaseMvpActivity;
 import com.chwl.app.base.TitleBar;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.common.widget.CircleImageView;
 import com.chwl.app.constants.BundleKeys;
 import com.chwl.app.family.presenter.FamilyHomePresenter;
--- a/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberAdapter.java
+++ b/app/src/main/java/com/chwl/app/family/view/adapter/FamilyMemberAdapter.java
@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.chwl.app.R;
 import com.chwl.app.common.widget.CircleImageView;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.core.family.bean.FamilyMemberInfo;

 import java.util.List;
--- a/app/src/main/java/com/chwl/app/home/activity/NewUserListActivity.java
+++ b/app/src/main/java/com/chwl/app/home/activity/NewUserListActivity.java
@@ -14,7 +14,7 @@ import com.chwl.app.base.BaseMvpActivity;
 import com.chwl.app.home.adapter.FindNewUserListAdapter;
 import com.chwl.app.home.presenter.NewUserListPresenter;
 import com.chwl.app.home.view.INewUserListActivityView;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.ui.widget.recyclerview.decoration.SpacingDecoration;
 import com.chwl.core.user.bean.UserInfo;
 import com.chwl.library.base.factory.CreatePresenter;
--- a/app/src/main/java/com/chwl/app/home/adapter/ContactsIndicatorAdapter.java
+++ b/app/src/main/java/com/chwl/app/home/adapter/ContactsIndicatorAdapter.java
@@ -14,7 +14,7 @@ import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.Common
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
 import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;

 import java.util.List;

--- a/app/src/main/java/com/chwl/app/ui/anim/FlowFaceDrawable.java
+++ b/app/src/main/java/com/chwl/app/ui/anim/FlowFaceDrawable.java
@@ -15,7 +15,7 @@ import androidx.annotation.Nullable;

 import com.bumptech.glide.request.FutureTarget;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/chwl/app/ui/anim/OverlayFaceDrawable.java
+++ b/app/src/main/java/com/chwl/app/ui/anim/OverlayFaceDrawable.java
@@ -15,7 +15,7 @@ import androidx.annotation.Nullable;

 import com.bumptech.glide.request.FutureTarget;
 import com.netease.nim.uikit.support.glide.GlideApp;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/com/chwl/app/ui/praise/HPUtils.java
+++ b/app/src/main/java/com/chwl/app/ui/praise/HPUtils.java
@@ -2,10 +2,10 @@ package com.chwl.app.ui.praise;

 import java.util.Random;

-public class Utils {
+public class HPUtils {
    private static final Random RANDOM = new Random();

-    private Utils() {
+    private HPUtils() {
    }

    public static int rondomRange(int max, int min) {
--- a/app/src/main/java/com/chwl/app/ui/praise/HiPraise.java
+++ b/app/src/main/java/com/chwl/app/ui/praise/HiPraise.java
@@ -20,7 +20,7 @@ public class HiPraise implements IPraise {
        final int maxDuration = 2500;
        final int minDuration = 2000;
        int minDelayAlphaTime = minDuration / 4;
-        duration = Utils.rondomRange(maxDuration, minDuration);
+        duration = HPUtils.rondomRange(maxDuration, minDuration);
        delayAplhaTime = new Random().nextInt((int) duration)
                % (duration - minDelayAlphaTime + 1) + minDelayAlphaTime;
    }
--- a/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
+++ b/app/src/main/java/com/chwl/app/ui/user/activity/UserInfoModifyActivity.kt
@@ -32,7 +32,7 @@ import com.chwl.app.application.App
 import com.chwl.app.audio.SoundSignatureActivity
 import com.chwl.app.base.BaseViewBindingActivity
 import com.chwl.app.common.util.BitmapUtil
-import com.chwl.app.common.util.Utils
+import com.chwl.library.common.util.Utils
 import com.chwl.app.databinding.ActivityUserInfoModifyBinding
 import com.chwl.app.ui.login.ModifyInfoActivity
 import com.chwl.app.ui.user.adapter.UserInfoLabelAdapter
--- a/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceDialog.java
+++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceDialog.java
@@ -19,7 +19,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.chwl.app.R;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.common.widget.dialog.DialogManager;
 import com.chwl.app.vip.VipMainActivity;
 import com.chwl.core.market_verify.MarketVerifyModel;
--- a/app/src/main/java/com/chwl/app/ui/widget/marqueeview/MarqueeView.java
+++ b/app/src/main/java/com/chwl/app/ui/widget/marqueeview/MarqueeView.java
@@ -16,7 +16,7 @@ import android.widget.ViewFlipper;
 import androidx.annotation.AnimRes;

 import com.chwl.app.R;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ExchangePermissionActivity.kt
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/ExchangePermissionActivity.kt
@@ -8,7 +8,7 @@ import androidx.core.content.ContextCompat
 import com.netease.nim.uikit.StatusBarUtil
 import com.chwl.app.R
 import com.chwl.app.base.BaseViewBindingActivity
-import com.chwl.app.common.util.Utils
+import com.chwl.library.common.util.Utils
 import com.chwl.app.databinding.ActivityExchangePermissionBinding
 import com.chwl.app.module_hall.hall.adapter.EnableExchangeAdapter
 import com.chwl.app.module_hall.hall.adapter.NoExchangeAdapter
--- a/app/src/module_labour_union/java/com/chwl/app/module_hall/income/IncomeDetailActivity.java
+++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/income/IncomeDetailActivity.java
@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.netease.nim.uikit.StatusBarUtil;
 import com.chwl.app.R;
 import com.chwl.app.base.BaseMvpActivity;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.app.module_hall.income.adapter.IncomeDetailAdapter;
 import com.chwl.app.module_hall.income.presenter.IncomeDetailPresenter;
 import com.chwl.app.module_hall.income.view.IIncomeDetailView;
--- a/app/src/module_music/java/com/chwl/app/music/widget/VoiceSeekDialog.java
+++ b/app/src/module_music/java/com/chwl/app/music/widget/VoiceSeekDialog.java
@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.chwl.app.R;
-import com.chwl.app.common.util.Utils;
+import com.chwl.library.common.util.Utils;
 import com.chwl.core.music.model.PlayerModel;


--- a/core/src/main/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java
+++ b/core/src/main/java/com/chwl/core/manager/trtc/TRTCEngineAdapter.java
@@ -2025,7 +2025,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
            x = options.positionInLandscapeMode.x / (float) resolutionWidth;
            y = options.positionInLandscapeMode.y / (float) resolutionHeight;
        }
-        Bitmap bitmap = Utils.getBitmap(watermarkUrl, decodeWidth, decodeHeight);
+        Bitmap bitmap = TRTCUtils.getBitmap(watermarkUrl, decodeWidth, decodeHeight);
        trtcCloud.setWatermark(bitmap, TRTC_VIDEO_STREAM_TYPE_BIG, x, y, width);

        return 0;
--- a/core/src/main/java/com/chwl/core/manager/trtc/TRTCUtils.java
+++ b/core/src/main/java/com/chwl/core/manager/trtc/TRTCUtils.java
@@ -3,7 +3,7 @@ package com.chwl.core.manager.trtc;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;

-public class Utils {
+public class TRTCUtils {

    private static boolean isSpace(final String s) {
        if (s == null) return true;
--- a/library/src/main/java/com/chwl/library/swipeactivity/SwipeActivityUtils.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeActivityUtils.java
@@ -10,8 +10,8 @@ import java.lang.reflect.Method;
 /**
 * Created by hm
 */
-public class Utils {
-    private Utils() {
+public class SwipeActivityUtils {
+    private SwipeActivityUtils() {
    }

    /**
--- a/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivity.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivity.java
@@ -65,7 +65,7 @@ public class SwipeBackActivity  extends RxAppCompatActivity implements SwipeBack

    @Override
    public void scrollToFinishActivity() {
-        Utils.convertActivityToTranslucent(this);
+        SwipeActivityUtils.convertActivityToTranslucent(this);
        getSwipeBackLayout().scrollToFinishActivity();
    }

--- a/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivityHelper.java
+++ b/library/src/main/java/com/chwl/library/swipeactivity/SwipeBackActivityHelper.java
@@ -32,7 +32,7 @@ public class SwipeBackActivityHelper {

            @Override
            public void onEdgeTouch(int edgeFlag) {
-                Utils.convertActivityToTranslucent(mActivity);
+                SwipeActivityUtils.convertActivityToTranslucent(mActivity);
            }

            @Override