my money

app/src/main/java/com/sheep/gamegroup/model/entity/UserAssets.java

@@ -4,14 +4,14 @@ package com.sheep.gamegroup.model.entity;
  * Created by realicing on 2018/5/9.
  * realicing@sina.com
  * {
- "sheep_bi_total": 22.4,
- "task_reward": 14.8,
- "proxy_commission": 0,
- "recharge_amount": 2,
- "cash_withdrawal": 20.4,
- "extension_extract": 4.6,
- "directional_currency": 0
- }
+ * "sheep_bi_total": 22.4,
+ * "task_reward": 14.8,
+ * "proxy_commission": 0,
+ * "recharge_amount": 2,
+ * "cash_withdrawal": 20.4,
+ * "extension_extract": 4.6,
+ * "directional_currency": 0
+ * }
  */
 public class UserAssets {
     private String sheep_bi_total;
@@ -26,12 +26,32 @@ public class UserAssets {
     private String extension_extract;//推广提成
     private float directional_currency;//定向消费货币
     private float appoint_task_amount;//定向奖励
-    private float game_golden_dan =0f;
+    private float game_golden_dan = 0f;
 
-    public void setSheep_bi_total(String sheep_bi_total){
+    private float sheep_balance = 0f;
+    private float activities_balance = 0f;
+
+    public float getSheep_balance() {
+        return sheep_balance;
+    }
+
+    public void setSheep_balance(float sheep_balance) {
+        this.sheep_balance = sheep_balance;
+    }
+
+    public float getActivities_balance() {
+        return activities_balance;
+    }
+
+    public void setActivities_balance(float activities_balance) {
+        this.activities_balance = activities_balance;
+    }
+
+    public void setSheep_bi_total(String sheep_bi_total) {
         this.sheep_bi_total = sheep_bi_total;
     }
-    public String getSheep_bi_total(){
+
+    public String getSheep_bi_total() {
         return this.sheep_bi_total;
     }
 
@@ -47,19 +67,23 @@ public class UserAssets {
         this.use_balance = use_balance;
     }
 
-    public String getUse_balance(){
+    public String getUse_balance() {
         return this.use_balance;
     }
-    public void setTask_reward(String task_reward){
+
+    public void setTask_reward(String task_reward) {
         this.task_reward = task_reward;
     }
-    public String getTask_reward(){
+
+    public String getTask_reward() {
         return this.task_reward;
     }
-    public void setProxy_commission(String proxy_commission){
+
+    public void setProxy_commission(String proxy_commission) {
         this.proxy_commission = proxy_commission;
     }
-    public String getProxy_commission(){
+
+    public String getProxy_commission() {
         return this.proxy_commission;
     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -86,6 +86,8 @@ public class ActMyMoney extends BaseActivity {
     TextView my_money_available_amount;
     @BindView(R.id.my_money_dingxiang_amount)
     TextView my_money_dingxiang_amount;
+    @BindView(R.id.my_money_activity_amount)
+    TextView my_money_activity_amount;
 
     private TitleFragmentListAdapter mAdapter;
 
@@ -273,6 +275,7 @@ public class ActMyMoney extends BaseActivity {
                 })).show();
                 break;
             case R.id.my_money_activity_tag:
+            case R.id.my_money_activity_amount:
                 Jump2View.getInstance().goWeb(this, new WebParams(Config.getUrlByPath(Config.PATH_ACTIVITY_COIN_LIST, "authorization", SpUtils.getToken(this)), "活动币"));
                 break;
         }
@@ -321,10 +324,11 @@ public class ActMyMoney extends BaseActivity {
         if (my_money_total_money == null) {
             return;
         }
-        my_money_total_money.setText(NumberFormatUtils.retainMost2W(userAssets.getSheep_bi_total()));
+        my_money_total_money.setText(NumberFormatUtils.retainMost2W(userAssets.getSheep_balance()));
         my_money_recharge_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getUse_balance()));
         my_money_available_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getCash_withdrawal()));
         my_money_dingxiang_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getDirectional_currency()));
+        my_money_activity_amount.setText(NumberFormatUtils.retainMost2W(userAssets.getActivities_balance()));
     }
 
     private void resetData() {
@@ -335,6 +339,7 @@ public class ActMyMoney extends BaseActivity {
         my_money_recharge_amount.setText("0.00");
         my_money_available_amount.setText("0.00");
         my_money_dingxiang_amount.setText("0.00");
+        my_money_activity_amount.setText("0.00");
     }
 
     //点击优惠购物

app/src/main/res/layout/act_my_money.xml

@@ -233,6 +233,14 @@
                             <TextView
                                 style="@style/style_item_label"
                                 android:text="活动币" />
+                            <TextView
+                                android:id="@+id/my_money_activity_amount"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="#333333"
+                                android:textSize="15sp"
+                                android:text="00.00"
+                                />
                             <TextView style="@style/style_item_end_next" />
                         </LinearLayout>
                         <View style="@style/style_item_line" />