yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_改版主分支' into dev_改版主分支

Browse Source
This commit is contained in:
hch
2024-03-22 10:14:07 +08:00
parent e9a3e8aa2f 61dcf0916d
commit 5ebb97cd3c
13 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/com/yunbao/common/bean/MessageSayHiStartBean.java
View File

@@ -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 +
'}';
}
}

5
common/src/main/java/com/yunbao/common/dialog/MessageSayHiNotifyDialog.java
View File

@@ -97,11 +97,12 @@ 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()
,WordUtil.isNewZh()?"歲":"Age"
,WordUtil.isNewZh()?"歲":"years old"
)
);
showTag();

4
common/src/main/java/com/yunbao/common/utils/MessageSayHiNotifyManager.java
View File

@@ -47,6 +47,10 @@ public class MessageSayHiNotifyManager {
.getMessageSayHiStartTimer(new HttpCallback<MessageSayHiStartBean>() {
@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();

5
common/src/main/res/values-en-rUS/string.xml
View File

@@ -25,7 +25,7 @@
<string name="refresh_footer_nothing">No more data</string>
<string name="black">Pull black</string>
<string name="black_ing">Relieving blackout</string>
<string name="chat_remarks">Remarks</string>
<string name="chat_remarks">Modify remarks</string>
<string name="chat_report">Report</string>
<string name="bonus_sign">Sign in immediately</string>
<string name="bonus_sign_1">Continuously signed in</string>
@@ -781,7 +781,8 @@
<string name="black_add">Add to blacklist</string>
<string name="black_error">Failed to join blacklist</string>
<string name="black_succer_more">Blacklist removed successfully</string>
<string name="black_succer_more">Succeeded in removing the blacklist</string>
<string name="black_more">Remove blacklist</string>
<string name="black_error_more">Failed to remove blacklist</string>
<string name="reply">Reply</string>

1
common/src/main/res/values-zh-rHK/strings.xml
View File

@@ -823,6 +823,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名单失败</string>
<string name="black_succer_more">移除黑名单成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名单失败</string>
<string name="reply">回復</string>

1
common/src/main/res/values-zh-rTW/strings.xml
View File

@@ -823,6 +823,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名单失败</string>
<string name="black_succer_more">移除黑名单成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名单失败</string>
<string name="reply">回復</string>

1
common/src/main/res/values-zh/strings.xml
View File

@@ -822,6 +822,7 @@
<string name="black_add">加入黑名單</string>
<string name="black_error">加入黑名單失敗</string>
<string name="black_succer_more">移除黑名單成功</string>
<string name="black_more">移除黑名單</string>
<string name="black_error_more">移除黑名單失敗</string>
<string name="reply">回復</string>

5
common/src/main/res/values/strings.xml
View File

@@ -25,7 +25,7 @@
<string name="refresh_footer_nothing">No more data</string>
<string name="black">Pull black</string>
<string name="black_ing">Relieving blackout</string>
<string name="chat_remarks">Remarks</string>
<string name="chat_remarks">Modify remarks</string>
<string name="chat_report">Report</string>
<string name="bonus_sign">Sign in immediately</string>
<string name="bonus_sign_1">Continuously signed in</string>
@@ -780,7 +780,8 @@
<string name="black_succer">Successfully joined the blacklist</string>
<string name="black_error">Failed to join blacklist</string>
<string name="black_succer_more">Blacklist removed successfully</string>
<string name="black_succer_more">Succeeded in removing the blacklist</string>
<string name="black_more">Remove blacklist</string>
<string name="black_error_more">Failed to remove blacklist</string>
<string name="reply">Reply</string>