diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index 1605a5157..0d473b009 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -111,7 +111,7 @@ import com.chwl.core.user.event.LoginUserInfoUpdateEvent; import com.chwl.core.user.event.NeedBindPhoneEvent; import com.chwl.core.user.event.NeedCompleteInfoEvent; import com.chwl.core.utils.SharedPreferenceUtils; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.library.base.factory.CreatePresenter; import com.chwl.library.threadmgr.ThreadPoolManager; import com.chwl.library.utils.JavaUtil; @@ -793,8 +793,8 @@ public class MainActivity extends BaseMvpActivity GameHomeModel.get().getRoomShortcut() .compose(bindUntilEvent(ActivityEvent.DESTROY)) .subscribe(uid -> { - if (StringUtils.toLong(uid) != 0) { - AVRoomActivity.start(context, StringUtils.toLong(uid)); + if (StringFormatUtils.toLong(uid) != 0) { + AVRoomActivity.start(context, StringFormatUtils.toLong(uid)); } }, Throwable::printStackTrace); diff --git a/app/src/main/java/com/chwl/app/audio/adapter/MyVoiceListAdapter.java b/app/src/main/java/com/chwl/app/audio/adapter/MyVoiceListAdapter.java index c1b008891..3fc437ca4 100644 --- a/app/src/main/java/com/chwl/app/audio/adapter/MyVoiceListAdapter.java +++ b/app/src/main/java/com/chwl/app/audio/adapter/MyVoiceListAdapter.java @@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.chwl.app.R; import com.chwl.app.audio.widget.VoiceLine; import com.chwl.core.audio.bean.UserVoiceInfo; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.library.utils.ResUtil; import java.util.List; @@ -105,7 +105,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter { - if (StringUtils.isEmpty(item.getVoiceUrl())) { + if (StringFormatUtils.isEmpty(item.getVoiceUrl())) { return; } boolean isChange = helper.getAdapterPosition() != voiceClickPos; @@ -140,7 +140,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter { - if (StringUtils.isEmpty(item.getVoiceUrl())) { + if (StringFormatUtils.isEmpty(item.getVoiceUrl())) { return; } boolean isChange = helper.getAdapterPosition() != voiceClickPos; @@ -177,7 +177,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter { - if (StringUtils.isEmpty(item.getVoiceUrl())) { + if (StringFormatUtils.isEmpty(item.getVoiceUrl())) { return; } boolean isChange = helper.getAdapterPosition() != voiceClickPos; diff --git a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java index dc4d75276..10472056a 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java @@ -144,7 +144,7 @@ import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.FirstChargeInfo; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.LogUtils; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.library.base.factory.CreatePresenter; import com.chwl.library.rxbus.RxBus; import com.chwl.library.utils.ResUtil; @@ -295,7 +295,7 @@ public class AVRoomActivity extends BaseMvpActivity= '!' && c <= '}') { - return (char) (c - 'ﻠ'); - } else if (c == 12288) { - return (char) (c - 12288 + 32); - } else if (c == '。') { - return '。'; - } else if (c == 12539) { - return '·'; - } else { - return c == 8226 ? '·' : c; - } - } - - public static int ord(char c) { - if ('a' <= c && c <= 'z') { - return c; - } else { - return 'A' <= c && c <= 'Z' ? c - 65 + 97 : 0; - } - } - - public static int compare(String x, String y) { - return FP.ref(x).compareTo(FP.ref(y)); - } - - public static long parseLong(String s) { - long l = 0L; - try { - l = Long.parseLong(s.trim()); - } catch (Exception e) { - return l; - } - return l; - } - -} diff --git a/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java b/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java index 4b4523360..9cb57d52a 100644 --- a/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java +++ b/app/src/main/java/com/chwl/app/ui/user/adapter/UserDesAdapter.java @@ -32,7 +32,7 @@ import com.chwl.core.user.bean.JoinWorldInfo; import com.chwl.core.user.bean.UserGameInfo; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.user.bean.UserPhoto; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.library.utils.ListUtils; import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.SizeUtils; @@ -224,14 +224,14 @@ public class UserDesAdapter extends UserTabBaseAdapter implements UserPhotoAdapt if (isOwner()) {// 主态 helper.setGone(R.id.layout_voice, true); - helper.setGone(R.id.layout_voice_bar, !StringUtils.isEmpty(userInfo.getUserVoice())); - helper.setGone(R.id.layout_voice_bar_no_data, StringUtils.isEmpty(userInfo.getUserVoice())); + helper.setGone(R.id.layout_voice_bar, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); + helper.setGone(R.id.layout_voice_bar_no_data, StringFormatUtils.isEmpty(userInfo.getUserVoice())); helper.setText(R.id.tv_voice_title, ResUtil.getString(R.string.user_adapter_userdesadapter_01)); helper.setGone(R.id.iv_voice_more, true); } else {// 客态 - helper.setGone(R.id.layout_voice, !StringUtils.isEmpty(userInfo.getUserVoice())); - helper.setGone(R.id.layout_voice_bar, !StringUtils.isEmpty(userInfo.getUserVoice())); + helper.setGone(R.id.layout_voice, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); + helper.setGone(R.id.layout_voice_bar, !StringFormatUtils.isEmpty(userInfo.getUserVoice())); helper.setGone(R.id.layout_voice_bar_no_data, false); helper.setText(R.id.tv_voice_title, ResUtil.getString(R.string.user_adapter_userdesadapter_02)); helper.setGone(R.id.iv_voice_more, false); diff --git a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java index 63741e4e1..8b1210476 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/UserInfoDialog.java @@ -82,7 +82,7 @@ import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.BaseInfo; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.CoreLogger; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.core.utils.net.BeanObserver; import com.chwl.core.utils.net.DontWarnObserver; import com.chwl.core.utils.net.RxHelper; @@ -868,7 +868,7 @@ public class UserInfoDialog extends AppCompatDialog implements View.OnClickListe //目标用户是否是管理,(房主或者管理员) boolean isTargetManager = isTargetRoomOwner || isTargetRoomAdmin; boolean isTargetOnMic = AvRoomDataManager.get().isOnMic(account); - boolean isTargetVip = AvRoomDataManager.get().isDatingVip(StringUtils.toLong(account)) || + boolean isTargetVip = AvRoomDataManager.get().isDatingVip(StringFormatUtils.toLong(account)) || AvRoomDataManager.get().isDatingVipMic(micPosition); //超管逻辑 if (SuperAdminUtil.isSuperAdmin()) { diff --git a/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/module/PublicChatHallInputPanel.java b/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/module/PublicChatHallInputPanel.java index 01cc5d43a..905bb7fb3 100644 --- a/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/module/PublicChatHallInputPanel.java +++ b/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/module/PublicChatHallInputPanel.java @@ -23,7 +23,6 @@ import android.widget.EditText; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.Toast; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.api.NimUIKit; @@ -61,7 +60,7 @@ import com.chwl.core.initial.InitialModel; import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import com.chwl.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; @@ -412,7 +411,7 @@ public class PublicChatHallInputPanel implements IEmoticonSelectedListener, IAud // 发送文本消息 private void onTextMessageSendButtonPressed() { String text = messageEditText.getText().toString(); - if (StringUtils.isEmpty(text)) return; + if (StringFormatUtils.isEmpty(text)) return; IMMessage textMessage = createTextMessage(text); if (AntiSpamUtil.checkLocalAntiSpam(textMessage)) { EventBus.getDefault().post(new AntiSpamEvent()); diff --git a/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java b/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java index 2f7206db4..7023bef19 100644 --- a/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java +++ b/app/src/module_public_chat_hall/java/com/chwl/app/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java @@ -31,7 +31,7 @@ import com.chwl.core.level.UserLevelResourceType; import com.chwl.core.noble.NobleResourceType; import com.chwl.core.noble.NobleUtil; import com.chwl.core.user.bean.UserInfo; -import com.chwl.core.utils.StringUtils; +import com.chwl.core.utils.StringFormatUtils; import org.greenrobot.eventbus.EventBus; @@ -402,7 +402,7 @@ public abstract class ChatRoomMsgViewHolderBase extends RecyclerViewHolder 200) { mBinding.editNum.setText("200"); SingleToastUtil.showToast(ResUtil.getString(R.string.erban_shipantics_pullradishactivity_01)); @@ -134,7 +134,7 @@ public class PullRadishActivity extends BaseBindingActivity