diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationBean.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationBean.java index 099eecd..99d1d75 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationBean.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationBean.java @@ -8,6 +8,9 @@ public class InvitationBean { private InvitationReward reward; private InvitationTotal total; private String qrcode; + private String max_divide; + private String permanent_divide; + private String invite_rule; private List reward_desc; private int show_invite_list; @@ -77,6 +80,30 @@ public class InvitationBean { this.show_invite_list = show_invite_list; } + public String getMax_divide() { + return max_divide; + } + + public void setMax_divide(String max_divide) { + this.max_divide = max_divide; + } + + public String getPermanent_divide() { + return permanent_divide; + } + + public void setPermanent_divide(String permanent_divide) { + this.permanent_divide = permanent_divide; + } + + public String getInvite_rule() { + return invite_rule; + } + + public void setInvite_rule(String invite_rule) { + this.invite_rule = invite_rule; + } + public class RewardDescBean { private String title; private String content; diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationTotal.java b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationTotal.java index b162ba4..a05a552 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationTotal.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/model/settings/InvitationTotal.java @@ -2,6 +2,7 @@ package com.xuebiping.bolizhuzi.model.settings; public class InvitationTotal { private int total_reward; + private int total_invite_reward; private int total_invite; private int total_commission; private int recharge_count; @@ -46,4 +47,12 @@ public class InvitationTotal { public void setAuth_count(int auth_count) { this.auth_count = auth_count; } + + public int getTotal_invite_reward() { + return total_invite_reward; + } + + public void setTotal_invite_reward(int total_invite_reward) { + this.total_invite_reward = total_invite_reward; + } } diff --git a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java index bde2ec1..08a1903 100644 --- a/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java +++ b/app/src/main/java/com/xuebiping/bolizhuzi/view/settings/InvitationActivity.java @@ -43,6 +43,7 @@ public class InvitationActivity extends BaseActivity implements private List posterList; private TextView tv_zg; private TextView tv_my_fc_bl; + private TextView tv_rule_txt; @Override @@ -81,6 +82,7 @@ public class InvitationActivity extends BaseActivity implements tv_zg = findViewById(R.id.tv_zg); tv_my_fc_bl = findViewById(R.id.tv_my_fc_bl); + tv_rule_txt = findViewById(R.id.tv_rule_txt); mShareDialog = new BottomShareDialog(this, R.style.SelectiveDialog); mShareDialog.setOnButtonSelectListener(this); @@ -212,14 +214,16 @@ public class InvitationActivity extends BaseActivity implements binding.firstLabel.setText(result.getReward().getFirst()); binding.secondLabel.setText(result.getReward().getSecond()); binding.thirdLabel.setText(result.getReward().getThird()); - //TODO 需要接口返回准确数据 - tv_zg.setText("最高" + result.getReward().getFour() +"分成"); - tv_my_fc_bl.setText(result.getReward().getThird()); + tv_zg.setText("最高" + result.getMax_divide() +"分成"); + tv_my_fc_bl.setText(result.getPermanent_divide()); binding.fourLabel.setText(result.getReward().getFour() + ""); posterList = result.getAvatar_list(); binding.totalPeopleLabel.setText(result.getTotal().getTotal_invite() + ""); - binding.totalRewardLabel.setText(result.getTotal().getRecharge_count() + ""); + binding.totalRewardLabel.setText(result.getTotal().getTotal_invite_reward() + ""); binding.totalTiChengLabel.setText(result.getTotal().getAuth_count() + ""); + + tv_rule_txt.setText(result.getInvite_rule()); + mShareData = result.getShare(); qrImageUrl = ConstUrl.IMAGE_URL + result.getQrcode(); if (result.getShow_invite_list() == 1) { diff --git a/app/src/main/res/layout/activity_invitation.xml b/app/src/main/res/layout/activity_invitation.xml index 6199151..941b220 100644 --- a/app/src/main/res/layout/activity_invitation.xml +++ b/app/src/main/res/layout/activity_invitation.xml @@ -513,7 +513,7 @@ + android:background="#3BE95340"/> @@ -614,6 +614,16 @@ android:textSize="14dp" android:textStyle="bold" /> + +