kotlin扩展类文件隔离，避免混淆失败

app/src/main/java/com/chwl/app/audio/viewmodel/SoundViewModel.kt

@@ -17,7 +17,7 @@ import com.chwl.core.auth.AuthModel
 import com.chwl.core.manager.AudioEngineManager
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.sound.model.SoundModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.common.application.BaseApp
 import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.SingleToastUtil

app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java

@@ -6,7 +6,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
@@ -16,6 +15,7 @@ import androidx.annotation.Nullable;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.coorchice.library.SuperTextView;
 import com.netease.nim.uikit.common.util.string.StringUtil;
 import com.opensource.svgaplayer.SVGAImageView;
@@ -39,7 +39,6 @@ import com.chwl.core.room.pk.bean.PKTeamInfo;
 import com.chwl.core.room.queue.bean.MicMemberInfo;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.utils.ActivityUtil;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.library.utils.ResUtil;
 import com.chwl.library.utils.config.BasicConfig;
 

app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
 import com.chwl.app.R
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class ExitRoomAdapter :
     BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_exit_room) {

app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt

@@ -16,7 +16,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.bean.RoomQueueInfo
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.praise.PraiseModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.config.BasicConfig
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt

@@ -26,7 +26,7 @@ import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent
 import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
 import com.chwl.core.utils.CurrentTimeUtils
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.rxbus.RxBus
 import com.chwl.library.utils.CommonUtils
 import io.reactivex.Observable

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt

@@ -16,10 +16,10 @@ import com.chwl.core.auth.AuthModel
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.RoomPKModel
 import com.chwl.core.room.anotherroompk.SimpleRoomInfo
-import com.chwl.core.utils.ifNotNullOrEmpty
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toIntOrDef
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.ifNotNullOrEmpty
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toIntOrDef
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding>() {

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt

@@ -16,7 +16,7 @@ import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.RoomPKModel
 import com.chwl.core.room.anotherroompk.SimpleRoomInfo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class RoomPKSearchActivity : BaseViewBindingActivity<ActivityRoomPkSearchBinding>() {

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
 import com.chwl.app.R
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.room.anotherroompk.SimpleRoomInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class RoomPKSearchAdapter :
     BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_room_pk_search) {

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt

@@ -9,7 +9,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogRoomPkFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt

@@ -8,7 +8,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogRoomPkForceFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class RoomPkForceFinishDialog : BaseDialog<DialogRoomPkForceFinishBinding>() {
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt

@@ -8,9 +8,9 @@ import com.chwl.app.databinding.DialogRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.RoomPKModel
-import com.chwl.core.utils.ifNotNullOrEmpty
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.ifNotNullOrEmpty
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toast
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable

app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt

@@ -14,7 +14,7 @@ import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.room.bean.RoomInfo
 import com.chwl.core.room.game.bean.GameInfo
 import com.chwl.core.room.game.GameModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class CreateRoomDialog : BaseDialog<DialogCreateRoomBinding>() {

app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt

@@ -16,7 +16,7 @@ import com.chwl.app.utils.SpannableBuilder
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.bean.BroadcastInfo
 import com.chwl.core.room.model.AvRoomModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.CommonUtils
 import com.chwl.library.utils.TextWatcherWrapper
 import io.reactivex.Observable

app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt

@@ -41,7 +41,7 @@ import com.chwl.core.pay.bean.PayRecordId
 import com.chwl.core.pay.event.FirstChargeEvent
 import com.chwl.core.room.model.AvRoomModel
 import com.chwl.core.utils.net.IgnoreException
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.common.util.DeviceUtil
 import com.chwl.library.utils.AppMetaDataUtil
 import com.chwl.library.utils.ResUtil

app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt

@@ -11,7 +11,7 @@ import com.chwl.app.databinding.DialogRedPackageGoRoomBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.redpackage.bean.RedPackageNotifyInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ResUtil
 import org.greenrobot.eventbus.EventBus
 

app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt

@@ -9,7 +9,7 @@ import com.chwl.app.R
 import com.chwl.app.ui.utils.loadAvatar
 import com.chwl.app.utils.UserUtils
 import com.chwl.core.redpackage.bean.RedEnvelopeItemVO
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ResUtil
 import java.text.SimpleDateFormat
 import java.util.Locale

app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt

@@ -21,7 +21,7 @@ import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.pay.PayModel
 import com.chwl.core.redpackage.RedPackageModel
 import com.chwl.core.user.UserModel
-import com.chwl.core.utils.toIntOrDef
+import com.chwl.core.utils.extension.toIntOrDef
 import com.chwl.library.annatation.ActLayoutRes
 import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.SingleToastUtil

app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt

@@ -17,7 +17,7 @@ import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.pay.PayModel
 import com.chwl.core.redpackage.RedPackageModel
 import com.chwl.core.user.UserModel
-import com.chwl.core.utils.toIntOrDef
+import com.chwl.core.utils.extension.toIntOrDef
 import com.chwl.library.annatation.ActLayoutRes
 import com.chwl.library.utils.SingleToastUtil
 import com.chwl.library.utils.codec.DESUtils

app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt

@@ -7,7 +7,7 @@ import com.chwl.app.avroom.bean.RoomAlbumPhotoInfo
 import com.chwl.app.base.BaseViewModel
 import com.chwl.core.Constants
 import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 class RoomAlbumFragmentViewModel : BaseViewModel() {
 

app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt

@@ -8,7 +8,7 @@ import com.chwl.app.base.Event
 import com.chwl.core.file.FileModel
 import com.chwl.core.gift.bean.GiftInfo
 import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt

@@ -18,7 +18,7 @@ import com.chwl.app.ui.utils.load
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.utils.CurrentTimeUtils
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ResUtil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt

@@ -16,10 +16,10 @@ import com.chwl.core.auth.AuthModel
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.SimpleRoomInfo
 import com.chwl.core.room.anotherroompk.SingleRoomPKModel
-import com.chwl.core.utils.ifNotNullOrEmpty
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toIntOrDef
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.ifNotNullOrEmpty
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toIntOrDef
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkCreateBinding>() {

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt

@@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder
 import com.chwl.app.R
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.room.anotherroompk.SimpleRoomInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class SingleRoomPKSearchAdapter :
     BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_single_room_pk_search) {

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt

@@ -9,7 +9,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogSingleRoomPkFinishBinding
 import com.chwl.app.ui.utils.load
 import com.chwl.core.im.custom.bean.RoomPkBean
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt

@@ -8,7 +8,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogSingleRoomPkForceFinishBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.RoomPkBean
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class SingleRoomPkForceFinishDialog : BaseDialog<DialogSingleRoomPkForceFinishBinding>() {
 

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt

@@ -8,9 +8,9 @@ import com.chwl.app.databinding.DialogSingleRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.SingleRoomPKModel
-import com.chwl.core.utils.ifNotNullOrEmpty
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.ifNotNullOrEmpty
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toast
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable

app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt

@@ -4,7 +4,7 @@ import android.text.method.ScrollingMovementMethod
 import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogSingleRoomPkRuleBinding
 import com.chwl.core.room.anotherroompk.SingleRoomPKModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 class SingleRoomPkRuleDialog : BaseDialog<DialogSingleRoomPkRuleBinding>() {
 

app/src/main/java/com/chwl/app/avroom/widget/BottomView.java

@@ -21,6 +21,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.netease.nimlib.sdk.msg.model.RecentContact;
@@ -39,7 +40,6 @@ import com.chwl.core.room.bean.RoomModeType;
 import com.chwl.core.super_admin.util.SuperAdminUtil;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.utils.SharedPreferenceUtils;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.library.utils.ListUtils;
 

app/src/main/java/com/chwl/app/avroom/widget/MessageView.java

@@ -56,6 +56,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
 import com.bumptech.glide.request.target.Target;
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.netease.nim.uikit.business.uinfo.UserInfoHelper;
 import com.netease.nim.uikit.common.ui.span.RadiusBackgroundSpan;
 import com.netease.nim.uikit.common.util.log.LogUtil;
@@ -179,7 +180,6 @@ import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.user.bean.UserInfo;
 import com.chwl.core.utils.ExtensionUtil;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.core.utils.net.DontWarnObserver;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.core.vip.bean.VipMessageInfo;

app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt

@@ -51,7 +51,7 @@ import com.chwl.core.room.bean.DatingNotifyInfo
 import com.chwl.core.super_admin.util.SuperAdminUtil
 import com.chwl.core.user.UserModel
 import com.chwl.core.user.bean.UserInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ListUtils
 import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.StringUtils

app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt

@@ -56,7 +56,7 @@ import com.chwl.core.room.bean.DatingNotifyInfo
 import com.chwl.core.super_admin.util.SuperAdminUtil
 import com.chwl.core.user.UserModel
 import com.chwl.core.user.bean.UserInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ListUtils
 import com.chwl.library.utils.ResUtil
 import com.chwl.library.utils.StringUtils

app/src/main/java/com/chwl/app/base/BaseViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.net.rxnet.exception.ExceptionHandle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt

@@ -9,7 +9,7 @@ import com.chwl.core.decoration.bean.DecorationInfo
 import com.chwl.core.decoration.DecorationModel
 import com.chwl.core.home.bean.BannerInfo
 import com.chwl.core.home.model.HomeModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class DecorationViewModel : BaseViewModel() {

app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt

@@ -15,8 +15,8 @@ import com.chwl.core.UriProvider
 import com.chwl.core.gift.GiftModel
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.utils.net.handleBeanData
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding>() {

app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt

@@ -23,8 +23,8 @@ import com.chwl.app.ui.webview.DialogWebViewActivity
 import com.chwl.core.UriProvider
 import com.chwl.core.fansteam.bean.FansTeamTaskInfo
 import com.chwl.core.manager.AvRoomDataManager
-import com.chwl.core.utils.subAndReplaceDot
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.subAndReplaceDot
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBinding>() {

app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt

@@ -9,7 +9,7 @@ import com.chwl.core.fansteam.bean.FansTeamInfo
 import com.chwl.core.fansteam.bean.FansTeamInitInfo
 import com.chwl.core.fansteam.bean.FansTeamJoinInfo
 import com.chwl.core.fansteam.bean.FansTeamJoinedInfo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 class FansTeamViewModel : BaseViewModel() {
 

app/src/main/java/com/chwl/app/home/HomeViewModel.kt

@@ -8,7 +8,7 @@ import com.chwl.core.home.bean.*
 import com.chwl.core.home.model.HomeModel
 import com.chwl.core.room.bean.AnchorInfo
 import com.chwl.core.user.bean.UserInfo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 

app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt

@@ -6,7 +6,7 @@ import com.chwl.app.base.BaseViewModel
 import com.chwl.core.bean.response.ListResult
 import com.chwl.core.home.bean.HomeRoomInfo
 import com.chwl.core.home.model.HomeModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 class RoomCommonViewModel : BaseViewModel() {
 

app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt

@@ -9,7 +9,7 @@ import com.chwl.app.R
 import com.chwl.app.ui.utils.ImageLoadUtilsV2
 import com.chwl.app.ui.utils.loadFromAssets
 import com.chwl.core.home.bean.HomeRoomInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 /**
  * create by lvzebiao @2019/11/13

app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java

@@ -12,7 +12,7 @@ import com.chwl.app.common.widget.CircleImageView;
 import com.chwl.app.ui.user.activity.UserInfoActivity;
 import com.chwl.app.ui.utils.ImageLoadUtilsV2;
 import com.chwl.core.home.bean.HomeRoomInfo;
-import com.chwl.core.utils.StringExtensionKt;
+import com.chwl.core.utils.extension.StringExtensionKt;
 
 public class HomeConcernsAdapter extends BaseQuickAdapter<HomeRoomInfo, BaseViewHolder> {
 

app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt

@@ -15,7 +15,7 @@ import com.chwl.app.ui.utils.ImageLoadUtilsV2
 import com.chwl.app.ui.utils.load
 import com.chwl.core.home.bean.HomeRoomInfo
 import com.chwl.core.utils.CoreTextUtils
-import com.chwl.core.utils.ifNullOrEmpty
+import com.chwl.core.utils.extension.ifNullOrEmpty
 import com.chwl.library.utils.ResUtil
 
 /**

app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt

@@ -29,7 +29,7 @@ import com.chwl.core.manager.AudioEngineManager
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.user.bean.UserInfo
 import com.chwl.core.utils.StarUtils
-import com.chwl.core.utils.ifNullOrEmpty
+import com.chwl.core.utils.extension.ifNullOrEmpty
 import com.chwl.library.common.widget.LinesFlexBoxLayoutManager
 import com.chwl.library.utils.ListUtils
 import com.chwl.library.utils.SingleToastUtil

app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt

@@ -8,7 +8,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogNewUserHelloBinding
 import com.chwl.app.ui.utils.load
 import com.chwl.core.channel_page.bean.NewUserHelloInfo
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 
 class NewUserHelloDialog : BaseDialog<DialogNewUserHelloBinding>() {
 

app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt

@@ -30,7 +30,7 @@ import com.chwl.app.ui.utils.loadAvatar
 import com.chwl.core.room.bean.AnchorInfo
 import com.chwl.core.user.bean.UserInfo
 import com.chwl.core.user.bean.UserInfoSkillEntity
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.utils.ListUtils
 import com.chwl.library.utils.SingleToastUtil
 import io.reactivex.Observable

app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt

@@ -6,7 +6,6 @@ import com.chwl.core.bean.response.ListResult
 import com.chwl.core.home.model.HomeModel
 import com.chwl.core.user.bean.DiamondGiveHistoryInfo
 import com.chwl.core.user.bean.SearchUserInfo
-import com.chwl.core.utils.toast
 
 class GiveGoldModel : BaseViewModel() {
 

app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt

@@ -15,7 +15,7 @@ import com.chwl.core.relation.cp.bean.UserCpLevelMpRootEntity
 import com.chwl.core.relation.cp.bean.UserCpListEntity
 import com.chwl.core.utils.net.BalanceNotEnoughExeption
 import com.chwl.core.utils.net.ServerException
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 import org.greenrobot.eventbus.EventBus
 

app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt

@@ -13,7 +13,7 @@ import com.chwl.core.skill.entity.PropsEntity
 import com.chwl.core.skill.entity.SkillPostServerEntity
 import com.chwl.core.skill.entity.SkillPropertyEntity
 import com.chwl.core.skill.event.SkillEvent
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 import org.greenrobot.eventbus.EventBus
 import java.io.File

app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt

@@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseViewHolder
 import com.chwl.app.R
 import com.chwl.app.skill.widget.ItemAttribute
 import com.chwl.core.skill.entity.PropDictVo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 
 class SkillSelectionAdapter(

app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt

@@ -11,7 +11,7 @@ import com.chwl.app.audio.helper.OnPlayListener
 import com.chwl.app.databinding.LayoutSkillAudioBinding
 import com.chwl.app.ui.widget.dialog.CommonTipDialog
 import com.chwl.core.utils.CoreTextUtils
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 import java.io.File
 

app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java

@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.netease.nim.uikit.api.NimUIKit;
 import com.netease.nim.uikit.api.model.contact.ContactChangedObserver;
 import com.netease.nim.uikit.api.model.main.OnlineStateChangeObserver;
@@ -55,7 +56,6 @@ import com.chwl.core.praise.event.PraiseEvent;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.user.bean.UserDetailInfo;
 import com.chwl.core.user.bean.UserInfo;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.core.utils.SystemUidUtil;
 import com.chwl.core.utils.net.BeanObserver;
 import com.chwl.library.utils.ListUtils;

app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt

@@ -13,7 +13,7 @@ import com.chwl.app.ui.webview.CommonWebViewActivity
 import com.chwl.core.Constants
 import com.chwl.core.UriProvider
 import com.chwl.core.relation.cp.bean.CpInvitePageEntity
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.common.util.DeviceUtil
 import com.chwl.library.utils.AppMetaDataUtil
 

app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java

@@ -21,7 +21,7 @@ import com.chwl.app.vip.util.VipHelper;
 import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.core.user.bean.UserInfo;
-import com.chwl.core.utils.StringExtensionKt;
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.chwl.library.utils.ResUtil;
 
 /**

app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java

@@ -16,7 +16,7 @@ import com.chwl.app.vip.util.VipHelper;
 import com.chwl.core.Constants;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.core.user.bean.AttentionInfo;
-import com.chwl.core.utils.StringExtensionKt;
+import com.chwl.core.utils.extension.StringExtensionKt;
 
 import java.util.List;
 

app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java

@@ -17,7 +17,7 @@ import com.chwl.app.vip.util.VipHelper;
 import com.chwl.core.im.friend.IMFriendModel;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.core.user.bean.FansInfo;
-import com.chwl.core.utils.StringExtensionKt;
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.chwl.library.utils.ResUtil;
 
 import java.util.List;

app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt

@@ -6,7 +6,7 @@ import com.chwl.app.base.BaseViewModel
 import com.chwl.core.bean.response.ListResult
 import com.chwl.core.set.bean.ShieldInfo
 import com.chwl.core.set.model.SetModel
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 
 class SetViewModel : BaseViewModel() {
 

app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt

@@ -11,7 +11,7 @@ import com.chwl.core.user.UserModel
 import com.chwl.core.user.bean.UserDetailInfo
 import com.chwl.core.user.bean.UserInfo
 import com.chwl.core.utils.net.BeanObserver
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 

app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java

@@ -34,6 +34,7 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.netease.nim.uikit.common.util.sys.ScreenUtil;
 import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
@@ -89,7 +90,6 @@ import com.chwl.core.room.pk.model.PkModel;
 import com.chwl.core.room.queue.bean.MicMemberInfo;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.user.bean.UserInfo;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.library.bindinglist.IItem;
 import com.chwl.library.bindinglist.MultiTypeAdapter;

app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java

@@ -16,6 +16,7 @@ import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 
+import com.chwl.core.utils.extension.StringExtensionKt;
 import com.example.lib_utils.ServiceTime;
 import com.opensource.svgaplayer.SVGADrawable;
 import com.opensource.svgaplayer.SVGADynamicEntity;
@@ -27,7 +28,6 @@ import com.chwl.app.common.svga.SimpleSvgaCallback;
 import com.chwl.app.common.widget.CircleImageSpan;
 import com.chwl.app.databinding.DialogVipAllServiceLevelUpBinding;
 import com.chwl.app.utils.SpannableBuilder;
-import com.chwl.core.utils.StringExtensionKt;
 import com.chwl.core.vip.bean.VipMessageInfo;
 import com.chwl.library.utils.ResUtil;
 

app/src/main/java/com/chwl/app/utils/MsgBuilder.kt

@@ -6,7 +6,7 @@ import androidx.core.graphics.toColorInt
 import com.chwl.app.ui.webview.CommonWebViewActivity
 import com.chwl.core.im.custom.bean.FairyMsgAttachment
 import com.chwl.core.manager.RoomEvent
-import com.chwl.core.utils.sub
+import com.chwl.core.utils.extension.sub
 
 class MsgBuilder {
 

app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt

@@ -14,7 +14,7 @@ import com.chwl.app.databinding.LayoutVipBroadcastViewBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.VipMessageAttachment
 import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.core.vip.VipBroadcastMsgEvent
 import com.chwl.library.rxbus.RxBus
 import io.reactivex.Observable

app/src/main/java/com/chwl/app/vip/VipMainActivity.kt

@@ -48,9 +48,9 @@ import com.chwl.core.pay.PayModel
 import com.chwl.core.pay.bean.ChargeBean
 import com.chwl.core.pay.bean.PayRecordId
 import com.chwl.core.utils.net.IgnoreException
-import com.chwl.core.utils.toast
 import com.chwl.core.vip.bean.VipAuthInfo
 import com.chwl.core.vip.bean.VipInfo
+import com.chwl.core.utils.extension.toast
 import com.chwl.core.vip.VipOpenEvent
 import com.chwl.library.common.util.DeviceUtil
 import com.chwl.library.utils.AppMetaDataUtil

app/src/main/java/com/chwl/app/vip/VipViewModel.kt

@@ -7,10 +7,10 @@ import com.chwl.app.base.BaseViewModel
 import com.chwl.core.bean.response.BeanResult
 import com.chwl.core.user.UserInfoUiMgr
 import com.chwl.core.user.UserModel
-import com.chwl.core.utils.toast
 import com.chwl.core.vip.bean.VipAuthInfo
 import com.chwl.core.vip.bean.VipBroadcastInfo
 import com.chwl.core.vip.bean.VipInfo
+import com.chwl.core.utils.extension.toast
 import com.chwl.core.vip.VipModel
 import com.chwl.library.utils.ResUtil
 

app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt

@@ -10,7 +10,7 @@ import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogVipBroadcastBinding
 import com.chwl.app.vip.VipViewModel
 import com.chwl.core.utils.CurrentTimeUtils
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt

@@ -14,7 +14,7 @@ import com.chwl.app.databinding.LayoutVipBroadcastViewBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
 import com.chwl.core.im.custom.bean.VipMessageAttachment
 import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent
-import com.chwl.core.utils.subAndReplaceDot
+import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.core.vip.VipBroadcastMsgEvent
 import com.chwl.library.rxbus.RxBus
 import io.reactivex.Observable

app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt

@@ -13,7 +13,7 @@ import com.chwl.app.module_hall.hall.adapter.SearchAdminAdapter
 import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.module_hall.hall.HallModel
 import com.chwl.core.module_hall.hall.bean.SuperAdminInfo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBinding>() {

app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt

@@ -20,7 +20,7 @@ import com.chwl.app.module_hall.hall.adapter.ManageSuperAdminAdapter
 import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.module_hall.hall.HallModel
 import com.chwl.core.module_hall.hall.bean.SuperAdminInfo
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class SuperAdminManageActivity : BaseViewBindingActivity<ActivitySuperAdminManegeBinding>() {

app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt

@@ -13,7 +13,7 @@ import com.chwl.app.module_hall.hall.adapter.ManageRoomSetAdapter
 import com.chwl.app.ui.utils.RVDelegate
 import com.chwl.core.module_hall.hall.HallModel
 import com.chwl.core.module_hall.hall.bean.SuperAdminHall
-import com.chwl.core.utils.toast
+import com.chwl.core.utils.extension.toast
 import com.chwl.library.utils.ResUtil
 
 class SuperAdminRoomSetActivity : BaseViewBindingActivity<ActivitySuperAdminRoomSetBinding>() {

core/src/main/java/com/chwl/core/utils/extension/StringExtension.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.utils
+package com.chwl.core.utils.extension
 
 import android.graphics.Color
 import com.chwl.library.utils.SingleToastUtil

core/src/main/java/com/chwl/core/utils/net/RxExtension.kt

@@ -3,7 +3,7 @@ package com.chwl.core.utils.net
 
 import com.chwl.core.R
 import com.chwl.core.bean.response.ServiceResult
-import com.chwl.core.utils.ifNullOrEmpty
+import com.chwl.core.utils.extension.ifNullOrEmpty
 import com.chwl.library.utils.ResUtil
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers