diff --git a/app/src/main/java/com/nnbc123/app/AgentActivity.java b/app/src/main/java/com/nnbc123/app/AgentActivity.java index d44a4ea81..9ba1ddf5b 100644 --- a/app/src/main/java/com/nnbc123/app/AgentActivity.java +++ b/app/src/main/java/com/nnbc123/app/AgentActivity.java @@ -15,7 +15,7 @@ import com.nnbc123.app.other.activity.SplashActivity; import com.nnbc123.core.linked.LinkedModel; import com.nnbc123.core.linked.bean.LinkedInfo; import com.nnbc123.core.user.UserModel; -import com.nnbc123.core.utils.TextUtils; +import com.nnbc123.core.utils.CTextUtils; import java.util.HashMap; import java.util.List; @@ -49,7 +49,7 @@ public class AgentActivity extends AppCompatActivity implements SceneRestorable if (roomuid != null) { linkedInfo.setRoomUid(roomuid); } - if (TextUtils.isEmptyText(roomuid) && uid != null) { + if (CTextUtils.isEmptyText(roomuid) && uid != null) { linkedInfo.setRoomUid(uid); } if (uid != null) { diff --git a/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt b/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt index fd459b0e3..308758d78 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/dialog/CreatePrivilegeCardDialog.kt @@ -35,7 +35,7 @@ import com.nnbc123.app.ui.widget.dialog.CommonTipDialog import com.nnbc123.core.file.FileModel import com.nnbc123.core.privilege.bean.PrivilegeCardInfo import com.nnbc123.core.utils.Logger -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils import com.nnbc123.library.common.file.FileHelper import com.nnbc123.library.common.photo.PhotoProviderNew import com.nnbc123.library.common.support.PathHelper @@ -268,9 +268,9 @@ class CreatePrivilegeCardDialog : BaseDialog() } private fun checkEmpty(): Boolean { - return (TextUtils.isEmptyText(binding.edName.text.toString()) || TextUtils.isEmptyText( + return (CTextUtils.isEmptyText(binding.edName.text.toString()) || CTextUtils.isEmptyText( binding.edUseNumber.text.toString() - ) || TextUtils.isEmptyText(binding.edValid.text.toString()) || TextUtils.isEmptyText(binding.edId.text.toString()) || TextUtils.isEmptyText( + ) || CTextUtils.isEmptyText(binding.edValid.text.toString()) || CTextUtils.isEmptyText(binding.edId.text.toString()) || CTextUtils.isEmptyText( mUrl )) } diff --git a/app/src/main/java/com/nnbc123/app/avroom/firstcharge/RewardAdapter.kt b/app/src/main/java/com/nnbc123/app/avroom/firstcharge/RewardAdapter.kt index aed985d10..4fd89c720 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/firstcharge/RewardAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/firstcharge/RewardAdapter.kt @@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.nnbc123.app.R import com.nnbc123.core.pay.bean.FirstChargeReward import com.nnbc123.app.ui.utils.ImageLoadUtils -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils class RewardAdapter(private val itemWidth: Int) : BaseQuickAdapter(R.layout.item_first_charge_reward) { @@ -23,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, !CTextUtils.isEmptyText(item.showTime)) } } \ No newline at end of file diff --git a/app/src/main/java/com/nnbc123/app/avroom/fragment/PrivilegeCardFragment.kt b/app/src/main/java/com/nnbc123/app/avroom/fragment/PrivilegeCardFragment.kt index a2fb0e90c..9b53ee7e1 100644 --- a/app/src/main/java/com/nnbc123/app/avroom/fragment/PrivilegeCardFragment.kt +++ b/app/src/main/java/com/nnbc123/app/avroom/fragment/PrivilegeCardFragment.kt @@ -21,7 +21,7 @@ import com.nnbc123.app.databinding.FragmentPrivilegeCardBinding import com.nnbc123.app.ui.utils.RVDelegate import com.nnbc123.app.ui.widget.dialog.CommonTipDialog import com.nnbc123.core.privilege.bean.PrivilegeCardInfo -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils import com.zhihu.matisse.internal.entity.CustomItem import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -173,7 +173,7 @@ class PrivilegeCardFragment : BaseViewBindingFragment(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, !CTextUtils.isEmptyText(item.showTime)) } } \ No newline at end of file diff --git a/app/src/main/java/com/nnbc123/app/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/nnbc123/app/home/adapter/HomeSingleAnchorAdapter.kt index 77267f5fe..b80194219 100644 --- a/app/src/main/java/com/nnbc123/app/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/home/adapter/HomeSingleAnchorAdapter.kt @@ -14,7 +14,7 @@ import com.nnbc123.app.ui.utils.loadFromAssets import com.nnbc123.core.home.bean.HomeRoomInfo import com.nnbc123.core.statistic.StatisticManager import com.nnbc123.core.statistic.protocol.StatisticsProtocol -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils /** * create by lvzebiao @2019/11/13 @@ -25,7 +25,7 @@ class HomeSingleAnchorAdapter : override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { helper.setText( R.id.tv_room_name, - if (!TextUtils.isEmptyText(item.title)) item.title else "" + if (!CTextUtils.isEmptyText(item.title)) item.title else "" ) ImageLoadUtilsV2.loadImage(helper.getView(R.id.iv_avatar), item.avatar) val ivPking = helper.getView(R.id.iv_pking) diff --git a/app/src/main/java/com/nnbc123/app/skill/widget/EditItem.kt b/app/src/main/java/com/nnbc123/app/skill/widget/EditItem.kt index 49e34dffb..c8fec43c2 100644 --- a/app/src/main/java/com/nnbc123/app/skill/widget/EditItem.kt +++ b/app/src/main/java/com/nnbc123/app/skill/widget/EditItem.kt @@ -7,7 +7,7 @@ import android.widget.EditText import android.widget.TextView import com.nnbc123.app.R import com.nnbc123.core.skill.entity.PropRefEntity -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils 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) + !CTextUtils.isEmptyText(itemAttr.selectedProperties[0].propVal) } private fun isContentEditable() = itemAttr.isSelf && itemAttr.editable diff --git a/app/src/main/java/com/nnbc123/app/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/nnbc123/app/skill/widget/RecordIResourceItem.kt index baab633cd..de15c19a7 100644 --- a/app/src/main/java/com/nnbc123/app/skill/widget/RecordIResourceItem.kt +++ b/app/src/main/java/com/nnbc123/app/skill/widget/RecordIResourceItem.kt @@ -10,7 +10,7 @@ import com.nnbc123.app.audio.helper.AudioPlayerHelper import com.nnbc123.app.audio.helper.OnPlayListener import com.nnbc123.app.databinding.LayoutSkillAudioBinding import com.nnbc123.app.ui.widget.dialog.CommonTipDialog -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils import com.nnbc123.core.utils.toast import java.io.File @@ -128,7 +128,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 || CTextUtils.isEmptyText(url)) return playState = PLAY_STATE_PLAYING binding.palyState = playState AudioPlayerHelper.get().playInThread(url, object : OnPlayListener { diff --git a/app/src/main/java/com/nnbc123/app/skill/widget/SelectionItem.kt b/app/src/main/java/com/nnbc123/app/skill/widget/SelectionItem.kt index e3e3ae527..dad8a9640 100644 --- a/app/src/main/java/com/nnbc123/app/skill/widget/SelectionItem.kt +++ b/app/src/main/java/com/nnbc123/app/skill/widget/SelectionItem.kt @@ -6,7 +6,7 @@ import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import com.nnbc123.app.R -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils import java.lang.StringBuilder class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { @@ -39,7 +39,7 @@ class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { private fun setContent() { val builder = StringBuilder() itemAttr.selectedProperties.forEach { - if (!TextUtils.isEmptyText(it.propVal)) { + if (!CTextUtils.isEmptyText(it.propVal)) { builder.append(it.propVal).append("、") } } diff --git a/app/src/main/java/com/nnbc123/app/ui/search/CommonSearchEmptyAdapter.kt b/app/src/main/java/com/nnbc123/app/ui/search/CommonSearchEmptyAdapter.kt index c45f5ac96..1d385d6dc 100644 --- a/app/src/main/java/com/nnbc123/app/ui/search/CommonSearchEmptyAdapter.kt +++ b/app/src/main/java/com/nnbc123/app/ui/search/CommonSearchEmptyAdapter.kt @@ -5,7 +5,7 @@ import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.nnbc123.core.home.bean.HomeRoomInfo -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils import com.nnbc123.app.R import com.nnbc123.app.avroom.activity.AVRoomActivity import com.nnbc123.app.ui.utils.load @@ -17,7 +17,7 @@ class CommonSearchEmptyAdapter : override fun convert(helper: BaseViewHolder, item: HomeRoomInfo) { val ivTag = helper.getView(R.id.iv_tag) - ivTag.isVisible = !TextUtils.isEmptyText(item.tagPict) + ivTag.isVisible = !CTextUtils.isEmptyText(item.tagPict) ivTag.load(item.tagPict) helper.setText(R.id.tv_online_num, item.onlineNum.toString()) .setText(R.id.tv_nickname, item.nick) diff --git a/app/src/main/java/com/nnbc123/app/ui/setting/bean/PermissionEntity.kt b/app/src/main/java/com/nnbc123/app/ui/setting/bean/PermissionEntity.kt index 219c0dc2c..9380a6df5 100644 --- a/app/src/main/java/com/nnbc123/app/ui/setting/bean/PermissionEntity.kt +++ b/app/src/main/java/com/nnbc123/app/ui/setting/bean/PermissionEntity.kt @@ -3,7 +3,7 @@ package com.nnbc123.app.ui.setting.bean import android.Manifest import android.os.Build import com.nnbc123.app.R -import com.nnbc123.core.utils.TextUtils +import com.nnbc123.core.utils.CTextUtils enum class PermissionEntity( val alias: String, @@ -60,7 +60,7 @@ enum class PermissionEntity( companion object { fun fetchPermission(name: String): PermissionEntity? { - if (TextUtils.isEmptyText(name)) return null + if (CTextUtils.isEmptyText(name)) return null values().forEach { if (it.permissionName.contains(name)) return it diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/nnbc123/app/ui/widget/MainRedPointTab.java index 023071064..0f56c9a8f 100644 --- a/app/src/main/java/com/nnbc123/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/nnbc123/app/ui/widget/MainRedPointTab.java @@ -22,7 +22,7 @@ import com.nnbc123.app.common.svga.SimpleSvgaCallback; import com.nnbc123.core.home.bean.MainTabInfo; import com.nnbc123.core.home.bean.MainTabType; import com.nnbc123.core.utils.CheckUtils; -import com.nnbc123.core.utils.TextUtils; +import com.nnbc123.core.utils.CTextUtils; import java.net.MalformedURLException; import java.net.URL; @@ -75,7 +75,7 @@ public class MainRedPointTab extends RelativeLayout { if (tabInfo == null) return; tvTabName.setSelected(select); isSelected = select; - if (!TextUtils.isEmptyText(tabInfo.getTabSelectedAnimation()) && select) { + if (!CTextUtils.isEmptyText(tabInfo.getTabSelectedAnimation()) && select) { URL url = null; try { url = new URL(tabInfo.getTabSelectedAnimation()); diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonTipDialog.java index d5ffe2440..81cc7abdd 100644 --- a/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/nnbc123/app/ui/widget/dialog/CommonTipDialog.java @@ -14,7 +14,7 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import com.nnbc123.app.R; -import com.nnbc123.core.utils.TextUtils; +import com.nnbc123.core.utils.CTextUtils; /** * @author jack @@ -49,7 +49,7 @@ public class CommonTipDialog extends BaseDialog { setContentView(R.layout.layout_ok_cancel_dialog); TextView title = findViewById(R.id.tv_title); - if (TextUtils.isEmptyText(titleMsg)) { + if (CTextUtils.isEmptyText(titleMsg)) { title.setVisibility(View.GONE); } else { title.setText(titleMsg); @@ -121,12 +121,12 @@ public class CommonTipDialog extends BaseDialog { private OnActionListener l; public void setOkText(String okText) { - if (!TextUtils.isEmptyText(okText)) + if (!CTextUtils.isEmptyText(okText)) this.okText = okText; } public void setCancelText(String cancelText) { - if (!TextUtils.isEmptyText(cancelText)) + if (!CTextUtils.isEmptyText(cancelText)) this.cancelText = cancelText; } diff --git a/app/src/main/java/com/nnbc123/app/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/nnbc123/app/ui/widget/dynamicface/DynamicFaceAdapter.java index 675576c6d..79cdd716f 100644 --- a/app/src/main/java/com/nnbc123/app/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/nnbc123/app/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -13,7 +13,7 @@ import com.nnbc123.app.ui.utils.ImageLoadUtils; import com.nnbc123.app.vip.VipHelper; import com.nnbc123.core.gift.bean.SimpleVipInfo; import com.nnbc123.core.room.face.FaceInfo; -import com.nnbc123.core.utils.TextUtils; +import com.nnbc123.core.utils.CTextUtils; import com.nnbc123.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 (CTextUtils.isEmptyText(vipIcon)) { // 普通表情 holder.ivNobleTag.setImageDrawable(null); } else { diff --git a/app/src/main/java/com/nnbc123/app/vip/VipHelper.java b/app/src/main/java/com/nnbc123/app/vip/VipHelper.java index 24433b8b3..be19dc2db 100644 --- a/app/src/main/java/com/nnbc123/app/vip/VipHelper.java +++ b/app/src/main/java/com/nnbc123/app/vip/VipHelper.java @@ -11,13 +11,13 @@ import androidx.annotation.Nullable; import com.nnbc123.app.ui.utils.ImageLoadUtils; import com.nnbc123.core.user.UserModel; import com.nnbc123.core.user.bean.UserInfo; -import com.nnbc123.core.utils.TextUtils; +import com.nnbc123.core.utils.CTextUtils; import com.nnbc123.core.vip.UserVipInfo; public class VipHelper { public static void loadVipIcon(@NonNull ImageView ivVipIcon, @Nullable UserVipInfo vipInfo) { - if (vipInfo == null || TextUtils.isEmptyText(vipInfo.getVipIcon())) { + if (vipInfo == null || CTextUtils.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 || CTextUtils.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 d157796f7..134012739 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -5,7 +5,7 @@ - +