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

完善个人资料，我的页面修改，红点提示逻辑

Browse Source
This commit is contained in:
18401019693
2023-05-10 13:09:46 +08:00
parent f99bef4ac8
commit 229c8e72cf
14 changed files with 170 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/yunbao/common/bean/UserBean.java
View File

@@ -50,7 +50,7 @@ public class UserBean implements Parcelable {
private String fans_pic;
private String gifticon;
private String department_name;
private String token_rong="";
private String token_rong = "";
private String noble_end_time;
private String slide;
private String users_type;
@@ -66,6 +66,17 @@ public class UserBean implements Parcelable {
private boolean randomPk;
//随机天梯排位赛PK img，仅在主播PK时使用
private String mRankPkImgUrl;
//是否填写完整资料
private String user_info_complete;
public String getUserInfoComplete() {
return user_info_complete;
}
public UserBean seUserInfoComplete(String userInfoComplete) {
this.user_info_complete = userInfoComplete;
return this;
}
public boolean isRandomPk() {
return randomPk;
@@ -117,8 +128,8 @@ public class UserBean implements Parcelable {
}
public String getIs_bind() {
if(StringUtil.isEmpty(is_bind)){
is_bind="0";
if (StringUtil.isEmpty(is_bind)) {
is_bind = "0";
}
return is_bind;
}

16
common/src/main/java/com/yunbao/common/event/CompleteInformationEvent.java Normal file
View File

@@ -0,0 +1,16 @@
package com.yunbao.common.event;
import com.yunbao.common.bean.BaseModel;
public class CompleteInformationEvent extends BaseModel {
private boolean completeInformation = false;
public boolean isCompleteInformation() {
return completeInformation;
}
public CompleteInformationEvent setCompleteInformation(boolean completeInformation) {
this.completeInformation = completeInformation;
return this;
}
}

45
common/src/main/java/com/yunbao/common/views/DrawerTaskChildViewHolder.java
View File

@@ -92,27 +92,34 @@ public class DrawerTaskChildViewHolder extends RecyclerView.ViewHolder {
ViewClicksAntiShake.clicksAntiShake(toReceive, new ViewClicksAntiShake.ViewClicksCallBack() {
@Override
public void onViewClicks() {
if (TextUtils.equals(model.getStatus(), "2")) {
LiveNetManager.get(itemView.getContext())
.sendTaskGift(model.getFlag(), new HttpCallback<String>() {
@Override
public void onSuccess(String data) {
if (listener != null) {
listener.giftSuccess(model, index);
}
}
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});
} else {
if (TextUtils.equals(model.getSrc(), "to_me_information")) {
Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true));
.setDisMiss(true)
.setHtmlUrl(model.getSrc())
.setScreen(TextUtils.equals(model.getShowType(), "2")));
}else {
if (TextUtils.equals(model.getStatus(), "2")) {
LiveNetManager.get(itemView.getContext())
.sendTaskGift(model.getFlag(), new HttpCallback<String>() {
@Override
public void onSuccess(String data) {
if (listener != null) {
listener.giftSuccess(model, index);
}
}
@Override
public void onError(String error) {
ToastUtil.show(R.string.net_error);
}
});
} else {
Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true));
}
}
}
});
}

49
common/src/main/java/com/yunbao/common/views/DrawerTaskViewHolder.java
View File

@@ -2,7 +2,6 @@ package com.yunbao.common.views;
import android.text.TextUtils;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -49,27 +48,35 @@ public class DrawerTaskViewHolder extends RecyclerView.ViewHolder {
if (TextUtils.isEmpty(model.getSrc())) {
ToastUtil.show("SHOWER_ERROR");
} else {
IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
StringBuffer htmlUrl = new StringBuffer();
if (model.getSrc().contains("?")) {
htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
.append("&uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
if (TextUtils.equals(model.getSrc(), "to_me_information")) {
Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true)
.setHtmlUrl(model.getSrc())
.setScreen(TextUtils.equals(model.getShowType(), "2")));
} else {
htmlUrl.append(CommonAppConfig.HOST)
.append("/")
.append(model.getSrc())
.append("?uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
}//资料
Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true)
.setHtmlUrl(htmlUrl.toString())
.setScreen(TextUtils.equals(model.getShowType(), "2")));
IMLoginModel userInfo = IMLoginManager.get(itemView.getContext()).getUserInfo();
StringBuffer htmlUrl = new StringBuffer();
if (model.getSrc().contains("?")) {
htmlUrl.append(CommonAppConfig.HOST).append("/").append(model.getSrc())
.append("&uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
} else {
htmlUrl.append(CommonAppConfig.HOST)
.append("/")
.append(model.getSrc())
.append("?uid=")
.append(userInfo.getId())
.append("&token=")
.append(userInfo.getToken());
}//资料
Bus.get().post(new CustomDrawerPopupEvent()
.setDisMiss(true)
.setHtmlUrl(htmlUrl.toString())
.setScreen(TextUtils.equals(model.getShowType(), "2")));
}
}

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

@@ -1143,4 +1143,5 @@ Limited ride And limited avatar frame</string>
<string name="delete_account1">Do you want to delete the account</string>
<string name="delete_account2">After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue?</string>
<string name="delete_account3">Confirm deletion</string>
<string name="complete_information">完整填寫領大禮</string>
</resources>

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

@@ -1144,4 +1144,5 @@
<string name="delete_account1">是否刪除賬號</string>
<string name="delete_account2">點擊刪除後即刻生效，且不可恢復，您確認要繼續嗎？</string>
<string name="delete_account3">確認刪除</string>
<string name="complete_information">完整填寫領大禮</string>
</resources>

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

@@ -1150,4 +1150,5 @@ Limited ride And limited avatar frame</string>
<string name="delete_account1">Do you want to delete the account</string>
<string name="delete_account2">After clicking delete, it will take effect immediately and cannot be restored. Are you sure you want to continue?</string>
<string name="delete_account3">Confirm deletion</string>
<string name="complete_information">完整填寫領大禮</string>
</resources>