From 04980cbb2f07beb4eaa9d703e0802bfd93103d3e Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 22 Mar 2024 09:46:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E8=A3=9C=E5=85=85=E7=BF=BB?= =?UTF-8?q?=E8=AD=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/dialog/MessageSayHiNotifyDialog.java | 2 +- common/src/main/res/values-en-rUS/string.xml | 5 +++-- common/src/main/res/values-zh-rHK/strings.xml | 1 + common/src/main/res/values-zh-rTW/strings.xml | 1 + common/src/main/res/values-zh/strings.xml | 1 + common/src/main/res/values/strings.xml | 5 +++-- .../java/com/yunbao/live/dialog/MenuPopuwWindow.java | 6 +++--- live/src/main/res/layout/popwindow_chat_more_v2.xml | 12 ++++++------ .../main/activity/PDLiveConversationActivity.java | 2 +- .../com/yunbao/main/activity/UserHomeActivity.java | 2 +- main/src/main/res/values/strings.xml | 12 ++++++------ 11 files changed, 27 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java index 51bf1139e..2594cbab2 100644 --- a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java @@ -101,7 +101,7 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow { ViewUtils.findViewById(findViewById(R.id.age), R.id.tag, TextView.class).setText(String.format("%s%s%s", WordUtil.getNewString(R.string.dialog_message_say_hi_age) , userInfoBean.getInfo().getAge() - ,WordUtil.isNewZh()?"歲":"Age" + ,WordUtil.isNewZh()?"歲":"years old" ) ); showTag(); diff --git a/common/src/main/res/values-en-rUS/string.xml b/common/src/main/res/values-en-rUS/string.xml index 84f93b757..6e17f9d91 100644 --- a/common/src/main/res/values-en-rUS/string.xml +++ b/common/src/main/res/values-en-rUS/string.xml @@ -25,7 +25,7 @@ No more data Pull black Relieving blackout - Remarks + Modify remarks Report Sign in immediately Continuously signed in @@ -781,7 +781,8 @@ Add to blacklist Failed to join blacklist - Blacklist removed successfully + Succeeded in removing the blacklist + Remove blacklist Failed to remove blacklist Reply diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index 09c3d9a13..6dd43de36 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -823,6 +823,7 @@ 加入黑名單 加入黑名单失败 移除黑名单成功 + 移除黑名單 移除黑名单失败 回復 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index 10a2ef80f..1e64c4f01 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -823,6 +823,7 @@ 加入黑名單 加入黑名单失败 移除黑名单成功 + 移除黑名單 移除黑名单失败 回復 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 1771677a9..19d80e38f 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -822,6 +822,7 @@ 加入黑名單 加入黑名單失敗 移除黑名單成功 + 移除黑名單 移除黑名單失敗 回復 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index e54aae184..d70f4813f 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ No more data Pull black Relieving blackout - Remarks + Modify remarks Report Sign in immediately Continuously signed in @@ -780,7 +780,8 @@ Successfully joined the blacklist Failed to join blacklist - Blacklist removed successfully + Succeeded in removing the blacklist + Remove blacklist Failed to remove blacklist Reply diff --git a/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java b/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java index fc6c67943..23aa3a6a1 100644 --- a/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java +++ b/live/src/main/java/com/yunbao/live/dialog/MenuPopuwWindow.java @@ -53,10 +53,10 @@ public class MenuPopuwWindow implements View.OnClickListener { public void onSuccess(RongIMClient.BlacklistStatus blacklistStatus) { if (blacklistStatus == RongIMClient.BlacklistStatus.IN_BLACK_LIST) { tvBlack.setTag("1"); - tvBlack.setText(R.string.black_ing); + tvBlack.setText(R.string.black_more); } else { tvBlack.setTag(null); - tvBlack.setText(R.string.black); + tvBlack.setText(R.string.black_add); } } @@ -89,7 +89,7 @@ public class MenuPopuwWindow implements View.OnClickListener { * @return */ public void show(View view) { - popupWindow = new PopupWindow(popupView, DpUtil.dp2px(97), ViewGroup.LayoutParams.WRAP_CONTENT, true); + popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, true); popupWindow.showAsDropDown(view); WindowManager.LayoutParams lp = mContext.getWindow().getAttributes(); lp.alpha = 0.8f; diff --git a/live/src/main/res/layout/popwindow_chat_more_v2.xml b/live/src/main/res/layout/popwindow_chat_more_v2.xml index 7c630f379..675de57a0 100644 --- a/live/src/main/res/layout/popwindow_chat_more_v2.xml +++ b/live/src/main/res/layout/popwindow_chat_more_v2.xml @@ -1,14 +1,14 @@ diff --git a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java index e4c53a3f2..e06c9c026 100644 --- a/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/PDLiveConversationActivity.java @@ -325,7 +325,7 @@ public class PDLiveConversationActivity extends AbsActivity implements View.OnCl private void showTag() { List tags = new ArrayList<>(); - tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"Age")); + tags.add(userInfoBean.getInfo().getAge()+(WordUtil.isNewZh()?"歲":"years old")); if (!StringUtil.isEmpty(userInfoBean.getInfo().getCareer())) { tags.add(userInfoBean.getInfo().getCareer()); } diff --git a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java index af4a6a0a8..870e8970e 100644 --- a/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java +++ b/main/src/main/java/com/yunbao/main/activity/UserHomeActivity.java @@ -259,7 +259,7 @@ public class UserHomeActivity extends AbsActivity { }); tagList = new ArrayList<>(); if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getAge())) { - tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "Age")); + tagList.add(userInfo.getUserHomeTopInfo().getAge() + (WordUtil.isNewZh() ? "歲" : "years old")); } if (!StringUtil.isEmpty(userInfo.getUserHomeTopInfo().getHeight())) { tagList.add(userInfo.getUserHomeTopInfo().getHeight()); diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index 2e784fa38..b26ef7e9f 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -37,7 +37,7 @@ Fan Return Mutual - Present a gift to accompany him/her~ + Accompany them with gifts~ Message Settings Order Settings Online @@ -53,17 +53,17 @@ 可以是自我介紹，交友意向，唱歌等，最多5秒 例如： 1.我願變成童話裡，你愛的那個天使 \n2.我還是很喜歡你，像風走了八千裡，不問歸期 \n3.我想吃碗面。什麼面？你的心裡面 - 長按錄製 - 點擊播放 - 重錄 - 保存 + Record + Play + Rerecord + Save 至少传一张图片 至少传一条文字消息 至少传一条语音消息 Personal information Nickname Sex - *Only one chance to choose gender, choose wisely. + *Only one chance to choose gender. Boys Girl Replace From 7167ad8e977b3a4978a226e9c988f4f6cfc3f327 Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 22 Mar 2024 09:53:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E8=A3=9C=E5=85=85=E7=BF=BB?= =?UTF-8?q?=E8=AD=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yunbao/common/dialog/MessageSayHiNotifyDialog.java | 3 ++- main/src/main/res/values/strings.xml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java index 2594cbab2..3967d1273 100644 --- a/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java +++ b/common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java @@ -97,7 +97,8 @@ public class MessageSayHiNotifyDialog extends AbsDialogCenterPopupWindow { anchorName = findViewById(R.id.anchorName); ImgLoader.display(mContext, userInfoBean.getUser().getAvatar(), avatar); anchorName.setText(userInfoBean.getUser().getUserNicename()); - ((TextView) findViewById(R.id.description)).setText(userInfoBean.getUser().getSignature()); + // ((TextView) findViewById(R.id.description)).setText(userInfoBean.getUser().getSignature()); + ((TextView) findViewById(R.id.description)).setText(WordUtil.isNewZh()?"他就在你附近，來看看～":"He is near you, come and see~"); ViewUtils.findViewById(findViewById(R.id.age), R.id.tag, TextView.class).setText(String.format("%s%s%s", WordUtil.getNewString(R.string.dialog_message_say_hi_age) , userInfoBean.getInfo().getAge() diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml index b26ef7e9f..177d88dd0 100644 --- a/main/src/main/res/values/strings.xml +++ b/main/src/main/res/values/strings.xml @@ -18,9 +18,9 @@ Unlocked Not yet reached level Successfully claimed - 置頂 - 取消置頂 - 刪除 + TOP + UnTOP + Delete Information Activities Chats From 61dcf0916d8f22ba68e6f737c35e198a9303955f Mon Sep 17 00:00:00 2001 From: zlzw <583819556@qq.com> Date: Fri, 22 Mar 2024 10:12:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E8=A1=A5=E5=85=85=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bean/MessageSayHiStartBean.java | 18 +++++++++++++++++- .../utils/MessageSayHiNotifyManager.java | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/yunbao/common/bean/MessageSayHiStartBean.java b/common/src/main/java/com/yunbao/common/bean/MessageSayHiStartBean.java index 37d571ac5..1aa44b4d7 100644 --- a/common/src/main/java/com/yunbao/common/bean/MessageSayHiStartBean.java +++ b/common/src/main/java/com/yunbao/common/bean/MessageSayHiStartBean.java @@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName; public class MessageSayHiStartBean extends BaseModel{ @SerializedName("time") private int nextTime; - + private int status; public int getNextTime() { return nextTime; } @@ -13,4 +13,20 @@ public class MessageSayHiStartBean extends BaseModel{ public void setNextTime(int nextTime) { this.nextTime = nextTime; } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + @Override + public String toString() { + return "MessageSayHiStartBean{" + + "nextTime=" + nextTime + + ", status=" + status + + '}'; + } } diff --git a/common/src/main/java/com/yunbao/common/utils/MessageSayHiNotifyManager.java b/common/src/main/java/com/yunbao/common/utils/MessageSayHiNotifyManager.java index 918e5daa2..b728a5b2b 100644 --- a/common/src/main/java/com/yunbao/common/utils/MessageSayHiNotifyManager.java +++ b/common/src/main/java/com/yunbao/common/utils/MessageSayHiNotifyManager.java @@ -47,6 +47,10 @@ public class MessageSayHiNotifyManager { .getMessageSayHiStartTimer(new HttpCallback() { @Override public void onSuccess(MessageSayHiStartBean data) { + if(data.getStatus()==0){ + Log.i(TAG, "onSuccess: 初始化定时器，定时器关:" + data.toString()); + return; + } timer = new Timer(); timer.schedule(createTask(), data.getNextTime() * 1000L); hiBean = new MessageSayHiBean();