From 3d73cae162c615c87169774cf82f871195379921 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 29 Nov 2023 05:30:01 +0800 Subject: [PATCH] =?UTF-8?q?kotlin=E6=89=A9=E5=B1=95=E7=B1=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=9A=94=E7=A6=BB=EF=BC=8C=E9=81=BF=E5=85=8D=E6=B7=B7?= =?UTF-8?q?=E6=B7=86=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chwl/app/audio/viewmodel/SoundViewModel.kt | 2 +- .../com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java | 3 +-- .../java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt | 2 +- .../app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt | 2 +- .../com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt | 2 +- .../chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt | 8 ++++---- .../chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt | 2 +- .../chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt | 2 +- .../chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt | 2 +- .../app/avroom/anotherroompk/RoomPkForceFinishDialog.kt | 2 +- .../chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt | 6 +++--- .../java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt | 2 +- .../com/chwl/app/avroom/dialog/SendBroadcastDialog.kt | 2 +- .../com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt | 2 +- .../chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt | 2 +- .../app/avroom/redpackage/open/RedPackageResultAdapter.kt | 2 +- .../redpackage/send/PrivateRedPackageEditorFragment.kt | 2 +- .../redpackage/send/PublicRedPackageEditorFragment.kt | 2 +- .../app/avroom/room_album/RoomAlbumFragmentViewModel.kt | 2 +- .../com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt | 2 +- .../chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt | 2 +- .../app/avroom/singleroompk/SingleRoomPKCreateActivity.kt | 8 ++++---- .../app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt | 2 +- .../app/avroom/singleroompk/SingleRoomPkFinishDialog.kt | 2 +- .../avroom/singleroompk/SingleRoomPkForceFinishDialog.kt | 2 +- .../app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt | 6 +++--- .../app/avroom/singleroompk/SingleRoomPkRuleDialog.kt | 2 +- .../main/java/com/chwl/app/avroom/widget/BottomView.java | 2 +- .../main/java/com/chwl/app/avroom/widget/MessageView.java | 2 +- .../java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt | 2 +- .../java/com/chwl/app/avroom/widget/RoomEffectView.kt | 2 +- app/src/main/java/com/chwl/app/base/BaseViewModel.kt | 2 +- .../chwl/app/decoration/viewmodel/DecorationViewModel.kt | 2 +- .../java/com/chwl/app/fansteam/FansTeamJoinActivity.kt | 4 ++-- .../java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt | 4 ++-- .../main/java/com/chwl/app/fansteam/FansTeamViewModel.kt | 2 +- app/src/main/java/com/chwl/app/home/HomeViewModel.kt | 2 +- .../main/java/com/chwl/app/home/RoomCommonViewModel.kt | 2 +- .../java/com/chwl/app/home/adapter/HomeChatAdapter.kt | 2 +- .../com/chwl/app/home/adapter/HomeConcernsAdapter.java | 2 +- .../java/com/chwl/app/home/adapter/HomePlayAdapter.kt | 2 +- .../com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt | 2 +- .../java/com/chwl/app/home/dialog/NewUserHelloDialog.kt | 2 +- .../main/java/com/chwl/app/home/widget/AnchorCardView.kt | 2 +- app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt | 1 - .../com/chwl/app/relation/cp/viewmodel/CpViewModel.kt | 2 +- app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt | 2 +- .../com/chwl/app/skill/adapter/SkillSelectionAdapter.kt | 2 +- .../java/com/chwl/app/skill/widget/RecordIResourceItem.kt | 2 +- .../chwl/app/ui/im/avtivity/NimP2PMessageActivity.java | 2 +- .../com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt | 2 +- .../java/com/chwl/app/ui/im/friend/FriendListAdapter.java | 2 +- .../app/ui/relation/adapter/AttentionListAdapter.java | 2 +- .../com/chwl/app/ui/relation/adapter/FansViewAdapter.java | 2 +- .../com/chwl/app/ui/setting/viewmodel/SetViewModel.kt | 2 +- .../com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt | 2 +- app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java | 2 +- .../app/ui/widget/dialog/AllServiceVipLevelUPDialog.java | 2 +- app/src/main/java/com/chwl/app/utils/MsgBuilder.kt | 2 +- app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt | 2 +- app/src/main/java/com/chwl/app/vip/VipMainActivity.kt | 2 +- app/src/main/java/com/chwl/app/vip/VipViewModel.kt | 2 +- .../java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt | 2 +- .../main/java/com/chwl/app/vip/view/VipBroadcastView.kt | 2 +- .../module_hall/hall/activity/SuperAdminAddActivity.kt | 2 +- .../module_hall/hall/activity/SuperAdminManageActivity.kt | 2 +- .../hall/activity/SuperAdminRoomSetActivity.kt | 2 +- .../chwl/core/utils/{ => extension}/StringExtension.kt | 2 +- core/src/main/java/com/chwl/core/utils/net/RxExtension.kt | 2 +- 69 files changed, 80 insertions(+), 82 deletions(-) rename core/src/main/java/com/chwl/core/utils/{ => extension}/StringExtension.kt (97%) diff --git a/app/src/main/java/com/chwl/app/audio/viewmodel/SoundViewModel.kt b/app/src/main/java/com/chwl/app/audio/viewmodel/SoundViewModel.kt index c7acecc42..b77ea9dc6 100644 --- a/app/src/main/java/com/chwl/app/audio/viewmodel/SoundViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java index b181090fe..3d0980f26 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt index 680b438c7..345bf9e53 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/ExitRoomAdapter.kt +++ b/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(R.layout.item_exit_room) { diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt index 3a8308873..e91713b06 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt index 62b66fc1e..b5749d047 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt index 3f0ecbc3d..8bf2c0a55 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKCreateActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt index 159956217..cb37d91d0 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt index c5da1a3f6..f09357451 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/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(R.layout.item_room_pk_search) { diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt index f80917e11..1b0fc6373 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt index a96b3ba41..2309c3fa5 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt index 17c6f7cdd..1c15c628e 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt index 875844347..371653f9a 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt index ed806d920..1af2ec4f7 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/SendBroadcastDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt index 07c4befb1..8e88f1e95 100644 --- a/app/src/main/java/com/chwl/app/avroom/firstcharge/FirstChargeDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt index 9190a6597..62658bb6f 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt index 2839b36e7..ac1aaeca2 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt index 7caa6299c..06ab38489 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt index 12cadc4fb..087dc40a3 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt index 18431b7f7..0b194b40d 100644 --- a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumFragmentViewModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt b/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt index 821635709..cf93aa851 100644 --- a/app/src/main/java/com/chwl/app/avroom/room_album/RoomAlbumViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt index b5aad4e30..1c8acba44 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKBoardView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt index b0919dd42..105288002 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt index 7f580d2cf..f381c2c0e 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt +++ b/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(R.layout.item_single_room_pk_search) { diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt index 652b41051..e953e61c3 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt index a21a46cfe..e8609db77 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt index 234a05e66..1935b8275 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt b/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt index 8d92a8a74..95bce2770 100644 --- a/app/src/main/java/com/chwl/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java index 9b6f941c3..88f3d2474 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 214f72b0b..bbf32f71d 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt index 0c836e346..1a584fea1 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectBoxView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt index c71ed2eaa..83b559466 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/RoomEffectView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/base/BaseViewModel.kt b/app/src/main/java/com/chwl/app/base/BaseViewModel.kt index 0fc8b97e0..39b52eccb 100644 --- a/app/src/main/java/com/chwl/app/base/BaseViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt index 87b53e972..286552b80 100644 --- a/app/src/main/java/com/chwl/app/decoration/viewmodel/DecorationViewModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt index c3d525638..5604e1d3d 100644 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt index 598f30dc5..524c12398 100644 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamJoinedActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt b/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt index ef800a874..76e86cc29 100644 --- a/app/src/main/java/com/chwl/app/fansteam/FansTeamViewModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt index 7cac1c2c2..dda58f14c 100644 --- a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt b/app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt index 7858b64cb..c1f97ce0c 100644 --- a/app/src/main/java/com/chwl/app/home/RoomCommonViewModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt index af151c797..86420cfbc 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomeChatAdapter.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java index a8f2e767b..fb75b9125 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomeConcernsAdapter.java +++ b/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 { diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt index efc5e0a48..5b3d180b8 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomePlayAdapter.kt +++ b/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 /** diff --git a/app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt index 0836181c7..9bf2e50fc 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/RoomNewFriendsAdapter.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt b/app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt index 81ae9821a..89dd71d15 100644 --- a/app/src/main/java/com/chwl/app/home/dialog/NewUserHelloDialog.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt b/app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt index d8ad91d15..900d68fb5 100644 --- a/app/src/main/java/com/chwl/app/home/widget/AnchorCardView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt b/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt index dc1218727..4e135c846 100644 --- a/app/src/main/java/com/chwl/app/pay/GiveGoldModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt index b16fc0606..68ddc8a7f 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt b/app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt index 1b582b79c..b2e2003c1 100644 --- a/app/src/main/java/com/chwl/app/skill/SkillDataDelegate.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt b/app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt index af7c4a096..7cea84ad6 100644 --- a/app/src/main/java/com/chwl/app/skill/adapter/SkillSelectionAdapter.kt +++ b/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( diff --git a/app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt index e102f474e..f5f142596 100644 --- a/app/src/main/java/com/chwl/app/skill/widget/RecordIResourceItem.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java index c1ae93fdf..2d1de6c87 100644 --- a/app/src/main/java/com/chwl/app/ui/im/avtivity/NimP2PMessageActivity.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt index d1b91ca8f..9a57b07d1 100644 --- a/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java index 43d200cc3..2c1945681 100644 --- a/app/src/main/java/com/chwl/app/ui/im/friend/FriendListAdapter.java +++ b/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; /** diff --git a/app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java index 585430e47..715e6dae5 100644 --- a/app/src/main/java/com/chwl/app/ui/relation/adapter/AttentionListAdapter.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java index ffd6c26df..5e68f83c9 100644 --- a/app/src/main/java/com/chwl/app/ui/relation/adapter/FansViewAdapter.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt b/app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt index 874eabace..b5bd65b9f 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/viewmodel/SetViewModel.kt +++ b/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() { diff --git a/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt index f4450ea6b..d0367cd00 100644 --- a/app/src/main/java/com/chwl/app/ui/user/viewmodel/UserInfoViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java b/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java index 84cf0ef52..01512499d 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java index b71ad4b51..ff6f01248 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/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; diff --git a/app/src/main/java/com/chwl/app/utils/MsgBuilder.kt b/app/src/main/java/com/chwl/app/utils/MsgBuilder.kt index b36037405..b2147e606 100644 --- a/app/src/main/java/com/chwl/app/utils/MsgBuilder.kt +++ b/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 { diff --git a/app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt b/app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt index 7e44a7678..501a430cd 100644 --- a/app/src/main/java/com/chwl/app/vip/VipBroadcastView.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index 38cc02689..d3abaff5c 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/vip/VipViewModel.kt b/app/src/main/java/com/chwl/app/vip/VipViewModel.kt index 1f3c710a0..fdb434dd8 100644 --- a/app/src/main/java/com/chwl/app/vip/VipViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt index be98e9891..606e481c4 100644 --- a/app/src/main/java/com/chwl/app/vip/dialog/VipBroadcastDialog.kt +++ b/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 diff --git a/app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt b/app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt index 3cf4189aa..261707de9 100644 --- a/app/src/main/java/com/chwl/app/vip/view/VipBroadcastView.kt +++ b/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 diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt index 395497964..8b7ac9130 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/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() { diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt index 9ce87a9cc..ce674b422 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminManageActivity.kt +++ b/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() { diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt index 7e67a8613..939de5c55 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminRoomSetActivity.kt +++ b/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() { diff --git a/core/src/main/java/com/chwl/core/utils/StringExtension.kt b/core/src/main/java/com/chwl/core/utils/extension/StringExtension.kt similarity index 97% rename from core/src/main/java/com/chwl/core/utils/StringExtension.kt rename to core/src/main/java/com/chwl/core/utils/extension/StringExtension.kt index 0c22108f7..442db22f9 100644 --- a/core/src/main/java/com/chwl/core/utils/StringExtension.kt +++ b/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 diff --git a/core/src/main/java/com/chwl/core/utils/net/RxExtension.kt b/core/src/main/java/com/chwl/core/utils/net/RxExtension.kt index 904ff0fcc..a3c801881 100644 --- a/core/src/main/java/com/chwl/core/utils/net/RxExtension.kt +++ b/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