From 40b4c45fcf7df325b2178e2c2ee284c5eafe6c61 Mon Sep 17 00:00:00 2001 From: zu Date: Wed, 29 Nov 2023 03:28:13 +0800 Subject: [PATCH] =?UTF-8?q?TextUtils.java=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/chwl/app/AgentActivity.java | 8 -------- .../com/chwl/app/avroom/firstcharge/Reward2Adapter.kt | 4 ++-- .../java/com/chwl/app/avroom/firstcharge/RewardAdapter.kt | 5 ++--- .../chwl/app/avroom/newuserchargegift/RewardAdapter.kt | 4 ++-- .../java/com/chwl/app/home/adapter/HomePlayAdapter.kt | 4 ++-- .../com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt | 8 ++++---- .../com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt | 4 ++-- .../java/com/chwl/app/home/adapter/RoomCommonAdapter.kt | 5 ++--- .../main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt | 4 ++-- .../java/com/chwl/app/home/adapter/RoomLikeAdapter.kt | 4 ++-- app/src/main/java/com/chwl/app/skill/widget/EditItem.kt | 4 ++-- .../java/com/chwl/app/skill/widget/RecordIResourceItem.kt | 4 ++-- .../main/java/com/chwl/app/skill/widget/SelectionItem.kt | 4 ++-- .../java/com/chwl/app/ui/adapter/StarWeekAdapter.java | 7 +++---- .../com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt | 4 ++-- .../java/com/chwl/app/ui/setting/bean/PermissionEntity.kt | 4 ++-- .../main/java/com/chwl/app/ui/widget/MainRedPointTab.java | 4 ++-- .../java/com/chwl/app/ui/widget/dialog/CommonDialog.java | 6 +++--- .../com/chwl/app/ui/widget/dialog/CommonTipDialog.java | 6 +++--- .../chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java | 5 ++--- .../app/ui/widget/dynamicface/DynamicFaceAdapter.java | 4 ++-- app/src/main/java/com/chwl/app/vip/util/VipHelper.java | 6 +++--- app/src/main/res/layout/fragment_me.xml | 4 ++-- .../app/community/dynamic/view/DynamicDetailActivity.java | 3 ++- .../chwl/app/community/publish/view/PublishActivity.java | 3 ++- .../main/java/com/chwl/core/settings/SettingsModel.java | 1 - .../core/utils/{TextUtils.java => CoreTextUtils.java} | 2 +- .../src/main/java/com/chwl/core/utils/ExtensionUtils.java | 4 ++-- 28 files changed, 57 insertions(+), 68 deletions(-) rename core/src/main/java/com/chwl/core/utils/{TextUtils.java => CoreTextUtils.java} (99%) diff --git a/app/src/main/java/com/chwl/app/AgentActivity.java b/app/src/main/java/com/chwl/app/AgentActivity.java index 197bea278..c3294a630 100644 --- a/app/src/main/java/com/chwl/app/AgentActivity.java +++ b/app/src/main/java/com/chwl/app/AgentActivity.java @@ -7,14 +7,6 @@ import android.os.Build; import androidx.appcompat.app.AppCompatActivity; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.chwl.app.other.activity.SplashActivity; -import com.chwl.core.linked.LinkedModel; -import com.chwl.core.linked.bean.LinkedInfo; -import com.chwl.core.user.UserModel; -import com.chwl.core.utils.TextUtils; - -import java.util.HashMap; import java.util.List; public class AgentActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt b/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt index 258cc76f3..29e65834b 100644 --- a/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/firstcharge/Reward2Adapter.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.pay.bean.FirstChargeReward -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class Reward2Adapter : BaseMultiItemQuickAdapter(null) { @@ -33,7 +33,7 @@ class Reward2Adapter : BaseMultiItemQuickAdapter(R.layout.item_first_charge_reward) { @@ -24,6 +23,6 @@ class RewardAdapter(private val itemWidth: Int) : ) helper.setText(R.id.tv_name, item.showText) .setText(R.id.tv_time, item.showTime) - .setGone(R.id.tv_time, !TextUtils.isEmptyText(item.showTime)) + .setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime)) } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt index 96863e097..50fc6f751 100644 --- a/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/newuserchargegift/RewardAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.load import com.chwl.core.pay.bean.FirstChargeReward -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class RewardAdapter : BaseQuickAdapter(R.layout.item_new_user_charge_reward) { @@ -16,6 +16,6 @@ class RewardAdapter : helper.setText(R.id.tv_name, item.showText) .setText(R.id.tv_time, "(${item.showTime})") - .setGone(R.id.tv_time, !TextUtils.isEmptyText(item.showTime)) + .setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime)) } } \ No newline at end of file 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 ca296a650..efc5e0a48 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 @@ -14,7 +14,7 @@ import com.chwl.app.home.helper.BannerHelper 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.TextUtils +import com.chwl.core.utils.CoreTextUtils import com.chwl.core.utils.ifNullOrEmpty import com.chwl.library.utils.ResUtil @@ -34,7 +34,7 @@ class HomePlayAdapter : BaseMultiItemQuickAdapter( item.itemType == HomeRoomInfo.TYPE_BROADCAST ) { helper.setText(R.id.tv_room_title, item.title) - helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) helper.setText(R.id.tv_online_number, "${item.onlineNum}") val tvMgName = helper.getView(R.id.tv_mg_name) diff --git a/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt index a4cfcba9e..8ac65f338 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/HomeSingleAnchorAdapter.kt @@ -12,7 +12,7 @@ import com.chwl.app.ui.utils.ImageLoadUtilsV2 import com.chwl.app.ui.utils.load import com.chwl.app.ui.utils.loadFromAssets import com.chwl.core.home.bean.HomeRoomInfo -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils /** * create by lvzebiao @2019/11/13 @@ -21,10 +21,10 @@ class HomeSingleAnchorAdapter : BaseQuickAdapter(R.layout.item_home_single_anchor) { override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { - helper.setText(R.id.tv_nickname, if (!TextUtils.isEmptyText(item.nick)) item.nick else "") + helper.setText(R.id.tv_nickname, if (!CoreTextUtils.isEmptyText(item.nick)) item.nick else "") helper.setText( R.id.tv_room_name, - if (!TextUtils.isEmptyText(item.title)) item.title else "" + if (!CoreTextUtils.isEmptyText(item.title)) item.title else "" ) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_avatar), item.avatar) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_avatar_big), item.avatar, false, 8) @@ -43,7 +43,7 @@ class HomeSingleAnchorAdapter : ) helper.setText( R.id.tv_topic, - if (!TextUtils.isEmptyText(item.roomDesc)) item.roomDesc else "" + if (!CoreTextUtils.isEmptyText(item.roomDesc)) item.roomDesc else "" ) helper.itemView.setOnClickListener { AVRoomActivity.startForFromType( diff --git a/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt index a84a67cae..1d298f01d 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MoreSingleAnchorAdapter.kt @@ -10,7 +10,7 @@ import com.chwl.app.avroom.activity.AVRoomActivity import com.chwl.app.ui.utils.load import com.chwl.app.ui.utils.loadFromAssets import com.chwl.core.home.bean.HomeRoomInfo -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils /** * create by lvzebiao @2019/11/13 @@ -24,7 +24,7 @@ class MoreSingleAnchorAdapter : val ivPking = helper.getView(R.id.iv_pking) val ivTag = helper.getView(R.id.iv_tag) ivPking.isVisible = item.isCrossPking - ivTag.isVisible = !TextUtils.isEmptyText(item.tagPict) && !item.isCrossPking + ivTag.isVisible = !CoreTextUtils.isEmptyText(item.tagPict) && !item.isCrossPking if (item.isCrossPking) { ivPking.loadFromAssets("svga/single_room_pking.svga") } else { diff --git a/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt index 62d97ad9d..29b5228b7 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomCommonAdapter.kt @@ -1,14 +1,13 @@ package com.chwl.app.home.adapter import android.widget.ImageView -import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R 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.TextUtils +import com.chwl.core.utils.CoreTextUtils class RoomCommonAdapter : BaseQuickAdapter(R.layout.item_room_common) { @@ -21,7 +20,7 @@ class RoomCommonAdapter : BaseQuickAdapter(R.layou setText(R.id.tv_id, "ID:${item.erbanNo}") } helper.setVisible(R.id.tv_in_pk, item.isCrossPking) - helper.setGone(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setGone(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) } diff --git a/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt index 5f492eaeb..58eda478d 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomHotAdapter.kt @@ -9,7 +9,7 @@ import com.chwl.app.avroom.activity.AVRoomActivity import com.chwl.app.home.helper.BannerHelper import com.chwl.app.ui.utils.load import com.chwl.core.home.bean.HomeRoomInfo -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class RoomHotAdapter : BaseMultiItemQuickAdapter(null) { @@ -34,7 +34,7 @@ class RoomHotAdapter : BaseMultiItemQuickAdapter(n helper.setVisible(R.id.tv_in_pk, item.isCrossPking) - helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict)) helper.getView(R.id.iv_room_tag).load(item.tagPict) val avatars: Array = arrayOf( diff --git a/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt index 1fd58005b..1345884be 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/RoomLikeAdapter.kt @@ -9,7 +9,7 @@ import com.chwl.app.avroom.activity.AVRoomActivity 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.TextUtils +import com.chwl.core.utils.CoreTextUtils class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) { @@ -23,7 +23,7 @@ class RoomLikeAdapter : BaseQuickAdapter(R.layout. setText(R.id.tv_id, "ID:${item.erbanNo}") } helper.setVisible(R.id.tv_in_pk, item.isCrossPking) - helper.setVisible(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setVisible(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) val avatars: Array = arrayOf( diff --git a/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt b/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt index 9363a3dbf..87dc08ad6 100644 --- a/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/EditItem.kt @@ -7,7 +7,7 @@ import android.widget.EditText import android.widget.TextView import com.chwl.app.R import com.chwl.core.skill.entity.PropRefEntity -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class EditItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: EditText @@ -48,7 +48,7 @@ class EditItem(private val itemAttr: ItemAttribute) : SkillItem { override fun isValid() = if (itemAttr.isMust == 0) true else { itemAttr.selectedProperties.isNotEmpty() && - !TextUtils.isEmptyText(itemAttr.selectedProperties[0].propVal) + !CoreTextUtils.isEmptyText(itemAttr.selectedProperties[0].propVal) } private fun isContentEditable() = itemAttr.isSelf && itemAttr.editable 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 0cc01f053..e102f474e 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 @@ -10,7 +10,7 @@ import com.chwl.app.audio.helper.AudioPlayerHelper 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.TextUtils +import com.chwl.core.utils.CoreTextUtils import com.chwl.core.utils.toast import com.chwl.library.utils.ResUtil import java.io.File @@ -129,7 +129,7 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem, } private fun playAudio(url: String?) { - if (playState == PLAY_STATE_PLAYING || TextUtils.isEmptyText(url)) return + if (playState == PLAY_STATE_PLAYING || CoreTextUtils.isEmptyText(url)) return playState = PLAY_STATE_PLAYING binding.palyState = playState AudioPlayerHelper.get().playInThread(url, object : OnPlayListener { diff --git a/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt b/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt index 1c501da1e..1fdeb0014 100644 --- a/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt +++ b/app/src/main/java/com/chwl/app/skill/widget/SelectionItem.kt @@ -6,7 +6,7 @@ import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import com.chwl.app.R -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: TextView @@ -38,7 +38,7 @@ class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { private fun setContent() { val builder = StringBuilder() itemAttr.selectedProperties.forEach { - if (!TextUtils.isEmptyText(it.propVal)) { + if (!CoreTextUtils.isEmptyText(it.propVal)) { builder.append(it.propVal).append("、") } } diff --git a/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java b/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java index 936cb148f..e65b5c44d 100644 --- a/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/adapter/StarWeekAdapter.java @@ -8,8 +8,7 @@ import com.chwl.app.R; import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.core.gift.bean.SimpleUserInfo; import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.chwl.core.utils.StringExtensionKt; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.library.common.application.BaseApp; import com.chwl.library.utils.ResUtil; import com.zhpan.bannerview.BaseBannerAdapter; @@ -34,7 +33,7 @@ public class StarWeekAdapter extends BaseBannerAdapter { } else { bg.setBackgroundResource(R.drawable.bg_star_week_2); } - if (TextUtils.isEmptyText(item.getAvatar())) { + if (CoreTextUtils.isEmptyText(item.getAvatar())) { ivAvatar.setImageResource(R.drawable.default_avatar); ivAvatar.setOnClickListener(v -> { if (item.getUid() == 0L) return; @@ -43,7 +42,7 @@ public class StarWeekAdapter extends BaseBannerAdapter { } else { ImageLoadUtils.loadImage(BaseApp.getContext(), item.getAvatar(), ivAvatar); } - if (TextUtils.isEmptyText(item.getNick())){ + if (CoreTextUtils.isEmptyText(item.getNick())){ tvNickCharm.setText(ResUtil.getString(R.string.ui_widget_giftdialog_013)); } else { tvNickCharm.setText(item.getNick()); diff --git a/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt b/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt index 544acfd56..45ebbf1ab 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/adapter/RoomShieldAdapter.kt @@ -7,7 +7,7 @@ import com.chwl.app.R import com.chwl.app.ui.utils.ImageLoadUtilsV2 import com.chwl.app.ui.utils.load import com.chwl.core.set.bean.ShieldInfo -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils class RoomShieldAdapter : BaseQuickAdapter(R.layout.item_room_shield) { @@ -17,7 +17,7 @@ class RoomShieldAdapter : BaseQuickAdapter(R.layout. setText(R.id.tv_room_title, item.title) setText(R.id.tv_id, "ID:${item.erbanNo}") } - helper.setGone(R.id.iv_room_tag, !TextUtils.isEmptyText(item.tagPict)) + helper.setGone(R.id.iv_room_tag, !CoreTextUtils.isEmptyText(item.tagPict)) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_room_tag), item.tagPict) helper.addOnClickListener(R.id.tv_unmask) } diff --git a/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt b/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt index 153e45957..b88ed0e45 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/bean/PermissionEntity.kt @@ -3,7 +3,7 @@ package com.chwl.app.ui.setting.bean import android.Manifest import android.os.Build import com.chwl.app.R -import com.chwl.core.utils.TextUtils +import com.chwl.core.utils.CoreTextUtils import com.chwl.library.utils.ResUtil enum class PermissionEntity( @@ -43,7 +43,7 @@ enum class PermissionEntity( companion object { fun fetchPermission(name: String): PermissionEntity? { - if (TextUtils.isEmptyText(name)) return null + if (CoreTextUtils.isEmptyText(name)) return null values().forEach { if (it.permissionName.contains(name)) return it diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java index 2a9852895..6979297aa 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java @@ -21,7 +21,7 @@ import com.chwl.app.common.svga.SimpleSvgaCallback; import com.chwl.core.home.bean.MainTabInfo; import com.chwl.core.home.bean.MainTabType; import com.chwl.core.utils.CheckUtils; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import java.net.MalformedURLException; import java.net.URL; @@ -74,7 +74,7 @@ public class MainRedPointTab extends RelativeLayout { if (tabInfo == null) return; tvTabName.setSelected(select); isSelected = select; - if (!TextUtils.isEmptyText(tabInfo.getTabSelectedAnimation()) && select) { + if (!CoreTextUtils.isEmptyText(tabInfo.getTabSelectedAnimation()) && select) { URL url = null; try { url = new URL(tabInfo.getTabSelectedAnimation()); diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java index fb841606b..797de6475 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonDialog.java @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import com.chwl.app.R; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.library.utils.ResUtil; import static android.graphics.Typeface.BOLD; @@ -98,12 +98,12 @@ public class CommonDialog extends BaseDialog { private OnActionListener l; public void setOkText(String okText) { - if (!TextUtils.isEmptyText(okText)) + if (!CoreTextUtils.isEmptyText(okText)) this.okText = okText; } public void setCancelText(String cancelText) { - if (!TextUtils.isEmptyText(cancelText)) + if (!CoreTextUtils.isEmptyText(cancelText)) this.cancelText = cancelText; } diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java index 02dc17c0c..d48825a2f 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/CommonTipDialog.java @@ -13,7 +13,7 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import com.chwl.app.R; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.library.utils.ResUtil; /** @@ -98,12 +98,12 @@ public class CommonTipDialog extends BaseDialog { private OnActionListener l; public void setOkText(String okText) { - if (!TextUtils.isEmptyText(okText)) + if (!CoreTextUtils.isEmptyText(okText)) this.okText = okText; } public void setCancelText(String cancelText) { - if (!TextUtils.isEmptyText(cancelText)) + if (!CoreTextUtils.isEmptyText(cancelText)) this.cancelText = cancelText; } diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java index bb30b309c..4a8e9d1d5 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/GiveDiamondTipDialog.java @@ -3,7 +3,6 @@ package com.chwl.app.ui.widget.dialog; import static android.graphics.Typeface.BOLD; import android.content.Context; -import android.media.Image; import android.os.Bundle; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -17,7 +16,7 @@ import androidx.annotation.ColorRes; import androidx.constraintlayout.widget.ConstraintLayout; import com.chwl.app.R; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.library.utils.ResUtil; /** @@ -133,7 +132,7 @@ public class GiveDiamondTipDialog extends BaseDialog { private OnActionListener l; public void setOkText(String okText) { - if (!TextUtils.isEmptyText(okText)) + if (!CoreTextUtils.isEmptyText(okText)) this.okText = okText; } diff --git a/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java index 38732b810..1b9474584 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -13,7 +13,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.app.vip.util.VipHelper; import com.chwl.core.gift.bean.SimpleVipInfo; import com.chwl.core.room.face.FaceInfo; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.library.utils.config.BasicConfig; import java.io.File; @@ -84,7 +84,7 @@ public class DynamicFaceAdapter extends BaseAdapter implements View.OnClickListe holder.ivVipLocked.setVisibility(isLocked ? View.VISIBLE : View.GONE); holder.faceIcon.setAlpha(isLocked ? 0.5f : 1f); String vipIcon = vipInfo == null ? "" : vipInfo.getVipIcon(); - if (TextUtils.isEmptyText(vipIcon)) { + if (CoreTextUtils.isEmptyText(vipIcon)) { // 普通表情 holder.ivNobleTag.setImageDrawable(null); } else { diff --git a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java index ca7a13584..d53e53f05 100644 --- a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java +++ b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java @@ -11,13 +11,13 @@ import androidx.annotation.Nullable; import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; -import com.chwl.core.utils.TextUtils; +import com.chwl.core.utils.CoreTextUtils; import com.chwl.core.vip.bean.UserVipInfo; public class VipHelper { public static void loadVipIcon(@NonNull ImageView ivVipIcon, @Nullable UserVipInfo vipInfo) { - if (vipInfo == null || TextUtils.isEmptyText(vipInfo.getVipIcon())) { + if (vipInfo == null || CoreTextUtils.isEmptyText(vipInfo.getVipIcon())) { ivVipIcon.setVisibility(View.GONE); } else { ivVipIcon.setVisibility(View.VISIBLE); @@ -27,7 +27,7 @@ public class VipHelper { public static void loadVipNickColor(@NonNull TextView tvNick, @Nullable UserVipInfo vipInfo, String defaultColor) { try { - if (vipInfo == null || TextUtils.isEmptyText(vipInfo.getFriendNickColour())) { + if (vipInfo == null || CoreTextUtils.isEmptyText(vipInfo.getFriendNickColour())) { tvNick.setTextColor(Color.parseColor(defaultColor)); } else { tvNick.setTextColor(Color.parseColor(vipInfo.getFriendNickColour())); diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 6b30f8035..a1c5e4690 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -5,7 +5,7 @@ - +