()
.setPageSize(pageSize)
- .setEmptyView(EmptyViewHelper.createEmptyView(this, "暂无搜索内容"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(this, ResUtil.getString(R.string.avroom_singleroompk_singleroompksearchactivity_01)))
.setLayoutManager(LinearLayoutManager(this))
.setRecyclerView(binding.recyclerView)
.setAdapter(roomPKSearchAdapter)
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java b/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java
index 191ea9183..e272bb816 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/view/IAvRoomView.java
@@ -3,14 +3,10 @@ package com.yizhuan.erban.avroom.view;
import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
-import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
-import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;
-import java.util.List;
-
/**
*
*
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt b/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt
index 638fb965c..23ee4bab9 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/view/IBaseRoomView.kt
@@ -1,10 +1,8 @@
package com.yizhuan.erban.avroom.view
-import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage
import com.yizhuan.xchat_android_core.bean.RoomMicInfo
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo
import com.yizhuan.xchat_android_library.base.IMvpBaseView
-import java.util.ArrayList
/**
*
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java b/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java
index 35081aaed..2ffcbbfff 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/view/IHomePartyView.java
@@ -1,7 +1,6 @@
package com.yizhuan.erban.avroom.view;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java
index c4d52b17f..73fbc595a 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/ActivityTimerView.java
@@ -1,14 +1,15 @@
package com.yizhuan.erban.avroom.widget;
-
import android.content.Context;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.concurrent.TimeUnit;
@@ -55,7 +56,7 @@ public class ActivityTimerView extends LinearLayout {
.observeOn(AndroidSchedulers.mainThread())
.doOnNext(aLong -> {
- tvTime.setText((maxTime - aLong) + "秒");
+ tvTime.setText((maxTime - aLong) + ResUtil.getString(R.string.avroom_widget_activitytimerview_01));
if (maxTime - aLong <= 0) {
setVisibility(GONE);
}
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java
index 7c0d53626..123d346b8 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/BottomView.java
@@ -44,6 +44,7 @@ import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -334,7 +335,7 @@ public class BottomView extends FrameLayout implements View.OnClickListener {
case R.id.icon_room_vip:
VipMainActivity.start(getContext());
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_VIP_ENTRANCE_ROOM_CLICK, "贵族房间入口点击事件");
+ .onEvent(StatisticsProtocol.EVENT_VIP_ENTRANCE_ROOM_CLICK, ResUtil.getString(R.string.avroom_widget_bottomview_01));
break;
default:
break;
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java
index 9410f7b19..de4a1315f 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/EditRoomTitleDialog.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.avroom.widget;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
-import androidx.appcompat.app.AppCompatDialog;
import android.text.Editable;
import android.text.InputFilter;
import android.text.InputType;
@@ -13,10 +12,13 @@ import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatDialog;
+
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
import com.yizhuan.erban.R;
import com.yizhuan.erban.utils.KeyBoardUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.concurrent.TimeUnit;
@@ -96,39 +98,39 @@ public class EditRoomTitleDialog extends AppCompatDialog {
etContent.setSelection(oldContent.length());
}
if (dialogType == TYPE_EDIT_PASSWORD) {
- tvTitle.setText("房间密码");
+ tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_01));
tvLimit.setVisibility(View.VISIBLE);
etContent.setInputType(InputType.TYPE_CLASS_NUMBER);
- etContent.setHint("请输入房间密码");
+ etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_02));
maxLength = 8;
etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
setLimtText();
} else if (dialogType == TYPE_EDIT_NAME){
- tvTitle.setText("房间名编辑");
+ tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_03));
tvLimit.setVisibility(View.VISIBLE);
- etContent.setHint("请输入房间名");
+ etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_04));
maxLength = 15;
etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
setLimtText();
} else if (dialogType == TYPE_EDIT_DESC) {
- tvTitle.setText("房间话题编辑");
+ tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_05));
tvLimit.setVisibility(View.VISIBLE);
- etContent.setHint("请输入房间话题");
+ etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_06));
maxLength = 15;
etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
setLimtText();
} else if (dialogType == TYPE_EDIT_TEAM_NAME) {
- tvTitle.setText("修改群聊名称");
+ tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_07));
tvLimit.setVisibility(View.GONE);
- etContent.setHint("请输入群聊名称");
+ etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_08));
maxLength = 16;
etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
setLimtText();
} else if (dialogType == TYPE_EDIT_TEAM_THEME) {
- tvTitle.setText("修改派对名称");
+ tvTitle.setText(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_09));
tvLimit.setVisibility(View.GONE);
- etContent.setHint("请输入派对名称");
+ etContent.setHint(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_010));
maxLength = 16;
etContent.setFilters(new InputFilter[]{new InputFilter.LengthFilter(maxLength)});
setLimtText();
@@ -148,7 +150,7 @@ public class EditRoomTitleDialog extends AppCompatDialog {
findViewById(R.id.btn_ok).setOnClickListener(v -> {
if (TextUtils.isEmpty(etContent.getText().toString())){
- SingleToastUtil.showToast("不能为空");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.avroom_widget_editroomtitledialog_011));
return;
}
if (onEditTitleListner != null) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
index 3b9e16ab7..97065a088 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/FixRoomTitleTextView.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.avroom.widget;
import android.content.Context;
-import androidx.appcompat.widget.AppCompatTextView;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import androidx.appcompat.widget.AppCompatTextView;
+
/**
* 尝试修复 https://bugly.qq.com/v2/crash-reporting/crashes/52320483a6/29504?pid=1
*
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java
index f81814d70..7c9fe2e57 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GalleryLayoutManager.java
@@ -1,23 +1,23 @@
package com.yizhuan.erban.avroom.widget;
+import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
import android.content.Context;
import android.graphics.PointF;
import android.graphics.Rect;
-import androidx.recyclerview.widget.LinearSmoothScroller;
-import androidx.recyclerview.widget.LinearSnapHelper;
-import androidx.recyclerview.widget.OrientationHelper;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
-
import android.util.AttributeSet;
import android.util.Log;
import android.util.SparseArray;
import android.view.View;
import android.view.ViewGroup;
-import com.yizhuan.erban.application.XChatApplication;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.LinearSnapHelper;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
-import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import com.yizhuan.erban.application.XChatApplication;
/**
* A custom LayoutManager to build a {@link android.widget.Gallery} or a {@link ViewPager}like {@link RecyclerView} and
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
index ba8bd76e3..8e448d775 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftEffectView.java
@@ -41,6 +41,7 @@ import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.ResolutionUtils;
import java.lang.ref.WeakReference;
@@ -141,14 +142,14 @@ public class GiftEffectView extends RelativeLayout implements SVGACallback {
receiverNick.setText(giftReceiver.getNick());
} else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_ALL) {
receiverAvatar.setImageResource(R.drawable.about_logo);
- receiverNick.setText("全麦");
+ receiverNick.setText(ResUtil.getString(R.string.avroom_widget_gifteffectview_01));
} else if (giftEffectInfo.getGiftReceiveType() == GiftEffectInfo.GIFT_RECEIVE_TYPE_MULTI) {
receiverAvatar.setImageResource(R.drawable.about_logo);
StringBuilder sb = new StringBuilder();
for (GiftReceiver targetUser : giftEffectInfo.getTargetUsers()) {
RoomQueueInfo roomQueueInfo = AvRoomDataManager.get().getRoomQueueMemberInfoByAccount(targetUser.getUid() + "");
if (roomQueueInfo == null) continue;
- sb.append(roomQueueInfo.mRoomMicInfo.getPosition() + 1).append("麦").append(",");
+ sb.append(roomQueueInfo.mRoomMicInfo.getPosition() + 1).append(ResUtil.getString(R.string.avroom_widget_gifteffectview_02)).append(",");
}
if (sb.length() > 0) {
sb.replace(sb.lastIndexOf(","), sb.length(), "");
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
index 72a52b469..06b8c632a 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/GiftV2View.java
@@ -35,7 +35,6 @@ import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.svga.SimpleSvgaParseCompletion;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.drawgift.DrawGiftHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo;
@@ -58,7 +57,7 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
-import com.yizhuan.xchat_android_core.utils.LogUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.ResolutionUtils;
import java.lang.ref.WeakReference;
@@ -700,10 +699,10 @@ public class GiftV2View extends FrameLayout implements GiftEffectView.GiftEffect
try {
SVGAVideoEntity svgaVideoEntity = popSvgaVideoItem(animation);
if (svgaVideoEntity != null) {
- System.out.println(TAG + ", 用缓存！");
+ System.out.println(TAG + ResUtil.getString(R.string.avroom_widget_giftv2view_01));
parseCompletion.onComplete(svgaVideoEntity);
} else {
- System.out.println(TAG + ", 用io！");
+ System.out.println(TAG + ResUtil.getString(R.string.avroom_widget_giftv2view_02));
URL url = new URL(animation);
mSVGAParser.decodeFromURL(url, parseCompletion, null);
}
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
index ae5a42891..6524979cd 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
@@ -155,6 +155,7 @@ import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
import com.yizhuan.xchat_android_library.utils.FormatUtils;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
@@ -385,12 +386,12 @@ public class MessageView extends FrameLayout {
// + " dis:"+ (lastVisibleItemPosition-(recyclerView.getAdapter().getItemCount()-1)));
if (lastVisibleItemPosition >= recyclerView.getAdapter().getItemCount() - 3) {
//最后一个显示出来了
-// Logger.e(TAG, "lastCompletelyVisibleItemPosition : 最后可见 ");
+// Logger.e(TAG, ResUtil.getString(R.string.avroom_widget_messageview_01));
needAutoScroll = true;
tvBottomTip.setVisibility(GONE);
keepSizeUnderLimit();
} else {
-// Logger.e(TAG, "lastCompletelyVisibleItemPosition : 最后一个没看见");
+// Logger.e(TAG, ResUtil.getString(R.string.avroom_widget_messageview_02));
// needAutoScroll = false;
}
}
@@ -742,7 +743,7 @@ public class MessageView extends FrameLayout {
if (chatRoomMessage.getMsgType() == MsgTypeEnum.tip) {
String contentText = chatRoomMessage.getContent();
// 房间通告
- if ("礼物特效".equals(contentText)) {
+ if (ResUtil.getString(R.string.avroom_widget_messageview_03).equals(contentText)) {
setUpdateGiftEffectMsg(tvContent);
} else if (XChatConstants.ROOM_INTRODUCTION.equals(contentText) || contentText.contains(IMNetEaseManager.ROOM_INTRO_TAG)) {
tvContent.setTextColor(ContextCompat.getColor(mContext, R.color.white));
@@ -1019,7 +1020,7 @@ public class MessageView extends FrameLayout {
if (fansTeamMsgAttachment.getSecond() == CUSTOM_MSG_SUB_FANS_TEAM_JOIN) {
FansTeamMsgInfo msgInfo = fansTeamMsgAttachment.getFansTeamMsgInfo();
SpannableBuilder text = new SpannableBuilder(tvContent);
- text.append("欢迎", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_04), new ForegroundColorSpan(whiteColor))
.append(msgInfo.getNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@Override
@@ -1029,7 +1030,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("加入粉丝团", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_05), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1050,7 +1051,7 @@ public class MessageView extends FrameLayout {
int second = datingAttachment.getSecond();
switch (second) {
case CustomAttachment.CUSTOM_MSG_VIP_ROOM_OPEN:
- text.append("贵族降临！恭喜", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_06), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getNick() + "(" + notifyInfo.getErbanNo() + ")", new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -1061,13 +1062,13 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("开通贵族系统，获得", new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_07), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getCurrVipName(), new ForegroundColorSpan(roomTipColor))
- .append("贵族身份！", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_08), new ForegroundColorSpan(whiteColor));
break;
case CustomAttachment.CUSTOM_MSG_VIP_ROOM_UPGRADE:
case CustomAttachment.CUSTOM_MSG_VIP_ROOM_ALL_UPGRADE:
- text.append("全场欢呼！！恭喜", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_09), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getNick() + "(" + notifyInfo.getErbanNo() + ")", new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@Override
@@ -1077,7 +1078,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("的贵族身份成功升级为", new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_010), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getCurrVipName(), new ForegroundColorSpan(roomTipColor));
break;
}
@@ -1096,13 +1097,13 @@ public class MessageView extends FrameLayout {
LuckyBagNoticeInfo noticeInfo = attachment.getLuckyBagNoticeInfo();
String nickName = RegexUtil.getPrintableString(noticeInfo.getNick());
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("恭喜 ", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_011), new ForegroundColorSpan(textColor))
.append(nickName, new ForegroundColorSpan(roomTipNickColor))
- .append("在", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_012), new ForegroundColorSpan(textColor))
.append(noticeInfo.getRoomTitle() + "", new ForegroundColorSpan(roomTipNickColor))
- .append("房间通过", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_013), new ForegroundColorSpan(textColor))
.append(noticeInfo.getLuckyBagName(), new ForegroundColorSpan(roomTipNickColor))
- .append(",开出", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_014), new ForegroundColorSpan(textColor))
.append(noticeInfo.getGiftName() + "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
}
@@ -1115,8 +1116,8 @@ public class MessageView extends FrameLayout {
SpannableBuilder text = new SpannableBuilder(tvContent);
switch (second) {
case CustomAttachment.CUSTOM_MSG_SUB_DATING_SELECT:
- text.append("本轮您选择了 ", new ForegroundColorSpan(whiteColor))
- .append((notifyInfo.getTargetPosition() + 1) + "号" + (notifyInfo.getTargetGender() == 1 ? "男" : "女") + "嘉宾:", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_015), new ForegroundColorSpan(whiteColor))
+ .append((notifyInfo.getTargetPosition() + 1) + ResUtil.getString(R.string.avroom_widget_messageview_016) + (notifyInfo.getTargetGender() == 1 ? ResUtil.getString(R.string.avroom_widget_messageview_017) : ResUtil.getString(R.string.avroom_widget_messageview_018)) + ResUtil.getString(R.string.avroom_widget_messageview_019), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -1127,7 +1128,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("作为你的心动对象", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_020), new ForegroundColorSpan(whiteColor));
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_LIKE:
if (notifyInfo.getHasSelectUser()) {
@@ -1141,7 +1142,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 的心动对象是 ", new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_021), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -1163,11 +1164,11 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 未选择心动对象", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_022), new ForegroundColorSpan(whiteColor));
}
break;
case CustomAttachment.CUSTOM_MSG_SUB_DATING_PUBLISH_HEART:
- text.append("恭喜 ", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_023), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -1178,7 +1179,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 和 ", new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_024), new ForegroundColorSpan(whiteColor))
.append(notifyInfo.getTargetNickname(), new ForegroundColorSpan(roomTipNickColor),
new OriginalDrawStatusClickSpan() {
@@ -1189,7 +1190,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 牵手成功，让我们见证他们幸福的开端", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_025), new ForegroundColorSpan(whiteColor));
break;
}
tvContent.setText(text.build());
@@ -1208,10 +1209,10 @@ public class MessageView extends FrameLayout {
TarotMsgBean tarotMsgBean = attachment.getTarotMsgBean();
String nickName = RegexUtil.getPrintableString(tarotMsgBean.getNick());
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("恭喜 ", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_026), new ForegroundColorSpan(textColor))
.append(nickName, new ForegroundColorSpan(roomTipNickColor))
.append(" " + tarotMsgBean.getDrawMsgText(), new ForegroundColorSpan(textColor))
- .append(tarotMsgBean.getDrawGoldNum() + "钻石", new ForegroundColorSpan(roomTipColor));
+ .append(tarotMsgBean.getDrawGoldNum() + ResUtil.getString(R.string.avroom_widget_messageview_027), new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
}
}
@@ -1231,14 +1232,14 @@ public class MessageView extends FrameLayout {
String nick = TextUtils.isEmpty(joinMiniWorldNoticeAttachment.getNick()) ? "" : joinMiniWorldNoticeAttachment.getNick();
String worldName = TextUtils.isEmpty(joinMiniWorldNoticeAttachment.getWorldName()) ? "" : joinMiniWorldNoticeAttachment.getWorldName();
SpannableBuilder append = new SpannableBuilder(tvContent)
- .append("欢迎")
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_028))
.append(" " + nick + " ", new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
UserInfoDialog.showNewUserInfoDialog(mContext, joinMiniWorldNoticeAttachment.getUid());
}
}, new ForegroundColorSpan(roomTipNickColor))
- .append("加入")
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_029))
.append(" 【" + worldName + "】 ", new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -1269,7 +1270,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("打开", new ForegroundColorSpan(textColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_030), new ForegroundColorSpan(textColor))
.append(sendNickname, new ForegroundColorSpan(roomTipColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -1281,15 +1282,15 @@ public class MessageView extends FrameLayout {
switch (roomMsg.getRedEnvelopeType()) {
case ALL_DIAMOND:
case ROOM_DIAMOND:
- text.append("的红包领取了", new ForegroundColorSpan(textColor))
- .append((int) roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_031), new ForegroundColorSpan(textColor))
+ .append((int) roomMsg.getAmount() + ResUtil.getString(R.string.avroom_widget_messageview_032), new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
break;
case ALL_GIFT:
case ROOM_GIFT:
- text.append("的红包领取了价值", new ForegroundColorSpan(textColor))
- .append((int) roomMsg.getAmount() + "钻石", new ForegroundColorSpan(roomTipColor))
- .append("的礼物", new ForegroundColorSpan(textColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_033), new ForegroundColorSpan(textColor))
+ .append((int) roomMsg.getAmount() + ResUtil.getString(R.string.avroom_widget_messageview_034), new ForegroundColorSpan(roomTipColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_035), new ForegroundColorSpan(textColor));
tvContent.setText(text.build());
}
tvContent.setOnClickListener(null);
@@ -1340,21 +1341,21 @@ public class MessageView extends FrameLayout {
boolean follow = roomFollowOwnerAttachment.isFollow();
SpannableBuilder append = new SpannableBuilder(tvContent)
- .append("欢迎")
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_036))
.append(" " + nick + " ", new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
UserInfoDialog.showNewUserInfoDialog(mContext, userInfo.getUid());
}
}, new ForegroundColorSpan(roomTipNickColor))
- .append("关注房主不迷路哦")
- .append(follow ? "已关注" : "关注",
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_037))
+ .append(follow ? ResUtil.getString(R.string.avroom_widget_messageview_038) : ResUtil.getString(R.string.avroom_widget_messageview_039),
new RadiusBackgroundSpan(follow ? Color.parseColor("#4cFFFFFF") : ContextCompat.getColor(tvContent.getContext(), R.color.appColor), SizeUtils.dp2px(tvContent.getContext(), 8), follow ? Color.parseColor("#D8FFFFFF") : Color.WHITE, (int) (tvContent.getTextSize() - SizeUtils.sp2px(tvContent.getContext(), 2) - .5f), SizeUtils.dp2px(tvContent.getContext(), 8), SizeUtils.dp2px(tvContent.getContext(), 4)),
follow ? null : new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
if (onClick != null) {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_FOLLOW_CHAT_CLICK, "语音房_收藏公屏提示");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_FOLLOW_CHAT_CLICK, ResUtil.getString(R.string.avroom_widget_messageview_040));
onClick.onFollowClick(position);
}
}
@@ -1384,7 +1385,7 @@ public class MessageView extends FrameLayout {
Map micMemberMap = attachment.getRoomPKInvitedUpMicMemberMap();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("房主/管理员邀请");
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_041));
boolean isHaveInTeam = false;
Iterator> iterator = micMemberMap.entrySet().iterator();
while (iterator.hasNext()) {
@@ -1405,15 +1406,15 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("进入");
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_042));
if (value.getGroupType() == PKTeamInfo.TEAM_RED) {
- text.append("红队", new ForegroundColorSpan(tvContent.getResources().getColor(R.color.color_FB3D74)))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_043), new ForegroundColorSpan(tvContent.getResources().getColor(R.color.color_FB3D74)))
.append("，");
} else if (value.getGroupType() == PKTeamInfo.TEAM_BLUE) {
- text.append("蓝队", new ForegroundColorSpan(tvContent.getResources().getColor(R.color.color_3291FC)))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_044), new ForegroundColorSpan(tvContent.getResources().getColor(R.color.color_3291FC)))
.append("，");
} else {
- text.append("未知队伍", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_045), new ForegroundColorSpan(whiteColor))
.append("，");
}
}
@@ -1428,27 +1429,27 @@ public class MessageView extends FrameLayout {
private void openRoomPKModeMsg(RoomPkAttachment attachment, TextView tvContent) {
RoomPkData roomPkData = attachment.getRoomPkData();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(String.format(Locale.getDefault(), "管理员发起房间PK，本次PK时间为 %s 秒，获得",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_046),
roomPkData.getDuration()),
new ForegroundColorSpan(whiteColor));
switch (roomPkData.getVoteMode()) {
case RoomPkData.VOTE_MODE_GIFT:
- text.append("礼物多", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_047), new ForegroundColorSpan(whiteColor));
break;
case RoomPkData.VOTE_MODE_PERSON:
- text.append("送礼人数多", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_048), new ForegroundColorSpan(whiteColor));
break;
}
- text.append("的团队获胜", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_049), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
private void stopRoomPkModeMsg(TextView tvContent) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员", new ForegroundColorSpan(whiteColor))
- .append("关闭了", new ForegroundColorSpan(greyColor))
- .append("房间 PK 模式", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_050), new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_051), new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_052), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
@@ -1456,7 +1457,7 @@ public class MessageView extends FrameLayout {
RoomPkData roomPkData = attachment.getRoomPkData();
SpannableBuilder text = new SpannableBuilder(textView)
.append(String.format(Locale.getDefault(),
- "PK开始啦！本次PK时间 %s 秒，快给喜欢的选手投票吧！", roomPkData.getDuration()),
+ ResUtil.getString(R.string.avroom_widget_messageview_053), roomPkData.getDuration()),
new ForegroundColorSpan(greyColor));
textView.setText(text.build());
}
@@ -1464,26 +1465,26 @@ public class MessageView extends FrameLayout {
private void restartRoomPKModeMsg(RoomPkAttachment attachment, TextView tvContent) {
RoomPkData roomPkData = attachment.getRoomPkData();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(String.format(Locale.getDefault(), "管理员重新开始房间PK，本次PK时间为 %s 秒，获得",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_054),
roomPkData.getDuration()),
new ForegroundColorSpan(whiteColor));
switch (roomPkData.getVoteMode()) {
case RoomPkData.VOTE_MODE_GIFT:
- text.append("礼物多", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_055), new ForegroundColorSpan(whiteColor));
break;
case RoomPkData.VOTE_MODE_PERSON:
- text.append("送礼人数多", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_056), new ForegroundColorSpan(whiteColor));
break;
}
- text.append("的团队获胜", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_057), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
private void roomPkResult(RoomPkAttachment attachment, TextView textView) {
RoomPkData roomPkData = attachment.getRoomPkData();
SpannableBuilder text = new SpannableBuilder(textView)
- .append("本场PK结果：", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_058), new ForegroundColorSpan(whiteColor));
Map teamMap = new HashMap<>();
PKTeamInfo blueTeam = null;
PKTeamInfo redTeam = null;
@@ -1496,9 +1497,9 @@ public class MessageView extends FrameLayout {
}
switch (roomPkData.getResult()) {
case RoomPkData.PK_RESULT_DRAW:
- text.append("平局！\n", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_059), new ForegroundColorSpan(whiteColor));
if (blueTeam != null && redTeam != null) {
- text.append(String.format(Locale.getDefault(), "PK值 %s : %s",
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_060),
FormatUtils.formatPKValue(blueTeam.getScore()),
FormatUtils.formatPKValue(redTeam.getScore())),
new ForegroundColorSpan(whiteColor));
@@ -1509,37 +1510,37 @@ public class MessageView extends FrameLayout {
|| blueProtector == null || blueProtector.getUid() == 0) {
break;
}
- text.append(String.format(Locale.getDefault(), "\n蓝队守护者：%s \n", blueProtector.getNick()),
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_061), blueProtector.getNick()),
new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), "蓝队守护值：%s \n",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_062),
FormatUtils.formatPKValue(blueTeam.getProtecScore())),
new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), "红队守护者：%s \n", redProtector.getNick()),
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_063), redProtector.getNick()),
new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), "红队守护值：%s",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_064),
FormatUtils.formatPKValue(redTeam.getProtecScore())),
new ForegroundColorSpan(whiteColor));
}
break;
case PKTeamInfo.TEAM_BLUE:
- text.append("蓝队胜利！\n", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_065), new ForegroundColorSpan(whiteColor));
if (blueTeam != null && redTeam != null) {
- text.append(String.format(Locale.getDefault(), "PK值 %s : %s \n",
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_066),
FormatUtils.formatPKValue(blueTeam.getScore()),
FormatUtils.formatPKValue(redTeam.getScore())),
new ForegroundColorSpan(whiteColor));
UserInfo blueProtector = blueTeam.getProtector();
if (blueProtector == null) {
- text.append(String.format(Locale.getDefault(), "胜利方战斗值：%s",
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_067),
FormatUtils.formatPKValue(blueTeam.getScore())),
new ForegroundColorSpan(whiteColor));
} else {
- text.append(String.format(Locale.getDefault(), "胜方守护者：%s \n", blueProtector.getNick()),
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_068), blueProtector.getNick()),
new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), "胜方守护值：%s",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_069),
FormatUtils.formatPKValue(blueTeam.getProtecScore())),
new ForegroundColorSpan(whiteColor));
}
@@ -1547,22 +1548,22 @@ public class MessageView extends FrameLayout {
break;
case PKTeamInfo.TEAM_RED:
- text.append("红队胜利！\n", new ForegroundColorSpan(whiteColor));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_070), new ForegroundColorSpan(whiteColor));
if (blueTeam != null && redTeam != null) {
- text.append(String.format(Locale.getDefault(), "PK值 %s : %s \n",
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_071),
FormatUtils.formatPKValue(redTeam.getScore()),
FormatUtils.formatPKValue(blueTeam.getScore())),
new ForegroundColorSpan(whiteColor));
UserInfo redProtector = redTeam.getProtector();
if (redProtector == null) {
- text.append(String.format(Locale.getDefault(), "胜利方战斗值：%s",
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_072),
FormatUtils.formatPKValue(redTeam.getScore())),
new ForegroundColorSpan(whiteColor));
} else {
- text.append(String.format(Locale.getDefault(), "红队守护者：%s \n", redProtector.getNick()),
+ text.append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_073), redProtector.getNick()),
new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), "红队守护值：%s",
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_074),
FormatUtils.formatPKValue(redTeam.getProtecScore())),
new ForegroundColorSpan(whiteColor));
}
@@ -1575,17 +1576,17 @@ public class MessageView extends FrameLayout {
private void startQueuingMicModeMsg(TextView tvContent) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员", new ForegroundColorSpan(whiteColor))
- .append("开启了", new ForegroundColorSpan(greyColor))
- .append("排麦模式", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_075), new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_076), new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_077), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
private void stopQueuingMicModeMsg(TextView tvContent) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员", new ForegroundColorSpan(whiteColor))
- .append("关闭了", new ForegroundColorSpan(greyColor))
- .append("排麦模式", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_078), new ForegroundColorSpan(whiteColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_079), new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_080), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
@@ -1593,10 +1594,10 @@ public class MessageView extends FrameLayout {
QueuingMicAttachment attachment = (QueuingMicAttachment) chatRoomMessage.getAttachment();
QueuingMicInfo queuingMicInfo = attachment.getQueuingMicInfo();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员设置", new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), " %d 麦",
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_081), new ForegroundColorSpan(whiteColor))
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_082),
JavaUtil.str2int(queuingMicInfo.getMicPos()) + 1), new ForegroundColorSpan(greyColor))
- .append("为自由麦", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_083), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
@@ -1604,17 +1605,17 @@ public class MessageView extends FrameLayout {
QueuingMicAttachment attachment = (QueuingMicAttachment) chatRoomMessage.getAttachment();
QueuingMicInfo queuingMicInfo = attachment.getQueuingMicInfo();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员关闭", new ForegroundColorSpan(whiteColor))
- .append(String.format(Locale.getDefault(), " %d 麦",
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_084), new ForegroundColorSpan(whiteColor))
+ .append(String.format(Locale.getDefault(), ResUtil.getString(R.string.avroom_widget_messageview_085),
JavaUtil.str2int(queuingMicInfo.getMicPos()) + 1), new ForegroundColorSpan(greyColor))
- .append("自由麦", new ForegroundColorSpan(whiteColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_086), new ForegroundColorSpan(whiteColor));
tvContent.setText(text.build());
}
private void setDragonBarRunawayMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) {
ChatRoomMessageExtension extension = chatRoomMessage.getChatRoomMessageExtension();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
+ .append(extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_087) : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
new OriginalDrawStatusClickSpan() {
@Override
@@ -1624,7 +1625,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 之前在本房间由于不明原因退出交友匹配，此次匹配展示为上次数据", new ForegroundColorSpan(roomTipColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_088), new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1633,7 +1634,7 @@ public class MessageView extends FrameLayout {
private void setDragonBarCancelMsg(ChatRoomMessage chatRoomMessage, TextView tvContent) {
ChatRoomMessageExtension extension = chatRoomMessage.getChatRoomMessageExtension();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
+ .append(extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_089) : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
new OriginalDrawStatusClickSpan() {
@Override
@@ -1643,7 +1644,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 放弃本次匹配", new ForegroundColorSpan(roomTipColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_090), new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1663,7 +1664,7 @@ public class MessageView extends FrameLayout {
msg = msg.substring(0, msg.length() - 1);
// 内容
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
+ .append(extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_091) : RegexUtil.getPrintableString(extension.getSenderNick()), new ForegroundColorSpan(Color.WHITE),
new OriginalDrawStatusClickSpan() {
@Override
@@ -1673,7 +1674,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 爱心值为 " + msg, new ForegroundColorSpan(roomTipColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_092) + msg, new ForegroundColorSpan(roomTipColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1685,15 +1686,15 @@ public class MessageView extends FrameLayout {
RoomBoxPrizeAttachment attachment = (RoomBoxPrizeAttachment) chatRoomMessage.getAttachment();
// 内容
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("厉害了 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_093), new ForegroundColorSpan(greyColor))
.append(attachment.getNick() + " ", new ForegroundColorSpan(roomTipColor))
- .append("摘" + attachment.getBoxTypeStr() + "获得 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_094) + attachment.getBoxTypeStr() + ResUtil.getString(R.string.avroom_widget_messageview_095), new ForegroundColorSpan(greyColor))
.append(attachment.getPrizeName(), new ForegroundColorSpan(Color.WHITE));
if (attachment.getPrizeNum() > 1) {
text.append(" x" + attachment.getPrizeNum() + " ", new ForegroundColorSpan(roomTipColor));
}
if (attachment.getSecond() == CUSTOM_MSG_SUB_BOX_ME) {
- text.append("(仅自己可见)", new ForegroundColorSpan(Color.WHITE));
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_096), new ForegroundColorSpan(Color.WHITE));
}
tvContent.setText(text.build());
}
@@ -1702,9 +1703,9 @@ public class MessageView extends FrameLayout {
RoomBoxPrizeAttachment attachment = (RoomBoxPrizeAttachment) chatRoomMessage.getAttachment();
// 内容
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("厉害了 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_097), new ForegroundColorSpan(greyColor))
.append(attachment.getNick() + " ", new ForegroundColorSpan(roomTipColor))
- .append(attachment.getBoxTypeStr() + " 获得", new ForegroundColorSpan(greyColor))
+ .append(attachment.getBoxTypeStr() + ResUtil.getString(R.string.avroom_widget_messageview_098), new ForegroundColorSpan(greyColor))
.append(attachment.getPrizeName(), new ForegroundColorSpan(Color.WHITE));
if (attachment.getPrizeNum() > 1) {
text.append(" x" + attachment.getPrizeNum() + " ", new ForegroundColorSpan(roomTipColor));
@@ -1714,21 +1715,21 @@ public class MessageView extends FrameLayout {
private void setUpdateAudioMsg(TextView tvContent) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("消息: ", new ForegroundColorSpan(roomTipColor))
- .append("管理员开启高音质模式 ", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_099), new ForegroundColorSpan(roomTipColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0100), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
private void setUpdateGiftEffectMsg(TextView tvContent) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("消息: ", new ForegroundColorSpan(roomTipColor))
- .append("管理员已关闭房间内礼物特效，点击底部“更多”图标即可开启", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0101), new ForegroundColorSpan(roomTipColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0102), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
private void setUpdateScreenMsg(TextView tvContent, String contentText) {
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("消息: ", new ForegroundColorSpan(roomTipColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0103), new ForegroundColorSpan(roomTipColor))
.append(contentText, new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
@@ -1737,7 +1738,7 @@ public class MessageView extends FrameLayout {
RoomNoticeAttachment attachment = (RoomNoticeAttachment) message.getAttachment();
RoomMessageViewNoticeInfo messageViewNoticeInfo = attachment.getRoomMessageViewNoticeInfo();
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("消息: ", new ForegroundColorSpan(roomTipColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0104), new ForegroundColorSpan(roomTipColor))
.append(messageViewNoticeInfo.getTips(), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
@@ -1746,7 +1747,7 @@ public class MessageView extends FrameLayout {
CleanScreenAttachment attachment = (CleanScreenAttachment) message.getAttachment();
// 内容
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append(attachment.getRoleType() == 1 ? "房主" : "管理员", new ForegroundColorSpan(Color.WHITE))
+ .append(attachment.getRoleType() == 1 ? ResUtil.getString(R.string.avroom_widget_messageview_0105) : ResUtil.getString(R.string.avroom_widget_messageview_0106), new ForegroundColorSpan(Color.WHITE))
.append("(" + attachment.getNick() + ") ", new ForegroundColorSpan(roomTipColor),
new OriginalDrawStatusClickSpan() {
@@ -1757,7 +1758,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append("已清空公屏消息", new ForegroundColorSpan(Color.WHITE));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0107), new ForegroundColorSpan(Color.WHITE));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1779,9 +1780,9 @@ public class MessageView extends FrameLayout {
private void setInviteUpMicMsg(TextView tvContent, RoomQueueMsgAttachment attachment) {
String targetNick = RegexUtil.getPrintableString(attachment.targetNick);
SpannableBuilder text = new SpannableBuilder(tvContent)
- .append("管理员将 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0108), new ForegroundColorSpan(greyColor))
.append(targetNick, new ForegroundColorSpan(roomTipColor))
- .append(" 抱上麦 ", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0109), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
@@ -1798,7 +1799,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 被 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0110), new ForegroundColorSpan(greyColor))
.append(nick, new ForegroundColorSpan(roomTipColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -1808,7 +1809,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 请下麦 ", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0111), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1827,7 +1828,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 被 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0112), new ForegroundColorSpan(greyColor))
.append(nick, new ForegroundColorSpan(roomTipColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -1837,7 +1838,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 请出房间 ", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0113), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1856,7 +1857,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 被 ", new ForegroundColorSpan(greyColor))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0114), new ForegroundColorSpan(greyColor))
.append(nick, new ForegroundColorSpan(roomTipColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -1866,7 +1867,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 关进小黑屋 ", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0115), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -1897,7 +1898,7 @@ public class MessageView extends FrameLayout {
ChatRoomMessageExtension extension = chatRoomMessage.getChatRoomMessageExtension();
SpannableBuilder text = new SpannableBuilder(tvContent);
addCommonTag(chatRoomMessage, text, tvContent);
- String nickName = extension == null ? "我" : RegexUtil.getPrintableString(extension.getSenderNick());
+ String nickName = extension == null ? ResUtil.getString(R.string.avroom_widget_messageview_0116) : RegexUtil.getPrintableString(extension.getSenderNick());
text.append(nickName, new ForegroundColorSpan(greyColor))
.append(": " + chatRoomMessage.getContent(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
List atUids = ExtensionUtil.getListExtension(chatRoomMessage, UserInfo.AT_UIDS);
@@ -1980,19 +1981,19 @@ public class MessageView extends FrameLayout {
AuctionAttachment auctionAttachment = (AuctionAttachment) attachment;
SpannableBuilder builder = new SpannableBuilder(tvContent);
if (attachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_AUCTION_START) {
- builder.append("房主 开启了竞拍", new ForegroundColorSpan(roomTipNickColor));
+ builder.append(ResUtil.getString(R.string.avroom_widget_messageview_0117), new ForegroundColorSpan(roomTipNickColor));
} else if (attachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_AUCTION_FINISH) {
if (auctionAttachment.getAuctionInfo().getCurMaxUid() > 0) {
senderNick = UserInfoHelper.getUserDisplayName(auctionAttachment.getAuctionInfo().getCurMaxUid() + "");
String voiceActorNick = UserInfoHelper.getUserDisplayName(auctionAttachment.getAuctionInfo().getAuctUid() + "");
builder.append(senderNick, new ForegroundColorSpan(roomTipNickColor))
- .append(" 以" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "钻石拍下 ")
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0118) + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + ResUtil.getString(R.string.avroom_widget_messageview_0119))
.append(voiceActorNick, new ForegroundColorSpan(roomTipNickColor));
} else
- builder.append("房主 结束了竞拍，当前暂无人出价", new ForegroundColorSpan(roomTipNickColor));
+ builder.append(ResUtil.getString(R.string.avroom_widget_messageview_0120), new ForegroundColorSpan(roomTipNickColor));
} else {
builder.append(senderNick, new ForegroundColorSpan(roomTipNickColor))
- .append(" 出价" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "钻石");
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0121) + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + ResUtil.getString(R.string.avroom_widget_messageview_0122));
}
tvContent.setText(builder.build());
}
@@ -2010,7 +2011,7 @@ public class MessageView extends FrameLayout {
.append(getNewUserDrawable(chatRoomMessage), badgeWidth, badgeHeight)
.append(RegexUtil.getPrintableString(roomTipAttachment.getNick()), new ForegroundColorSpan(roomTipColor))
.append(roomTipAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_SUB_TYPE_ROOM_TIP_SHARE_ROOM ?
- " 分享了房间" : " 关注了房主", new ForegroundColorSpan(greyColor));
+ ResUtil.getString(R.string.avroom_widget_messageview_0123) : ResUtil.getString(R.string.avroom_widget_messageview_0124), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
@@ -2025,7 +2026,7 @@ public class MessageView extends FrameLayout {
SpannableBuilder text = new SpannableBuilder(tvContent)
.append(getNewUserDrawable(chatRoomMessage), badgeWidth, badgeHeight)
.append(RegexUtil.getPrintableString(roomTipAttachment.getNick()), new ForegroundColorSpan(roomTipColor))
- .append(" 收藏了房间", new ForegroundColorSpan(greyColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0125), new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}
@@ -2092,7 +2093,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 全麦送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0126), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(giftInfo == null ? "" : giftInfo.getGiftUrl(), giftLength, giftLength)
.append("X" + giftAttachment.getMultiGiftReceiveInfo().getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)));
tvContent.setText(text.build());
@@ -2128,9 +2129,9 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 全麦送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0127), new ForegroundColorSpan(getResources().getColor(R.color.white)));
- text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ text.append(luckyGiftInfo.getGiftName() + ResUtil.getString(R.string.avroom_widget_messageview_0128), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -2139,10 +2140,10 @@ public class MessageView extends FrameLayout {
}
}
});
- text.append(",爆出了");
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0129));
for (GiftList luckyGiftList : luckyGiftInfo.getGiftList()) {
if (luckyGiftList.getGiftInfo() == null) continue;
- text.append("价值" + luckyGiftList.getGiftInfo().getGoldPrice() + "钻石的")
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0130) + luckyGiftList.getGiftInfo().getGoldPrice() + ResUtil.getString(R.string.avroom_widget_messageview_0131))
.append(luckyGiftList.getGiftInfo().getGiftUrl(), giftLength, giftLength)
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append("、");
@@ -2183,9 +2184,9 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 送出 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0132), new ForegroundColorSpan(getResources().getColor(R.color.white)));
- text.append(luckyGiftInfo.getGiftName() + "给", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ text.append(luckyGiftInfo.getGiftName() + ResUtil.getString(R.string.avroom_widget_messageview_0133), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(luckyGiftInfo.getUser().getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View widget) {
@@ -2194,10 +2195,10 @@ public class MessageView extends FrameLayout {
}
}
});
- text.append(",爆出了");
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0134));
for (GiftList luckyGiftList : luckyGiftInfo.getGiftList()) {
if (luckyGiftList.getGiftInfo() == null) continue;
- text.append("价值" + luckyGiftList.getGiftInfo().getGoldPrice() + "钻石的礼物")
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0135) + luckyGiftList.getGiftInfo().getGoldPrice() + ResUtil.getString(R.string.avroom_widget_messageview_0136))
.append(luckyGiftList.getGiftInfo().getGiftUrl(), giftLength, giftLength)
.append("X" + luckyGiftList.getGiftNum(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append("、");
@@ -2233,7 +2234,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 送给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0137), new ForegroundColorSpan(getResources().getColor(R.color.white)));
for (GiftReceiver targetUser : attachment.getGiftMultiReceiverInfo().getTargetUsers()) {
text.append(targetUser.getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@@ -2279,10 +2280,10 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 全麦施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0138), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
- .append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
- .append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0139) : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0140) : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -2313,7 +2314,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0141), new ForegroundColorSpan(getResources().getColor(R.color.white)));
for (MagicReceiver targetUser : magicMultiReceiverInfo.getTargetUsers()) {
text.append(targetUser.getNick(), new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@@ -2330,11 +2331,11 @@ public class MessageView extends FrameLayout {
Editable msg = text.builder;
msg.delete(msg.length() - 1, msg.length());
- text.append(" 施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0142), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
.append(" X" + magicMultiReceiverInfo.getNumber(), new ForegroundColorSpan(getResources().getColor(R.color.white)))
- .append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
- .append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0143) : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0144) : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -2366,7 +2367,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0145), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(targetNick, new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -2376,10 +2377,10 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 施魔法 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0146), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(magicInfo == null ? "" : TextUtils.isEmpty(magicInfo.getIcon()) ? "" : magicInfo.getIcon(), giftLength, giftLength)
- .append(showEffect ? " 并 " : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
- .append(showEffect ? " 触发暴击 " : "", new ForegroundColorSpan(roomTipNickColor));
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0147) : "", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(showEffect ? ResUtil.getString(R.string.avroom_widget_messageview_0148) : "", new ForegroundColorSpan(roomTipNickColor));
tvContent.setText(text.build());
tvContent.setOnClickListener(null);
tvContent.setMovementMethod(new LinkMovementMethod());
@@ -2409,7 +2410,7 @@ public class MessageView extends FrameLayout {
}
}
})
- .append(" 送给 ", new ForegroundColorSpan(getResources().getColor(R.color.white)))
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0149), new ForegroundColorSpan(getResources().getColor(R.color.white)))
.append(targetNick, new ForegroundColorSpan(roomTipNickColor), new OriginalDrawStatusClickSpan() {
@Override
@@ -2466,15 +2467,15 @@ public class MessageView extends FrameLayout {
}
});
- text.append(TextUtils.isEmpty(carName) ? "" : " 驾着 ", new ForegroundColorSpan(greyColor))
+ text.append(TextUtils.isEmpty(carName) ? "" : ResUtil.getString(R.string.avroom_widget_messageview_0150), new ForegroundColorSpan(greyColor))
.append(carName, new ForegroundColorSpan(roomTipColor));
- String enterText = " 进入了房间 ";
+ String enterText = ResUtil.getString(R.string.avroom_widget_messageview_0151);
if (fromType == AVRoomActivity.FROM_TYPE_RECOMMEND) {
- enterText = " 根据首页推荐进入了房间";
+ enterText = ResUtil.getString(R.string.avroom_widget_messageview_0152);
}
if (fromType == AVRoomActivity.FROM_TYPE_USER || fromType == AVRoomActivity.FROM_TYPE_HELLO) {
String finalFromUid = fromUid;
- text.append(" 跟随 ", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0153), new ForegroundColorSpan(whiteColor))
.append(fromNick, new ForegroundColorSpan(roomTipColor),
new OriginalDrawStatusClickSpan() {
@Override
@@ -2484,12 +2485,12 @@ public class MessageView extends FrameLayout {
}
}
});
- enterText = " 进入了房间";
+ enterText = ResUtil.getString(R.string.avroom_widget_messageview_0154);
}
if (fromType == AVRoomActivity.FROM_TYPE_GAME_RECOMMEND) {
String finalFromUid = fromUid;
- text.append(" 接受 ", new ForegroundColorSpan(whiteColor))
+ text.append(ResUtil.getString(R.string.avroom_widget_messageview_0155), new ForegroundColorSpan(whiteColor))
.append(fromNick, new ForegroundColorSpan(roomTipColor),
new OriginalDrawStatusClickSpan() {
@Override
@@ -2499,7 +2500,7 @@ public class MessageView extends FrameLayout {
}
}
});
- enterText = " 的邀请,进入了房间";
+ enterText = ResUtil.getString(R.string.avroom_widget_messageview_0156);
}
text.append(enterText, new ForegroundColorSpan(whiteColor));
@@ -2516,7 +2517,7 @@ public class MessageView extends FrameLayout {
new OriginalDrawStatusClickSpan() {
@Override
public void onClick(@NonNull View view) {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_WELCOME_HIM, "欢迎TA");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_WELCOME_HIM, ResUtil.getString(R.string.avroom_widget_messageview_0157));
ExtensionUtil.setWelcomeLocal(chatRoomMessage, true);
mMessageAdapter.notifyItemChanged(position);
long targetUid = JavaUtil.str2long(chatRoomMessage.getFromAccount());
@@ -2556,9 +2557,9 @@ public class MessageView extends FrameLayout {
.append(senderNick, new ForegroundColorSpan(roomTipColor))
.append(desc, new ForegroundColorSpan(textColor))
.append(tagNick, new ForegroundColorSpan(roomTipColor))
- .append((TextUtils.isEmpty(carName) ? "" : " 驾着 "))
+ .append((TextUtils.isEmpty(carName) ? "" : ResUtil.getString(R.string.avroom_widget_messageview_0158)))
.append(carName, new ForegroundColorSpan(roomTipColor))
- .append("进入了房间", new ForegroundColorSpan(textColor));
+ .append(ResUtil.getString(R.string.avroom_widget_messageview_0159), new ForegroundColorSpan(textColor));
}
/**
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java
index f2bd06e11..30db3cac4 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/PKBoardView.java
@@ -26,6 +26,7 @@ import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent;
import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent;
import com.yizhuan.xchat_android_core.room.pk.model.PkModel;
import com.yizhuan.xchat_android_library.utils.FormatUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -162,7 +163,7 @@ public class PKBoardView extends RelativeLayout implements View.OnClickListener
}
} else {
- tvPkTimer.setText("未开始");
+ tvPkTimer.setText(ResUtil.getString(R.string.avroom_widget_pkboardview_01));
if (!isTeamHaveMember(PKTeamInfo.TEAM_RED)) {
ivAddRedTeamMember.setVisibility(VISIBLE);
} else {
@@ -305,8 +306,8 @@ public class PKBoardView extends RelativeLayout implements View.OnClickListener
if (!AvRoomDataManager.get().isManager()) {
//已经排麦不操作
if (!PkModel.get().getPkMemberInfoList().isEmpty() && AvRoomDataManager.get().myIsInQueue) {
-// Toast.makeText(getContext(), "您已经在排麦了~", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("您已经在排麦了~");
+// Toast.makeText(getContext(), ResUtil.getString(R.string.avroom_widget_pkboardview_02), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.avroom_widget_pkboardview_03));
return;
}
if (onActionListener != null) {
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java
index 70276c4b6..19481a1b8 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RankNavigatorAdapter.java
@@ -2,12 +2,11 @@ package com.yizhuan.erban.avroom.widget;
import android.content.Context;
import android.graphics.Color;
-
-import androidx.core.content.ContextCompat;
-
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -15,7 +14,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.C
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
-import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -30,10 +29,10 @@ public class RankNavigatorAdapter extends CommonNavigatorAdapter {
private List mTitleList = new ArrayList<>();
public RankNavigatorAdapter(boolean showMonth) {
- mTitleList.add("日榜");
- mTitleList.add("周榜");
+ mTitleList.add(ResUtil.getString(R.string.avroom_widget_ranknavigatoradapter_01));
+ mTitleList.add(ResUtil.getString(R.string.avroom_widget_ranknavigatoradapter_02));
if (showMonth) {
- mTitleList.add("月榜");
+ mTitleList.add(ResUtil.getString(R.string.avroom_widget_ranknavigatoradapter_03));
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
index 36b534ddf..4ff0f6e51 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.kt
@@ -50,6 +50,7 @@ import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ListUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import io.reactivex.Observable
import io.reactivex.ObservableEmitter
import io.reactivex.ObservableOnSubscribe
@@ -252,18 +253,18 @@ class RoomEffectView @JvmOverloads constructor(
textView.setBackgroundResource(defaultBg)
ImageLoadUtils.loadBackground(mContext, backgroundUrl, defaultBg, textView)
val text = SpannableBuilder()
- .append("恭喜", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_01), ForegroundColorSpan(Color.WHITE))
.append(
getShortString(oneUserNick, 8),
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("与", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_02), ForegroundColorSpan(Color.WHITE))
.append(
getShortString(anotherUserNick, 8),
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
.append(
- "在(" + getShortString(roomTitle, 10) + ")" + sweetWords,
+ ResUtil.getString(R.string.avroom_widget_roomeffectview_03) + getShortString(roomTitle, 10) + ")" + sweetWords,
ForegroundColorSpan(Color.WHITE)
)
textView.text = text.build()
@@ -309,22 +310,22 @@ class RoomEffectView @JvmOverloads constructor(
val attachment = message?.attachment as? RoomReceivedLuckyGiftAttachment ?: return
val noticeInfo = attachment.luckyBagNoticeInfo ?: return
val text = SpannableBuilder()
- .append("恭喜！", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_04), ForegroundColorSpan(Color.WHITE))
.append(
noticeInfo.nick.subAndReplaceDot(6) + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("在", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_05), ForegroundColorSpan(Color.WHITE))
.append(
noticeInfo.luckyBagName + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("中欧气爆棚,开出了价值 ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_06), ForegroundColorSpan(Color.WHITE))
.append(
noticeInfo.goldPrice + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("钻的", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_07), ForegroundColorSpan(Color.WHITE))
.append(
noticeInfo.giftName,
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
@@ -407,12 +408,12 @@ class RoomEffectView @JvmOverloads constructor(
val textView =
LayoutInflater.from(mContext).inflate(R.layout.layout_room_box_notify, null) as TextView
val text = SpannableBuilder()
- .append("厉害了! ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_08), ForegroundColorSpan(Color.WHITE))
.append(
attachment.nick + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("摘" + attachment.boxTypeStr + "获得 ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_09) + attachment.boxTypeStr + ResUtil.getString(R.string.avroom_widget_roomeffectview_010), ForegroundColorSpan(Color.WHITE))
.append(
attachment.prizeName,
ForegroundColorSpan(resources.getColor(R.color.notice_gift))
@@ -455,12 +456,12 @@ class RoomEffectView @JvmOverloads constructor(
private fun showBoxNotifyBySVGA(chatRoomMessage: ChatRoomMessage) {
val attachment = chatRoomMessage.attachment as RoomBoxPrizeAttachment
val text = SpannableBuilder()
- .append("厉害了! ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_011), ForegroundColorSpan(Color.WHITE))
.append(
attachment.nick + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append("摘" + attachment.boxTypeStr + "获得 ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_012) + attachment.boxTypeStr + ResUtil.getString(R.string.avroom_widget_roomeffectview_013), ForegroundColorSpan(Color.WHITE))
.append(
attachment.prizeName,
ForegroundColorSpan(resources.getColor(R.color.notice_gift))
@@ -534,12 +535,12 @@ class RoomEffectView @JvmOverloads constructor(
.inflate(R.layout.layout_room_radish_notify, null) as TextView
textView.setBackgroundResource(R.drawable.bg_radish_notice)
val text = SpannableBuilder()
- .append("厉害了! ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_014), ForegroundColorSpan(Color.WHITE))
.append(
attachment.nick.subAndReplaceDot(6) + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append(attachment.boxTypeStr + " 获得", ForegroundColorSpan(Color.WHITE))
+ .append(attachment.boxTypeStr + ResUtil.getString(R.string.avroom_widget_roomeffectview_015), ForegroundColorSpan(Color.WHITE))
.append(
attachment.prizeName,
ForegroundColorSpan(resources.getColor(R.color.notice_gift))
@@ -602,12 +603,12 @@ class RoomEffectView @JvmOverloads constructor(
private fun showRadishNotifyBySVGA(chatRoomMessage: ChatRoomMessage?) {
val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment ?: return
val text = SpannableBuilder()
- .append("厉害了! ", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_016), ForegroundColorSpan(Color.WHITE))
.append(
attachment.nick + " ",
ForegroundColorSpan(resources.getColor(R.color.notice_nick))
)
- .append(attachment.boxTypeStr + " 获得", ForegroundColorSpan(Color.WHITE))
+ .append(attachment.boxTypeStr + ResUtil.getString(R.string.avroom_widget_roomeffectview_017), ForegroundColorSpan(Color.WHITE))
.append(
attachment.prizeName,
ForegroundColorSpan(resources.getColor(R.color.notice_gift))
@@ -772,15 +773,15 @@ class RoomEffectView @JvmOverloads constructor(
// 内容
val text = MessageView.SpannableBuilder(textView)
.append(targetNicks[0], ForegroundColorSpan(Color.WHITE))
- var enterText = " 进入了房间 "
+ var enterText = ResUtil.getString(R.string.avroom_widget_roomeffectview_018)
if (fromType == AVRoomActivity.FROM_TYPE_RECOMMEND) {
- enterText = " 根据首页推荐进入了房间"
+ enterText = ResUtil.getString(R.string.avroom_widget_roomeffectview_019)
}
if (fromType == AVRoomActivity.FROM_TYPE_USER) {
- enterText = " 跟随 " + fromNick.subAndReplaceDot(7) + "进入了房间"
+ enterText = ResUtil.getString(R.string.avroom_widget_roomeffectview_020) + fromNick.subAndReplaceDot(7) + ResUtil.getString(R.string.avroom_widget_roomeffectview_021)
}
if (fromType == AVRoomActivity.FROM_TYPE_GAME_RECOMMEND) {
- enterText = " 接受 " + fromNick.subAndReplaceDot(7) + "的邀请,进入了房间"
+ enterText = ResUtil.getString(R.string.avroom_widget_roomeffectview_022) + fromNick.subAndReplaceDot(7) + ResUtil.getString(R.string.avroom_widget_roomeffectview_023)
}
text.append(enterText, ForegroundColorSpan(Color.WHITE))
textView.text = text.build()
@@ -1017,7 +1018,7 @@ class RoomEffectView @JvmOverloads constructor(
}
override fun onError() {
- emitter.onError(Throwable("svga解析失败"))
+ emitter.onError(Throwable(ResUtil.getString(R.string.avroom_widget_roomeffectview_024)))
}
}, null
)
@@ -1287,7 +1288,7 @@ class RoomEffectView @JvmOverloads constructor(
val rootView = LayoutInflater.from(mContext).inflate(R.layout.layout_room_rank_notify, null)
val textView = rootView.findViewById(R.id.tv_content)
val text = MessageView.SpannableBuilder(textView)
- .append("恭喜", ForegroundColorSpan(Color.WHITE))
+ .append(ResUtil.getString(R.string.avroom_widget_roomeffectview_025), ForegroundColorSpan(Color.WHITE))
.append("「${msgBean.title}」房间", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
.append(msgBean.desc, ForegroundColorSpan(Color.WHITE))
.append("TOP1", ForegroundColorSpan(Color.parseColor("#FFFC4C")))
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java
index d73f2d236..99306794d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankNavigatorAdapter.java
@@ -2,10 +2,11 @@ package com.yizhuan.erban.avroom.widget;
import android.content.Context;
import android.graphics.Color;
-import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -13,6 +14,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.C
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -27,8 +29,8 @@ public class RoomRankNavigatorAdapter extends CommonNavigatorAdapter {
private List mTitleList = new ArrayList<>();
public RoomRankNavigatorAdapter() {
- mTitleList.add("贡献榜");
- mTitleList.add("魅力榜");
+ mTitleList.add(ResUtil.getString(R.string.avroom_widget_roomranknavigatoradapter_01));
+ mTitleList.add(ResUtil.getString(R.string.avroom_widget_roomranknavigatoradapter_02));
}
@Override
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java
index 70fd61ae8..c445a317d 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/RoomRankWrapViewPager.java
@@ -1,15 +1,16 @@
package com.yizhuan.erban.avroom.widget;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
public class RoomRankWrapViewPager extends ViewPager {
private Context context;
private int minHeight;
diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java
index 9569ac51a..98aaf3e38 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/ScrollSpeedLinearLayoutManger.java
@@ -2,11 +2,12 @@ package com.yizhuan.erban.avroom.widget;
import android.content.Context;
import android.graphics.PointF;
+import android.util.DisplayMetrics;
+import android.util.Log;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearSmoothScroller;
import androidx.recyclerview.widget.RecyclerView;
-import android.util.DisplayMetrics;
-import android.util.Log;
/**
* @author chenran
diff --git a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java
index 273d74a09..b70b7f9cf 100644
--- a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpActivity.java
@@ -5,9 +5,9 @@ import android.util.Log;
import androidx.annotation.Nullable;
+import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl;
import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface;
diff --git a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java
index c42b43a99..52339735b 100644
--- a/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/base/AbstractMvpFragment.java
@@ -1,12 +1,13 @@
package com.yizhuan.erban.base;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
+
+import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactory;
import com.yizhuan.xchat_android_library.base.factory.PresenterMvpFactoryImpl;
import com.yizhuan.xchat_android_library.base.factory.PresenterProxyInterface;
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
index 3e504e68f..5093ce5d6 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java
@@ -94,6 +94,7 @@ import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.NetworkUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.UIUtils;
import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
@@ -497,7 +498,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
.compose(bindUntilEvent(ActivityEvent.PAUSE))
.subscribe((s) -> {
if (XChatConstants.SHOW.equals(s)) {
- getDialogManager().showProgressDialog(this, "请稍后...", true);
+ getDialogManager().showProgressDialog(this, ResUtil.getString(R.string.erban_base_baseactivity_01), true);
} else if (XChatConstants.HIDE.equals(s)) {
getDialogManager().dismissDialog();
}
@@ -1003,7 +1004,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
public void onOk() {
isShowingChargeDialog = false;
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NOT_ENOUGH_TO_RECHARGE,
- "余额不足_去充值:送礼物");
+ ResUtil.getString(R.string.erban_base_baseactivity_02));
ChargeActivity.start(context);
}
@@ -1039,7 +1040,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
int gender = helloInfo.getGender();
String nick = helloInfo.getNick();
String avatar = helloInfo.getAvatar();
- getDialogManager().showNewbieHelloDialog(avatar, gender, nick, message, "去找TA", "忽略", true, new DialogManager.OkCancelDialogListener() {
+ getDialogManager().showNewbieHelloDialog(avatar, gender, nick, message, ResUtil.getString(R.string.erban_base_baseactivity_03), ResUtil.getString(R.string.erban_base_baseactivity_04), true, new DialogManager.OkCancelDialogListener() {
@SuppressLint("CheckResult")
@Override
public void onOk() {
@@ -1059,10 +1060,10 @@ public abstract class BaseActivity extends RxAppCompatActivity
AVRoomActivity.startForFromType(context, helloInfo.getInRoomUid(),
AVRoomActivity.FROM_TYPE_USER, nick, helloInfo.getUid());
} else {
- SingleToastUtil.showToast("来聊聊天嘛~");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.erban_base_baseactivity_05));
}
} else {
- SingleToastUtil.showToast("来聊聊天嘛~");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.erban_base_baseactivity_06));
}
});
}
@@ -1080,7 +1081,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
public void onEvent(BroadcastMessage broadcastMessage) {
if (broadcastMessage != null) {
String contentStr = broadcastMessage.getContent();
- Logger.i("全局广播:" + contentStr);
+ Logger.i(ResUtil.getString(R.string.erban_base_baseactivity_07) + contentStr);
if (TextUtils.isEmpty(contentStr)) return;
BaseActivity baseMvpActivity = mReference.get();
if (baseMvpActivity == null) return;
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java
index f31dd78d0..c4c144d7d 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingActivity.java
@@ -1,11 +1,12 @@
package com.yizhuan.erban.base;
import android.content.Intent;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
import android.os.Bundle;
import android.view.View;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+
import com.yizhuan.erban.BR;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java
index 3c4b1b8b6..31cc86684 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingFragment.java
@@ -1,13 +1,14 @@
package com.yizhuan.erban.base;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java
index 9d46bd777..b78c3b8db 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseBindingTakePhotoActivity.java
@@ -1,12 +1,13 @@
package com.yizhuan.erban.base;
import android.annotation.SuppressLint;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
import android.net.Uri;
import android.os.Bundle;
import android.view.View;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+
import com.jph.takephoto.app.TakePhotoActivity;
import com.jph.takephoto.compress.CompressConfig;
import com.jph.takephoto.model.CropOptions;
@@ -15,6 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.file.FileModel;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
import java.io.File;
@@ -44,8 +46,8 @@ public abstract class BaseBindingTakePhotoActivity ex
}
protected void showTakePhotoOperationDialog() {
- ButtonItem buttonItem = new ButtonItem("拍照上传", this::checkPermissionAndStartCamera);
- ButtonItem buttonItem1 = new ButtonItem("本地相册", () -> {
+ ButtonItem buttonItem = new ButtonItem(ResUtil.getString(R.string.erban_base_basebindingtakephotoactivity_01), this::checkPermissionAndStartCamera);
+ ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.erban_base_basebindingtakephotoactivity_02), () -> {
String mCameraCapturingName = CAMERA_PREFIX + System.currentTimeMillis() + ".jpg";
File cameraOutFile = JXFileUtils.getTempFile(BaseBindingTakePhotoActivity.this, mCameraCapturingName);
if (!cameraOutFile.getParentFile().exists()) {
@@ -61,7 +63,7 @@ public abstract class BaseBindingTakePhotoActivity ex
List buttonItems = new ArrayList<>();
buttonItems.add(buttonItem);
buttonItems.add(buttonItem1);
- getDialogManager().showCommonPopupDialog(buttonItems, "取消", false);
+ getDialogManager().showCommonPopupDialog(buttonItems, ResUtil.getString(R.string.erban_base_basebindingtakephotoactivity_03), false);
}
private void checkPermissionAndStartCamera() {
@@ -90,14 +92,14 @@ public abstract class BaseBindingTakePhotoActivity ex
}
public void onUploadFail() {
- toast("上传失败");
+ toast(ResUtil.getString(R.string.erban_base_basebindingtakephotoactivity_04));
getDialogManager().dismissDialog();
}
@SuppressLint("CheckResult")
@Override
public void takeSuccess(TResult result) {
- getDialogManager().showProgressDialog(BaseBindingTakePhotoActivity.this, "请稍后");
+ getDialogManager().showProgressDialog(BaseBindingTakePhotoActivity.this, ResUtil.getString(R.string.erban_base_basebindingtakephotoactivity_05));
FileModel.get()
.uploadFile(result.getImage().getCompressPath())
.compose(bindToLifecycle())
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java b/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java
index e06f69010..bb8a340fc 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseBsDialog.java
@@ -2,12 +2,13 @@ package com.yizhuan.erban.base;
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.view.WindowManager;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.yizhuan.erban.R;
import butterknife.ButterKnife;
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt b/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt
index 86f9720f7..7d45b8907 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseDialog.kt
@@ -10,7 +10,6 @@ import androidx.fragment.app.FragmentActivity
import androidx.viewbinding.ViewBinding
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.trello.rxlifecycle3.components.support.RxDialogFragment
-import java.lang.Exception
import java.lang.reflect.ParameterizedType
abstract class BaseDialog : RxDialogFragment() {
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java
index 031c9bfe5..8b993eb28 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseFragment.java
@@ -28,6 +28,7 @@ import com.yizhuan.erban.common.ReloadFragment;
import com.yizhuan.erban.common.widget.StatusLayout;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_library.utils.NetworkUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.UIUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@@ -190,7 +191,7 @@ public abstract class BaseFragment extends RxFragment implements KeyEvent.Callba
list.get(index).onActivityResult(requestCode, resultCode, data);
}
} else {
- MLog.error(this, "嵌套fragment出现问题");
+ MLog.error(this, ResUtil.getString(R.string.erban_base_basefragment_01));
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java b/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java
index 36129982c..6bfec84b8 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseLazyFragment.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.base;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import android.view.View;
+import androidx.annotation.Nullable;
+
/**
* 具备懒加载的fragment
*
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java
index 610c1e9b4..a5fff9c96 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpPresenter.java
@@ -1,6 +1,7 @@
package com.yizhuan.erban.base;
import android.os.Bundle;
+
import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;
diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java
index 211fdece6..0f482d2e5 100644
--- a/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/base/BaseMvpTakePhotoActivity.java
@@ -4,9 +4,10 @@ import android.annotation.SuppressLint;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.CallSuper;
import android.util.Log;
+import androidx.annotation.CallSuper;
+
import com.jph.takephoto.app.TakePhoto;
import com.jph.takephoto.app.TakePhotoImpl;
import com.jph.takephoto.compress.CompressConfig;
@@ -16,6 +17,7 @@ import com.jph.takephoto.model.TContextWrap;
import com.jph.takephoto.model.TResult;
import com.jph.takephoto.permission.InvokeListener;
import com.jph.takephoto.permission.PermissionManager;
+import com.jph.takephoto.permission.PermissionManager.TPermissionType;
import com.jph.takephoto.permission.TakePhotoInvocationHandler;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.permission.PermissionActivity;
@@ -23,8 +25,8 @@ import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_core.file.FileModel;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.file.JXFileUtils;
-import com.jph.takephoto.permission.PermissionManager.TPermissionType;
import java.io.File;
import java.util.ArrayList;
@@ -44,8 +46,8 @@ public abstract class BaseMvpTakePhotoActivity {
+ ButtonItem buttonItem = new ButtonItem(ResUtil.getString(R.string.erban_base_basemvptakephotoactivity_01), this::checkPermissionAndStartCamera);
+ ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.erban_base_basemvptakephotoactivity_02), () -> {
String mCameraCapturingName = CAMERA_PREFIX + System.currentTimeMillis() + ".jpg";
File cameraOutFile = JXFileUtils.getTempFile(BaseMvpTakePhotoActivity.this, mCameraCapturingName);
if (!cameraOutFile.getParentFile().exists()) {
@@ -61,7 +63,7 @@ public abstract class BaseMvpTakePhotoActivity buttonItems = new ArrayList<>();
buttonItems.add(buttonItem);
buttonItems.add(buttonItem1);
- getDialogManager().showCommonPopupDialog(buttonItems, "取消", false);
+ getDialogManager().showCommonPopupDialog(buttonItems, ResUtil.getString(R.string.erban_base_basemvptakephotoactivity_03), false);
}
private void checkPermissionAndStartCamera() {
@@ -92,14 +94,14 @@ public abstract class BaseMvpTakePhotoActivity {
Single> getSingle(int page, int size);
default String getEmptyTips() {
- return "暂无数据";
+ return ResUtil.getString(R.string.base_list_irecyclerlistener_01);
}
default int getEmptyResId() {
diff --git a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java b/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java
index 14b7724cb..8dd424221 100644
--- a/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/base/list/LineColorDecoration.java
@@ -5,9 +5,10 @@ import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.yizhuan.xchat_android_library.utils.SizeUtils;
diff --git a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java b/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java
index c6289d837..aeff71058 100644
--- a/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/base/list/MultiCommonAdapter.java
@@ -1,11 +1,12 @@
package com.yizhuan.erban.base.list;
-import androidx.annotation.LayoutRes;
import android.util.SparseIntArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.LayoutRes;
+
import java.util.List;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java b/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java
index 0ceca4d88..a5cc6c233 100644
--- a/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java
+++ b/app/src/main/java/com/yizhuan/erban/base/list/RefreshRecyclerView.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.base.list;
import android.content.Context;
+import android.util.AttributeSet;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.util.AttributeSet;
/**
* Created by lvzebiao on 2018/12/28.
diff --git a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java b/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java
index cea770e06..3d8b72888 100644
--- a/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/base/list/WrapperAdapter.java
@@ -1,14 +1,15 @@
package com.yizhuan.erban.base.list;
import android.content.Context;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.yizhuan.erban.R;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java
index faa5a9c98..2ae802718 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillBaseActivity.java
@@ -1,13 +1,14 @@
package com.yizhuan.erban.bills.activities;
import android.annotation.SuppressLint;
-import androidx.databinding.ViewDataBinding;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.jzxiang.pickerview.TimePickerDialog;
import com.jzxiang.pickerview.data.Type;
import com.jzxiang.pickerview.listener.OnDateSetListener;
@@ -17,6 +18,7 @@ import com.yizhuan.erban.bills.adapter.BillBaseAdapter;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.TimeUtils;
import java.util.ArrayList;
@@ -74,7 +76,7 @@ public abstract class BillBaseActivity extends BaseBi
setDate(System.currentTimeMillis());
mDialogYearMonthDayBuild = new TimePickerDialog.Builder()
.setType(Type.YEAR_MONTH_DAY)
- .setTitleStringId("日期选择")
+ .setTitleStringId(ResUtil.getString(R.string.bills_activities_billbaseactivity_01))
.setThemeColor(getResources().getColor(R.color.line_background))
.setWheelItemTextNormalColor(getResources().getColor(R.color
.timetimepicker_default_text_color))
diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java
index da5bc7731..02b4a5f4f 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java
@@ -21,6 +21,7 @@ import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -136,7 +137,7 @@ public class BillGiftExpendActivity extends BillBaseActivity
implements IBillGiftIncomeGroupView, CommonNavigator.NavigatorSelectedListener {
@@ -59,7 +61,7 @@ public class BillGiftIncomeGroupActivity extends BaseMvpActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- initTitleBar("充值记录");
+ initTitleBar(ResUtil.getString(R.string.bills_activities_chargebillsactivity_01));
}
@Override
@@ -171,7 +172,7 @@ public class ChargeBillsActivity extends BillBaseActivity
});
}
mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary));
- mTitleBar.addAction(new TitleBar.TextAction("充值") {
+ mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_chargebillsactivity_02)) {
@Override
public void performAction(View view) {
startActivity(new Intent(mActivity, ChargeActivity.class));
diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java
index 849dcbc32..09b3cee12 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
-import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java
index 242433c9b..36a2605ae 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java
@@ -20,6 +20,7 @@ import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo;
import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -54,7 +55,7 @@ public class RedBagBillsActivity extends BillBaseActivity
mTitleBar.setLeftClickListener(v -> finish());
}
mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary));
- mTitleBar.addAction(new TitleBar.TextAction("充值") {
+ mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_redbagbillsactivity_01)) {
@Override
public void performAction(View view) {
startActivity(new Intent(RedBagBillsActivity.this, ChargeActivity.class));
@@ -158,7 +159,7 @@ public class RedBagBillsActivity extends BillBaseActivity
adapter.addData(billItemEntities);
} else {
if (mCurrentCounter == 1) {
- showNoData("亲爱的宝贝，你还没有红包记录哦!");
+ showNoData(ResUtil.getString(R.string.bills_activities_redbagbillsactivity_02));
} else {
adapter.loadMoreEnd(true);
}
diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java
index 2288c804e..a7bc96cfe 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java
@@ -19,6 +19,7 @@ import com.yizhuan.erban.bills.fragmemt.WithdrawBillsFragment;
import com.yizhuan.erban.databinding.ActivityWithdrawBillsBinding;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.TimeUtils;
import org.greenrobot.eventbus.EventBus;
@@ -68,7 +69,7 @@ public class WithdrawBillsActivity extends BaseBindingActivity finish());
}
mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary));
- mTitleBar.addAction(new TitleBar.TextAction("充值") {
+ mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_withdrawbillsactivity_01)) {
@Override
public void performAction(View view) {
startActivity(new Intent(WithdrawBillsActivity.this, ChargeActivity.class));
@@ -88,7 +89,7 @@ public class WithdrawBillsActivity extends BaseBindingActivity mTitleList = new ArrayList<>();
public BillGiftIncomeGroupNavigatorAdapter() {
- mTitleList.add("钻石礼物");
- mTitleList.add("萝卜礼物");
+ mTitleList.add(ResUtil.getString(R.string.bills_widget_billgiftincomegroupnavigatoradapter_01));
+ mTitleList.add(ResUtil.getString(R.string.bills_widget_billgiftincomegroupnavigatoradapter_02));
}
@Override
public int getCount() {
diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java b/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java
index 20ac4508d..13ab2e788 100644
--- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java
+++ b/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java
@@ -2,13 +2,14 @@ package com.yizhuan.erban.bills.widget;
import android.content.Context;
import android.content.res.TypedArray;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import com.yizhuan.erban.R;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java
index ed77488b0..700831ce5 100644
--- a/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/bindadapter/BaseAdapter.java
@@ -1,12 +1,13 @@
package com.yizhuan.erban.bindadapter;
-import androidx.databinding.DataBindingUtil;
-import androidx.databinding.ViewDataBinding;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java b/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java
index 84532da32..5450b71de 100644
--- a/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java
+++ b/app/src/main/java/com/yizhuan/erban/bindadapter/BindingViewHolder.java
@@ -1,8 +1,9 @@
package com.yizhuan.erban.bindadapter;
-import androidx.databinding.ViewDataBinding;
import android.view.View;
+import androidx.databinding.ViewDataBinding;
+
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java
index 67a3a9d4d..f5d8bbaa2 100644
--- a/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/bindadapter/RvAdapter.java
@@ -1,11 +1,8 @@
package com.yizhuan.erban.bindadapter;
import androidx.databinding.BindingAdapter;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.RecyclerView;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-
import java.util.List;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java b/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java
index e232a7ad8..8fe509be6 100644
--- a/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/bindadapter/ViewAdapter.java
@@ -1,12 +1,7 @@
package com.yizhuan.erban.bindadapter;
-import androidx.databinding.BindingAdapter;
-
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
-
-import androidx.annotation.Nullable;
-
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
@@ -14,18 +9,21 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.databinding.BindingAdapter;
+
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.utils.StarUtils;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import com.yizhuan.xchat_android_library.utils.TimeUtils;
+import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
+import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
import java.util.Date;
diff --git a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java b/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java
index 993215b3c..64c6351d8 100644
--- a/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/common/AbsStatusFragment.java
@@ -1,14 +1,12 @@
package com.yizhuan.erban.common;
import android.os.Bundle;
+import android.view.View;
+
import androidx.fragment.app.Fragment;
-import android.view.View;
-import android.widget.Toast;
-
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
/**
* Created by xujiexing on 14-7-21.
diff --git a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java b/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java
index 88768d946..8cb25ee32 100644
--- a/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/common/EmptyViewHelper.java
@@ -9,12 +9,13 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.NetworkUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
public class EmptyViewHelper {
public static View createEmptyView(Context context, String text) {
- if (!NetworkUtils.isNetworkAvailable(context)) text = "网络异常,请检查网络再试~";
+ if (!NetworkUtils.isNetworkAvailable(context)) text = ResUtil.getString(R.string.erban_common_emptyviewhelper_01);
View view = LayoutInflater.from(context).inflate(R.layout.layout_ktv_empty, null);
view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
((TextView) view.findViewById(R.id.tv_hint)).setText(text);
@@ -22,7 +23,7 @@ public class EmptyViewHelper {
}
public static View createDarkEmptyView(Context context, String text) {
- if (!NetworkUtils.isNetworkAvailable(context)) text = "网络异常,请检查网络再试~";
+ if (!NetworkUtils.isNetworkAvailable(context)) text = ResUtil.getString(R.string.erban_common_emptyviewhelper_02);
View view = LayoutInflater.from(context).inflate(R.layout.layout_ktv_empty, null);
view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
((TextView) view.findViewById(R.id.tv_hint)).setText(text);
diff --git a/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java b/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java
index 1b2dcea64..eab83e4fa 100644
--- a/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/common/NetworkErrorFragment.java
@@ -1,15 +1,14 @@
package com.yizhuan.erban.common;
+import static com.yizhuan.erban.common.NoDataFragment.LAYOUTID_PARAM;
+
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import com.yizhuan.xchat_android_library.utils.NetworkUtils;
import com.yizhuan.erban.R;
-
-import static com.yizhuan.erban.common.NoDataFragment.LAYOUTID_PARAM;
+import com.yizhuan.xchat_android_library.utils.NetworkUtils;
/**
* Created by xujiexing on 14-4-9.
diff --git a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java b/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java
index e45230d38..634c1cd4c 100644
--- a/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/common/ReloadFragment.java
@@ -3,16 +3,17 @@ package com.yizhuan.erban.common;
import android.annotation.TargetApi;
import android.os.Build;
import android.os.Bundle;
-import androidx.annotation.ColorInt;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
+
+import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.NetworkUtils;
import com.yizhuan.xchat_android_library.utils.log.MLog;
-import com.yizhuan.erban.R;
/**
* Created by xujiexing on 14-4-9.
diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java b/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java
index 893f39f99..70acaa73f 100644
--- a/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java
+++ b/app/src/main/java/com/yizhuan/erban/common/permission/EasyPermissions.java
@@ -25,12 +25,13 @@ import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
+
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AlertDialog;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
import com.yizhuan.erban.common.widget.dialog.BaseAlertDialogBuilder;
diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java b/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java
index 2cfcfe31b..bfc8ddd7d 100644
--- a/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/common/permission/PermissionActivity.java
@@ -4,10 +4,10 @@ package com.yizhuan.erban.common.permission;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
-
import com.yizhuan.erban.R;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java b/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java
index 7382df933..a21f0e8f1 100644
--- a/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java
+++ b/app/src/main/java/com/yizhuan/erban/common/permission/StatusBarCompat.java
@@ -4,7 +4,6 @@ import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
import android.os.Build;
-import androidx.core.view.ViewCompat;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -12,6 +11,8 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
+import androidx.core.view.ViewCompat;
+
/**
* Utils for status bar
* Created by qiu on 3/29/16.
diff --git a/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java b/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java
index 65f2f4462..0f4de8bfa 100644
--- a/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java
+++ b/app/src/main/java/com/yizhuan/erban/common/server/NetworkService.java
@@ -10,6 +10,9 @@ import android.net.NetworkInfo;
import android.os.IBinder;
import android.util.Log;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+
public class NetworkService extends Service {
// Class that answers queries about the state of network connectivity.
@@ -40,7 +43,7 @@ public class NetworkService extends Service {
@Override
public void onReceive(Context context, Intent intent) {
- System.out.println("收到网络改变广播！");
+ System.out.println(ResUtil.getString(R.string.common_server_networkservice_01));
// The action of this intent or null if none is specified.
// action是行动的意思，也许是我水平问题无法理解为什么叫行动，我一直理解为标识（现在理解为意图）
String action = intent.getAction(); // 当前接受到的广播的标识(行动/意图)
@@ -70,7 +73,7 @@ public class NetworkService extends Service {
// NetworkInfo为空或者是不可用的情况下
netState = 0;
-// Toast.makeText(context, "没有可用网络!\n请连接网络后刷新本界面", Toast.LENGTH_SHORT).show();
+// Toast.makeText(context, ResUtil.getString(R.string.common_server_networkservice_02), Toast.LENGTH_SHORT).show();
/**
* 这里推荐使用本地广播的方式发送:
@@ -81,24 +84,24 @@ public class NetworkService extends Service {
if(netState == 0){
sendNetBroadCast(ACTION_NETWORK_STATE_CHANGE_FAILED,netState);
- Log.d(TAG, "网络已断开");
+ Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_03));
}else{
// if (count != -1) {
// if (!ConnectionManager.getInstance().getConnection().isConnected()) {
-// Log.d(TAG, "启动重连服务器！切换网络计数:" + count);
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_04) + count);
// ChatManager.getInstance().reconnect(ChatManager.getInstance().getWorkHandler());// 重连服务器
// }
-// Log.d(TAG, "网络已链接");
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_05));
// }
count++;
}
// switch (netState) {
// case 2:// WIFI
-// Log.d(TAG, "已切换为wifi");
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_06));
// if (count != -1) {
// if (!ConnectionManager.getInstance().getConnection().isConnected()) {
-// Log.d(TAG, "启动重连服务器！切换网络计数:" + count);
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_07) + count);
// ChatManager.getInstance().reconnect(ChatManager.getInstance().getWorkHandler());// 重连服务器
// }
//
@@ -106,10 +109,10 @@ public class NetworkService extends Service {
// count++;
// break;
// case 1:// other
-// Log.d(TAG, "已切换为手机网络");
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_08));
// if (count != -1) {
// if (!ConnectionManager.getInstance().getConnection().isConnected()) {
-// Log.d(TAG, "启动重连服务器！切换网络计数:" + count);
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_09) + count);
// ChatManager.getInstance().reconnect(ChatManager.getInstance().getWorkHandler());// 重连服务器
// }
//
@@ -117,7 +120,7 @@ public class NetworkService extends Service {
// count++;
// break;
// case 0:// no net
-// Log.d(TAG, "网络已断开");
+// Log.d(TAG, ResUtil.getString(R.string.common_server_networkservice_010));
// break;
//
// default:
@@ -159,7 +162,7 @@ public class NetworkService extends Service {
@Override
public void onCreate() {
super.onCreate();
- System.out.println("服务被创建");
+ System.out.println(ResUtil.getString(R.string.common_server_networkservice_011));
// msgFactory = ChatMsgFactory.getInstance();
// chatManager = ChatManager.getInstance();
@@ -172,7 +175,7 @@ public class NetworkService extends Service {
@Override
public void onDestroy() {
super.onDestroy();
- System.out.println("服务被销毁");
+ System.out.println(ResUtil.getString(R.string.common_server_networkservice_012));
// 注销接收
unregisterReceiver(mReceiver);
}
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java
index 3cda585c3..2ebaa9024 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/CircleGradualImageView.java
@@ -9,10 +9,11 @@ import android.graphics.RadialGradient;
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
-import android.util.AttributeSet;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java
index b742d68ec..58fcdb0ff 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/CircleImageView.java
@@ -14,9 +14,10 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
+import androidx.appcompat.widget.AppCompatImageView;
+
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java b/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java
index 40d292893..a32dafc9a 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/CustomAutoWidthImageSpan.java
@@ -19,7 +19,6 @@ import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
-
import java.lang.ref.WeakReference;
public class CustomAutoWidthImageSpan extends ImageSpan {
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java b/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java
index 4d7fe306a..5bdef1a32 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/CustomImageSpan.java
@@ -7,11 +7,12 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.engine.GlideException;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java b/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java
index 88902632d..aeea62618 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/FloatingLiveMiniView.java
@@ -1,11 +1,12 @@
package com.yizhuan.erban.common.widget;
import android.content.Context;
-import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.RelativeLayout;
+import androidx.annotation.Nullable;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java b/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java
index 2589f3eb7..ec83820e9 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/LimitEditText.java
@@ -2,11 +2,12 @@ package com.yizhuan.erban.common.widget;
import android.content.Context;
import android.content.res.TypedArray;
-import androidx.appcompat.widget.AppCompatEditText;
import android.text.InputFilter;
import android.util.AttributeSet;
import android.widget.TextView;
+import androidx.appcompat.widget.AppCompatEditText;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.utils.LimitInputFliter;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java
index 38d1ab41d..1cdfce144 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/MaskImageView.java
@@ -8,9 +8,9 @@ import android.graphics.ColorFilter;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
import android.util.AttributeSet;
+import android.widget.ImageView;
import com.yizhuan.erban.R;
-import android.widget.ImageView;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java b/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java
index ed47d0f0c..55f6c4e3b 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/OriginalDrawStatusClickSpan.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.common.widget;
+import android.text.TextPaint;
+import android.text.style.ClickableSpan;
+
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
-import android.text.TextPaint;
-import android.text.style.ClickableSpan;
public abstract class OriginalDrawStatusClickSpan extends ClickableSpan {
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java b/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java
index e72a96c5d..5d4519066 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/SlideListViewPager.java
@@ -1,12 +1,13 @@
package com.yizhuan.erban.common.widget;
import android.content.Context;
-import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.WindowManager;
+import androidx.viewpager.widget.ViewPager;
+
public class SlideListViewPager extends ViewPager {
private Context context;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java b/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java
index b6af68409..be8863a00 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/StatusLayout.java
@@ -10,8 +10,8 @@ import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.log.MLog;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java b/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java
index 2cc44688c..a13958900 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/TextDrawable.java
@@ -6,11 +6,12 @@ import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.drawable.Drawable;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
public class TextDrawable extends Drawable {
private String mContent;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java
index 7c84070af..5e47a7510 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsDialog.java
@@ -4,11 +4,6 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.AppCompatDialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -17,6 +12,12 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.community.publish.view.WorldsChooseFrg;
@@ -27,6 +28,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.Commo
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo;
import com.yizhuan.xchat_android_core.home.bean.TabInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -68,9 +70,9 @@ public class ChooseWorldsDialog extends AppCompatDialogFragment
viewPager = mRootView.findViewById(R.id.viewpager);
List mTabInfoList = new ArrayList<>();
-// mTabInfoList.add(new TabInfo(1, "我加入的"));
-// mTabInfoList.add(new TabInfo(2, "大家都在聊"));
- mTabInfoList.add(new TabInfo(3, "全部"));
+// mTabInfoList.add(new TabInfo(1, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_01)));
+// mTabInfoList.add(new TabInfo(2, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_02)));
+ mTabInfoList.add(new TabInfo(3, ResUtil.getString(R.string.widget_dialog_chooseworldsdialog_03)));
List mTabs = new ArrayList<>();
// mTabs.add(WorldsChooseFrg.newInstance(Constants.TYPE_JOINED).setmChooseWorldCallback(this));
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java
index a9ba2b9b8..afd4a3065 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/ChooseWorldsIndicatorAdapter.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.common.widget.dialog;
import android.content.Context;
-import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java
index 55151c00c..d88bf7ce4 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CommonPopupDialog.java
@@ -2,8 +2,6 @@ package com.yizhuan.erban.common.widget.dialog;
import android.content.Context;
import android.os.Bundle;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.LayoutInflater;
@@ -15,6 +13,8 @@ import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.TextView;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java
index f37886964..9f83e52bd 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/CustomPopupDialog.java
@@ -12,10 +12,9 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
-
+import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.xchat_android_library.utils.ResolutionUtils;
-import com.yizhuan.erban.R;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java
index 93a5367c0..d46e1683e 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java
@@ -2,15 +2,13 @@ package com.yizhuan.erban.common.widget.dialog;
import android.content.Context;
-import com.orhanobut.logger.Logger;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.radish.task.activity.TaskCenterActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
-
-import java.util.HashMap;
-import java.util.Map;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* 弹框帮助类，减少一些的代码的冗余
@@ -30,8 +28,8 @@ public class DialogUiHelper {
if (dialogManager == null) {
dialogManager = new DialogManager(context);
}
- String[] messages = new String[]{"您的萝卜不足,请前往任务中心\n", "完成任务获取更多的萝卜"};
- dialogManager.showOkCancelWithTitleDialog(messages, "前往", true, () -> {
+ String[] messages = new String[]{ResUtil.getString(R.string.widget_dialog_dialoguihelper_01), ResUtil.getString(R.string.widget_dialog_dialoguihelper_02)};
+ dialogManager.showOkCancelWithTitleDialog(messages, ResUtil.getString(R.string.widget_dialog_dialoguihelper_03), true, () -> {
if (!ActivityUtil.isValidContext(context)) {
return;
}
@@ -46,10 +44,10 @@ public class DialogUiHelper {
if (dialogManager == null) {
dialogManager = new DialogManager(context);
}
- dialogManager.showOkCancelDialog("余额不足，请充值",
+ dialogManager.showOkCancelDialog(ResUtil.getString(R.string.widget_dialog_dialoguihelper_04),
true, () -> {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_NOT_ENOUGH_TO_RECHARGE,
- "余额不足_去充值:" + CHARGE_FROM);
+ ResUtil.getString(R.string.widget_dialog_dialoguihelper_05) + CHARGE_FROM);
ChargeActivity.start(context);
});
}
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java
index 7af012fb6..66a775a4a 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/LoadingImageView.java
@@ -2,10 +2,11 @@ package com.yizhuan.erban.common.widget.dialog;
import android.animation.ObjectAnimator;
import android.content.Context;
-import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.animation.LinearInterpolator;
+import androidx.appcompat.widget.AppCompatImageView;
+
/**
* create by lvzebiao @2019/12/5
*/
diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java
index 39955575a..5b49296eb 100644
--- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/TimeOutProgressDialog.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.common.widget.dialog;
import android.app.Activity;
import android.os.Handler;
import android.os.Looper;
-import android.widget.Toast;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt b/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
index f5d25203b..5814e4655 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/DecorationCommonAdapter.kt
@@ -6,7 +6,6 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
-import com.yizhuan.xchat_android_core.room.game.GameInfo
open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) :
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java
index a08c1cbba..a0d9ccc60 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/HeadWearShopAdapter.java
@@ -6,9 +6,9 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.databinding.ItemHeadWearBinding;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
/**
* Created by huangmeng1 on 2018/5/10.
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
index 2283858f5..36146b45a 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyCarAdapter.java
@@ -11,6 +11,7 @@ import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.databinding.ItemCarGarageNormalBinding;
import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.jetbrains.annotations.NotNull;
@@ -59,7 +60,7 @@ public class MyCarAdapter extends BaseAdapter {
days = item.getRemainingDay()+"";
}
binding.tvCounters.setText(String.format(binding.tvCounters.getResources().getString(R.string.decoration_status_wrapper),
- binding.tvCounters.getResources().getString(R.string.decoration_remainder) + days + "天"));
+ binding.tvCounters.getResources().getString(R.string.decoration_remainder) + days + ResUtil.getString(R.string.decoration_adapter_mycaradapter_01)));
} else {
if (status == CarInfo.STATUS_OFF_SHELF || status == CarInfo.STATUS_OUT_OF_DATE) {
binding.tvCounters.setText(String.format(binding.tvCounters.getResources().getString(R.string.decoration_status_wrapper),
@@ -77,19 +78,19 @@ public class MyCarAdapter extends BaseAdapter {
if (!canUse) {
tvUsed.setVisibility(View.GONE);
- tvUsed.setText("使用");
+ tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_02));
tvUsed.setBackgroundResource(R.drawable.bg_common_disable);
tvUsed.setEnabled(false);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_secondary_4f516a));
} else if (isUsing) {
tvUsed.setVisibility(View.VISIBLE);
- tvUsed.setText("取消使用");
+ tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_03));
tvUsed.setBackgroundResource(R.drawable.bg_common_cancel);
tvUsed.setEnabled(true);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.color_4C5AF1));
} else {
tvUsed.setVisibility(View.VISIBLE);
- tvUsed.setText("使用");
+ tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mycaradapter_04));
tvUsed.setBackgroundResource(R.drawable.bg_common_confirm);
tvUsed.setTextColor(mContext.getResources().getColor(R.color.text_title_color));
tvUsed.setEnabled(true);
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java
index 1ed8603c5..8e9344616 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyChatBubbleAdapter.java
@@ -9,11 +9,10 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.databinding.ItemMyChatBubbleBinding;
-import com.yizhuan.erban.databinding.ItemMyUserCardWearBinding;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by huangmeng1 on 2018/5/11.
@@ -56,7 +55,7 @@ public class MyChatBubbleAdapter extends BaseAdapter {
if (item.isHasExpired()) {
binding.tvUsed.setVisibility(View.GONE);
binding.tvUsed.setEnabled(false);
- binding.tvUsed.setText("使用");
+ binding.tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_mychatbubbleadapter_01));
} else {
binding.tvUsed.setVisibility(View.VISIBLE);
binding.tvUsed.setEnabled(true);
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java
index 0a183660c..f5f47756a 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyHeadWearAdapter.java
@@ -8,6 +8,7 @@ import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.databinding.ItemMyHeadWearBinding;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by huangmeng1 on 2018/5/11.
@@ -50,7 +51,7 @@ public class MyHeadWearAdapter extends BaseAdapter {
if (item.getStatus() == 2) {
binding.tvUsed.setVisibility(View.GONE);
binding.tvUsed.setEnabled(false);
- binding.tvUsed.setText("使用");
+ binding.tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_myheadwearadapter_01));
} else {
binding.tvUsed.setVisibility(View.VISIBLE);
binding.tvUsed.setEnabled(true);
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
index 1cd3480c1..d9dc094a5 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/adapter/MyNamePlateAdapter.java
@@ -6,11 +6,10 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
-import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by yudi
@@ -47,7 +46,7 @@ public class MyNamePlateAdapter extends BaseQuickAdapter {
if (item.isHasExpired()) {
binding.tvUsed.setVisibility(View.GONE);
binding.tvUsed.setEnabled(false);
- binding.tvUsed.setText("使用");
+ binding.tvUsed.setText(ResUtil.getString(R.string.decoration_adapter_myusercardwearadapter_01));
} else {
binding.tvUsed.setVisibility(View.VISIBLE);
binding.tvUsed.setEnabled(true);
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java
index c9b9e20f1..9071b6d59 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java
@@ -5,19 +5,19 @@ import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.TextView;
-import android.widget.Toast;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.common.widget.dialog.DialogUiHelper;
-import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration;
import com.yizhuan.xchat_android_core.decoration.bean.CurrencyType;
import com.yizhuan.xchat_android_core.decoration.car.CarModel;
import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel;
+import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption;
import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.functions.BiConsumer;
@@ -66,7 +66,7 @@ public class DecorationDialogHelper {
if (view == null) {
return;
}
- dialogManager.showOkCancelCustomDialog(view, "确定", "取消", false, this::handleDialogOkClick);
+ dialogManager.showOkCancelCustomDialog(view, ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_01), ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_02), false, this::handleDialogOkClick);
}
private View getBuyContentView() {
@@ -177,52 +177,52 @@ public class DecorationDialogHelper {
switch (options.getType()) {
case DecorationSaleType.BUY_HEAD_WEAR:
dialogManager.showProgressDialog(context, "", true);
- DialogUiHelper.CHARGE_FROM = "买头饰";
+ DialogUiHelper.CHARGE_FROM = ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_03);
HeadwearModel.get().buyHeadWearV2(options.getDecoration().getDecorationId(), calcCurrencyType())
.compose(RxHelper.bindContext(context))
.map(s -> {
if (options.getDecoration().isRenew()) {
- return "续费成功";
+ return ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_04);
}
- return "购买成功";
+ return ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_05);
})
.subscribe(new DecorationConsumer());
break;
case DecorationSaleType.BUY_CAR:
- DialogUiHelper.CHARGE_FROM = "买座驾";
+ DialogUiHelper.CHARGE_FROM = ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_06);
dialogManager.showProgressDialog(context, "", true);
CarModel.get().buyThisCarV2(options.getDecoration().getDecorationId(), calcCurrencyType())
.compose(RxHelper.bindContext(context))
.map(s -> {
if (options.getDecoration().isRenew()) {
- return "续费成功";
+ return ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_07);
}
- return "购买成功";
+ return ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_08);
})
.subscribe(new DecorationConsumer());
break;
case DecorationSaleType.SEND_CAR:
- DialogUiHelper.CHARGE_FROM = "买座驾";
+ DialogUiHelper.CHARGE_FROM = ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_09);
CarModel.get().sendCarV2(
String.valueOf(options.getTargetUid()),
String.valueOf(options.getDecoration().getDecorationId()),
calcCurrencyType())
.compose(RxHelper.bindContext(context))
- .map(s -> "赠送成功")
+ .map(s -> ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_010))
.subscribe(new DecorationConsumer());
break;
case DecorationSaleType.SEND_HEAD_WEAR:
- DialogUiHelper.CHARGE_FROM = "买头饰";
+ DialogUiHelper.CHARGE_FROM = ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_011);
HeadwearModel.get().sendHeadWearV2(
calcCurrencyType(),
String.valueOf(options.getDecoration().getDecorationId()),
String.valueOf(options.getTargetUid()))
.compose(RxHelper.bindContext(context))
- .map(s -> "赠送成功")
+ .map(s -> ResUtil.getString(R.string.decoration_helper_decorationdialoghelper_012))
.subscribe(new DecorationConsumer());
break;
}
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java
index e8e0c251e..540657d39 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationHelper.java
@@ -9,14 +9,12 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.decoration.DecorationInfo;
import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent;
import com.yizhuan.xchat_android_core.decoration.DecorationModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
-import io.reactivex.functions.Consumer;
-
/**
* create by lvzebiao @2019/3/21
*/
@@ -50,7 +48,7 @@ public class DecorationHelper {
long targetUid) {
DecorationInfo decorationInfo = EventBus.getDefault().getStickyEvent(DecorationInfoEvent.class).getDecorationInfo();
dialogManager.showOkCancelDialog(
- "赠送确认",
+ ResUtil.getString(R.string.decoration_helper_decorationhelper_01),
context.getResources().getString(
R.string.donate_decoration_info_text,
decorationInfo.getName(),
@@ -58,8 +56,8 @@ public class DecorationHelper {
String.valueOf(decorationInfo.getDressDay())
),
- "赠送",
- "取消",
+ ResUtil.getString(R.string.decoration_helper_decorationhelper_02),
+ ResUtil.getString(R.string.decoration_helper_decorationhelper_03),
true,
() -> {
dialogManager.showProgressDialog(context);
@@ -67,7 +65,7 @@ public class DecorationHelper {
.compose(RxHelper.bindContext(context))
.subscribe(s -> {
dialogManager.dismissDialog();
- SingleToastUtil.showToast("赠送成功");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.decoration_helper_decorationhelper_04));
}, throwable -> {
dialogManager.dismissDialog();
SingleToastUtil.showToast(throwable.getMessage());
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt
index 6cd20c0d0..e8daf1c2c 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationCommonFragment.kt
@@ -15,6 +15,7 @@ import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
/**
@@ -53,7 +54,7 @@ class DecorationCommonFragment : BaseViewBindingFragment {
dialogManager.showOkCancelDialog(
- "购买确认",
+ ResUtil.getString(R.string.decoration_view_decorationcommonfragment_02),
mContext.resources.getString(
R.string.buy_decoration_info_text,
decorationInfo.name,
decorationInfo.dressDay.toString()
),
- "购买",
- "取消",
+ ResUtil.getString(R.string.decoration_view_decorationcommonfragment_03),
+ ResUtil.getString(R.string.decoration_view_decorationcommonfragment_04),
true
) {
decorationViewModel.buyDecoration(
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt
index bf9e34267..dbcaa6966 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.kt
@@ -7,7 +7,6 @@ import android.view.View
import androidx.activity.viewModels
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
-import androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener
import com.netease.nim.uikit.StatusBarUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingActivity
@@ -26,6 +25,7 @@ import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.FormatUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -55,9 +55,9 @@ class DecorationStoreActivity : BaseViewBindingActivity = ArrayList(5)
- tabInfoList.add(TabInfo(TAB_HEAD_WEAR, "头饰"))
- tabInfoList.add(TabInfo(TAB_CAR, "座驾"))
- tabInfoList.add(TabInfo(TAB_NAMEPLATE, "铭牌"))
- tabInfoList.add(TabInfo(TAB_USER_CARD, "资料卡"))
- tabInfoList.add(TabInfo(TAB_CHAT_BUBBLE, "聊天气泡"))
+ tabInfoList.add(TabInfo(TAB_HEAD_WEAR, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_03)))
+ tabInfoList.add(TabInfo(TAB_CAR, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_04)))
+ tabInfoList.add(TabInfo(TAB_NAMEPLATE, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_05)))
+ tabInfoList.add(TabInfo(TAB_USER_CARD, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_06)))
+ tabInfoList.add(TabInfo(TAB_CHAT_BUBBLE, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_07)))
val commonNavigator = CommonNavigator(this)
commonNavigator.isAdjustMode = true
val indicator = MyDecorationMagicIndicator(this, tabInfoList)
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java
index aa04ba08b..87e3189c8 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyCarFragment.java
@@ -2,12 +2,11 @@ package com.yizhuan.erban.decoration.view;
import android.annotation.SuppressLint;
import android.os.Bundle;
+import android.view.View;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
-import android.view.View;
-
import com.yizhuan.erban.BR;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingFragment;
@@ -21,6 +20,7 @@ import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.List;
@@ -106,7 +106,7 @@ public class MyCarFragment extends BaseBindingFragment {
if (ListUtils.isListEmpty(mCarGarageAdapter.getData())) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有座驾哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.decoration_view_mycarfragment_01));
}
List list = mCarGarageAdapter.getData();
@@ -163,11 +163,11 @@ public class MyCarFragment extends BaseBindingFragment {
if (ListUtils.isListEmpty(bubbleAdapter.getData())) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有聊天气泡哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.decoration_view_mychatbubblefragment_01));
}
})
.subscribe();
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java
index 02366a475..312de4816 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyDecorationActivity.java
@@ -39,6 +39,7 @@ import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.ArrayList;
@@ -79,7 +80,7 @@ public class MyDecorationActivity extends BaseBindingActivity tabInfoList = new ArrayList<>(5);
- tabInfoList.add(new TabInfo(1, "头饰"));
- tabInfoList.add(new TabInfo(2, "座驾"));
- tabInfoList.add(new TabInfo(3, "铭牌"));
- tabInfoList.add(new TabInfo(4, "资料卡"));
- tabInfoList.add(new TabInfo(5, "聊天气泡"));
+ tabInfoList.add(new TabInfo(1, ResUtil.getString(R.string.decoration_view_mydecorationactivity_02)));
+ tabInfoList.add(new TabInfo(2, ResUtil.getString(R.string.decoration_view_mydecorationactivity_03)));
+ tabInfoList.add(new TabInfo(3, ResUtil.getString(R.string.decoration_view_mydecorationactivity_04)));
+ tabInfoList.add(new TabInfo(4, ResUtil.getString(R.string.decoration_view_mydecorationactivity_05)));
+ tabInfoList.add(new TabInfo(5, ResUtil.getString(R.string.decoration_view_mydecorationactivity_06)));
CommonNavigator commonNavigator = new CommonNavigator(this);
commonNavigator.setAdjustMode(true);
MyDecorationMagicIndicator indicator = new MyDecorationMagicIndicator(this, tabInfoList);
@@ -161,21 +162,21 @@ public class MyDecorationActivity extends BaseBindingActivity CarModel.get().driveThisCar(carInfo.getCarId())
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.subscribe((voidServiceResult, throwable1) -> {
if (voidServiceResult != null && voidServiceResult.isSuccess()) {
- SingleToastUtil.showToastShort("驾驶成功");
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.decoration_view_mydecorationactivity_08));
// 实时更新座驾被选中
mMyCarFragment.getAdapter().check(carInfo);
} else if (voidServiceResult != null && !voidServiceResult.isSuccess()) {
- SingleToastUtil.showToastShort("驾驶失败: 网络异常!");
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.decoration_view_mydecorationactivity_09));
} else if (throwable1 != null) {
- SingleToastUtil.showToastShort("驾驶失败: 网络异常!");
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.decoration_view_mydecorationactivity_010));
} else {
- SingleToastUtil.showToastShort("驾驶失败: 网络异常!");
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.decoration_view_mydecorationactivity_011));
}
}));
}
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java
index 778e730ff..88fa71ef0 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java
@@ -21,6 +21,7 @@ import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -69,7 +70,7 @@ public class MyHeadWearFragment extends BaseBindingFragment {
if (ListUtils.isListEmpty(shopAdapter.getData())) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有头饰哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.decoration_view_myheadwearfragment_01));
}
List list = shopAdapter.getData();
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java
index 71275f31c..86d8ae229 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyNamePlateFragment.java
@@ -2,13 +2,12 @@ package com.yizhuan.erban.decoration.view;
import android.annotation.SuppressLint;
import android.os.Bundle;
+import android.view.View;
import androidx.annotation.Nullable;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.View;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.yizhuan.erban.R;
@@ -20,6 +19,7 @@ import com.yizhuan.xchat_android_core.decoration.nameplate.NamePlateModel;
import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -87,7 +87,7 @@ public class MyNamePlateFragment extends BaseFragment {
} else {
List info = serviceResult.getNameplateList();
if (ListUtils.isListEmpty(info)) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有铭牌哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.decoration_view_mynameplatefragment_01));
return;
}
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java b/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java
index 9c888f9b4..fff164091 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/MyUserCardWearFragment.java
@@ -2,31 +2,24 @@ package com.yizhuan.erban.decoration.view;
import android.annotation.SuppressLint;
import android.app.Activity;
-import android.util.Log;
import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
-import com.chad.library.adapter.base.BaseQuickAdapter;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.yizhuan.erban.BR;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingFragment;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding;
-import com.yizhuan.erban.decoration.adapter.MyHeadWearAdapter;
import com.yizhuan.erban.decoration.adapter.MyUserCardWearAdapter;
-import com.yizhuan.erban.decoration.helper.DecorationDialogHelper;
-import com.yizhuan.erban.decoration.helper.DecorationSaleType;
-import com.yizhuan.erban.decoration.viewmodel.HeadWearVm;
import com.yizhuan.erban.decoration.viewmodel.UserCardWearVm;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
-import java.util.List;
import java.util.Objects;
/**
@@ -68,7 +61,7 @@ public class MyUserCardWearFragment extends BaseBindingFragment {
if (ListUtils.isListEmpty(shopAdapter.getData())) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有资料卡哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.decoration_view_myusercardwearfragment_01));
}
})
.subscribe();
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java
index 22a7c56ad..43a049f33 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/CarMagicIndicator.java
@@ -3,16 +3,13 @@ package com.yizhuan.erban.decoration.view.widgets;
import android.content.Context;
import androidx.core.content.ContextCompat;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import com.yizhuan.xchat_android_core.home.bean.TabInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -47,7 +44,7 @@ public class CarMagicIndicator extends CommonNavigatorAdapter {
scaleTransitionPagerTitleView.setMinScale(1);
scaleTransitionPagerTitleView.setTextSize(16);
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());
- if (mTitleList.get(i).getName().equals("座驾")) {
+ if (mTitleList.get(i).getName().equals(ResUtil.getString(R.string.view_widgets_carmagicindicator_01))) {
scaleTransitionPagerTitleView.findViewById(R.id.car_badge).setId(R.id.car_badge_garage);
}
scaleTransitionPagerTitleView.setOnClickListener(view -> {
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java
index 20fc1f484..4b7c3270d 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/view/widgets/MyDecorationMagicIndicator.java
@@ -9,6 +9,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.C
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.xchat_android_core.home.bean.TabInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -42,7 +43,7 @@ public class MyDecorationMagicIndicator extends CommonNavigatorAdapter {
scaleTransitionPagerTitleView.setMinScale(0.9f);
scaleTransitionPagerTitleView.setTextSize(15);
scaleTransitionPagerTitleView.setText(mTitleList.get(i).getName());
- if (mTitleList.get(i).getName().equals("座驾")) {
+ if (mTitleList.get(i).getName().equals(ResUtil.getString(R.string.view_widgets_mydecorationmagicindicator_01))) {
scaleTransitionPagerTitleView.findViewById(R.id.car_badge).setId(R.id.car_badge_garage);
}
scaleTransitionPagerTitleView.setOnClickListener(view -> {
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java
index 59a3bff6d..a93ee1e67 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/CarShopVm.java
@@ -4,7 +4,6 @@ import com.yizhuan.erban.base.BaseListViewModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.decoration.car.CarModel;
import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
-import com.yizhuan.xchat_android_library.utils.JavaUtil;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt
index af8d18cd5..c73e49f35 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/DecorationViewModel.kt
@@ -2,6 +2,7 @@ package com.yizhuan.erban.decoration.viewmodel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
@@ -9,6 +10,7 @@ import com.yizhuan.xchat_android_core.decoration.DecorationModel
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.utils.toast
+import com.yizhuan.xchat_android_library.utils.ResUtil
class DecorationViewModel : BaseViewModel() {
@@ -53,7 +55,7 @@ class DecorationViewModel : BaseViewModel() {
true,
block = {
DecorationModel.buyDecoration(dressType, dressId)
- "购买成功".toast()
+ ResUtil.getString(R.string.decoration_viewmodel_decorationviewmodel_01).toast()
},
)
}
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java
index bedea2efb..56dbb1a7f 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/HeadWearVm.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.decoration.viewmodel;
import com.yizhuan.erban.base.BaseListViewModel;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel;
+import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java
index 2bf95e466..1b027d870 100644
--- a/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java
+++ b/app/src/main/java/com/yizhuan/erban/decoration/viewmodel/UserChatBubbleVm.java
@@ -4,7 +4,6 @@ import com.yizhuan.erban.base.BaseListViewModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo;
-import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java
index 76811eef5..c7c0ceadb 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java
@@ -1,14 +1,13 @@
package com.yizhuan.erban.family.presenter;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilyAttentionFragmentView;
-import com.yizhuan.xchat_android_core.user.AttentionModel;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
+import com.yizhuan.xchat_android_core.user.AttentionModel;
import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;
-import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;
-
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -38,9 +37,9 @@ public class FamilyAttentionPresenter extends BaseMvpPresenter> loadData(int targetPage){
FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (familyInfo == null){
- return Single.error(new Throwable("家族信息不存在."));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familygamelistpresenter_01)));
}
if (isLoading){
- return Single.error(new Throwable("正在刷新,请稍后..."));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familygamelistpresenter_02)));
}
isLoading = true;
return FamilyModel.Instance().loadFamilyGameList(
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java
index e8d81e580..e60665121 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java
@@ -1,17 +1,20 @@
package com.yizhuan.erban.family.presenter;
import android.os.Bundle;
+
import androidx.annotation.Nullable;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
+import com.yizhuan.erban.home.view.IFamilyHomeActivityView;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent;
import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent;
import com.yizhuan.xchat_android_core.family.event.FamilyUpdateEvent;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
-import com.yizhuan.erban.home.view.IFamilyHomeActivityView;
import com.yizhuan.xchat_android_library.base.PresenterEvent;
import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import io.reactivex.Single;
import io.reactivex.SingleSource;
@@ -130,7 +133,7 @@ public class FamilyHomePresenter extends BaseMvpPresenter joinFamily(String str) {
if (null == familyInfo){
- return Single.error(new Exception("没有家族数据!"));
+ return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyhomepresenter_01)));
}
return FamilyModel.Instance().applyJoinFamily(
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java
index 323178220..2e448d44a 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java
@@ -1,16 +1,14 @@
package com.yizhuan.erban.family.presenter;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilyInfoView;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_library.base.PresenterEvent;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
+import com.yizhuan.xchat_android_library.base.PresenterEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.functions.Function;
/**
* @author jack
@@ -28,7 +26,7 @@ public class FamilyInfoPresenter extends BaseMvpPresenter {
public Single changeVerifyStatus(final boolean isOn) {
final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (null == familyInfo){
- return Single.error(new Exception("没有加入家族.."));
+ return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_01)));
}
return FamilyModel.Instance().modifyFamilyInfo(
familyInfo.getFamilyId(),
@@ -48,7 +46,7 @@ public class FamilyInfoPresenter extends BaseMvpPresenter {
public Single changeFamilyAvatar(final String url) {
final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (null == familyInfo){
- return Single.error(new Exception("没有加入家族.."));
+ return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_02)));
}
return FamilyModel.Instance().modifyFamilyInfo(
familyInfo.getFamilyId(),
@@ -67,7 +65,7 @@ public class FamilyInfoPresenter extends BaseMvpPresenter {
public Single changeFamilyName(final String str) {
final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (null == familyInfo){
- return Single.error(new Exception("没有加入家族.."));
+ return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_03)));
}
return FamilyModel.Instance().modifyFamilyInfo(
familyInfo.getFamilyId(),
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java
index 20ea35051..00a08d1a0 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.family.presenter;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView;
import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo;
import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java
index 1f2b23d0c..d0c99ef49 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java
@@ -1,9 +1,11 @@
package com.yizhuan.erban.family.presenter;
import android.os.Bundle;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView;
import com.yizhuan.xchat_android_core.Constants;
@@ -15,6 +17,7 @@ import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.Trade
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_library.base.PresenterEvent;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -39,8 +42,8 @@ public class FamilyMemberCurrencyPresenter extends BaseMvpPresenter refreshData(){
FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (null == familyInfo) {
- return Single.error(new Throwable("没有家族信息"));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_01)));
}
this.page = Constants.PAGE_START;
return loadData(familyInfo.getFamilyId(),Constants.PAGE_START);
@@ -74,7 +77,7 @@ public class FamilyMemberListPresenter extends BaseMvpPresenter loadMoreData() {
FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily();
if (null == familyInfo) {
- return Single.error(new Throwable("没有家族信息"));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_02)));
}
return loadData(familyInfo.getFamilyId(),this.page);
}
@@ -82,7 +85,7 @@ public class FamilyMemberListPresenter extends BaseMvpPresenter loadData(String familyId, int targetPage) {
if (isLoading){
- return Single.error(new Throwable("正在加载,请稍后..."));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_03)));
}
this.page = targetPage;
isLoading = true;
@@ -119,7 +122,7 @@ public class FamilyMemberListPresenter extends BaseMvpPresenter removeFamilyMember(FamilyMemberInfo familyMemberInfo) {
if (null == familyMemberInfo){
- return Single.error(new Throwable("没有成员信息"));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_04)));
}
return FamilyModel.Instance().kickOutFamily(
String.valueOf(familyMemberInfo.getUid())
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java
index 243df0bca..3cc2c388f 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java
@@ -1,18 +1,15 @@
package com.yizhuan.erban.family.presenter;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberSearchView;
import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember;
-import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent;
-import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_library.base.PresenterEvent;
-import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -44,7 +41,7 @@ public class FamilyMemberSearchPresenter extends BaseMvpPresenter removeFamilyMember(FamilyMemberInfo familyMemberInfo) {
if (null == familyMemberInfo){
- return Single.error(new Throwable("没有成员信息"));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymembersearchpresenter_02)));
}
return FamilyModel.Instance().kickOutFamily(
String.valueOf(familyMemberInfo.getUid())
diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java
index 444363022..5a0afc468 100644
--- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java
+++ b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java
@@ -1,14 +1,14 @@
package com.yizhuan.erban.family.presenter;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView;
import com.yizhuan.xchat_android_core.Constants;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_library.base.PresenterEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -42,7 +42,7 @@ public class FamilySearchPresent extends BaseMvpPresenter {
private Single> loadData(int targetPage){
if (isLoading){
- return Single.error(new Throwable("加载中,请稍后..."));
+ return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familysearchpresent_01)));
}
this.page = targetPage;
isLoading = true;
diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java
index 45626a6c2..59bd656e5 100644
--- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java
@@ -5,9 +5,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.StyleSpan;
@@ -17,6 +14,10 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.jay.widget.StickyHeadersLinearLayoutManager;
import com.jzxiang.pickerview.TimePickerDialog;
@@ -25,18 +26,19 @@ import com.jzxiang.pickerview.listener.OnDateSetListener;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView;
+import com.yizhuan.erban.family.presenter.FamilyCurrencyPresenter;
import com.yizhuan.erban.family.view.adapter.FamilyCurrencyBillAdapter;
import com.yizhuan.erban.family.view.dialog.FamilyContributionDialog;
-import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.FormatUtils;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo;
import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo;
-import com.yizhuan.erban.family.presenter.FamilyCurrencyPresenter;
+import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.yizhuan.xchat_android_library.utils.FormatUtils;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -105,7 +107,7 @@ public class FamilyCurrencyActivity extends BaseMvpActivity getMvpPresenter().exitFamily().subscribe(new SingleObserver() {
@Override
public void onSubscribe(Disposable d) {
@@ -360,7 +362,7 @@ public class FamilyHomeActivity extends BaseMvpActivity{
+ ButtonItem buttonItem = new ButtonItem(ResUtil.getString(R.string.view_activity_familyinfoactivity_03), ()->{
ErbanTakePhotoActivity.startToTakePhoto(this,this);
});
- ButtonItem buttonItem1 = new ButtonItem("本地相册", () -> {
+ ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.view_activity_familyinfoactivity_04), () -> {
ErbanTakePhotoActivity.startToSelectPhoto(this,this);
});
List buttonItems = new ArrayList<>();
buttonItems.add(buttonItem);
buttonItems.add(buttonItem1);
- getDialogManager().showCommonPopupDialog(buttonItems, "取消", false);
+ getDialogManager().showCommonPopupDialog(buttonItems, ResUtil.getString(R.string.view_activity_familyinfoactivity_05), false);
}else if (id == llFamilyName.getId()){
FamilyTextInputActivity.start(this, familyInfo.getFamilyName(), new FamilyTextInputActivity.CallBack() {
@@ -145,7 +146,7 @@ public class FamilyInfoActivity extends BaseMvpActivity getMvpPresenter().removeFamilyMember(familyMemberInfo)
.subscribe(new SingleObserver() {
@Override
@@ -281,7 +283,7 @@ public class FamilyMemberListActivity extends BaseMvpActivity() {
@@ -54,7 +55,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity() {
@@ -59,7 +53,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity() {
@@ -37,14 +34,14 @@ class FansTeamListActivity : BaseViewBindingActivity()
.setRefreshLayout(binding.swipeRefresh)
.setLayoutManager(LinearLayoutManager(this))
.setRecyclerView(binding.recyclerView)
.setAdapter(FansTeamListAdapter())
.setPageSize(pageSize)
- .setEmptyView(EmptyViewHelper.createEmptyView(this, "还没有加入粉丝团"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(this, ResUtil.getString(R.string.erban_fansteam_fansteamlistactivity_02)))
.build()
binding.swipeRefresh.setOnRefreshListener {
diff --git a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt
index eef93a689..ec15fe4eb 100644
--- a/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt
@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo
+import com.yizhuan.xchat_android_library.utils.ResUtil
class FansTeamTaskAdapter :
BaseQuickAdapter(R.layout.item_fans_team_task) {
@@ -22,7 +23,7 @@ class FansTeamTaskAdapter :
tvTaskStatus.text = if (item.isFinished || item.awardVal == 0) {
tvTaskStatus.setBackgroundResource(R.drawable.shape_f4f4f4_radius_4dp)
tvTaskStatus.setTextColor("#FF999999".toColorInt())
- if (item.isFinished) "已完成" else "${item.awardVal}/${item.totalNum}"
+ if (item.isFinished) ResUtil.getString(R.string.erban_fansteam_fansteamtaskadapter_01) else "${item.awardVal}/${item.totalNum}"
} else {
tvTaskStatus.setBackgroundResource(R.drawable.shape_ff4e7f_radius_4dp)
tvTaskStatus.setTextColor(Color.WHITE)
diff --git a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
index 3459692c7..78ee62e66 100644
--- a/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/friend/view/SelectFriendActivity.java
@@ -3,11 +3,10 @@ package com.yizhuan.erban.friend.view;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.view.View;
import androidx.fragment.app.Fragment;
-import android.view.View;
-
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
@@ -33,6 +32,7 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.share.bean.SessionType;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.ArrayList;
@@ -56,7 +56,7 @@ public class SelectFriendActivity extends BaseBindingActivity {
+ getDialogManager().showOkCancelDialog(ResUtil.getString(R.string.friend_view_selectfriendactivity_08) + nick + "？", () -> {
//发出自定义消息
IMMessage message = WorldDynamicAttachment.createShareMsg(dynamicImMsg, targetId);
IMNetEaseManager.get().sendMessage(message)
@@ -273,7 +273,7 @@ public class SelectFriendActivity extends BaseBindingActivity()
- fullResult.add(SingleRoomSortInfo(null, "推荐"))
+ fullResult.add(SingleRoomSortInfo(null, ResUtil.getString(R.string.erban_home_homeviewmodel_03)))
result?.let { fullResult.addAll(it) }
_singleRoomSortInfoLiveData.value = ListResult.success(fullResult, 1)
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt b/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt
index a52a17d1a..b0d9864b6 100644
--- a/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/MeViewModel.kt
@@ -5,7 +5,6 @@ import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo
-import com.yizhuan.xchat_android_core.room.game.GameInfo
class MeViewModel : BaseViewModel() {
diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java
index 7a0272fc3..5669354fa 100644
--- a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java
@@ -3,10 +3,11 @@ package com.yizhuan.erban.home.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import android.view.View;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.netease.nim.uikit.StatusBarUtil;
@@ -14,13 +15,13 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.home.adapter.CollectionRoomAdapter;
-import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
+import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo;
import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -46,7 +47,7 @@ public class CollectionRoomActivity extends BaseActivity implements SwipeRefres
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_collection_room);
ButterKnife.bind(this);
- initWhiteTitleBar("我收藏的房间");
+ initWhiteTitleBar(ResUtil.getString(R.string.home_activity_collectionroomactivity_01));
initRecyclerView();
swipeRefresh.setOnRefreshListener(this);
}
@@ -71,7 +72,7 @@ public class CollectionRoomActivity extends BaseActivity implements SwipeRefres
HomeRoomInfo fansRoomListBean = (HomeRoomInfo) adapter.getItem(position);
switch (view.getId()){
case R.id.cl_root:
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_FOLLOW_ROOM_CLICK, "我页_进入关注房间");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_FOLLOW_ROOM_CLICK, ResUtil.getString(R.string.home_activity_collectionroomactivity_02));
AVRoomActivity.start(CollectionRoomActivity.this,fansRoomListBean.getRoomUid() );
break;
default:
@@ -95,7 +96,7 @@ public class CollectionRoomActivity extends BaseActivity implements SwipeRefres
swipeRefresh.setRefreshing(false);
List info = serviceResult.getFansRoomList();
if (ListUtils.isListEmpty(info)) {
- showNoData(R.drawable.icon_common_failure, "亲爱的用户，你还没有收藏哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.home_activity_collectionroomactivity_03));
}else {
hideStatus();
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java b/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java
index 17e76199d..d835f45a9 100644
--- a/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java
+++ b/app/src/main/java/com/yizhuan/erban/home/activity/CommunityNoticeAct.java
@@ -3,14 +3,13 @@ package com.yizhuan.erban.home.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
import android.text.TextUtils;
import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
@@ -23,6 +22,7 @@ import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -52,11 +52,11 @@ public class CommunityNoticeAct extends BaseMvpActivity getMvpPresenter().delete(AuthModel.get().getCurrentUid()));
}
});
@@ -128,7 +128,7 @@ public class CommunityNoticeAct extends BaseMvpActivity(
@SuppressLint("CheckResult")
override fun init() {
EventBus.getDefault().postSticky(VisitorUnreadCountEvent(0))
- initTitleBar("访客记录")
+ initTitleBar(ResUtil.getString(R.string.home_activity_visitorlistactivity_01))
rvDelegate = RVDelegate.Builder()
.setRefreshLayout(binding.swipeRefresh)
.setLayoutManager(LinearLayoutManager(this))
.setRecyclerView(binding.recyclerView)
.setAdapter(VisitorListAdapter())
.setPageSize(pageSize)
- .setEmptyView(EmptyViewHelper.createEmptyView(this, "暂未有人到访"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(this, ResUtil.getString(R.string.home_activity_visitorlistactivity_02)))
.build()
rvDelegate.adapter.setOnLoadMoreListener({ loadData(false) }, binding.recyclerView)
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java
index fd336bb85..9ec95ff78 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java
@@ -1,22 +1,16 @@
package com.yizhuan.erban.home.adapter;
import android.content.Context;
-import android.content.Intent;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
-import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
+import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter;
import com.yizhuan.erban.utils.CommonJumpHelper;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java
index c82eb8469..4620c0909 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java
@@ -5,7 +5,6 @@ import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo;
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
index d49269ad7..cd9fd92b1 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/ContactsIndicatorAdapter.java
@@ -1,12 +1,13 @@
package com.yizhuan.erban.home.adapter;
import android.content.Context;
-import androidx.appcompat.widget.AppCompatTextView;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.appcompat.widget.AppCompatTextView;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java
index 248ce3cc3..071506cc5 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/FindNewUserListAdapter.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.home.adapter;
import android.content.Context;
-import androidx.annotation.Nullable;
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.Nullable;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java
index 3a1d215f3..2da3f38c3 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeConcernsAdapter.java
@@ -15,6 +15,7 @@ import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
public class HomeConcernsAdapter extends BaseQuickAdapter {
@@ -45,7 +46,7 @@ public class HomeConcernsAdapter extends BaseQuickAdapter(
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)
- tvMgName.text = item.mgName.ifNullOrEmpty { "扩列交友" }
+ tvMgName.text = item.mgName.ifNullOrEmpty { ResUtil.getString(R.string.home_adapter_homeplayadapter_01) }
if (item.mgName.isNullOrEmpty()) {
setGradient(tvMgName, "#FF8C5FFF", "#FFFF969B")
} else {
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
index 791b4bbaf..2fb28039d 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
@@ -16,6 +16,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* 首页热门adapter
@@ -47,7 +48,7 @@ public class HomeRoomFragmentAdapter extends BaseMultiItemQuickAdapter(R.layout.item_room_game) {
@@ -25,12 +26,12 @@ class RoomGameAdapter : BaseQuickAdapter(R.layout.
setText(R.id.tv_room_title, item.title)
itemView.setOnClickListener {
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_MINI_GAME_ROOM_SUCCESS, "小游戏tab进入房间成功")
+ .onEvent(StatisticsProtocol.EVENT_MINI_GAME_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomgameadapter_01))
AVRoomActivity.start(mContext, item.uid)
}
val tvRoomGame = helper.getView(R.id.tv_room_game)
tvRoomGame.text = item.mgName
- helper.setText(R.id.tv_game_status, if (item.state == 1) "游戏中" else "等人中")
+ helper.setText(R.id.tv_game_status, if (item.state == 1) ResUtil.getString(R.string.home_adapter_roomgameadapter_02) else ResUtil.getString(R.string.home_adapter_roomgameadapter_03))
setGradient(tvRoomGame)
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt
index 95a22fb1c..26ce69e62 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomHotAdapter.kt
@@ -7,12 +7,12 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.home.helper.BannerHelper
-import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
import com.yizhuan.xchat_android_core.utils.TextUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
class RoomHotAdapter : BaseMultiItemQuickAdapter(null) {
@@ -29,7 +29,7 @@ class RoomHotAdapter : BaseMultiItemQuickAdapter(n
helper.itemView.setOnClickListener {
AVRoomActivity.start(mContext, item.uid)
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_RM_ROOM_SUCCESS, "热门进入房间")
+ .onEvent(StatisticsProtocol.EVENT_RM_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomhotadapter_01))
}
helper.getView(R.id.iv_room_image).load(item.avatar)
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt
index 0afb330e6..cb6e852e7 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/RoomLikeAdapter.kt
@@ -6,13 +6,13 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
-import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
import com.yizhuan.xchat_android_core.utils.TextUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) {
@@ -44,7 +44,7 @@ class RoomLikeAdapter : BaseQuickAdapter(R.layout.
helper.itemView.setOnClickListener {
AVRoomActivity.start(mContext, item.roomUid)
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_SCFJ_ROOM_SUCCESS, "成功进入收藏的房间")
+ .onEvent(StatisticsProtocol.EVENT_SCFJ_ROOM_SUCCESS, ResUtil.getString(R.string.home_adapter_roomlikeadapter_01))
}
if (item.isValid) {
helper.setGone(R.id.tv_online_number, true)
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java
index 7ea956d81..3bd2cf832 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/TopMagicIndicatorAdapter.java
@@ -1,7 +1,6 @@
package com.yizhuan.erban.home.adapter;
import android.content.Context;
-import android.graphics.Color;
import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.FrameLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java
index 52b8712f6..3690dc451 100644
--- a/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/adapter/VisitorListAdapter.java
@@ -1,6 +1,5 @@
package com.yizhuan.erban.home.adapter;
-
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
@@ -8,6 +7,7 @@ import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.home.bean.VisitorInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ public class VisitorListAdapter extends BaseQuickAdapter() {
@@ -50,9 +46,9 @@ class HelloMessageDialog : BaseDialog() {
imageView.isGone = avatarUrl.isNullOrEmpty()
}
binding.tvContent.text = if (helloMessageInfo.sayHelloUserAvatarList?.size == 1) {
- "Ta给你发送了一条消息~"
+ ResUtil.getString(R.string.home_dialog_hellomessagedialog_01)
} else {
- "Ta们向你发送了多条消息~"
+ ResUtil.getString(R.string.home_dialog_hellomessagedialog_02)
}
binding.tvView.setOnClickListener {
RoomMsgActivity.start(context)
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java
index 00fa1c583..9d7e49b4d 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/AttentionFragment.java
@@ -1,13 +1,17 @@
package com.yizhuan.erban.home.fragment;
+import static com.yizhuan.erban.R.id.swipe_refresh;
+import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG;
+
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Bundle;
+import android.view.View;
+
import androidx.annotation.Nullable;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
@@ -37,9 +41,6 @@ import java.util.List;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
-import static com.yizhuan.erban.R.id.swipe_refresh;
-import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG;
-
/**
* 主页关注界面
*
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt
index 3b68b75a8..9c7e0cbce 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/ContactsListFragment.kt
@@ -12,6 +12,7 @@ import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity
import com.yizhuan.erban.ui.im.recent.RecentListFragment
import com.yizhuan.erban.ui.relation.AttentionListActivity
import com.yizhuan.erban.ui.relation.FansListActivity
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
/**
@@ -46,7 +47,7 @@ class ContactsListFragment : BaseViewBindingFragment
}
})
} else {
- toast("暂无未读消息需要清理")
+ toast(ResUtil.getString(R.string.home_fragment_contactslistfragment_01))
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt
index 944f51d25..84149d1f1 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt
@@ -20,7 +20,7 @@ import com.yizhuan.xchat_android_core.DemoCache
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
-import java.util.*
+import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* Peko首页
@@ -31,7 +31,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener,
override fun onClick(v: View) {
when (v.id) {
R.id.iv_search -> {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH, "进入搜索页")
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH, ResUtil.getString(R.string.home_fragment_homefragment_01))
SearchActivity.start(activity)
//为啥触发条件这么恶心
if (DemoCache.readAnchorCardView() == 0) {
@@ -40,12 +40,12 @@ class HomeFragment : BaseFragment(), View.OnClickListener,
}
R.id.iv_ranking -> {
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_HOME_RANK_CLICK, "首页_榜单")
+ .onEvent(StatisticsProtocol.EVENT_HOME_RANK_CLICK, ResUtil.getString(R.string.home_fragment_homefragment_02))
CommonWebViewActivity.start(mContext, UriProvider.getRanking())
}
R.id.iv_my_room -> {
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_HOME_MY_ROOM_CLICK, "首页_我的房间")
+ .onEvent(StatisticsProtocol.EVENT_HOME_MY_ROOM_CLICK, ResUtil.getString(R.string.home_fragment_homefragment_03))
OpenRoomHelper.openRoom(baseActivity)
}
}
@@ -74,9 +74,9 @@ class HomeFragment : BaseFragment(), View.OnClickListener,
private fun initTitleTab() {
val fragmentPos: MutableList = ArrayList()
val tagList: MutableList = ArrayList()
- tagList.add("推荐")
- tagList.add("派对")
- tagList.add("直播")
+ tagList.add(ResUtil.getString(R.string.home_fragment_homefragment_04))
+ tagList.add(ResUtil.getString(R.string.home_fragment_homefragment_05))
+ tagList.add(ResUtil.getString(R.string.home_fragment_homefragment_06))
fragmentPos.add(RecommendFragment.newInstance())
fragmentPos.add(PartyFragment.newInstance())
fragmentPos.add(LiveFragment.newInstance())
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java
index 2ec0e5f1e..b6837f69a 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java
@@ -18,6 +18,7 @@ import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -55,12 +56,12 @@ public class HomePlayFragment extends BaseFragment {
.setAdapter(playAdapter)
.setLayoutManager(new LinearLayoutManager(mContext))
.setRecyclerView(recyclerView)
- .setEmptyView(EmptyViewHelper.createEmptyView(getContext(), "暂无数据"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(getContext(), ResUtil.getString(R.string.home_fragment_homeplayfragment_01)))
.build();
playAdapter.setOnItemClickListener((adapter, view, position) -> {
HomeRoomInfo homePlayInfo = playAdapter.getItem(position);
if (homePlayInfo != null) {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_KH_ROOM_SUCCESS, "点击组队开黑进入房间");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_KH_ROOM_SUCCESS, ResUtil.getString(R.string.home_fragment_homeplayfragment_02));
AVRoomActivity.startForFromType(mContext, homePlayInfo.getUid(), AVRoomActivity.FROM_TYPE_RECOMMEND);
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
index 765ac5526..4e4cd568a 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
@@ -2,7 +2,6 @@ package com.yizhuan.erban.home.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.os.Handler;
import android.view.View;
import android.view.ViewGroup;
@@ -14,15 +13,12 @@ import androidx.recyclerview.widget.RecyclerView;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
-import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent;
import com.yizhuan.xchat_android_core.home.model.GameHomeModel;
-import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.utils.ListUtils;
-import com.yizhuan.xchat_android_library.utils.log.MLog;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -33,7 +29,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Random;
-import java.util.concurrent.CancellationException;
/**
*
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt
index f813f1f39..c370044a3 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/LiveFragment.kt
@@ -28,6 +28,7 @@ import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -77,7 +78,7 @@ class LiveFragment : BaseViewBindingFragment(),
it?.let {
mAdapter.setOnceLookStatus(it.onceLookStatus)
rvDelegate.loadData(it.singleRoomList, true)
- binding.tvTitle.text = if (it.onceLookStatus) "曾经看过的人" else "Top热播"
+ binding.tvTitle.text = if (it.onceLookStatus) ResUtil.getString(R.string.home_fragment_livefragment_01) else ResUtil.getString(R.string.home_fragment_livefragment_02)
}
}
@@ -86,8 +87,8 @@ class LiveFragment : BaseViewBindingFragment(),
super.onPageSelected(position)
StatisticManager.Instance().onEvent(
StatisticsProtocol.EVENT_GEBO_TAB_CLICK,
- "个播页二级tab分类点击",
- mapOf("tab_name" to mTabInfoList.getOrElse(position) { "未知tab" })
+ ResUtil.getString(R.string.home_fragment_livefragment_03),
+ mapOf("tab_name" to mTabInfoList.getOrElse(position) { ResUtil.getString(R.string.home_fragment_livefragment_04) })
)
}
})
@@ -97,7 +98,7 @@ class LiveFragment : BaseViewBindingFragment(),
super.onResume()
loadData()
StatisticManager.Instance().onEvent(
- StatisticsProtocol.EVENT_RECENT_CARD_SHOW, "最近在看卡片曝光"
+ StatisticsProtocol.EVENT_RECENT_CARD_SHOW, ResUtil.getString(R.string.home_fragment_livefragment_05)
)
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt
index ea9644ecd..4bbe02152 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.kt
@@ -45,6 +45,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent
import com.yizhuan.xchat_android_core.utils.StarUtils
import com.yizhuan.xchat_android_library.utils.FormatUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -293,7 +294,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
R.id.ll_room -> {
//我的房间,开房
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, "我页_进入我的房间")
+ .onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, ResUtil.getString(R.string.home_fragment_mefragment_01))
OpenRoomHelper.openRoom(context as BaseActivity?)
}
R.id.ll_gain -> {
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt
index 66622f805..7f881f67b 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/PartyFragment.kt
@@ -18,6 +18,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -98,10 +99,10 @@ class PartyFragment : BaseFragment(), PartyMagicIndicatorAdapter.OnItemSelectLis
mTabInfoList.add(title)
val tabId: Int = info[i].id
fragment = when (title) {
- "喜欢" -> {
+ ResUtil.getString(R.string.home_fragment_partyfragment_01) -> {
RoomLikeFragment.newInstance()
}
- "小游戏" -> {
+ ResUtil.getString(R.string.home_fragment_partyfragment_02) -> {
RoomGameFragment.newInstance()
}
else -> {
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt
index f75f1f7fc..c3d96425a 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt
@@ -30,6 +30,7 @@ import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
import com.yizhuan.xchat_android_core.initial.InitialModel
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -85,7 +86,7 @@ class RecommendFragment : BaseFragment(),
homeViewModel.bannerLiveData.observe(this) {
BannerHelper.setBanner(mBinding.rollView, it) { _, _ ->
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_HOME_BANNER_CLICK, "首页_banner")
+ .onEvent(StatisticsProtocol.EVENT_HOME_BANNER_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_01))
}
}
@@ -107,7 +108,7 @@ class RecommendFragment : BaseFragment(),
currMatchClick = abcArray[i]
StatisticManager.Instance().onEvent(
"${currMatchClick}_match_click",
- "资源位点击",
+ ResUtil.getString(R.string.home_fragment_recommendfragment_02),
mapOf("user_id" to AuthModel.get().currentUid.toString())
)
if (it[i].resourceType == 5) {
@@ -127,7 +128,7 @@ class RecommendFragment : BaseFragment(),
AVRoomActivity.start(context, it.uid)
StatisticManager.Instance().onEvent(
"${currMatchClick}_match_success",
- "资源位匹配成功",
+ ResUtil.getString(R.string.home_fragment_recommendfragment_03),
mapOf("user_id" to AuthModel.get().currentUid.toString())
)
} else {
@@ -139,7 +140,7 @@ class RecommendFragment : BaseFragment(),
mBinding.tvMore.setOnClickListener {
(parentFragment as HomeFragment).onItemSelect(1, null)
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_ZXTJ_ROOM_MORE_CLICK, "最新推荐更多点击")
+ .onEvent(StatisticsProtocol.EVENT_ZXTJ_ROOM_MORE_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_04))
}
}
@@ -161,11 +162,11 @@ class RecommendFragment : BaseFragment(),
private fun initTitleTab() {
val tagList = InitialModel.get().cacheInitInfo?.homeTabList.let {
- if (it?.size == 2) it else arrayListOf( "热门房间","组队开黑")
+ if (it?.size == 2) it else arrayListOf( ResUtil.getString(R.string.home_fragment_recommendfragment_05),ResUtil.getString(R.string.home_fragment_recommendfragment_06))
}
mFragmentsBottom.add(HomePlayFragment.newInstance())
mFragmentsBottom.add(RoomHotFragment.newInstance())
- if (tagList[0] != "组队开黑") {
+ if (tagList[0] != ResUtil.getString(R.string.home_fragment_recommendfragment_07)) {
mFragmentsBottom.reverse()
}
val commonNavigator = CommonNavigator(context)
@@ -201,7 +202,7 @@ class RecommendFragment : BaseFragment(),
mBinding.llSingleAnchor.setOnClickListener {
(parentFragment as HomeFragment).onItemSelect(2, null)
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_RQZB_ROOM_MORE_CLICK, "人气主播更多点击")
+ .onEvent(StatisticsProtocol.EVENT_RQZB_ROOM_MORE_CLICK, ResUtil.getString(R.string.home_fragment_recommendfragment_08))
}
}
@@ -211,7 +212,7 @@ class RecommendFragment : BaseFragment(),
}
mBinding.viewPager.currentItem = position
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_TJ_TABEXCHANGE, "用户切换tab次数,热门房间or组队开黑")
+ .onEvent(StatisticsProtocol.EVENT_TJ_TABEXCHANGE, ResUtil.getString(R.string.home_fragment_recommendfragment_09))
}
@Subscribe(threadMode = ThreadMode.MAIN)
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt
index f2c683601..5e8c45395 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomCommonFragment.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.os.Bundle
import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
+import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.common.EmptyViewHelper
@@ -15,6 +16,7 @@ import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
import com.yizhuan.xchat_android_core.statistic.StatisticManager
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -46,7 +48,7 @@ class RoomCommonFragment : BaseViewBindingFragment()
.setAdapter(mAdapter)
.setLayoutManager(LinearLayoutManager(mContext))
.setPageSize(20)
- .setEmptyView(EmptyViewHelper.createEmptyView(mContext, "暂无房间"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(mContext, ResUtil.getString(R.string.home_fragment_roomcommonfragment_01)))
.setRefreshLayout(binding.refreshLayout)
.setRecyclerView(binding.recyclerView)
.build()
@@ -54,9 +56,9 @@ class RoomCommonFragment : BaseViewBindingFragment()
mAdapter.getItem(position)?.let {
AVRoomActivity.start(context, it.roomUid)
StatisticManager.Instance()
- .onEvent("tab${tabID}_success_room", "通过派对tab下面的房间，成功进房的统计")
+ .onEvent("tab${tabID}_success_room", ResUtil.getString(R.string.home_fragment_roomcommonfragment_02))
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_COMMON_TAB_ROOM_SUCCESS, "通用tab进入房间成功")
+ .onEvent(StatisticsProtocol.EVENT_COMMON_TAB_ROOM_SUCCESS, ResUtil.getString(R.string.home_fragment_roomcommonfragment_03))
}
}
mAdapter.setOnLoadMoreListener({
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt
index ccbcad9a9..1c3563eb5 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomGameFragment.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.home.fragment
import android.os.Bundle
import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.LinearLayoutManager
+import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.activity.AVRoomActivity
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.common.EmptyViewHelper
@@ -12,6 +13,7 @@ import com.yizhuan.erban.home.adapter.RoomGameAdapter
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -38,7 +40,7 @@ class RoomGameFragment : BaseViewBindingFragment() {
rvDelegate = RVDelegate.Builder()
.setAdapter(roomHotAdapter)
.setRecyclerView(binding.recyclerView)
- .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无房间"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(context, ResUtil.getString(R.string.home_fragment_roomgamefragment_01)))
.setLayoutManager(LinearLayoutManager(mContext))
.setRefreshLayout(binding.refreshLayout)
.setPageSize(pageSize)
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt
index a0e35be33..ab56fc3e3 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomHotFragment.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.home.fragment
import android.os.Bundle
import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.LinearLayoutManager
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.FragmentRoomHotBinding
@@ -11,6 +12,7 @@ import com.yizhuan.erban.home.adapter.RoomHotAdapter
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -39,7 +41,7 @@ class RoomHotFragment : BaseViewBindingFragment() {
rvDelegate = RVDelegate.Builder()
.setAdapter(roomHotAdapter)
.setRecyclerView(binding.recyclerView)
- .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无房间"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(context, ResUtil.getString(R.string.home_fragment_roomhotfragment_01)))
.setLayoutManager(LinearLayoutManager(mContext))
.setPageSize(pageSize)
.build()
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt
index 1bcbe1c85..0a8ffecb4 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomLikeFragment.kt
@@ -7,6 +7,7 @@ import androidx.fragment.app.activityViewModels
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.appbar.AppBarLayout
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.FragmentRoomLikeBinding
@@ -17,6 +18,7 @@ import com.yizhuan.erban.ui.relation.AttentionListActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -68,7 +70,7 @@ class RoomLikeFragment : BaseViewBindingFragment() {
.setLayoutManager(LinearLayoutManager(mContext))
.setPageSize(pageSize)
.setRefreshLayout(binding.refreshLayout)
- .setEmptyView(EmptyViewHelper.createEmptyView(mContext, "暂无收藏"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(mContext, ResUtil.getString(R.string.home_fragment_roomlikefragment_01)))
.setRecyclerView(binding.rvCollect)
.build()
diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt
index 148535517..499ff5983 100644
--- a/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RoomSingleFragment.kt
@@ -3,6 +3,7 @@ package com.yizhuan.erban.home.fragment
import android.os.Bundle
import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.GridLayoutManager
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewBindingFragment
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.FragmentRoomSingleBinding
@@ -12,6 +13,7 @@ import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -47,7 +49,7 @@ class RoomSingleFragment : BaseViewBindingFragment()
.setAdapter(adapter)
.setRecyclerView(binding.recyclerView)
.setRefreshLayout(binding.refreshLayout)
- .setEmptyView(EmptyViewHelper.createEmptyView(context, "暂无房间"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(context, ResUtil.getString(R.string.home_fragment_roomsinglefragment_01)))
.setLayoutManager(GridLayoutManager(mContext, 2))
.setPageSize(pageSize)
.build()
diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java b/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java
index 327a9fbbb..e4128a634 100644
--- a/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/home/helper/LoadPageDataHelper.java
@@ -1,12 +1,12 @@
package com.yizhuan.erban.home.helper;
+import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.Constants;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
/**
* @author jack
@@ -33,7 +33,7 @@ public class LoadPageDataHelper {
private Single internalLoadData(int targetPage) {
if (loading) {
- return Single.error(new Throwable("正在加载中..."));
+ return Single.error(new Throwable(ResUtil.getString(R.string.home_helper_loadpagedatahelper_01)));
}
loading = true;
return loadData.loadData(targetPage)
diff --git a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java b/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java
index b26c483ef..b26b8db76 100644
--- a/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/home/helper/OpenRoomHelper.java
@@ -32,6 +32,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
public class OpenRoomHelper {
@@ -190,7 +191,7 @@ public class OpenRoomHelper {
onOpenRoomFail(activity, roomResult.getError());
}
} else {
- onOpenRoomFail(activity, "未知错误");
+ onOpenRoomFail(activity, ResUtil.getString(R.string.home_helper_openroomhelper_01));
}
});
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java
index 3e7c97a5e..9eba8af3c 100644
--- a/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/home/presenter/CommunityNoticePresenter.java
@@ -2,11 +2,13 @@ package com.yizhuan.erban.home.presenter;
import android.annotation.SuppressLint;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.home.view.ICommunityNoticeAct;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo;
import com.yizhuan.xchat_android_core.home.model.CommunityNoticeModel;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -44,7 +46,7 @@ public class CommunityNoticePresenter extends BaseMvpPresenter
+ //
@Override
diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java b/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java
index 3ac95c3c8..b15d5757e 100644
--- a/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java
+++ b/app/src/main/java/com/yizhuan/erban/home/view/IFamilyHomeActivityView.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.home.view;
-import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
+import com.yizhuan.xchat_android_library.base.IMvpBaseView;
/**
* @author jack
diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
index 1a51d5574..5dbd51dab 100644
--- a/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
+++ b/app/src/main/java/com/yizhuan/erban/home/widget/AnchorCardView.kt
@@ -34,6 +34,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ListUtils
+import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.SingleToastUtil
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -109,13 +110,13 @@ class AnchorCardView @JvmOverloads constructor(
StatisticManager.Instance()
.onEvent(
StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_ROOM_CLICK,
- "个播展示卡片进入房间点击",
+ ResUtil.getString(R.string.home_widget_anchorcardview_01),
mapOf("room_id" to it.erbanNo.toString())
)
}
intervalRange()
StatisticManager.Instance()
- .onEvent(StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_SHOW, "个播展示卡片曝光")
+ .onEvent(StatisticsProtocol.EVENT_PERSONALSHOW_TOP_CARD_SHOW, ResUtil.getString(R.string.home_widget_anchorcardview_02))
} ?: run {
isVisible = false
}
diff --git a/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java b/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java
index 58a44f0db..8c629032a 100644
--- a/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java
+++ b/app/src/main/java/com/yizhuan/erban/home/widget/StickyScrollView.java
@@ -1,8 +1,6 @@
package com.yizhuan.erban.home.widget;
-import java.util.ArrayList;
-
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
@@ -18,6 +16,8 @@ import androidx.core.widget.NestedScrollView;
import com.yizhuan.erban.R;
+import java.util.ArrayList;
+
public class StickyScrollView extends NestedScrollView {
/**
diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java
index 89437f6b2..2d4e10b3b 100644
--- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyComfirmToPayDialog.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.luckymoney.dialog;
import android.content.Context;
-import androidx.appcompat.app.AppCompatDialog;
import android.view.View;
+import androidx.appcompat.app.AppCompatDialog;
+
/**
* Created by MadisonRong on 17/07/2018.
*/
diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java
index fc8659dc1..d4b272b44 100644
--- a/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/luckymoney/dialog/LuckyMoneyDialog.java
@@ -4,8 +4,6 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDialog;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.View;
@@ -14,22 +12,24 @@ import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatDialog;
+
import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.erban.luckymoney.view.LuckyMoneyDetailActivity;
import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
+import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo;
+import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.share.bean.SessionType;
import com.yizhuan.xchat_android_core.team.bean.TeamEvent;
import com.yizhuan.xchat_android_core.team.model.TeamModel;
+import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-
+import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.disposables.Disposable;
diff --git a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java
index e26fb33ea..97ffcd4c9 100644
--- a/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/luckymoney/view/LuckyMoneyCreationActivity.java
@@ -2,37 +2,38 @@ package com.yizhuan.erban.luckymoney.view;
import android.content.Context;
import android.content.Intent;
-import androidx.core.content.ContextCompat;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
+import androidx.core.content.ContextCompat;
+
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.team.model.TeamMember;
+import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityLuckyMoneyCreationBinding;
+import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
+import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.share.bean.SessionType;
import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
import com.yizhuan.xchat_android_core.team.model.TeamModel;
+import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-
+import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
-import com.trello.rxlifecycle3.android.ActivityEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.Objects;
@@ -105,7 +106,7 @@ public class LuckyMoneyCreationActivity extends BaseBindingActivity {
- getDialogManager().showProgressDialog(getApplicationContext(), "发送中", false);
+ getDialogManager().showProgressDialog(getApplicationContext(), ResUtil.getString(R.string.luckymoney_view_luckymoneycreationactivity_02), false);
sendLuckyMoney();
});
}
@@ -240,12 +241,12 @@ public class LuckyMoneyCreationActivity extends BaseBindingActivity
adapter.getItem(position)?.let {
GiveGoldToUserActivity.start(this, it)
diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt
index 0d19575e9..2b2b52d95 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSearchActivity.kt
@@ -1,13 +1,14 @@
package com.yinyuan.doudou.pay.activity
+
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.os.Parcelable
-import androidx.recyclerview.widget.LinearLayoutManager
import android.text.Editable
import android.text.TextWatcher
+import androidx.recyclerview.widget.LinearLayoutManager
import com.yinyuan.doudou.pay.adapter.GiveSearchAdapter
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseActivity
@@ -16,8 +17,7 @@ import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.net.RxHelper
-
-
+import com.yizhuan.xchat_android_library.utils.ResUtil
import kotlinx.android.synthetic.main.activity_give_gold_search.*
class GiveGoldSearchActivity : BaseActivity(), TextWatcher {
@@ -40,7 +40,7 @@ class GiveGoldSearchActivity : BaseActivity(), TextWatcher {
val adapter = GiveSearchAdapter()
rvDelegate = RVDelegate.Builder()
.setPageSize(Int.MAX_VALUE)
- .setEmptyView(EmptyViewHelper.createEmptyView(this, "暂无搜索内容"))
+ .setEmptyView(EmptyViewHelper.createEmptyView(this, ResUtil.getString(R.string.pay_activity_givegoldsearchactivity_01)))
.setLayoutManager(LinearLayoutManager(this))
.setRecyclerView(recyclerView)
.setAdapter(adapter)
diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
index ff72bf1f0..857a5a4b0 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldSuccessActivity.kt
@@ -5,7 +5,7 @@ import android.content.Intent
import android.os.Bundle
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseActivity
-
+import com.yizhuan.xchat_android_library.utils.ResUtil
import kotlinx.android.synthetic.main.activity_give_gold_success.*
class GiveGoldSuccessActivity : BaseActivity() {
@@ -23,7 +23,7 @@ class GiveGoldSuccessActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_give_gold_success)
- initTitleBar("转赠到寻梦帐号")
+ initTitleBar(ResUtil.getString(R.string.pay_activity_givegoldsuccessactivity_01))
tvNickname.text = "转赠给:${intent.getStringExtra("nickname")}"
tvGold.text = "${intent.getStringExtra("gold")?.toInt()}钻石"
tvSure.setOnClickListener { finish() }
diff --git a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
index 74e480fd6..584ab7f9d 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/pay/activity/GiveGoldToUserActivity.kt
@@ -14,7 +14,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.DemoCache
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
-
+import com.yizhuan.xchat_android_library.utils.ResUtil
import kotlinx.android.synthetic.main.activity_give_gold_to_user.*
class GiveGoldToUserActivity : BaseActivity(), GridPasswordView.OnPasswordChangedListener, TextWatcher {
@@ -40,19 +40,19 @@ class GiveGoldToUserActivity : BaseActivity(), GridPasswordView.OnPasswordChange
@SuppressLint("SetTextI18n")
private fun init() {
- initTitleBar("转赠到寻梦帐号")
+ initTitleBar(ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_01))
userInfo?.apply {
tvId.text = "Id:${erbanNo}"
tvNickname.text = nick
ImageLoadUtils.loadAvatar(context, avatar, ivAvatar)
val initInfo = DemoCache.readInitInfo()
- editGold.hint = if (initInfo.redEnvelopeConfig.rate == 0.0) "请输入转赠钻石数量" else "请输入转赠钻石数量，需为10倍数"
- tv_desc.text = if (initInfo.redEnvelopeConfig.rate == 0.0) "钻石" else "钻石，另将收取一定比例手续费"
+ editGold.hint = if (initInfo.redEnvelopeConfig.rate == 0.0) ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_02) else ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_03)
+ tv_desc.text = if (initInfo.redEnvelopeConfig.rate == 0.0) ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_04) else ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_05)
tvSure.setOnClickListener {
var gold = editGold.text.toString().toInt()
if (gold <= 0) {
- toast("请输入正确钻石数量")
+ toast(ResUtil.getString(R.string.pay_activity_givegoldtouseractivity_06))
return@setOnClickListener
}
var rateGold = gold * initInfo.redEnvelopeConfig.rate / 100
diff --git a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java b/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java
index 883b8f0da..e2e5f52d5 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPassWordFragment.java
@@ -1,6 +1,5 @@
package com.yizhuan.erban.pay.password;
-
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.text.TextUtils;
@@ -19,6 +18,7 @@ import androidx.fragment.app.FragmentManager;
import com.jungly.gridpasswordview.GridPasswordView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.setting.VerifyPhoneActivity;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
//也可继承design中的BottomSheetDialogFragment
@@ -103,7 +103,7 @@ public class GiveGoldPassWordFragment extends DialogFragment {
mPassword.getPswView().setOnPasswordChangedListener(listener);
if (getArguments() != null) {
if (!TextUtils.isEmpty(getArguments().getString(EXTRA_NICKNAME))) {
- mPassword.getTvNickname().setText("转赠给:" + getArguments().getString(EXTRA_NICKNAME));
+ mPassword.getTvNickname().setText(ResUtil.getString(R.string.pay_password_givegoldpasswordfragment_01) + getArguments().getString(EXTRA_NICKNAME));
} else {
mPassword.getTvNickname().setVisibility(View.GONE);
}
diff --git a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java b/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java
index 52e5bb86c..a740e7d8e 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java
+++ b/app/src/main/java/com/yizhuan/erban/pay/password/GiveGoldPasswordView.java
@@ -11,7 +11,6 @@ import com.jungly.gridpasswordview.GridPasswordView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.password.PasswordKeyboardView;
-
import java.util.ArrayList;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java b/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java
index 9d75ae26c..55cf4fccc 100644
--- a/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/pay/presenter/PayPresenter.java
@@ -2,10 +2,12 @@ package com.yizhuan.erban.pay.presenter;
import android.annotation.SuppressLint;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.pay.view.IPayView;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -39,7 +41,7 @@ public class PayPresenter extends AbstractMvpPresenter {
PayModel.get().setCurrentWalletInfo(walletInfo);
getMvpView().setupUserWalletBalance(walletInfo);
} else {
- getMvpView().getUserWalletInfoFail("请求错误");
+ getMvpView().getUserWalletInfoFail(ResUtil.getString(R.string.pay_presenter_paypresenter_01));
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
index 11b90a6ad..4b81251e0 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java
@@ -1,15 +1,16 @@
package com.yizhuan.erban.radish.activity;
-import androidx.lifecycle.Observer;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.viewpager.widget.ViewPager;
+
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
@@ -29,6 +30,7 @@ import com.yizhuan.xchat_android_core.radish.RadishWalletInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
@@ -49,7 +51,7 @@ public class RadishRecordActivity extends BaseMvpActivity fragments = new ArrayList<>(2);
diff --git a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java
index 21027a570..a2cb63409 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java
@@ -1,5 +1,7 @@
package com.yizhuan.erban.radish.adapter;
+import static com.yizhuan.erban.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME;
+
import androidx.core.content.ContextCompat;
import com.chad.library.adapter.base.BaseViewHolder;
@@ -11,8 +13,6 @@ import com.yizhuan.xchat_android_library.utils.TimeUtils;
import java.util.List;
-import static com.yizhuan.erban.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME;
-
public class RadishRecordAdapter extends BillBaseAdapter {
private byte mType;
diff --git a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java b/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java
index e50e01239..3409acb5f 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java
@@ -23,6 +23,7 @@ import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.concurrent.TimeUnit;
@@ -115,7 +116,7 @@ public class PrizeAnimUiHelper {
if (prizeAnim == null) {
return;
}
- final String day = String.valueOf(prizeAnim.getSignDays()) + "天";
+ final String day = String.valueOf(prizeAnim.getSignDays()) + ResUtil.getString(R.string.radish_helper_prizeanimuihelper_01);
final String reward = prizeAnim.getPrizeName();
ShareDialog shareDialog = new ShareDialog(context);
shareDialog.setType(ShareDialog.TYPE_SHARE_H5);
@@ -128,9 +129,9 @@ public class PrizeAnimUiHelper {
@Override
public void onSharePlatformClick(Platform platform) {
if (mType == TYPE_SIGN_IN_PAGE) {
-// StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SHARE_CLICK, "签到-分享");
+// StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SHARE_CLICK, ResUtil.getString(R.string.radish_helper_prizeanimuihelper_02));
} else if (mType == TYPE_REWARD_PAGE) {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_REWARD_SHARE_CLICK, "累计奖励-分享");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_REWARD_SHARE_CLICK, ResUtil.getString(R.string.radish_helper_prizeanimuihelper_03));
}
toShare(platform, day, reward);
diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java b/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java
index f55e6755b..7303c4805 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java
@@ -6,9 +6,6 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.os.SystemClock;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
@@ -18,6 +15,10 @@ import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.coorchice.library.SuperTextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
@@ -57,6 +58,7 @@ import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
import com.yy.mobile.rollingtextview.CharOrder;
@@ -147,7 +149,7 @@ public class SignInActivity extends BaseMvpActivity {
+ getDialogManager().showOkCancelWithTitleDialog(ResUtil.getString(R.string.radish_signin_signinactivity_010), builder.build(), okLabel, true, () -> {
Single.create((SingleOnSubscribe) emitter -> {
if (info.getType() == ReplenishSignInfo.TYPE_SHARE) {
@@ -246,7 +248,7 @@ public class SignInActivity extends BaseMvpActivity>) picUrl -> {
if (TextUtils.isEmpty(picUrl)) {
- return Single.error(new Throwable("获取分享图片失败"));
+ return Single.error(new Throwable(ResUtil.getString(R.string.radish_signin_signinactivity_011)));
}
return Single.just(picUrl);
}).flatMap((Function>) picUrl ->
@@ -316,7 +318,7 @@ public class SignInActivity extends BaseMvpActivity 0) {
setGoldPool((int) count);
- toast("签到成功，奖金池已增加" + count + "钻石");
+ toast(ResUtil.getString(R.string.radish_signin_signinactivity_014) + count + ResUtil.getString(R.string.radish_signin_signinactivity_015));
}
getMvpPresenter().getSignDetail();
}
@@ -533,7 +535,7 @@ public class SignInActivity extends BaseMvpActivity= info.getSignDays();
if (info != null) {
- showView(info.getReceive(), vThird, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + "天", showIcon);
+ showView(info.getReceive(), vThird, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_03), showIcon);
}
case 2:
info = list.get(1);
showIcon = mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= info.getSignDays();
if (info != null) {
- showView(info.getReceive(), vSecond, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + "天", showIcon);
+ showView(info.getReceive(), vSecond, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_04), showIcon);
}
case 1:
info = list.get(0);
showIcon = mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= info.getSignDays();
if (info != null) {
- showView(info.getReceive(), vFirst, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + "天", showIcon);
+ showView(info.getReceive(), vFirst, info.getSignDays(), info.getSignRewardName() + "\n" + info.getSignDays() + ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_05), showIcon);
}
}
@@ -173,22 +175,22 @@ public class RewardTotalNoticeAdapter{
if (mSignDetailInfo != null) {
if (mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_OPEN_DRAW) { // 已瓜分
- showView(true, vFourth, 28, "已领取\n28天", true);
+ showView(true, vFourth, 28, ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_06), true);
} else if (mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_OPEN_UN_DRAW) { // 能瓜分但未瓜分
- showView(false, vFourth, 28, "瓜分钻石\n28天", mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= 28);
+ showView(false, vFourth, 28, ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_07), mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= 28);
} else if (mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_UN_OPEN) { // 不可瓜分
- showView(false, vFourth, 28, "瓜分钻石\n28天", false);
+ showView(false, vFourth, 28, ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_08), false);
}
}
// if (mSignDetailInfo != null && mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_OPEN_DRAW) {
-// showView(true, vFourth, 28, "已领取\n28天");
+// showView(true, vFourth, 28, ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_09));
//
// } else
-// showView(false, vFourth, 28, "瓜分钻石\n28天");
+// showView(false, vFourth, 28, ResUtil.getString(R.string.signin_adpter_rewardtotalnoticeadapter_010));
}
diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java b/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java
index 8f04408aa..7fbb25ceb 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/signin/helper/SignInUiHelper.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.utils.SpannableBuilder;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* create by lvzebiao @2019/4/28
@@ -22,19 +23,19 @@ public class SignInUiHelper {
}
View customView = View.inflate(context, R.layout.dialog_supplement_sign_success, null);
TextView tvTitle = customView.findViewById(R.id.tv_title);
- tvTitle.setText("补签成功");
+ tvTitle.setText(ResUtil.getString(R.string.signin_helper_signinuihelper_01));
TextView tvContent = customView.findViewById(R.id.tv_content);
if (!TextUtils.isEmpty(prizeName)) {
tvContent.setVisibility(View.VISIBLE);
SpannableBuilder builder = new SpannableBuilder();
- builder.append("获得 ")
+ builder.append(ResUtil.getString(R.string.signin_helper_signinuihelper_02))
.append(prizeName, new ForegroundColorSpan(context.getResources().getColor(R.color.appColor)));
tvContent.setText(builder.build());
} else {
tvContent.setVisibility(View.GONE);
}
- dialogManager.showOkCancelCustomDialog(customView, "确定", null, true, null);
+ dialogManager.showOkCancelCustomDialog(customView, ResUtil.getString(R.string.signin_helper_signinuihelper_03), null, true, null);
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java
index 4bce81261..2cb18e1a4 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java
@@ -1,7 +1,6 @@
package com.yizhuan.erban.radish.signin.view;
import android.content.Context;
-import androidx.core.content.ContextCompat;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
import android.view.LayoutInflater;
@@ -9,9 +8,12 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.marqueeview.BetterMarqueeView;
import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -51,8 +53,8 @@ public class CarveUpGoldAdapter extends BetterMarqueeView.Adapter() {
@@ -176,8 +178,8 @@ public class SignInDialog extends AppCompatDialog {
public void onSuccess(SignInfo signInfo) {
long addGoldNum = signInfo.getSignGoldNum();
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SIGN_SUCCESS,
- "签到成功-弹框");
- SingleToastUtil.showToast("签到成功，奖金池已增加" + addGoldNum + "钻石");
+ ResUtil.getString(R.string.signin_view_signindialog_04));
+ SingleToastUtil.showToast(ResUtil.getString(R.string.signin_view_signindialog_05) + addGoldNum + ResUtil.getString(R.string.signin_view_signindialog_06));
//启动播放动画
long newPoolNumber = addGoldNum + detailInfo.getShowGoldNum();
rtvGoldPool.setText(NumberFormatUtil.formatCommaInt(newPoolNumber), true);
diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java
index d3174cb04..7954776d1 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java
@@ -3,13 +3,14 @@ package com.yizhuan.erban.radish.task.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewStub;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
import com.yizhuan.erban.base.BaseMvpActivity;
@@ -28,6 +29,7 @@ import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
@@ -42,9 +44,9 @@ import butterknife.ButterKnife;
public class TaskCenterActivity extends BaseMvpActivity implements ITaskCenterView {
public interface FromPage {
- String GIFT = "-礼物面板";
- String FIND = "-发现页";
- String RADISH_NOT_ENOUGH_DIALOG = "-萝卜不足弹窗";
+ String GIFT = ResUtil.getString(R.string.task_activity_taskcenteractivity_01);
+ String FIND = ResUtil.getString(R.string.task_activity_taskcenteractivity_02);
+ String RADISH_NOT_ENOUGH_DIALOG = ResUtil.getString(R.string.task_activity_taskcenteractivity_03);
}
/**
@@ -65,7 +67,7 @@ public class TaskCenterActivity extends BaseMvpActivity mTitleList = new ArrayList<>();
public RadishRecordNavAdapter() {
- mTitleList.add("收入");
- mTitleList.add("支出");
+ mTitleList.add(ResUtil.getString(R.string.radish_widget_radishrecordnavadapter_01));
+ mTitleList.add(ResUtil.getString(R.string.radish_widget_radishrecordnavadapter_02));
}
@Override
diff --git a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java
index e5e16339d..7a0d51110 100644
--- a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java
@@ -2,10 +2,11 @@ package com.yizhuan.erban.radish.widget;
import android.content.Context;
import android.graphics.Color;
-import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
@@ -13,6 +14,7 @@ import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.C
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -22,8 +24,8 @@ public class TaskCenterNavAdapter extends CommonNavigatorAdapter {
private List mTitleList = new ArrayList<>();
public TaskCenterNavAdapter() {
- mTitleList.add("每日任务");
- mTitleList.add("成就任务");
+ mTitleList.add(ResUtil.getString(R.string.radish_widget_taskcenternavadapter_01));
+ mTitleList.add(ResUtil.getString(R.string.radish_widget_taskcenternavadapter_02));
}
@Override
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
index f9146c09f..3fb08c054 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/CpViewHelper.kt
@@ -10,7 +10,6 @@ import androidx.annotation.ColorInt
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.common.widget.dialog.DialogManager
-import java.lang.StringBuilder
object CpViewHelper {
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt
index ec7d39416..fa2d88c9d 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpHomeActivity.kt
@@ -17,6 +17,7 @@ import com.yizhuan.erban.ui.user.UserInfoActivity
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -27,7 +28,7 @@ class CpHomeActivity : BaseBindingActivity() {
private var hasAddedTitle = false
private val vm: CpViewModel by viewModels()
override fun init() {
- initTitleBar("亲密关系")
+ initTitleBar(ResUtil.getString(R.string.cp_activity_cphomeactivity_01))
mBinding.cpCardView.setClick(this)
initObserver()
vm.getCpRelation(mUserId)
@@ -81,7 +82,7 @@ class CpHomeActivity : BaseBindingActivity() {
if (hasAddedTitle) return
hasAddedTitle = true
mTitleBar.addAction(object : TitleBar.TextAction(
- "关系任务", Color.parseColor("#4C5AF1")
+ ResUtil.getString(R.string.cp_activity_cphomeactivity_02), Color.parseColor("#4C5AF1")
) {
override fun performAction(view: View) {
start(CpTaskActivity::class.java)
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
index 9b586b552..4e4e55918 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/activity/CpInviteRecordActivity.kt
@@ -11,7 +11,6 @@ import com.yizhuan.erban.base.BaseBindingActivity
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivityCpInviteRecordBinding
import com.yizhuan.erban.relation.cp.CpDataManager
-import com.yizhuan.erban.relation.cp.CpDataParser
import com.yizhuan.erban.relation.cp.CpViewHelper
import com.yizhuan.erban.relation.cp.adapter.InviteRecordAdapter
import com.yizhuan.erban.relation.cp.dialog.CpInviteReplyConfirmDialog
@@ -22,6 +21,7 @@ import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent
import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity
import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -33,7 +33,7 @@ class CpInviteRecordActivity : BaseBindingActivity(),
@@ -36,7 +37,7 @@ class CpTaskActivity : BaseBindingActivity(),
}
override fun init() {
- initTitleBar("关系任务")
+ initTitleBar(ResUtil.getString(R.string.cp_activity_cptaskactivity_01))
vm.loadingLiveData.observe(this) {
if (it) dialogManager.showProgressDialog(this)
else dialogManager.dismissDialog()
@@ -72,8 +73,8 @@ class CpTaskActivity : BaseBindingActivity(),
private fun setViewPager() {
val list = ArrayList(2)
- list.add("每日甜蜜")
- list.add("海誓山盟")
+ list.add(ResUtil.getString(R.string.cp_activity_cptaskactivity_02))
+ list.add(ResUtil.getString(R.string.cp_activity_cptaskactivity_03))
val commonNavigator = CommonNavigator(this)
commonNavigator.isAdjustMode = true
@@ -111,7 +112,7 @@ class CpTaskActivity : BaseBindingActivity(),
when (i) {
2 -> {
cpDescView.setTaskData(
- "CP等级", "亲密值", CpTaskDescriptionView.TaskEntity.toTaskList(
+ ResUtil.getString(R.string.cp_activity_cptaskactivity_04), ResUtil.getString(R.string.cp_activity_cptaskactivity_05), CpTaskDescriptionView.TaskEntity.toTaskList(
intimacyTitles, intimacyContents
)
)
@@ -119,7 +120,7 @@ class CpTaskActivity : BaseBindingActivity(),
}
3 -> {
cpDescView.setTaskData(
- "CP等级", "等级特权", CpTaskDescriptionView.TaskEntity.toTaskList(
+ ResUtil.getString(R.string.cp_activity_cptaskactivity_06), ResUtil.getString(R.string.cp_activity_cptaskactivity_07), CpTaskDescriptionView.TaskEntity.toTaskList(
privilegeTitles, privilegeContents
)
)
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt
index d42e9e1da..a850dc12e 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskAdapter.kt
@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.relation.cp.Task
+import com.yizhuan.xchat_android_library.utils.ResUtil
class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_task) {
override fun convert(helper: BaseViewHolder, item: Task?) {
@@ -12,7 +13,7 @@ class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_ta
helper.setText(R.id.tv_task_title, it.taskDesc)
helper.setText(R.id.tv_task_desc, it.taskSecretDesc)
helper.setText(R.id.tv_task_completed, "${it.currentVal}/${it.taskNeedVal}")
- helper.setText(R.id.tv_task_status, if (it.isComplete) "已完成" else "待完成")
+ helper.setText(R.id.tv_task_status, if (it.isComplete) ResUtil.getString(R.string.cp_adapter_cptaskadapter_01) else ResUtil.getString(R.string.cp_adapter_cptaskadapter_02))
helper.getView(R.id.tv_task_status).isEnabled = it.isComplete
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java
index 6a240d0bc..80f8855a5 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/adapter/CpTaskIndicatorAdapter.java
@@ -7,7 +7,6 @@ import android.widget.TextView;
import androidx.core.content.ContextCompat;
-import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt
index 6b8da1816..098566ae8 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpGlobalDialog.kt
@@ -13,7 +13,8 @@ import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-import io.reactivex.*
+import io.reactivex.Observable
+import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt
index e59a0df71..b31b28913 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInvitePageDialog.kt
@@ -2,7 +2,6 @@ package com.yizhuan.erban.relation.cp.dialog
import android.content.Context
import android.graphics.Color
-import android.text.SpannableStringBuilder
import android.text.style.AbsoluteSizeSpan
import android.view.View
import com.netease.nim.uikit.common.util.sys.ScreenUtil
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
index 85d61fedb..f43b8fef9 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/dialog/CpInviteReplyDialog.kt
@@ -13,7 +13,8 @@ import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-import io.reactivex.*
+import io.reactivex.Observable
+import io.reactivex.Observer
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt
index af296fdb5..620b54809 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/viewmodel/CpViewModel.kt
@@ -2,12 +2,14 @@ package com.yizhuan.erban.relation.cp.viewmodel
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.erban.relation.cp.model.CpModel
import com.yizhuan.xchat_android_core.relation.cp.*
import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption
import com.yizhuan.xchat_android_core.utils.net.ServerException
import com.yizhuan.xchat_android_core.utils.toast
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
class CpViewModel : BaseViewModel() {
@@ -116,7 +118,7 @@ class CpViewModel : BaseViewModel() {
},
block = {
CpModel.makeCpInvite(acceptUid, declaration, propsId)
- "邀请已发送".toast()
+ ResUtil.getString(R.string.cp_viewmodel_cpviewmodel_01).toast()
EventBus.getDefault().post(CpBindUnbindEvent())
}
)
diff --git a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt b/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt
index b410db10a..31d9423d1 100644
--- a/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt
+++ b/app/src/main/java/com/yizhuan/erban/relation/cp/widget/RelationCpCardView.kt
@@ -16,6 +16,7 @@ import com.yizhuan.erban.relation.extention.visibility
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity
import com.yizhuan.xchat_android_core.relation.cp.CpRelation
+import com.yizhuan.xchat_android_library.utils.ResUtil
class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) :
FrameLayout(context, attr, def) {
@@ -112,11 +113,11 @@ class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) :
) {
if (cpRelation.waitUnbound) {
if (cpRelation.unboundUid != selfUId) {
- binding.tvRecoveryUnbind.text = "关系解绑中"
+ binding.tvRecoveryUnbind.text = ResUtil.getString(R.string.cp_widget_relationcpcardview_01)
binding.tvRecoveryUnbind.isEnabled = false
binding.tvRecoveryUnbind.background = null
} else {
- binding.tvRecoveryUnbind.text = "撤销解除关系"
+ binding.tvRecoveryUnbind.text = ResUtil.getString(R.string.cp_widget_relationcpcardview_02)
binding.tvRecoveryUnbind.isEnabled = true
binding.tvRecoveryUnbind.background =
ContextCompat.getDrawable(context, R.drawable.bg_ff696f_ffafc3_cornor_4)
diff --git a/app/src/main/java/com/yizhuan/erban/service/DaemonService.java b/app/src/main/java/com/yizhuan/erban/service/DaemonService.java
index 22f493249..62e1b7098 100644
--- a/app/src/main/java/com/yizhuan/erban/service/DaemonService.java
+++ b/app/src/main/java/com/yizhuan/erban/service/DaemonService.java
@@ -1,6 +1,5 @@
package com.yizhuan.erban.service;
-import android.annotation.TargetApi;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
@@ -10,12 +9,14 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.IBinder;
+
import androidx.annotation.Nullable;
import com.yizhuan.erban.R;
import com.yizhuan.erban.reciever.NotificationClickReceiver;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* @author chenran
@@ -26,7 +27,7 @@ public class DaemonService extends Service {
private static final String TAG = "DaemonService";
public static final int NOTICE_ID = 100;
private static final String CHANNEL_ID = "IN_ROOM";
- private static final String CHANNEL_NAME = "在房间里面通知提示";
+ private static final String CHANNEL_NAME = ResUtil.getString(R.string.erban_service_daemonservice_01);
private String title;
private boolean isStartForeground = false;
@@ -59,8 +60,8 @@ public class DaemonService extends Service {
Notification.Builder builder = new Notification.Builder(this);
builder.setSmallIcon(R.mipmap.app_logo);
builder.setContentTitle(title);
- builder.setContentText("点击返回房间");
- builder.setTicker("正在房间内");
+ builder.setContentText(ResUtil.getString(R.string.erban_service_daemonservice_02));
+ builder.setTicker(ResUtil.getString(R.string.erban_service_daemonservice_03));
Intent clickIntent = new Intent(this, NotificationClickReceiver.class);
int flag = PendingIntent.FLAG_UPDATE_CURRENT;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
@@ -75,7 +76,7 @@ public class DaemonService extends Service {
//8.0系统适配
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
String channelID = getPackageName() + "1";
- String channelName = "进入房间通知";
+ String channelName = ResUtil.getString(R.string.erban_service_daemonservice_04);
NotificationChannel channel = new NotificationChannel(channelID, channelName, NotificationManager.IMPORTANCE_HIGH);
channel.setSound(null, null);
NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -87,8 +88,8 @@ public class DaemonService extends Service {
} else {
Notification.Builder builder = new Notification.Builder(this);
builder.setSmallIcon(R.mipmap.app_logo);
- builder.setContentText("无房间信息");
- builder.setTicker("无房间信息");
+ builder.setContentText(ResUtil.getString(R.string.erban_service_daemonservice_05));
+ builder.setTicker(ResUtil.getString(R.string.erban_service_daemonservice_06));
//8.0系统适配
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
builder.setChannelId(CHANNEL_ID);
diff --git a/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt b/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt
index 0536ad290..a20eed88a 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/SkillDataDelegate.kt
@@ -1,6 +1,7 @@
package com.yizhuan.erban.skill
import android.annotation.SuppressLint
+import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.skill.dialog.SkillSelectionDialog
import com.yizhuan.erban.skill.repository.SkillDataManager
@@ -13,6 +14,7 @@ import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
import com.yizhuan.xchat_android_core.skill.event.SkillEvent
import com.yizhuan.xchat_android_core.utils.toast
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import java.io.File
@@ -80,7 +82,7 @@ class SkillDataDelegate(private val skillView: SkillCardView, private val activi
}
}, {
activity.dialogManager.dismissDialog()
- "上传失败,请重新录制".toast()
+ ResUtil.getString(R.string.erban_skill_skilldatadelegate_01).toast()
(sourceItem as RecordIResourceItem).setItemByState(RecordIResourceItem.RECORD_STATE_READY)
})
}
@@ -147,7 +149,7 @@ class SkillDataDelegate(private val skillView: SkillCardView, private val activi
@SuppressLint("CheckResult")
internal fun saveSkill() {
if (!skillView.isValid()) {
- activity.toast("请填写或选择带*条目的内容")
+ activity.toast(ResUtil.getString(R.string.erban_skill_skilldatadelegate_02))
return
}
val item = parseSelectedValues()
@@ -186,7 +188,7 @@ class SkillDataDelegate(private val skillView: SkillCardView, private val activi
SkillModel.instance.deleteSkill(skillView.getAttributes().id)
.compose(activity.bindToLifecycle())
.subscribe({
- activity.toast("删除成功")
+ activity.toast(ResUtil.getString(R.string.erban_skill_skilldatadelegate_03))
val event = SkillEvent()
event.event = SkillEvent.REMOVE
EventBus.getDefault().post(event)
diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt b/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt
index a5e5227e3..4c2c581b0 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/activity/AddSkillActivity.kt
@@ -9,12 +9,12 @@ import com.netease.nim.uikit.StatusBarUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseBindingActivity
import com.yizhuan.erban.databinding.ActivitySkillEditBinding
-import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
import com.yizhuan.erban.skill.repository.SkillDataManager
import com.yizhuan.erban.skill.repository.SkillModel
import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO
+import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
-import io.reactivex.functions.Consumer
+import com.yizhuan.xchat_android_library.utils.ResUtil
@ActLayoutRes(R.layout.activity_skill_edit)
class AddSkillActivity : BaseBindingActivity() {
@@ -22,7 +22,7 @@ class AddSkillActivity : BaseBindingActivity() {
private var cardType = -1
override fun init() {
delegate = SkillEditableDelegate(this)
- initTitleBar("添加技能")
+ initTitleBar(ResUtil.getString(R.string.skill_activity_addskillactivity_01))
mBinding.click = this
mBinding.btnDelete.visibility = View.GONE
val cardId = intent?.getIntExtra(ITEM, -1) ?: -1
@@ -88,7 +88,7 @@ class AddSkillActivity : BaseBindingActivity() {
if (aBoolean) {
setSkillViewData(it)
} else {
- toast("请给予应用必要权限，让程序可正常工作。")
+ toast(ResUtil.getString(R.string.skill_activity_addskillactivity_02))
finish()
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt b/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt
index 0dda92a26..af7cbc869 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/activity/SkillEditableDelegate.kt
@@ -6,7 +6,9 @@ import com.yizhuan.erban.databinding.ActivitySkillEditBinding
import com.yizhuan.erban.skill.SKillDataParser
import com.yizhuan.erban.skill.SkillDataDelegate
import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog
-import com.yizhuan.xchat_android_core.skill.entity.*
+import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
+import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity
+import com.yizhuan.xchat_android_library.utils.ResUtil
/**
* 编辑-添加 界面
@@ -15,14 +17,14 @@ class SkillEditableDelegate(
private val activity: BaseBindingActivity
) {
internal fun init() {
- activity.initTitleBar("技能卡")
+ activity.initTitleBar(ResUtil.getString(R.string.skill_activity_skilleditabledelegate_01))
}
private var saveTipDialog: CommonTipDialog = CommonTipDialog(activity)
init {
- saveTipDialog.setOkText("是")
- saveTipDialog.setCancelText("否")
+ saveTipDialog.setOkText(ResUtil.getString(R.string.skill_activity_skilleditabledelegate_02))
+ saveTipDialog.setCancelText(ResUtil.getString(R.string.skill_activity_skilleditabledelegate_03))
saveTipDialog.setTipMsg(activity.resources.getString(R.string.tip_save_skill))
saveTipDialog.setOnActionListener(object : CommonTipDialog.OnActionListener {
override fun onOk() {
diff --git a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt b/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt
index 85d8074ee..38fe2003a 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/activity/SkillHomeActivity.kt
@@ -14,17 +14,16 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseBindingActivity
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivitySkillHomeBinding
-import com.yizhuan.erban.skill.SKillDataParser
import com.yizhuan.erban.skill.adapter.MineSkillCardAdapter
import com.yizhuan.erban.skill.decoration.SkillLinearVerticalDecoration
import com.yizhuan.erban.skill.dialog.AddSkillCardDialog
-import com.yizhuan.xchat_android_core.skill.event.SkillEvent
import com.yizhuan.erban.skill.repository.SkillDataManager
import com.yizhuan.erban.skill.repository.SkillModel
import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO
-import com.yizhuan.erban.skill.widget.SkillAttribute
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil
+import com.yizhuan.xchat_android_core.skill.event.SkillEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
+import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@@ -37,7 +36,7 @@ class SkillHomeActivity : BaseBindingActivity() {
@SuppressLint("CheckResult")
override fun init() {
- initTitleBar("技能卡")
+ initTitleBar(ResUtil.getString(R.string.skill_activity_skillhomeactivity_01))
pageType = intent.getIntExtra(PAGE_TYPE, PAGE_TYPE_SELF)
userId = intent.getLongExtra(USER_ID, 0)
EventBus.getDefault().register(this)
@@ -98,7 +97,7 @@ class SkillHomeActivity : BaseBindingActivity() {
private fun createEmptyView(): View {
if (pageType == PAGE_TYPE_CUSTOM) {
- return EmptyViewHelper.createEmptyView(this, "暂未添加技能卡")
+ return EmptyViewHelper.createEmptyView(this, ResUtil.getString(R.string.skill_activity_skillhomeactivity_02))
}
val rootView = FrameLayout(this)
rootView.layoutParams =
diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt b/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt
index aabd45c05..f1cbb06e0 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/adapter/AddSkillCardAdapter.kt
@@ -4,8 +4,8 @@ import android.text.TextUtils
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
-import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
+import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
class AddSkillCardAdapter :
BaseQuickAdapter(R.layout.item_add_skill_select_card) {
diff --git a/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt b/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt
index 81192802c..b69e41b2a 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/adapter/MineSkillCardAdapter.kt
@@ -7,8 +7,8 @@ import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.skill.SKillDataParser
import com.yizhuan.erban.skill.SkillDataDelegate
import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO
-import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity
import com.yizhuan.erban.skill.widget.SkillCardView
+import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity
/**
* 用户所有技能卡 显示
diff --git a/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt b/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt
index cb642d660..7fd0950df 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/dialog/AddSkillCardDialog.kt
@@ -8,9 +8,9 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.databinding.DialogAddSkillItemBinding
import com.yizhuan.erban.skill.adapter.AddSkillCardAdapter
import com.yizhuan.erban.skill.decoration.SkillGridDecoration
-import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil
+import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_add_skill_item)
diff --git a/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt b/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt
index 714187d1d..8f506e870 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/dialog/SkillSelectionDialog.kt
@@ -8,10 +8,10 @@ import com.yizhuan.erban.R
import com.yizhuan.erban.databinding.DialogAddSkillItemBinding
import com.yizhuan.erban.skill.adapter.SkillSelectionAdapter
import com.yizhuan.erban.skill.decoration.SkillGridDecoration
-import com.yizhuan.xchat_android_core.skill.entity.PropsEntity
import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil
import com.yizhuan.xchat_android_core.skill.entity.PropDictVo
+import com.yizhuan.xchat_android_core.skill.entity.PropsEntity
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.dialog_add_skill_item)
diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt b/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt
index 777abe246..2da4861ca 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/repository/Api.kt
@@ -1,10 +1,10 @@
package com.yizhuan.erban.skill.repository
import com.google.gson.JsonElement
+import com.yizhuan.xchat_android_core.bean.response.ServiceResult
import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult
import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
import io.reactivex.Single
import okhttp3.RequestBody
diff --git a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt b/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt
index 1022eb83e..857f69fed 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/repository/SkillModel.kt
@@ -1,18 +1,16 @@
package com.yizhuan.erban.skill.repository
import com.google.gson.Gson
+import com.yizhuan.xchat_android_core.base.BaseModel
import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity
import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity
-import com.yizhuan.xchat_android_core.base.BaseModel
import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity
import com.yizhuan.xchat_android_core.utils.net.RxHelper
import com.yizhuan.xchat_android_library.net.rxnet.RxNet
import io.reactivex.Single
-import okhttp3.MediaType
import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.RequestBody
import okhttp3.RequestBody.Companion.toRequestBody
class SkillModel : BaseModel(), ISkillModel {
diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt
index 7c2c45a54..06fac89b1 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/widget/RecordIResourceItem.kt
@@ -12,6 +12,7 @@ import com.yizhuan.erban.databinding.LayoutSkillAudioBinding
import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.yizhuan.xchat_android_core.utils.toast
+import com.yizhuan.xchat_android_library.utils.ResUtil
import java.io.File
class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
@@ -28,11 +29,11 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
itemAttribute
setTipMsg(
if (itemAttribute.audioStatus == RECORD_STATE_JUDGE)
- "您录制的声音正在审核中，确定要重新录制吗？"
- else "确定要重新录制吗？"
+ ResUtil.getString(R.string.skill_widget_recordiresourceitem_01)
+ else ResUtil.getString(R.string.skill_widget_recordiresourceitem_02)
)
- setCancelText("否")
- setOkText("是")
+ setCancelText(ResUtil.getString(R.string.skill_widget_recordiresourceitem_03))
+ setOkText(ResUtil.getString(R.string.skill_widget_recordiresourceitem_04))
setBold(true)
setTextSize(ScreenUtil.dip2px(16f))
setOnActionListener(object : CommonTipDialog.OnActionListener {
@@ -50,11 +51,11 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
//删除录制
private val deleteTipDialog by lazy {
CommonTipDialog(context).apply {
- setTipMsg("确定要删除该声音吗？")
- setCancelText("确定")
+ setTipMsg(ResUtil.getString(R.string.skill_widget_recordiresourceitem_05))
+ setCancelText(ResUtil.getString(R.string.skill_widget_recordiresourceitem_06))
setBold(true)
setTextSize(ScreenUtil.dip2px(16f))
- setOkText("取消")
+ setOkText(ResUtil.getString(R.string.skill_widget_recordiresourceitem_07))
setOnActionListener(object : CommonTipDialog.OnActionListener {
override fun onCancel() {
if (AudioPlayerHelper.get().isPlaying) {
@@ -81,7 +82,7 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
binding.recordView.recordDuration = MAX_RECORD_DURATION
binding.recordState = itemAttribute.audioStatus
itemAttribute.audioDuration?.let { binding.duration = it }
- binding.btnCancel.text = if (itemAttribute.isSelf) "取消录制" else "取消重新录制"
+ binding.btnCancel.text = if (itemAttribute.isSelf) ResUtil.getString(R.string.skill_widget_recordiresourceitem_08) else ResUtil.getString(R.string.skill_widget_recordiresourceitem_09)
binding.click = this
}
@@ -107,7 +108,7 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
override fun onRecordSuccess(file: File?) {
if (audioLength < 3) {
- "录制时间不能少于3s哦".toast()
+ ResUtil.getString(R.string.skill_widget_recordiresourceitem_010).toast()
binding.recordState = RECORD_STATE_READY
return
}
@@ -115,7 +116,7 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
}
override fun onRecordFail() {
- "录制失败，请重试".toast()
+ ResUtil.getString(R.string.skill_widget_recordiresourceitem_011).toast()
setItemByState(RECORD_STATE_READY)
}
@@ -133,7 +134,7 @@ class RecordIResourceItem(private val itemAttribute: ItemAttribute) : SkillItem,
binding.palyState = playState
AudioPlayerHelper.get().playInThread(url, object : OnPlayListener {
override fun onError(error: String?) {
- "播放出错，请重试".toast()
+ ResUtil.getString(R.string.skill_widget_recordiresourceitem_012).toast()
playState = PLAY_STATE_READY
binding.palyState = playState
}
diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt b/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt
index 85e710c36..96e2b60e7 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/widget/SelectionItem.kt
@@ -7,7 +7,6 @@ import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.utils.TextUtils
-import java.lang.StringBuilder
class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem {
private lateinit var contentView: TextView
diff --git a/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt b/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt
index 817045aad..717b3a231 100644
--- a/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt
+++ b/app/src/main/java/com/yizhuan/erban/skill/widget/TimerRecorderView.kt
@@ -3,7 +3,6 @@ package com.yizhuan.erban.skill.widget
import android.animation.ValueAnimator
import android.content.Context
import android.graphics.Canvas
-import android.graphics.Color
import android.graphics.Paint
import android.graphics.RectF
import android.util.AttributeSet
diff --git a/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java b/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java
index a6b89766b..b6013e06e 100644
--- a/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java
+++ b/app/src/main/java/com/yizhuan/erban/sys/ErbanSysMsgViewModel.java
@@ -1,10 +1,10 @@
package com.yizhuan.erban.sys;
-import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo;
import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgModel;
+import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import java.util.Map;
diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java
index 02b24fe61..827a29c23 100644
--- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java
@@ -1,13 +1,14 @@
package com.yizhuan.erban.team.adapter;
import android.content.Context;
-import androidx.databinding.ViewDataBinding;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.databinding.ViewDataBinding;
+
import com.netease.nim.uikit.common.ui.imageview.HeadImageView;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.BR;
diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java
index 2a1ae7b95..0a2bc8973 100644
--- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamWeeklyBillAdapter.java
@@ -10,10 +10,11 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.bindadapter.BindingViewHolder;
import com.yizhuan.erban.common.widget.CircleImageView;
-import com.yizhuan.xchat_android_library.utils.FormatUtils;
import com.yizhuan.erban.ui.widget.UserInfoDialog;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo;
+import com.yizhuan.xchat_android_library.utils.FormatUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -25,7 +26,7 @@ import java.util.Date;
public class TeamWeeklyBillAdapter extends BaseAdapter {
private Context context;
- private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM月dd日 HH:mm:ss");
+ private SimpleDateFormat simpleDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.team_adapter_teamweeklybilladapter_01));
public TeamWeeklyBillAdapter(Context context) {
this(R.layout.item_team_weekly_bill_transcation_record, BR.transactionRecordInfo, context);
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java
index 8cac60612..3470f38c4 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/AddMemberActivity.java
@@ -2,21 +2,23 @@ package com.yizhuan.erban.team.view;
import android.app.Activity;
import android.content.Intent;
-import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityAddTeamMemberBinding;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.team.adapter.AddTeamMemberAdapter;
import com.yizhuan.erban.team.viewmodel.FamilyMemberVM;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.Iterator;
@@ -152,7 +154,7 @@ public class AddMemberActivity extends BaseBindingActivity 0){
mBinding.tvSelectMember.setVisibility(View.VISIBLE);
- mBinding.tvSelectMember.setText(sb.append("共").append(members.size()).append("人").toString());
+ mBinding.tvSelectMember.setText(sb.append(ResUtil.getString(R.string.team_view_createteammessageactivity_02)).append(members.size()).append(ResUtil.getString(R.string.team_view_createteammessageactivity_03)).toString());
}
}
@@ -156,13 +157,13 @@ public class CreateTeamMessageActivity extends BaseBindingTakePhotoActivity {
teamViewModel.clearChattingHistory(teamId);
MessageListPanelHelper.getInstance().notifyClearMessages(teamId);
- toast("清空成功");
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_03));
});
buttonItems.add(buttonItem1);
@@ -313,9 +314,9 @@ public class NimTeamManagementActivity extends BaseBindingTakePhotoActivity {
if (throwable != null) {
throwable.printStackTrace();
- toast("删除失败" + throwable.getMessage());
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_04) + throwable.getMessage());
} else {
- toast("删除成功");
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_05));
RxBus.get().post(new TeamEvent().setOperation(TeamEvent.OP_DELETE_TEAM));
finish();
}
@@ -323,16 +324,16 @@ public class NimTeamManagementActivity extends BaseBindingTakePhotoActivity teamViewModel.quiteTeam(teamInfo.getId())
.compose(bindToLifecycle())
.subscribe((s, throwable) -> {
if (throwable != null) {
throwable.printStackTrace();
- toast("退出失败" + throwable.getMessage());
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_08) + throwable.getMessage());
} else {
- toast("退出成功");
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_09));
RxBus.get().post(new TeamEvent().setOperation(TeamEvent.OP_QUIT_TEAM));
finish();
}
@@ -383,7 +384,7 @@ public class NimTeamManagementActivity extends BaseBindingTakePhotoActivity {
if (throwable != null) {
throwable.printStackTrace();
- toast("更新群头像失败");
+ toast(ResUtil.getString(R.string.team_view_nimteammanagementactivity_010));
} else {
GlideApp.with(this)
.load(url)
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java
index 333fceab1..906903a1b 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java
@@ -46,6 +46,7 @@ import com.yizhuan.xchat_android_core.team.model.TeamModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -266,8 +267,8 @@ public class NimTeamMessageActivity extends BaseMessageActivity {
}
private void onRequestTeamInfoFailed() {
-// Toast.makeText(NimTeamMessageActivity.this, "获取群组信息失败!", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("获取群组信息失败!");
+// Toast.makeText(NimTeamMessageActivity.this, ResUtil.getString(R.string.team_view_nimteammessageactivity_01), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.team_view_nimteammessageactivity_02));
finish();
}
@@ -284,7 +285,7 @@ public class NimTeamMessageActivity extends BaseMessageActivity {
team = d;
fragment.setTeam(team);
- setTitle(team == null ? sessionId : team.getName() + "(" + team.getMemberCount() + "人)");
+ setTitle(team == null ? sessionId : team.getName() + "(" + team.getMemberCount() + ResUtil.getString(R.string.team_view_nimteammessageactivity_03));
invalidTeamTipText.setText(team.getType() == TeamTypeEnum.Normal ? R.string.normal_team_invalid_tip : R.string.team_invalid_tip);
invalidTeamTipView.setVisibility(team.isMyTeam() ? View.GONE : View.VISIBLE);
@@ -410,7 +411,7 @@ public class NimTeamMessageActivity extends BaseMessageActivity {
@Override
protected void initToolBar() {
ToolBarOptions options = new NimToolBarOptions();
- options.titleString = "群聊";
+ options.titleString = ResUtil.getString(R.string.team_view_nimteammessageactivity_04);
setToolBar(R.id.toolbar, options);
}
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java
index 2d05feaa2..348308657 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageFragment.java
@@ -4,7 +4,6 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
-import android.util.Log;
import com.netease.nim.uikit.business.session.fragment.MessageFragment;
import com.netease.nim.uikit.business.session.module.input.InputPanel;
@@ -12,11 +11,8 @@ import com.netease.nim.uikit.business.session.module.input.NimAudioChatEvent;
import com.netease.nim.uikit.business.session.module.input.NimImageActionEvent;
import com.netease.nim.uikit.business.session.module.list.MessageListPanelEx;
import com.netease.nimlib.sdk.NIMClient;
-import com.netease.nimlib.sdk.msg.MsgService;
-import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.team.TeamService;
-import com.netease.nimlib.sdk.team.model.LeaveTeamAttachment;
import com.netease.nimlib.sdk.team.model.Team;
import com.netease.nimlib.sdk.team.model.TeamMember;
import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -29,7 +25,6 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java b/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java
index e72372669..000298487 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/TeamListFragment.java
@@ -2,6 +2,7 @@ package com.yizhuan.erban.team.view;
import android.app.Activity;
import android.os.Bundle;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java
index 9ca7a9a05..f3307583e 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberListActivity.java
@@ -3,10 +3,10 @@ package com.yizhuan.erban.team.view;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.view.View;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.SimpleItemAnimator;
-import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
@@ -17,9 +17,6 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.databinding.ActivityTeamMemberListBinding;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.team.adapter.TeamMemberListAdapter;
import com.yizhuan.erban.team.bean.NimTeamMember;
import com.yizhuan.erban.team.event.TeamMemberUpdateEvent;
@@ -28,6 +25,10 @@ import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo;
import com.yizhuan.xchat_android_core.team.model.TeamModel;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -312,7 +313,7 @@ public class TeamMemberListActivity extends BaseBindingActivity teamViewModel.kickOutTeamMember(chatId, String.valueOf(teamMemberInfo.getUid()))
.compose(bindToLifecycle())
.subscribe((s, throwable) -> {
@@ -329,8 +330,8 @@ public class TeamMemberListActivity extends BaseBindingActivity
teamViewModel.setTeamManager(chatId, String.valueOf(teamMemberInfo.getUid()), wannaSetManager)
.compose(bindToLifecycle())
@@ -350,7 +351,7 @@ public class TeamMemberListActivity extends BaseBindingActivity
muteTeamMember(teamMemberInfo, true, position));
} else {
@@ -366,7 +367,7 @@ public class TeamMemberListActivity extends BaseBindingActivity {
if (throwable != null) {
throwable.printStackTrace();
- toast("操作失败");
+ toast(ResUtil.getString(R.string.team_view_teammemberlistactivity_09));
} else {
teamMemberInfo.setDisable(wannaMute);
teamInfo.setDisabledCount(wannaMute ?
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java
index 1f935c3c4..06096088f 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/TeamMemberSearchListActivity.java
@@ -1,9 +1,14 @@
package com.yizhuan.erban.team.view;
+import static com.yizhuan.erban.team.view.TeamMemberListActivity.EXTRA_ID;
+import static com.yizhuan.erban.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE;
+import static com.yizhuan.erban.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL;
+import static com.yizhuan.erban.team.view.TeamMemberListActivity.REQUEST_CODE;
+import static com.yizhuan.erban.team.view.TeamMemberListActivity.RESULT_DATA;
+
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
-import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -12,14 +17,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.EditorInfo;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.ActivityTeamMemberSearchListBinding;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.team.adapter.TeamMemberListAdapter;
import com.yizhuan.erban.team.bean.NimTeamMember;
import com.yizhuan.erban.team.event.TeamMemberUpdateEvent;
@@ -27,16 +31,14 @@ import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.xchat_android_core.team.bean.TeamInfo;
import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo;
import com.yizhuan.xchat_android_core.team.model.TeamModel;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.rxbus.RxBusHelper;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.Iterator;
-import static com.yizhuan.erban.team.view.TeamMemberListActivity.EXTRA_ID;
-import static com.yizhuan.erban.team.view.TeamMemberListActivity.KEY_OPERATION_TYPE;
-import static com.yizhuan.erban.team.view.TeamMemberListActivity.OP_TEAM_MEMBER_NORMAL;
-import static com.yizhuan.erban.team.view.TeamMemberListActivity.REQUEST_CODE;
-import static com.yizhuan.erban.team.view.TeamMemberListActivity.RESULT_DATA;
-
/**
* Created by MadisonRong on 31/05/2018.
*/
@@ -132,8 +134,8 @@ public class TeamMemberSearchListActivity extends BaseBindingActivity iterator = teamMemberListAdapter.getData().iterator();
while (iterator.hasNext()){
@@ -256,7 +258,7 @@ public class TeamMemberSearchListActivity extends BaseBindingActivity {
if (throwable != null) {
throwable.printStackTrace();
- toast("操作失败");
+ toast(ResUtil.getString(R.string.team_view_teammembersearchlistactivity_04));
} else {
teamMemberInfo.setDisable(wannaMute);
teamInfo.setDisabledCount(wannaMute ?
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java
index 657bea336..bf712a343 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillActivity.java
@@ -2,26 +2,27 @@ package com.yizhuan.erban.team.view;
import android.content.Context;
import android.content.Intent;
-import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillBinding;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.FormatUtils;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.team.adapter.TeamWeeklyBillAdapter;
import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.xchat_android_core.family.model.FamilyModel;
import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.FormatUtils;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
import java.util.List;
diff --git a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java
index bee7fbe13..71d6c6dd5 100644
--- a/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/team/view/TeamWeeklyBillSearchActivity.java
@@ -2,7 +2,6 @@ package com.yizhuan.erban.team.view;
import android.content.Context;
import android.content.Intent;
-import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -10,17 +9,20 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.EditorInfo;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillSearchBinding;
-import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.erban.team.adapter.TeamWeeklyBillAdapter;
import com.yizhuan.erban.team.viewmodel.TeamVM;
import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo;
+import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.List;
@@ -120,8 +122,8 @@ public class TeamWeeklyBillSearchActivity extends BaseBindingActivity {
if (throwable != null) {
throwable.printStackTrace();
- toast("更新失败");
+ toast(ResUtil.getString(R.string.team_view_updateteamnameactivity_03));
} else {
TeamModel.get().setTeamInfoCache(teamInfo.getTid(), teamInfo);
finish();
}
});
} else {
- Snackbar.make(mBinding.layoutCoordinator, "所填内容为空！", Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(mBinding.layoutCoordinator, ResUtil.getString(R.string.team_view_updateteamnameactivity_04), Snackbar.LENGTH_SHORT).show();
}
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java b/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java
index f2bc20c53..6926b47c8 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/anim/AnimFactory.java
@@ -7,10 +7,12 @@ import android.graphics.drawable.ColorDrawable;
import android.util.Log;
import com.netease.nim.uikit.common.util.log.LogUtil;
+import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
import com.yizhuan.xchat_android_core.room.face.FaceInfo;
import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo;
import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
import java.util.List;
@@ -88,7 +90,7 @@ public class AnimFactory {
drawable.addFrame(overlayFaceDrawable, duration);
} else {
// 未知类型,不显示动画
- e.onError(new Throwable("未知类型,不显示动画"));
+ e.onError(new Throwable(ResUtil.getString(R.string.ui_anim_animfactory_01)));
return;
}
@@ -160,7 +162,7 @@ public class AnimFactory {
drawable.addFrame(overlayFaceDrawable, duration);
} else {
// 未知类型,不显示动画
- e.onError(new Throwable("未知类型,不显示动画"));
+ e.onError(new Throwable(ResUtil.getString(R.string.ui_anim_animfactory_02)));
return;
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java b/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java
index e15a191d3..3c7dac48b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/anim/FlowFaceDrawable.java
@@ -9,6 +9,7 @@ import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java b/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java
index 60759c1a5..4ff10e416 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/anim/OneFaceDrawable.java
@@ -9,9 +9,10 @@ import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.text.TextUtils;
import com.bumptech.glide.request.FutureTarget;
import com.netease.nim.uikit.support.glide.GlideApp;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java b/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java
index 8e01dee82..c4b91bddb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/anim/OverlayFaceDrawable.java
@@ -9,6 +9,7 @@ import android.graphics.Paint;
import android.graphics.PixelFormat;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java b/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java
index 52a531e4c..0313e07dc 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/behavior/FixAppBarBehavior.java
@@ -1,12 +1,14 @@
package com.yizhuan.erban.ui.behavior;
import android.content.Context;
-import com.google.android.material.appbar.AppBarLayout;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.View;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+
+import com.google.android.material.appbar.AppBarLayout;
+
/**
* 此文件不能删，引用到AppLayout下面的
* create by lvzebiao @2020/1/7
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java
index 71184fe18..21d4027a5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceGVAdapter.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.ui.gift.adapter;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -11,6 +10,8 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.gift.util.RecyclerViewUtil;
import com.yizhuan.erban.ui.gift.widget.GiftDataInfo;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java
index a35f9bfeb..797bd9fe3 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/adapter/FaceVPAdapter.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.ui.gift.adapter;
-import androidx.viewpager.widget.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
+import androidx.viewpager.widget.PagerAdapter;
+
import java.util.List;
public class FaceVPAdapter extends PagerAdapter {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java b/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java
index 4ce12bde9..59bf7dc60 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java
@@ -2,11 +2,9 @@ package com.yizhuan.erban.ui.gift.callback;
import com.yizhuan.erban.ui.widget.GiftDialog;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
-import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
public class OnGiftDialogBtnClickListenerWrapper implements GiftDialog.OnGiftDialogBtnClickListener {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
index 10ac50227..b333e619e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java
@@ -1,12 +1,11 @@
package com.yizhuan.erban.ui.gift.dialog;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import androidx.databinding.ObservableBoolean;
import androidx.databinding.ObservableField;
-import android.graphics.drawable.Drawable;
-
import com.yizhuan.erban.R;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java b/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java
index 41ac8c244..baa7f3a68 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/util/ExpressionUtil.java
@@ -3,9 +3,6 @@ package com.yizhuan.erban.ui.gift.util;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ImageSpan;
@@ -14,6 +11,9 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.gift.adapter.FaceGVAdapter;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java b/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java
index 6c8ebd130..12be072b2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/util/GiftPanelControl.java
@@ -1,13 +1,15 @@
package com.yizhuan.erban.ui.gift.util;
+import static android.content.Context.LAYOUT_INFLATER_SERVICE;
+
import android.content.Context;
-import androidx.viewpager.widget.ViewPager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.gift.adapter.FaceGVAdapter;
@@ -17,8 +19,6 @@ import com.yizhuan.erban.ui.gift.widget.GiftDataInfo;
import java.util.ArrayList;
import java.util.List;
-import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-
/**
* Created by KathLine on 2017/1/12.
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java b/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java
index d363079bd..3d9b1e5b2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/util/RecyclerViewUtil.java
@@ -1,11 +1,12 @@
package com.yizhuan.erban.ui.gift.util;
import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* Created by KathLine on 2017/4/27.
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java
index 698f897d7..af3c3faf4 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/CustormAnim.java
@@ -5,10 +5,11 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
-import androidx.annotation.NonNull;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
+import androidx.annotation.NonNull;
+
import com.yizhuan.erban.R;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java
index 54ce36c0a..5d3acc209 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/gift/widget/GiftControl.java
@@ -3,10 +3,14 @@ package com.yizhuan.erban.ui.gift.widget;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
-import androidx.annotation.NonNull;
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.NonNull;
+
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -76,7 +80,7 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
&& giftFrameLayout.getCurrentSendUserId().equals(gift.getSendUserId())
&& giftFrameLayout.getCurrentGiftGroup() == gift.getGiftGroup()) {
//连击
- Log.i(TAG, "addGiftQueue: ========giftFrameLayout("+ giftFrameLayout.getIndex()+")连击========礼物：" + gift.getGiftId() + ",连击X" + gift.getGiftCount());
+ Log.i(TAG, "addGiftQueue: ========giftFrameLayout("+ giftFrameLayout.getIndex()+ResUtil.getString(R.string.gift_widget_giftcontrol_01) + gift.getGiftId() + ResUtil.getString(R.string.gift_widget_giftcontrol_02) + gift.getGiftCount());
giftFrameLayout.setGiftCount(gift.getGiftCount());
giftFrameLayout.setSendGiftTime(gift.getSendGiftTime());
return;
@@ -92,18 +96,18 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
private void addGiftQueue(final GiftDataInfo gift, final boolean supportCombo) {
if (mGiftQueue != null) {
if (mGiftQueue.size() == 0) {
- Log.d(TAG, "addGiftQueue---集合个数：" + mGiftQueue.size() + ",礼物：" + gift.getGiftId());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_03) + mGiftQueue.size() + ResUtil.getString(R.string.gift_widget_giftcontrol_04) + gift.getGiftId());
mGiftQueue.add(gift);
showGift();
return;
}
}
- Log.d(TAG, "addGiftQueue---集合个数：" + mGiftQueue.size() + ",礼物：" + gift.getGiftId());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_05) + mGiftQueue.size() + ResUtil.getString(R.string.gift_widget_giftcontrol_06) + gift.getGiftId());
if (supportCombo) {
boolean addflag = false;
for (GiftDataInfo model : mGiftQueue) {
if (model.getGiftId().equals(gift.getGiftId()) && model.getSendUserId().equals(gift.getSendUserId()) && model.getGiftGroup() == gift.getGiftGroup()) {
- Log.d(TAG, "addGiftQueue: ========已有集合========" + gift.getGiftId() + ",礼物数：" + gift.getGiftCount());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_07) + gift.getGiftId() + ResUtil.getString(R.string.gift_widget_giftcontrol_08) + gift.getGiftCount());
model.setGiftCount(model.getGiftCount() + gift.getGiftCount());
addflag = true;
break;
@@ -111,7 +115,7 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
}
//如果在现有的集合中不存在同一人发的礼物就加入到现有集合中
if (!addflag) {
- Log.d(TAG, "addGiftQueue: --------新的集合--------" + gift.getGiftId() + ",礼物数：" + gift.getGiftCount());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_09) + gift.getGiftId() + ResUtil.getString(R.string.gift_widget_giftcontrol_010) + gift.getGiftCount());
mGiftQueue.add(gift);
}
} else {
@@ -130,14 +134,14 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
GiftFrameLayout giftFrameLayout;
for (int i = 0; i < mGiftLayoutList.size(); i++) {
giftFrameLayout = mGiftLayoutList.get(i);
- Log.d(TAG, "showGift: begin->集合个数：" + mGiftQueue.size());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_011) + mGiftQueue.size());
if (!giftFrameLayout.isShowing() && giftFrameLayout.isEnd()) {
boolean hasGift = giftFrameLayout.setGift(getGift());
if (hasGift) {
giftFrameLayout.startAnimation(custormAnim);
}
}
- Log.d(TAG, "showGift: end->集合个数：" + mGiftQueue.size());
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_012) + mGiftQueue.size());
}
}
@@ -151,7 +155,7 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
if (mGiftQueue.size() != 0) {
gift = mGiftQueue.get(0);
mGiftQueue.remove(0);
- Log.i(TAG, "getGift---集合个数：" + mGiftQueue.size() + ",送出礼物---" + gift.getGiftId() + ",礼物数X" + gift.getGiftCount());
+ Log.i(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_013) + mGiftQueue.size() + ResUtil.getString(R.string.gift_widget_giftcontrol_014) + gift.getGiftId() + ResUtil.getString(R.string.gift_widget_giftcontrol_015) + gift.getGiftCount());
}
return gift;
}
@@ -231,13 +235,13 @@ public class GiftControl implements GiftFrameLayout.LeftGiftAnimationStatusListe
private void reStartAnimation(final GiftFrameLayout giftFrameLayout, final int index) {
//动画结束，这时不能触发连击动画
giftFrameLayout.setCurrentShowStatus(false);
- Log.d(TAG, "reStartAnimation: 动画结束");
+ Log.d(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_016));
AnimatorSet animatorSet = giftFrameLayout.endAnmation(custormAnim);
if (animatorSet != null) {
animatorSet.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- Log.i(TAG, "礼物动画dismiss: index = " + index);
+ Log.i(TAG, ResUtil.getString(R.string.gift_widget_giftcontrol_017) + index);
//动画完全结束
giftFrameLayout.CurrentEndStatus(true);
giftFrameLayout.setGiftViewEndVisibility(isEmpty());
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
index f5a7a550c..1b9672782 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/MessageListPanelEx.java
@@ -17,7 +17,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.api.model.user.UserInfoObserver;
import com.netease.nim.uikit.business.contact.selector.activity.ContactSelectActivity;
@@ -65,7 +64,9 @@ import com.netease.nimlib.sdk.robot.model.RobotAttachment;
import com.netease.nimlib.sdk.robot.model.RobotMsgType;
import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.nimlib.sdk.team.model.TeamMember;
+import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -141,8 +142,8 @@ public class MessageListPanelEx {
try {
container.activity.startActivity(intent);
} catch (ActivityNotFoundException e) {
-// Toast.makeText(container.activity, "路径错误", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("路径错误");
+// Toast.makeText(container.activity, ResUtil.getString(R.string.ui_im_messagelistpanelex_01), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.ui_im_messagelistpanelex_02));
}
} else if (LinkElement.TYPE_BLOCK.equals(element.getType())) {
@@ -698,8 +699,8 @@ public class MessageListPanelEx {
}
if (message == null) {
-// Toast.makeText(container.activity, "该类型不支持转发", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("该类型不支持转发");
+// Toast.makeText(container.activity, ResUtil.getString(R.string.ui_im_messagelistpanelex_03), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.ui_im_messagelistpanelex_04));
return;
}
@@ -1203,7 +1204,7 @@ public class MessageListPanelEx {
private void longClickItemEarPhoneMode(CustomAlertDialog alertDialog, MsgTypeEnum msgType) {
if (msgType != MsgTypeEnum.audio) return;
- String content = UserPreferences.isEarPhoneModeEnable() ? "切换成扬声器播放" : "切换成听筒播放";
+ String content = UserPreferences.isEarPhoneModeEnable() ? ResUtil.getString(R.string.ui_im_messagelistpanelex_05) : ResUtil.getString(R.string.ui_im_messagelistpanelex_06);
final String finalContent = content;
alertDialog.addItem(content, new CustomAlertDialog.onSeparateItemClickListener() {
@@ -1224,7 +1225,7 @@ public class MessageListPanelEx {
public void onClick() {
forwardMessage = item;
ContactSelectActivity.Option option = new ContactSelectActivity.Option();
- option.title = "选择转发的人";
+ option.title = ResUtil.getString(R.string.ui_im_messagelistpanelex_07);
option.type = ContactSelectActivity.ContactSelectType.BUDDY;
option.multi = false;
option.maxSelectNum = 1;
@@ -1241,7 +1242,7 @@ public class MessageListPanelEx {
public void onClick() {
forwardMessage = item;
ContactSelectActivity.Option option = new ContactSelectActivity.Option();
- option.title = "选择转发的群";
+ option.title = ResUtil.getString(R.string.ui_im_messagelistpanelex_08);
option.type = ContactSelectActivity.ContactSelectType.TEAM;
option.multi = false;
option.maxSelectNum = 1;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
index f69511b83..4fe409294 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
@@ -6,6 +6,7 @@ import android.content.Intent;
import android.os.Bundle;
import com.trello.rxlifecycle3.components.support.RxAppCompatActivity;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.audio.VoiceMatchActivity;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
@@ -34,7 +35,6 @@ import com.yizhuan.erban.relation.cp.activity.CpTaskActivity;
import com.yizhuan.erban.team.view.NimTeamMessageActivity;
import com.yizhuan.erban.ui.login.BindPhoneActivity;
import com.yizhuan.erban.ui.login.ShowBindPhoneActivity;
-import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.setting.FeedbackActivity;
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
@@ -60,6 +60,7 @@ import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.withdraw.WithdrawModel;
import com.yizhuan.xchat_android_library.net.rxnet.callback.CallBack;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -230,22 +231,22 @@ public class RouterHandler {
return false;
}
dmi = (DialogManagerInterface) context;
- StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_matchsex, "异性匹配");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_matchsex, ResUtil.getString(R.string.ui_im_routerhandler_01));
if (AvRoomDataManager.get().isRoomOwner()
&& AvRoomDataManager.get().isCpRoom()
&& DemoCache.readBoolean(IS_FIRST, true)) {
DemoCache.saveBoolean(IS_FIRST, false);
- dmi.getDialogManager().showOkCancelDialog("匹配会退出当前房间并解散用户", true,
+ dmi.getDialogManager().showOkCancelDialog(ResUtil.getString(R.string.ui_im_routerhandler_02), true,
() -> showSexMatchDialog(context));
} else {
showSexMatchDialog(context);
}
break;
case RouterType.CITY_MATCHING:
-// StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_player, "找玩友");
+// StatisticManager.Instance().onEvent(StatisticsProtocol.game_homepage_player, ResUtil.getString(R.string.ui_im_routerhandler_03));
// context.startActivity(new Intent(context, UserMatchActivity.class));
- SingleToastUtil.showToast("暂不支持哟！");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_04));
break;
case RouterType.GAME_MATCHING:
break;
@@ -283,7 +284,7 @@ public class RouterHandler {
break;
case RouterType.MY_ROOM:
//我的房间,开房
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, "我页_进入我的房间");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ME_INTO_MY_ROOM_CLICK, ResUtil.getString(R.string.ui_im_routerhandler_05));
OpenRoomHelper.openRoom((BaseActivity) context);
break;
case RouterType.COLLECTION_ROOM:
@@ -297,7 +298,7 @@ public class RouterHandler {
} else if (HallDataManager.get().hasLiveHall()) {
ModuleHallActivity.start(context);
} else {
- SingleToastUtil.showToast("你还没有公会或房间！");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_06));
}
break;
// case RouterType.PATRIARCH_MODE:
@@ -332,7 +333,7 @@ public class RouterHandler {
UIHelper.showSettingAct(context);
break;
default:
- SingleToastUtil.showToast("暂不支持哟！");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.ui_im_routerhandler_07));
return false;
}
return true;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java
index f715762ae..51594e236 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/actions/ChatterBoxAction.java
@@ -1,37 +1,18 @@
package com.yizhuan.erban.ui.im.actions;
import android.os.Handler;
-import android.text.TextUtils;
import com.netease.nim.uikit.business.session.actions.BaseAction;
-import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
-import com.netease.nimlib.sdk.msg.MessageBuilder;
-import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
-import com.netease.nimlib.sdk.msg.model.CustomMessageConfig;
-import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.higuide.TuTuGuideHelper;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper;
-import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxModel;
import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent;
-import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo;
-import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment;
-import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
-import java.util.List;
-
-import io.reactivex.Single;
-import io.reactivex.functions.BiConsumer;
-
public class ChatterBoxAction extends BaseAction {
private long lastClick = 0L;
@@ -47,7 +28,7 @@ public class ChatterBoxAction extends BaseAction {
if (currentClick - lastClick > 1000L) {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_START_CHATTER_BOX, "消息-发起话匣子");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_START_CHATTER_BOX, ResUtil.getString(R.string.im_actions_chatterboxaction_01));
EventBus.getDefault().post(new HideInputEvent());
lastClick = currentClick;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java
index 0e2382c53..462a389bd 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/actions/GiftAction.java
@@ -10,19 +10,13 @@ import com.yizhuan.erban.ui.widget.GiftDialog;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox;
-import com.yizhuan.xchat_android_core.magic.MagicModel;
-import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
-import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo;
-import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
-import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
/**
@@ -42,7 +36,7 @@ public class GiftAction extends BaseAction implements GiftDialog.OnGiftDialogBtn
@Override
public void onClick() {
if (giftDialog == null) {
- GiftDialog.GIFT_DIALOG_FROM = "私聊";
+ GiftDialog.GIFT_DIALOG_FROM = ResUtil.getString(R.string.im_actions_giftaction_01);
giftDialog = new GiftDialog(getActivity(), Long.valueOf(getAccount()), false, false, true);
giftDialog.setGiftDialogBtnClickListener(this);
@@ -63,9 +57,9 @@ public class GiftAction extends BaseAction implements GiftDialog.OnGiftDialogBtn
callback.onFail();
}
if (throwable instanceof VipLevelNotEnoughException) {
- new DialogManager(getActivity()).showOkDialog("尚未达到赠送" +
+ new DialogManager(getActivity()).showOkDialog(ResUtil.getString(R.string.im_actions_giftaction_02) +
giftInfo.getGiftName() +
- "所需贵族等级,所需贵族等级:" +
+ ResUtil.getString(R.string.im_actions_giftaction_03) +
giftInfo.getGiftVipInfo().getVipName());
}
})
@@ -75,7 +69,7 @@ public class GiftAction extends BaseAction implements GiftDialog.OnGiftDialogBtn
MessageListPanelHelper.getInstance().notifyAddMessage(imMessage);
if (callback != null) {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_PRIVATECHAT_SENDGIFT,
- "私聊_送礼物");
+ ResUtil.getString(R.string.im_actions_giftaction_04));
callback.onSuccess();
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java
index 7b0fd5aa7..a646b8905 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/audio/ShakeHeartDialogFragment.java
@@ -5,9 +5,6 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -23,6 +20,10 @@ import android.view.animation.ScaleAnimation;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
import com.yizhuan.erban.R;
public class ShakeHeartDialogFragment extends DialogFragment {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java
index 0c74d1401..7e320725b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/AddBlackListActivity.java
@@ -23,6 +23,7 @@ import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -69,8 +70,8 @@ public class AddBlackListActivity extends BaseMvpActivity {
if (throwable != null) {
-// Toast.makeText(itemView.getContext(), "移除黑名单失败", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("移除黑名单失败");
+// Toast.makeText(itemView.getContext(), ResUtil.getString(R.string.im_avtivity_blacklistadapter_01), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.im_avtivity_blacklistadapter_02));
} else {
-// Toast.makeText(itemView.getContext(), "移除黑名单成功", Toast.LENGTH_SHORT).show();
- SingleToastUtil.showToastShort("移除黑名单成功");
+// Toast.makeText(itemView.getContext(), ResUtil.getString(R.string.im_avtivity_blacklistadapter_03), Toast.LENGTH_SHORT).show();
+ SingleToastUtil.showToastShort(ResUtil.getString(R.string.im_avtivity_blacklistadapter_04));
}
});
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java
index b24616b09..aa688262f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java
@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
-import android.widget.ImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -16,6 +15,7 @@ import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -36,7 +36,7 @@ public class BlackListManageActivity extends BaseMvpActivity nimUserInfos) {
if (ListUtils.isListEmpty(nimUserInfos)) {
- showNoData(R.drawable.icon_common_failure, "你的黑名单为空哦!");
+ showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.im_avtivity_blacklistmanageactivity_02));
} else {
hideStatus();
if (mAdapter != null) {
@@ -85,7 +85,7 @@ public class BlackListManageActivity extends BaseMvpActivity UserInfoActivity.Companion.start(context, userInfo.getUid()));
clUserDetails.setOnClickListener(v -> AVRoomActivity.startForFromType(
context,
@@ -393,7 +393,7 @@ public class NimP2PMessageActivity extends NewBaseMessageActivity {
if (id == 2) return;
if (id == 1) {
// 正在输入
- SingleToastUtil.showToast("对方正在输入...");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.im_avtivity_nimp2pmessageactivity_05));
}
} catch (Exception e) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java
index 41f8257d9..9742df862 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/avtivity/SwipeRecyclerViewItem.java
@@ -1,9 +1,6 @@
package com.yizhuan.erban.ui.im.avtivity;
import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -14,6 +11,10 @@ import android.widget.FrameLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
+
import com.yizhuan.erban.R;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java
index 995d3ceb2..711555d36 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MVHChatterBoxStart.java
@@ -22,6 +22,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.DiceThrowAttachment;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.HashMap;
import java.util.List;
@@ -87,7 +88,7 @@ public class MVHChatterBoxStart extends MsgViewHolderBase implements View.OnClic
if (startTime != 0L && System.currentTimeMillis() - startTime >= 3 * 24 * 60 * 60 * 1000) {
canClick = false;
- tvThrowDice.setText("已过期");
+ tvThrowDice.setText(ResUtil.getString(R.string.im_chat_mvhchatterboxstart_01));
} else {
@@ -103,7 +104,7 @@ public class MVHChatterBoxStart extends MsgViewHolderBase implements View.OnClic
}
}
- tvThrowDice.setText(canClick ? "抛点数" : "已抛");
+ tvThrowDice.setText(canClick ? ResUtil.getString(R.string.im_chat_mvhchatterboxstart_02) : ResUtil.getString(R.string.im_chat_mvhchatterboxstart_03));
}
@@ -121,9 +122,9 @@ public class MVHChatterBoxStart extends MsgViewHolderBase implements View.OnClic
if (tvThrowDice.isEnabled()) {
if (isFromHome)
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_CHATTER_BOX_POINTS, " 消息-发起话匣子-抛点数");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MESSAGE_CHATTER_BOX_POINTS, ResUtil.getString(R.string.im_chat_mvhchatterboxstart_04));
else
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOME_CHAT_NUMBER_OF_POINTS, "首页-私聊-话匣子游戏-抛点数");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_HOME_CHAT_NUMBER_OF_POINTS, ResUtil.getString(R.string.im_chat_mvhchatterboxstart_05));
}
tvThrowDice.setEnabled(false);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java
index 6759d3745..d15908398 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderAudioParty.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.ui.im.chat;
-import androidx.core.content.ContextCompat;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
import com.yizhuan.erban.R;
@@ -14,6 +15,7 @@ import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment;
import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
public class MsgViewHolderAudioParty extends MsgViewHolderBase implements View.OnClickListener {
@@ -69,14 +71,14 @@ public class MsgViewHolderAudioParty extends MsgViewHolderBase implements View.O
public void onClick(View v) {
OpenAudioPartyAttachment attachment = (OpenAudioPartyAttachment) message.getAttachment();
if (attachment == null || attachment.getRoomUid() == 0) {
- SingleToastUtil.showToast("无房间信息");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_01));
return;
}
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_JOIN_PARTY, "世界客态页-群聊-加入语音派对");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_MINI_WORLD_JOIN_PARTY, ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_02));
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_PARTY,
- "加入语音派对:群聊");
+ ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_03));
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_PARTY_B,
- "加入语音派对:世界id:" + attachment.getWorldId());
+ ResUtil.getString(R.string.im_chat_msgviewholderaudioparty_04) + attachment.getWorldId());
MiniWorldHelper.report(attachment.getWorldId(), MiniWorldHelper.TYPE_AUDIO_PARTY_JOIN);
AVRoomActivity.start(v.getContext(), attachment.getRoomUid());
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java
index 3eea86f31..df53ef18a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderChatHint.java
@@ -18,6 +18,7 @@ import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan;
import com.yizhuan.erban.ui.webview.SimpleWebViewActivity;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
public class MsgViewHolderChatHint extends MsgViewHolderBase {
@@ -57,7 +58,7 @@ public class MsgViewHolderChatHint extends MsgViewHolderBase {
ChatHintAttachment attachment = (ChatHintAttachment) message.getAttachment();
if (attachment != null) {
String content = attachment.getContent();
- String restoreTitle = "《整治网络直播乱象》";
+ String restoreTitle = ResUtil.getString(R.string.im_chat_msgviewholderchathint_01);
if (TextUtils.isEmpty(content) || !content.contains(restoreTitle)) {
tvContent.setText(content);
} else {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java
index 9a4267b84..6def8fabe 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderGift.java
@@ -14,6 +14,7 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by chenran on 2017/10/3.
@@ -63,7 +64,7 @@ public class MsgViewHolderGift extends MsgViewHolderBase {
String targetNick = attachment.getGiftReceiveInfo().getTargetNick();
if (!TextUtils.isEmpty(targetNick)) {
- tvTargetNick.setText("赠给 " + targetNick);
+ tvTargetNick.setText(ResUtil.getString(R.string.im_chat_msgviewholdergift_01) + targetNick);
}
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java
index 1a7d93126..1f49876a0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderHello.java
@@ -6,18 +6,13 @@ import android.widget.TextView;
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
-import com.yizhuan.erban.MainActivity;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.base.BaseMvpActivity;
-import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
-import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
-import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.functions.BiConsumer;
@@ -70,10 +65,10 @@ public class MsgViewHolderHello extends MsgViewHolderBase implements View.OnClic
if (roomInfo != null && roomInfo.getUid() > 0 && roomInfo.getUid() == inRoomUid) {
AVRoomActivity.start(context, inRoomUid);
} else {
- SingleToastUtil.showToast("来聊聊天嘛~");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.im_chat_msgviewholderhello_01));
}
} else {
- SingleToastUtil.showToast("来聊聊天嘛~");
+ SingleToastUtil.showToast(ResUtil.getString(R.string.im_chat_msgviewholderhello_02));
}
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java
index 7f6c483a2..99c92fa8f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderLevel.java
@@ -9,9 +9,9 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.xchat_android_core.UriProvider;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by chenran on 2017/10/3.
@@ -43,11 +43,11 @@ public class MsgViewHolderLevel extends MsgViewHolderBase {
LevelUpAttachment attachment = (LevelUpAttachment) message.getAttachment();
if (attachment.getSecond() == CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP) {
avatar.setImageResource(R.drawable.ic_chat_user_level);
- giftName.setText("恭喜!您的等级已到达" + attachment.levelName);
+ giftName.setText(ResUtil.getString(R.string.im_chat_msgviewholderlevel_01) + attachment.levelName);
container.setOnClickListener(v -> CommonWebViewActivity.start(context, UriProvider.getUserLevelUrl()));
} else if (attachment.getSecond() == CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP) {
avatar.setImageResource(R.drawable.ic_chat_charm_level);
- giftName.setText("恭喜!您的魅力等级已到达" + attachment.levelName);
+ giftName.setText(ResUtil.getString(R.string.im_chat_msgviewholderlevel_02) + attachment.levelName);
container.setOnClickListener(v -> CommonWebViewActivity.start(context, UriProvider.getUserLevelUrl()));
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java
index 32e476f7c..90a29a95f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderOnline.java
@@ -16,6 +16,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by chenran on 2017/9/21.
@@ -47,12 +48,12 @@ public class MsgViewHolderOnline extends MsgViewHolderBase implements View.OnCli
OpenRoomNotiAttachment attachment = (OpenRoomNotiAttachment) message.getAttachment();
if (attachment != null) {
if (!StringUtil.isEmpty(attachment.getNick())) {
- nick.setText(attachment.getNick() + " 上线啦");
+ nick.setText(attachment.getNick() + ResUtil.getString(R.string.im_chat_msgviewholderonline_01));
ImageLoadUtils.loadAvatar(avatar.getContext(), attachment.getAvatar(), avatar);
} else {
NimUserInfo nimUserInfo = NIMClient.getService(UserService.class).getUserInfo(attachment.getUid() + "");
if (nimUserInfo != null) {
- nick.setText(nimUserInfo.getName() + " 上线啦");
+ nick.setText(nimUserInfo.getName() + ResUtil.getString(R.string.im_chat_msgviewholderonline_02));
ImageLoadUtils.loadAvatar(avatar.getContext(), nimUserInfo.getAvatar(), avatar);
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java
index ab07395a7..00f285454 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPackage.java
@@ -6,16 +6,15 @@ import android.widget.TextView;
import com.coorchice.library.utils.LogUtils;
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
-
-import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
+import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
-
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.Map;
@@ -54,21 +53,21 @@ public class MsgViewHolderRedPackage extends MsgViewHolderBase {
String id = notifyInfo.getRedEnvelopeId();
LogUtils.d("getTime = " + message.getTime());
if (map != null && map.containsKey(id)) { //已领取
- tvNickname.setText("红包已领取");
+ tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_01));
tvAll.setVisibility(View.GONE);
- tvTip.setText("可前往账单查看详情");
+ tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_02));
contentContainer.setAlpha(0.5f);
} else if (CurrentTimeUtils.getCurrentTime() - message.getTime() < halfHour) {
tvNickname.setText(notifyInfo.getSendUserNick());
- tvAll.setText("发出了一个全服红包");
+ tvAll.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_03));
tvAll.setVisibility(View.VISIBLE);
- tvTip.setText("点击进房领取>");
+ tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_04));
contentContainer.setAlpha(1f);
DialogManager.OkCancelDialogListener listener = () -> AVRoomActivity.start(context, notifyInfo.getRoomUid(),
AVRoomActivity.FROM_TYPE_ALL_RED, notifyInfo.getSendUserNick(), notifyInfo);
contentContainer.setOnClickListener(v -> {
if (AvRoomDataManager.get().isOwnerOnMic() && AvRoomDataManager.get().getRoomId() != notifyInfo.getRoomUid()) {
- new DialogManager(context).showOkCancelDialog("是否下麦退出当前房间?", true, listener);
+ new DialogManager(context).showOkCancelDialog(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_05), true, listener);
} else {
listener.onOk();
}
@@ -76,9 +75,9 @@ public class MsgViewHolderRedPackage extends MsgViewHolderBase {
}
);
} else {//已失效
- tvNickname.setText("红包已失效");
+ tvNickname.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_06));
tvAll.setVisibility(View.GONE);
- tvTip.setText("下次要快点来哦~");
+ tvTip.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpackage_07));
contentContainer.setAlpha(0.5f);
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java
index 849c921ca..799cc8690 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderRedPacket.java
@@ -8,6 +8,7 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by chenran on 2017/9/21.
@@ -35,7 +36,7 @@ public class MsgViewHolderRedPacket extends MsgViewHolderBase implements View.On
@Override
protected void bindContentView() {
RedPacketAttachment attachment = (RedPacketAttachment) message.getAttachment();
- text.setText("收到" + attachment.getRedPacketInfo().getPacketName() + "红包，快去看看吧！");
+ text.setText(ResUtil.getString(R.string.im_chat_msgviewholderredpacket_01) + attachment.getRedPacketInfo().getPacketName() + ResUtil.getString(R.string.im_chat_msgviewholderredpacket_02));
container.setOnClickListener(this);
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java
index 3f170b427..b5bacd1fb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java
@@ -1,5 +1,8 @@
package com.yizhuan.erban.ui.im.chat;
+import static com.yizhuan.xchat_android_core.UriProvider.IM_SERVER_URL;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE;
+
import android.text.style.ForegroundColorSpan;
import android.widget.TextView;
@@ -23,15 +26,13 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.VoiceBottleShakeHeartAttachment;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.Map;
-import static com.yizhuan.xchat_android_core.UriProvider.IM_SERVER_URL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE;
-
/**
* 文字消息holder
*
@@ -77,10 +78,10 @@ public class MsgViewHolderText extends MsgViewHolderBase {
CarveUpGoldThirdLevelAttachment cuAttachment = (CarveUpGoldThirdLevelAttachment) attachment;
int appColor = context.getResources().getColor(R.color.appColor);
SpannableBuilder builder = new SpannableBuilder()
- .append("【签到瓜分百万】哇塞，恭喜 ")
+ .append(ResUtil.getString(R.string.im_chat_msgviewholdertext_01))
.append(cuAttachment.getNick() + " ", new ForegroundColorSpan(appColor))
- .append("签到获得 ")
- .append(cuAttachment.getGoldNum() + "钻石", new ForegroundColorSpan(appColor))
+ .append(ResUtil.getString(R.string.im_chat_msgviewholdertext_02))
+ .append(cuAttachment.getGoldNum() + ResUtil.getString(R.string.im_chat_msgviewholdertext_03), new ForegroundColorSpan(appColor))
.append("！");
text = builder.build();
} else if (attachment instanceof VoiceBottleShakeHeartAttachment) {
@@ -94,9 +95,9 @@ public class MsgViewHolderText extends MsgViewHolderBase {
String heartHint;
if (message.getFromAccount().equals(String.valueOf(AuthModel.get().getCurrentUid()))) {
- heartHint = "已向对方发送一颗小心心~";
+ heartHint = ResUtil.getString(R.string.im_chat_msgviewholdertext_04);
} else {
- heartHint = "Ta向你发送了一颗小心心~";
+ heartHint = ResUtil.getString(R.string.im_chat_msgviewholdertext_05);
}
Map localExtension = message.getLocalExtension();
if (localExtension != null && localExtension.containsKey(VoiceBottleShakeHeartAttachment.KEY_VOICE_BOTTLE_NEED_SHAKE_HEART)) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java
index c120d9025..8d53135b9 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgV2ViewHolder.java
@@ -1,7 +1,10 @@
package com.yizhuan.erban.ui.im.chat;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT;
+
import android.graphics.Color;
-import androidx.core.content.ContextCompat;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextPaint;
@@ -15,6 +18,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.core.content.ContextCompat;
+
import com.alibaba.fastjson.JSON;
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
@@ -35,10 +40,6 @@ import com.yizhuan.xchat_android_library.utils.SizeUtils;
import java.util.List;
import java.util.Objects;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT;
-
/**
* Created by lvzebiao on 2020/3/28.
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java
index 2b575f8b0..c5306a25f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/chat/SysMsgViewHolder.java
@@ -1,7 +1,12 @@
package com.yizhuan.erban.ui.im.chat;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL;
+import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT;
+
import android.graphics.Color;
-import androidx.core.content.ContextCompat;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextPaint;
@@ -15,6 +20,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.core.content.ContextCompat;
+
import com.alibaba.fastjson.JSON;
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
@@ -37,12 +44,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT;
-
/**
* Created by MadisonRong on 17/06/2018.
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
index 42b1fb7e0..39881e663 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/fragment/MessageFragment.java
@@ -68,6 +68,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment;
import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@@ -352,7 +353,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
@Override
public void onSuccess(Void param) {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_PRIVATECHAT_CAHT,
- "私聊_聊文字或图片");
+ ResUtil.getString(R.string.im_fragment_messagefragment_01));
}
@Override
@@ -599,11 +600,11 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
throwable.printStackTrace();
} else {
isChat = privateChatLimitInfo.isChat();
- hintText = "暂未达到可发起私聊等级";
+ hintText = ResUtil.getString(R.string.im_fragment_messagefragment_02);
inputPanel.setLimitLevel(privateChatLimitInfo.isChat(), privateChatLimitInfo.getMessage());
- String experLevel = "财富等级≥" + privateChatLimitInfo.getWealthLevel();
- String charmLevel = "魅力等级≥" + privateChatLimitInfo.getCharmLevel();
+ String experLevel = ResUtil.getString(R.string.im_fragment_messagefragment_03) + privateChatLimitInfo.getWealthLevel();
+ String charmLevel = ResUtil.getString(R.string.im_fragment_messagefragment_04) + privateChatLimitInfo.getCharmLevel();
String privacyAgreementDescTip = getContext().getString(R.string.text_chat_limit, experLevel, charmLevel);
SpannableString ss = new SpannableString(privacyAgreementDescTip);
int experLevelIndex = privacyAgreementDescTip.indexOf(experLevel);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java b/app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java
index 7c41c30b1..97eaad72f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/ActFriendList.java
@@ -3,6 +3,7 @@ package com.yizhuan.erban.ui.im.friend;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
index 905c573c9..1a099a856 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java
@@ -1,14 +1,13 @@
package com.yizhuan.erban.ui.im.friend;
import android.app.Activity;
-
-import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.content.ContextCompat;
-
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
@@ -22,8 +21,7 @@ import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
-
-import lombok.val;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* @author chenran
@@ -162,7 +160,7 @@ public class FriendListAdapter extends BaseQuickAdapter {
if (getActivity() == null || getActivity().isFinishing()) {
- Logger.i("界面已销毁");
+ Logger.i(ResUtil.getString(R.string.im_friend_friendlistfragment_01));
return;
}
FriendListFragment.this.onFriendListUpdate(IMFriendModel.get().getMyFriendsAccounts());
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
index dc98bf0ad..29722aaa0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentContactsFragment.java
@@ -1,5 +1,7 @@
package com.yizhuan.erban.ui.im.recent;
+import static com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog.onSeparateItemClickListener;
+
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
@@ -34,7 +36,6 @@ import com.netease.nimlib.sdk.RequestCallbackWrapper;
import com.netease.nimlib.sdk.ResponseCode;
import com.netease.nimlib.sdk.msg.MsgService;
import com.netease.nimlib.sdk.msg.MsgServiceObserve;
-import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
@@ -46,6 +47,7 @@ import com.yizhuan.erban.home.event.ContactTrashEvent;
import com.yizhuan.erban.ui.im.recent.adapter.RecentContactAdapter;
import com.yizhuan.xchat_android_core.utils.CheckUtils;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import org.greenrobot.eventbus.EventBus;
@@ -64,8 +66,6 @@ import java.util.Set;
import me.everything.android.ui.overscroll.OverScrollDecoratorHelper;
-import static com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog.onSeparateItemClickListener;
-
/**
* 最近联系人列表(会话列表)
*
@@ -136,7 +136,7 @@ public class RecentContactsFragment extends TFragment {
adapter.notifyDataSetChanged();
boolean empty = items.isEmpty() && msgLoaded;
emptyBg.setVisibility(empty ? View.VISIBLE : View.GONE);
- emptyHint.setText("你还没有聊天记录哦!\n快去和好友聊天吧!");
+ emptyHint.setText(ResUtil.getString(R.string.im_recent_recentcontactsfragment_01));
}
@Override
@@ -284,7 +284,7 @@ public class RecentContactsFragment extends TFragment {
}
});
- alertDialog.addItem("删除该聊天（仅服务器）", new onSeparateItemClickListener() {
+ alertDialog.addItem(ResUtil.getString(R.string.im_recent_recentcontactsfragment_02), new onSeparateItemClickListener() {
@Override
public void onClick() {
NIMClient.getService(MsgService.class)
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java
index de5de00b2..db6dead72 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/RecentListFragment.java
@@ -1,28 +1,23 @@
package com.yizhuan.erban.ui.im.recent;
import android.annotation.SuppressLint;
-import android.content.Intent;
import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.OrientationHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ImageView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.google.gson.Gson;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.business.recent.RecentContactsCallback;
-import com.netease.nimlib.sdk.msg.attachment.AudioAttachment;
-import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.model.Team;
@@ -38,7 +33,6 @@ import com.yizhuan.erban.team.view.NimTeamMessageActivity;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.ui.im.recent.adapter.AttentionInRoomAdapter;
import com.yizhuan.erban.ui.relation.AttentionListActivity;
-import com.yizhuan.erban.ui.widget.RecallDialog;
import com.yizhuan.tutu.mentoring_relationship.adapter.GrabApprenticesAdapter;
import com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity;
import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity;
@@ -46,40 +40,24 @@ import com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity;
import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.auth.event.LogoutEvent;
-import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment;
import com.yizhuan.xchat_android_core.im.RefreshInRoomListEvent;
-import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgVoiceAttachment;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo;
import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo;
import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent;
import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel;
-import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment;
-import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.AttentionModel;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;
import com.yizhuan.xchat_android_core.user.bean.AttentionItem;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.utils.CommonUtils;
import com.yizhuan.xchat_android_library.utils.ListUtils;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -88,36 +66,9 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Objects;
import io.reactivex.Single;
import io.reactivex.functions.BiConsumer;
-import io.reactivex.functions.Consumer;
-
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_GAME;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUSH_NOTIFIFICATION;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY;
-import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY;
/**
* 最近聊天列表
@@ -255,7 +206,7 @@ public class RecentListFragment extends BaseFragment {
grabApprenticesInfoList.remove(item);
// 点击抢徒弟按钮，打点
StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_ROB,
- "抢徒弟");
+ ResUtil.getString(R.string.im_recent_recentlistfragment_01));
MentoringRelationshipModel.get()
.grabApprentices(item.getUid())
.compose(bindUntilEvent(FragmentEvent.DESTROY))
@@ -264,7 +215,7 @@ public class RecentListFragment extends BaseFragment {
NimP2PMessageActivity.start(getContext(), s);
// 抢徒弟成功，打点
StatisticManager.Instance().onEvent(StatisticsProtocol.NEWS_ROB_SUCCESS,
- "抢徒成功");
+ ResUtil.getString(R.string.im_recent_recentlistfragment_02));
} else {
toast(throwable.getMessage());
}
@@ -283,7 +234,7 @@ public class RecentListFragment extends BaseFragment {
SharedPreferenceUtils.put(share_pref_is_newbie_clicked, true);// 是否第一次点击发现萌新
ivRedPoint.setVisibility(View.GONE);
RoomNewbieActivity.start(getActivity(), false);
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MESSAGE_FINDNEW_CLICK, "消息页_发现萌新");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_ROOM_MESSAGE_FINDNEW_CLICK, ResUtil.getString(R.string.im_recent_recentlistfragment_03));
});
}
@@ -348,7 +299,7 @@ public class RecentListFragment extends BaseFragment {
Team t = NimUIKit.getTeamProvider().getTeamById(recent.getContactId());
if (t != null && t.isMyTeam()) {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_WORLD_PAGE_ENTER_GROUP_CHAT,
- "进入群聊:消息页");
+ ResUtil.getString(R.string.im_recent_recentlistfragment_04));
MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), true);
} else {
MiniWorldTeamMessageActivity.start(mContext, recent.getContactId(), false);
@@ -357,7 +308,7 @@ public class RecentListFragment extends BaseFragment {
}
} else {
- toast("该版本不支持，请下载最新版本");
+ toast(ResUtil.getString(R.string.im_recent_recentlistfragment_05));
}
}
});
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java
index 08f11f42a..7c19cbf37 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/adapter/AttentionInRoomAdapter.java
@@ -1,7 +1,5 @@
package com.yizhuan.erban.ui.im.recent.adapter;
-import android.graphics.Color;
-
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
index f39a94d47..ecc1b0794 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/CommonRecentViewHolder.java
@@ -1,5 +1,9 @@
package com.yizhuan.erban.ui.im.recent.holder;
+import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
+import static android.view.View.VISIBLE;
+
import android.annotation.SuppressLint;
import android.graphics.drawable.AnimationDrawable;
import android.os.Handler;
@@ -18,15 +22,9 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.vip.VipHelper;
import com.yizhuan.xchat_android_core.level.UserLevelVo;
-import com.yizhuan.xchat_android_core.noble.NobleInfo;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.SystemUidUtil;
-import static android.view.View.GONE;
-import static android.view.View.INVISIBLE;
-import static android.view.View.VISIBLE;
-
/**
* @author Administrator
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java
index af0071da2..9ecceab4d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/im/recent/holder/TeamRecentViewHolder.java
@@ -1,5 +1,8 @@
package com.yizhuan.erban.ui.im.recent.holder;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
import android.graphics.drawable.AnimationDrawable;
import android.os.Handler;
import android.text.TextUtils;
@@ -12,7 +15,6 @@ import com.netease.nim.uikit.business.recent.TeamMemberAitHelper;
import com.netease.nim.uikit.business.team.helper.TeamHelper;
import com.netease.nim.uikit.common.ui.draggablebubbles.BubbleMessageTouchListener;
import com.netease.nim.uikit.common.ui.draggablebubbles.MessageBubbleView;
-import com.netease.nim.uikit.common.ui.drop.DropFake;
import com.netease.nim.uikit.common.ui.drop.DropManager;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter;
import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder;
@@ -24,15 +26,11 @@ import com.netease.nimlib.sdk.msg.model.RecentContact;
import com.netease.nimlib.sdk.team.TeamService;
import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum;
import com.netease.nimlib.sdk.team.model.Team;
-import com.trello.rxlifecycle3.LifecycleProvider;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.im.recent.TeamExt;
import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment;
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
-
public class TeamRecentViewHolder extends RecentViewHolder {
private Team team;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java b/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java
index 7097ae839..f8b6d6087 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/IndicatorHelper.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.ui.indicator_impl;
import android.content.Context;
-import androidx.viewpager.widget.ViewPager;
import android.widget.LinearLayout;
+import androidx.viewpager.widget.ViewPager;
+
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java
index 06255fbea..7740f35c5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/indicator_impl/JustColorIndicatorAdapter.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.ui.indicator_impl;
import android.content.Context;
-import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.core.content.ContextCompat;
+
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java
index c9d8fb9de..17ddba1ea 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/list/BaseListAdapter.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.ui.list;
import android.content.Context;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.List;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java b/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java
index 3665476c3..5d44119fb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java
@@ -1,10 +1,12 @@
package com.yizhuan.erban.ui.login;
-import androidx.annotation.NonNull;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.StringUtils;
-import com.yizhuan.xchat_android_library.utils.net.MobileNumberUtils;
import java.util.regex.Pattern;
@@ -53,18 +55,18 @@ public class AccountValidator {
if (!TextUtils.isEmpty(text)) {
char c = text.charAt(0);
// if (!(c == '1')) {
-// errorMessage = "手机号码错误";
+// errorMessage = ResUtil.getString(R.string.ui_login_accountvalidator_01);
// return false;
// }
// if(!MobileNumberUtils.isChinaInternalNumber(text) && !MobileNumberUtils.isChinaMobileNumber(text) && !MobileNumberUtils.isChinaTelecomNumber(text) && !MobileNumberUtils.isChinaUnicomNumber(text)){
-// errorMessage = "请填写正确的手机号码";
+// errorMessage = ResUtil.getString(R.string.ui_login_accountvalidator_02);
// return false;
// }
// if (text.length() == 7) {
// return true;
// }
} else {
- errorMessage = "手机号不能为空！";
+ errorMessage = ResUtil.getString(R.string.ui_login_accountvalidator_03);
return false;
}
return true;
@@ -74,19 +76,19 @@ public class AccountValidator {
if (!TextUtils.isEmpty(text)) {
// char c = text.charAt(0);
// if (!(c == '1')) {
-// errorStr = "手机号码错误";
+// errorStr = ResUtil.getString(R.string.ui_login_accountvalidator_04);
// return false;
// }
if (text.length() != 11) {
- errorMessage = "账号长度为11个字符";
+ errorMessage = ResUtil.getString(R.string.ui_login_accountvalidator_05);
return false;
}
// if(!MobileNumberUtils.isChinaInternalNumber(text) && !MobileNumberUtils.isChinaMobileNumber(text) && !MobileNumberUtils.isChinaTelecomNumber(text) && !MobileNumberUtils.isChinaUnicomNumber(text)){
-// errorStr = "请填写正确的手机号码";
+// errorStr = ResUtil.getString(R.string.ui_login_accountvalidator_06);
// return false;
// }
} else {
- errorMessage = "账号不能为空！";
+ errorMessage = ResUtil.getString(R.string.ui_login_accountvalidator_07);
return false;
}
return true;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
index d92af4382..56a8e3c64 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/AddUserInfoActivity.java
@@ -1,9 +1,10 @@
package com.yizhuan.erban.ui.login;
import android.os.Bundle;
+import android.view.KeyEvent;
+
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
-import android.view.KeyEvent;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java
index 790821da5..cc5696f35 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/BindCodeActivity.java
@@ -5,41 +5,28 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.text.Spannable;
-import android.text.SpannableString;
import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView;
-import androidx.core.content.ContextCompat;
-
import com.coorchice.library.utils.LogUtils;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.login.ui.CodeEditText;
import com.yizhuan.xchat_android_core.auth.AuthModel;
-import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
-import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.code.CodeType;
-import com.yizhuan.xchat_android_core.statistic.StatisticManager;
-import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
import io.reactivex.SingleObserver;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@@ -171,7 +158,7 @@ public class BindCodeActivity extends BaseActivity {
@Override
public void onError(Throwable e) {
toast(e.getMessage());
- LogUtils.e("获取短信失败!");
+ LogUtils.e(ResUtil.getString(R.string.ui_login_bindcodeactivity_01));
}
});
}
@@ -191,11 +178,11 @@ public class BindCodeActivity extends BaseActivity {
}
private void bindPhone() {
- getDialogManager().showProgressDialog(BindCodeActivity.this, "正在绑定请稍后...");
+ getDialogManager().showProgressDialog(BindCodeActivity.this, ResUtil.getString(R.string.ui_login_bindcodeactivity_02));
AuthModel.get().bindPhone(mPhone, codeEt.getText().toString())
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.doOnSuccess(s -> {
- toast("绑定手机号成功");
+ toast(ResUtil.getString(R.string.ui_login_bindcodeactivity_03));
setResult(RESULT_OK);
})
.doOnError(throwable -> toast(throwable.getMessage()))
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java b/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java
index 466665a43..9a3fae092 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/BindSuccessDialog.java
@@ -1,14 +1,15 @@
package com.yizhuan.erban.ui.login;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java
index 7c5628eb0..df311ef3a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownDescTimer.java
@@ -1,10 +1,12 @@
package com.yizhuan.erban.ui.login;
import android.os.CountDownTimer;
-import android.text.Html;
import android.view.View;
import android.widget.TextView;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+
/**
* Created by zhouxiangfeng on 2017/5/2.
@@ -34,13 +36,13 @@ public class CodeDownDescTimer extends CountDownTimer {
mTvSecond.setVisibility(View.VISIBLE);
mTvSecond.setText(millisUntilFinished / 1000 + "s"); //设置倒计时时间
tvGetCode.setClickable(false); //设置不可点击
- tvGetCode.setText("后可重新获取验证码");
+ tvGetCode.setText(ResUtil.getString(R.string.ui_login_codedowndesctimer_01));
}
@Override
public void onFinish() {
mTvSecond.setVisibility(View.GONE);
- tvGetCode.setText("重新获取验证码");
+ tvGetCode.setText(ResUtil.getString(R.string.ui_login_codedowndesctimer_02));
tvGetCode.setClickable(true);//重新获得点击
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java
index 944d2f136..edd7f7fbb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/CodeDownTimer.java
@@ -8,6 +8,7 @@ import android.text.style.ForegroundColorSpan;
import android.widget.TextView;
import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
@@ -33,7 +34,7 @@ public class CodeDownTimer extends CountDownTimer {
@Override
public void onTick(long millisUntilFinished) {
mTextView.setClickable(false); //设置不可点击
- mTextView.setText(millisUntilFinished / 1000 + "秒后重试"); //设置倒计时时间
+ mTextView.setText(millisUntilFinished / 1000 + ResUtil.getString(R.string.ui_login_codedowntimer_01)); //设置倒计时时间
mTextView.setTextColor(mTextView.getResources().getColor(R.color.color_FF3852)); //设置按钮为灰色，这时是不能点击的
/**
@@ -60,7 +61,7 @@ public class CodeDownTimer extends CountDownTimer {
@Override
public void onFinish() {
- mTextView.setText("重新获取");
+ mTextView.setText(ResUtil.getString(R.string.ui_login_codedowntimer_02));
mTextView.setClickable(true);//重新获得点击
mTextView.setTextColor(mTextView.getResources().getColor(R.color.appColor)); //还原背景色
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java
index a743984e9..2a9363cfb 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.java
@@ -5,18 +5,13 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.text.Spannable;
-import android.text.SpannableString;
import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.EditText;
import android.widget.TextView;
-import androidx.core.content.ContextCompat;
-
import com.coorchice.library.utils.LogUtils;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
@@ -26,22 +21,15 @@ import com.yizhuan.erban.ui.login.helper.LogoutHelper;
import com.yizhuan.erban.ui.login.ui.CodeEditText;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.event.LoginEvent;
-import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException;
-import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
-import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
import io.reactivex.SingleObserver;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
@@ -173,14 +161,14 @@ public class LoginCodeActivity extends BaseActivity {
public void onError(Throwable e) {
toast(e.getMessage());
// finish();
- LogUtils.e("获取短信失败!");
+ LogUtils.e(ResUtil.getString(R.string.ui_login_logincodeactivity_01));
}
});
}
private void login() {
String smsCode = codeEt.getText().toString();
- getDialogManager().showProgressDialog(this, "正在登录...");
+ getDialogManager().showProgressDialog(this, ResUtil.getString(R.string.ui_login_logincodeactivity_02));
AuthModel.get().login(
mPhone,
"",
@@ -209,7 +197,7 @@ public class LoginCodeActivity extends BaseActivity {
});
StatisticManager.Instance().onEvent(this,
- StatisticsProtocol.EVENT_LOGIN_PHONE_CLICK, "点击手机号登录", null);
+ StatisticsProtocol.EVENT_LOGIN_PHONE_CLICK, ResUtil.getString(R.string.ui_login_logincodeactivity_03), null);
}
public void dealWithLoginError(Throwable e) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java
index eb7622b94..92bd8e6da 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/ModifyInfoActivity.java
@@ -2,12 +2,6 @@ package com.yizhuan.erban.ui.login;
import android.content.Intent;
import android.os.Bundle;
-
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
-
-import com.google.android.material.snackbar.Snackbar;
-
import android.text.Editable;
import android.text.InputFilter;
import android.text.TextWatcher;
@@ -16,12 +10,17 @@ import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.content.ContextCompat;
+
+import com.google.android.material.snackbar.Snackbar;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* Created by zhouxiangfeng on 2017/5/13.
@@ -98,14 +97,14 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
etEditText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(60)});
etEditText.addTextChangedListener(textWatcher);
rlNickGroup.setVisibility(View.GONE);
- initWhiteTitleBar("修改个人介绍");
+ initWhiteTitleBar(ResUtil.getString(R.string.ui_login_modifyinfoactivity_01));
} else if (modifyType == NICK_MODIFY) {
rlNickGroup.setVisibility(View.VISIBLE);
rlContentGroup.setVisibility(View.GONE);
etEditTextNick.setFilters(new InputFilter[]{new InputFilter.LengthFilter(15)});
etEditTextNick.addTextChangedListener(textWatcher);
- initWhiteTitleBar("修改昵称");
+ initWhiteTitleBar(ResUtil.getString(R.string.ui_login_modifyinfoactivity_02));
} else {
initTitleBar("");
}
@@ -131,7 +130,7 @@ public class ModifyInfoActivity extends BaseActivity implements View.OnClickList
setResult(RESULT_OK, intent);
finish();
} else {
- Snackbar.make(layout_coordinator, "所填内容为空！", Snackbar.LENGTH_SHORT).show();
+ Snackbar.make(layout_coordinator, ResUtil.getString(R.string.ui_login_modifyinfoactivity_03), Snackbar.LENGTH_SHORT).show();
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java b/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java
index d1cda034c..48500c517 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/PasswordValidator.java
@@ -4,6 +4,9 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
+import com.yizhuan.erban.R;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
+
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -25,11 +28,11 @@ public class PasswordValidator {
if (16 >= text.length() && text.length() >= 6) {
return true;
} else {
- errorMessage = "密码长度6-16个字符";
+ errorMessage = ResUtil.getString(R.string.ui_login_passwordvalidator_01);
return false;
}
} else {
- errorMessage = "密码不能为空！";
+ errorMessage = ResUtil.getString(R.string.ui_login_passwordvalidator_02);
}
return false;
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java
index e28895a08..0479d8ef5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java
@@ -12,6 +12,7 @@ import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.setting.VerifyPhoneActivity;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
public class ShowBindPhoneActivity extends BaseActivity {
@@ -24,7 +25,7 @@ public class ShowBindPhoneActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_show_bind_phone);
- initWhiteTitleBar("绑定手机");
+ initWhiteTitleBar(ResUtil.getString(R.string.ui_login_showbindphoneactivity_01));
TextView tv_phone = findViewById(R.id.tv_phone);
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null && !TextUtils.isEmpty(userInfo.getPhone())) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
index ffb666f60..6612e459d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
@@ -23,12 +23,12 @@ import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.initial.bean.InitInfo;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
-import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.HashMap;
import java.util.Map;
@@ -122,20 +122,20 @@ public class AddUserInfoFragment extends BaseFragment
switch (v.getId()) {
case R.id.ok_btn:
if (TextUtils.isEmpty(tvNick.getText().toString().trim())) {
- toast("昵称不能为空！");
+ toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_01));
return;
}
if (gender == -1) {
- toast("必须要选性别哦");
+ toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_02));
return;
}
InitInfo initInfo = InitialModel.get().getCacheInitInfo();
if (initInfo != null && initInfo.isCheckInviteCode() && TextUtils.isEmpty(tvCode.getText())) {
- String message = "当前未填写邀请码哦～\n确认继续下一步吗？";
+ String message = ResUtil.getString(R.string.login_fragment_adduserinfofragment_03);
getDialogManager().showOkCancelDialog(
message,
- "确认",
- "取消",
+ ResUtil.getString(R.string.login_fragment_adduserinfofragment_04),
+ ResUtil.getString(R.string.login_fragment_adduserinfofragment_05),
new DialogManager.OkCancelDialogListener() {
@Override
public void onCancel() {
@@ -153,7 +153,7 @@ public class AddUserInfoFragment extends BaseFragment
break;
case R.id.tv_random_nick:
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_INFORMATION_RANDOM_NAME,
- "随机昵称");
+ ResUtil.getString(R.string.login_fragment_adduserinfofragment_06));
setRandomNick();
break;
@@ -192,11 +192,11 @@ public class AddUserInfoFragment extends BaseFragment
if (gender == UserInfo.GENDER_MALE || gender == UserInfo.GENDER_FEMALE) {
userInfo.setGender(gender);
} else {
- toast("必须要选性别哦");
+ toast(ResUtil.getString(R.string.login_fragment_adduserinfofragment_07));
return;
}
- getDialogManager().showProgressDialog(getContext(), "请稍后...");
+ getDialogManager().showProgressDialog(getContext(), ResUtil.getString(R.string.login_fragment_adduserinfofragment_08));
LinkedInfo linkedInfo = LinkedModel.get().getLinkedInfo();
String channel = "";
@@ -219,7 +219,7 @@ public class AddUserInfoFragment extends BaseFragment
@Override
public void onSuccess(UserInfo userInfo) {
getDialogManager().dismissDialog();
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_COMPLETE, "注册完成(提交个人资料)");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_COMPLETE, ResUtil.getString(R.string.login_fragment_adduserinfofragment_09));
AuthModel.get().setThirdUserInfo(null);
getActivity().finish();
}
@@ -237,7 +237,7 @@ public class AddUserInfoFragment extends BaseFragment
attributes.put("shareUid", uid);
attributes.put("roomUid", roomUid);
StatisticManager.Instance().onEvent(getContext(),
- StatisticsProtocol.EVENT_LOGIN_REPARI_SUCCESS_CLICK, "补全", attributes);
+ StatisticsProtocol.EVENT_LOGIN_REPARI_SUCCESS_CLICK, ResUtil.getString(R.string.login_fragment_adduserinfofragment_010), attributes);
}
@Override
diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java
index 04a0ad890..fa3f3c808 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/helper/LogoutHelper.java
@@ -9,7 +9,6 @@ import androidx.core.content.ContextCompat;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
-import com.yizhuan.erban.ui.login.LoginActivity;
import com.yizhuan.xchat_android_core.PreferencesUtils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException;
@@ -17,6 +16,7 @@ import com.yizhuan.xchat_android_core.auth.exception.BanAccountException;
import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.io.IOException;
import java.text.SimpleDateFormat;
@@ -36,7 +36,7 @@ public class LogoutHelper {
public static void dealWithLoginError(BaseActivity activity,Throwable e){
if (!(e instanceof IsSuperAdminException)) {
String msg = e.getMessage();
- StringBuilder eventLabel = new StringBuilder("登录注册页-登录失败");
+ StringBuilder eventLabel = new StringBuilder(ResUtil.getString(R.string.login_helper_logouthelper_01));
if (!TextUtils.isEmpty(msg)) {
eventLabel.append(msg);
}
@@ -45,29 +45,29 @@ public class LogoutHelper {
}
if (e instanceof BanAccountException) {
BanAccountException exception = (BanAccountException) e;
- String text = "您的账号因" + exception.getMessage() + "被封禁\n解封时间：";
+ String text = ResUtil.getString(R.string.login_helper_logouthelper_02) + exception.getMessage() + ResUtil.getString(R.string.login_helper_logouthelper_03);
int start = text.length();
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日", Locale.getDefault());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.login_helper_logouthelper_04), Locale.getDefault());
text += simpleDateFormat.format(new Date(exception.getDate()));
SpannableString spannableString = new SpannableString(text);
spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(activity, R.color.appColor)),
start, text.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- activity.getDialogManager().showOkCancelWithTitleDialog("您被封号了",
- spannableString, "确定", "取消", null);
+ activity.getDialogManager().showOkCancelWithTitleDialog(ResUtil.getString(R.string.login_helper_logouthelper_05),
+ spannableString, ResUtil.getString(R.string.login_helper_logouthelper_06), ResUtil.getString(R.string.login_helper_logouthelper_07), null);
} else if (e instanceof AccountCancelException) {
AccountCancelException exception = (AccountCancelException) e;
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy年MM月dd日", Locale.getDefault());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.login_helper_logouthelper_08), Locale.getDefault());
- String text = "注销时间：" + simpleDateFormat.format(new Date(exception.getCancelDate()));
+ String text = ResUtil.getString(R.string.login_helper_logouthelper_09) + simpleDateFormat.format(new Date(exception.getCancelDate()));
int end = text.length();
- text += "\n\n请联系客服（微信：pekokefu01）处理哦～";
+ text += ResUtil.getString(R.string.login_helper_logouthelper_010);
SpannableString spannableString = new SpannableString(text);
spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(activity, R.color.appColor)),
0, end, Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
- activity.getDialogManager().showOkWithTitleDialog("该账号已注销",
- spannableString, "我知道了", true, null);
+ activity.getDialogManager().showOkWithTitleDialog(ResUtil.getString(R.string.login_helper_logouthelper_011),
+ spannableString, ResUtil.getString(R.string.login_helper_logouthelper_012), true, null);
} else if (e instanceof IOException) {
- activity.toast("网络异常,请检查您的网络再试~");
+ activity.toast(ResUtil.getString(R.string.login_helper_logouthelper_013));
} else {
activity.toast(e.getMessage());
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java
index 191999a19..1fb08a579 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchModeActivity.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.ui.patriarch;
import android.content.Context;
import android.content.Intent;
import android.graphics.Paint;
-import android.os.Bundle;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
@@ -14,6 +13,7 @@ import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
@ActLayoutRes(R.layout.activity_patriarch_mode)
public class PatriarchModeActivity extends BaseBindingActivity {
@@ -25,7 +25,7 @@ public static void start(Context context) {
@Override
protected void init() {
- initWhiteTitleBar("青少年模式");
+ initWhiteTitleBar(ResUtil.getString(R.string.ui_patriarch_patriarchmodeactivity_01));
mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/peko/activity/cleanNet/index.html"));
mBinding.tvOpen.setOnClickListener(v -> start(PatriarchPwdActivity.class));
@@ -38,9 +38,9 @@ public static void start(Context context) {
super.onResume();
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null && userInfo.isParentMode()) {
- mBinding.tvOpen.setText("关闭青少年模式");
+ mBinding.tvOpen.setText(ResUtil.getString(R.string.ui_patriarch_patriarchmodeactivity_02));
} else {
- mBinding.tvOpen.setText("开启青少年模式");
+ mBinding.tvOpen.setText(ResUtil.getString(R.string.ui_patriarch_patriarchmodeactivity_03));
}
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
index 08964183e..6f524f897 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
@@ -15,6 +15,7 @@ import com.yizhuan.erban.databinding.ActivityPatriarchPwdBinding;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
@ActLayoutRes(R.layout.activity_patriarch_pwd)
@@ -26,7 +27,7 @@ public class PatriarchPwdActivity extends BaseBindingActivity {
- if ("下一步".equals(mBinding.tvCommit.getText().toString())) {
+ if (ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_02).equals(mBinding.tvCommit.getText().toString())) {
firstPwd = mBinding.etPwd.getText().toString();
mBinding.etPwd.setText("");
- mBinding.text.setText("再次输入密码");
- mBinding.tvTip.setText("我们将不提供找回密码服务 请您牢记已设置的密码");
- mBinding.tvCommit.setText("完成");
+ mBinding.text.setText(ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_03));
+ mBinding.tvTip.setText(ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_04));
+ mBinding.tvCommit.setText(ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_05));
} else if (firstPwd != null && !firstPwd.equals(mBinding.etPwd.getText().toString())) {
- toast("两次密码不一致");
+ toast(ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_06));
} else {
commit();
}
@@ -86,7 +87,7 @@ public class PatriarchPwdActivity extends BaseBindingActivity {
- toast(UserModel.get().getCacheLoginUserInfo().isParentMode() ? "青少年模式已关闭" : "青少年模式已开启");
+ toast(UserModel.get().getCacheLoginUserInfo().isParentMode() ? ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_07) : ResUtil.getString(R.string.ui_patriarch_patriarchpwdactivity_08));
UserModel.get().getCacheLoginUserInfo().setParentMode(!UserModel.get().getCacheLoginUserInfo().isParentMode());
UserModel.get().getCacheLoginUserInfo().setHasSetParentPwd(true);
finish();
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java
index 1c467add8..927352123 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/LimitEnterRoomHelper.java
@@ -4,9 +4,11 @@ import android.app.Dialog;
import android.content.Context;
import android.text.TextUtils;
+import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
/**
* 进房限制的一些处理，因为main和avroom 基本一样，所以写一起减少冗余
@@ -43,7 +45,7 @@ public class LimitEnterRoomHelper {
pmLimitTimeDialog = DialogManager.createDialog(thisContext);
pmLimitTimeDialog.show();
DialogManager.setDialog(
- pmLimitTimeDialog, "提示", tips, "确定", null, false, false, true,
+ pmLimitTimeDialog, ResUtil.getString(R.string.patriarch_help_limitenterroomhelper_01), tips, ResUtil.getString(R.string.patriarch_help_limitenterroomhelper_02), null, false, false, true,
() -> {
if (handle != null) {
handle.clickHandle();
diff --git a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java b/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java
index fc1f79860..72f7362f3 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/patriarch/help/PmDialogShowMrg.java
@@ -5,7 +5,6 @@ import android.text.TextUtils;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-import com.yizhuan.erban.ui.patriarch.PatriarchModeDialog;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.user.UserModel;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/Security.java b/app/src/main/java/com/yizhuan/erban/ui/pay/Security.java
index 2972bf8a8..f09b57fc7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/pay/Security.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/pay/Security.java
@@ -3,7 +3,6 @@ package com.yizhuan.erban.ui.pay;
import android.text.TextUtils;
import android.util.Base64;
-
import java.io.IOException;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java b/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java
index ee98a2b80..67d1672c7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/praise/HiPraise.java
@@ -2,7 +2,6 @@ package com.yizhuan.erban.ui.praise;
import android.graphics.Bitmap;
-
import com.yizhuan.erban.ui.praise.base.IDrawable;
import com.yizhuan.erban.ui.praise.base.IPraise;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java b/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java
index ed147e327..b2c6ef681 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseDrawable.java
@@ -7,11 +7,11 @@ import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.Paint;
import android.graphics.PointF;
-import androidx.annotation.NonNull;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.LinearInterpolator;
+import androidx.annotation.NonNull;
import com.yizhuan.erban.ui.praise.base.IDrawable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java b/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java
index 8c2660b9a..c443b7680 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/praise/PraiseWithCallbackDrawable.java
@@ -1,6 +1,7 @@
package com.yizhuan.erban.ui.praise;
import android.graphics.Bitmap;
+
import androidx.annotation.NonNull;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java b/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java
index 4765cbcaf..9a694e3f2 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/praise/SimpleDrawTask.java
@@ -10,7 +10,6 @@ import android.os.Handler;
import android.os.HandlerThread;
import android.os.SystemClock;
-
import com.yizhuan.erban.ui.praise.base.IDrawTask;
import com.yizhuan.erban.ui.praise.base.IDrawable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java b/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java
index bdf444a64..514cee61b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java
@@ -1,10 +1,11 @@
package com.yizhuan.erban.ui.radish;
import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.core.content.ContextCompat;
import android.text.TextUtils;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
import com.yizhuan.erban.bills.adapter.BillBaseAdapter;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java b/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java
index 557f1611e..e73568d24 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/AttentionListActivity.java
@@ -1,19 +1,22 @@
package com.yizhuan.erban.ui.relation;
+import static com.yizhuan.erban.R.id.swipe_refresh;
+
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import android.view.View;
+
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
+import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.ui.relation.adapter.AttentionListAdapter;
import com.yizhuan.erban.ui.user.UserInfoActivity;
@@ -21,9 +24,8 @@ import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.praise.event.PraiseEvent;
import com.yizhuan.xchat_android_core.user.AttentionModel;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_core.user.bean.AttentionInfo;
-
+import com.yizhuan.xchat_android_library.utils.ListUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -35,8 +37,6 @@ import java.util.List;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
-import static com.yizhuan.erban.R.id.swipe_refresh;
-
/**
* 关注列表
*/
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java
index bdac39f96..a182af9b5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/FansListFragment.java
@@ -1,5 +1,7 @@
package com.yizhuan.erban.ui.relation;
+import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG;
+
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
@@ -41,8 +43,6 @@ import java.util.List;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
-import static com.yizhuan.erban.friend.action.AbstractSelectFriendAction.ROOM_MSG;
-
/**
* 粉丝列表
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java
index 60d781754..691560971 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java
@@ -1,10 +1,10 @@
package com.yizhuan.erban.ui.relation.adapter;
-import androidx.appcompat.widget.AppCompatImageView;
-
import android.text.TextUtils;
import android.view.View;
+import androidx.appcompat.widget.AppCompatImageView;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
index 0f18a314f..59fc038bf 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java
@@ -1,11 +1,11 @@
package com.yizhuan.erban.ui.relation.adapter;
-import android.graphics.drawable.GradientDrawable;
-import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.widget.AppCompatImageView;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
@@ -17,6 +17,7 @@ import com.yizhuan.xchat_android_core.im.friend.IMFriendModel;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.FansInfo;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -81,10 +82,10 @@ public class FansViewAdapter extends BaseQuickAdapter
TextView tvAttention = baseViewHolder.getView(R.id.attention_img);
baseViewHolder.setVisible(R.id.attention_img, type == AbstractSelectFriendAction.TYPE_NORMAL);
if (IMFriendModel.get().isMyFriend(String.valueOf(fansInfo.getUid()))) {
- tvAttention.setText("互相关注");
+ tvAttention.setText(ResUtil.getString(R.string.relation_adapter_fansviewadapter_01));
tvAttention.setBackgroundResource(R.drawable.bg_common_disable);
} else {
- tvAttention.setText("+关注");
+ tvAttention.setText(ResUtil.getString(R.string.relation_adapter_fansviewadapter_02));
tvAttention.setBackgroundResource(R.drawable.bg_common_confirm);
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
index a400fe696..9ac21ac51 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/search/SearchActivity.java
@@ -33,15 +33,12 @@ import com.yizhuan.erban.decoration.helper.DecorationSaleType;
import com.yizhuan.erban.friend.action.AbstractSelectFriendAction;
import com.yizhuan.erban.friend.view.SelectFriendActivity;
import com.yizhuan.erban.home.adapter.ContactsIndicatorAdapter;
-import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter;
-import com.yizhuan.erban.ui.search.event.SearchEvent;
import com.yizhuan.erban.ui.search.presenter.SearchPresenter;
import com.yizhuan.erban.ui.search.view.ISearchView;
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
-import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
@@ -59,6 +56,7 @@ import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.utils.ImeUtil;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
+import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
@@ -313,7 +311,7 @@ public class SearchActivity extends BaseMvpActivity list = adapter.getData();
if (position >= 0 && position < list.size()) {
@@ -351,7 +349,7 @@ public class SearchActivity extends BaseMvpActivity list = adapter.getData();
if (position >= 0 && position < list.size()) {
@@ -362,7 +360,7 @@ public class SearchActivity extends BaseMvpActivity {
+ getDialogManager().showOkCancelDialog(ResUtil.getString(R.string.ui_search_searchactivity_011) + nick + "？", () -> {
//发出自定义消息
IMMessage message = WorldDynamicAttachment.createShareMsg(dynamicImMsg, targetId);
IMNetEaseManager.get().sendMessage(message)
@@ -573,7 +571,7 @@ public class SearchActivity extends BaseMvpActivity {
- StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_INTO_RESULT_ROOM_CLICK, "搜索_进入结果房间");
+ StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_SEARCH_INTO_RESULT_ROOM_CLICK, ResUtil.getString(R.string.ui_search_searchadapter_01));
AVRoomActivity.start(mContext, item.getUid());
});
}
@@ -67,7 +66,7 @@ public class SearchAdapter extends BaseQuickAdapter implements ISearchView {
@@ -153,12 +133,12 @@ public class SearchDetailFragment extends BaseMvpFragment