brief http interface modify

chengzhenyu 8 年之前
父节点
当前提交
dff5cc0563

+ 2 - 1
app/src/main/java/ai/pai/lensman/bean/BriefsBean.java

@@ -8,9 +8,10 @@ import java.util.ArrayList;
8 8
 
9 9
 public class BriefsBean {
10 10
 
11
-    public float avgIncome;
11
+    public float weekIncome;
12 12
     public int   todayUpload;
13 13
     public float todayIncome;
14
+    public int weekSold;
14 15
     public ArrayList<MessageBean> msgList;
15 16
     public ArrayList<SystemMessageBean> systemMsgList;
16 17
 

+ 2 - 4
app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java

@@ -11,8 +11,6 @@ import android.widget.TextSwitcher;
11 11
 import android.widget.TextView;
12 12
 import android.widget.ViewSwitcher;
13 13
 
14
-import com.android.common.utils.DeviceUtils;
15
-
16 14
 import ai.pai.lensman.R;
17 15
 import ai.pai.lensman.base.BaseActivity;
18 16
 import ai.pai.lensman.bean.BriefsBean;
@@ -25,7 +23,7 @@ public class BriefsActivity extends BaseActivity implements BriefsContract.View{
25 23
 
26 24
     @BindView(R.id.tv_upload_photo_num)        TextView uploadPhotoNumText;
27 25
     @BindView(R.id.tv_today_capture_num)       TextView captureNumText;
28
-    @BindView(R.id.tv_average_money_amount)    TextView averageMoneyText;
26
+    @BindView(R.id.tv_average_money_amount)    TextView weekIncomeText;
29 27
     @BindView(R.id.tv_today_incoming_account)  TextView todayIncomingText;
30 28
     @BindView(R.id.tv_total_incoming_account)  TextView totalIncomingText;
31 29
     @BindView(R.id.tv_today_capture_hours_account) TextView todayCaptureHoursText;
@@ -77,7 +75,7 @@ public class BriefsActivity extends BaseActivity implements BriefsContract.View{
77 75
     public void updateUserInfo(BriefsBean bean) {
78 76
         uploadPhotoNumText.setText(String.valueOf(bean.todayUpload));
79 77
         captureNumText.setText(String.valueOf(bean.todayUpload));
80
-        averageMoneyText.setText(String.valueOf(bean.avgIncome));
78
+        weekIncomeText.setText(String.valueOf(bean.weekIncome));
81 79
         todayIncomingText.setText(String.valueOf(bean.todayIncome));
82 80
         totalIncomingText.setText(String.valueOf(bean.todayIncome));
83 81
         todayCaptureHoursText.setText(String.valueOf(bean.todayUpload));

+ 2 - 1
app/src/main/java/ai/pai/lensman/briefs/BriefsInteractor.java

@@ -50,9 +50,10 @@ public class BriefsInteractor implements BaseInteractor {
50 50
                     if(status == 200){
51 51
                         JSONObject data = json.getJSONObject("data");
52 52
                         bean = new BriefsBean();
53
-                        bean.avgIncome =(float)data.getDouble("avg_income");
53
+                        bean.weekIncome =(float)data.getDouble("week_income");
54 54
                         bean.todayIncome = (float)data.getDouble("today_income");
55 55
                         bean.todayUpload = data.getInt("today_upload");
56
+                        bean.weekSold = data.getInt("week_sold");
56 57
                         JSONObject msgObj = data.getJSONObject("messages");
57 58
                         JSONArray systemMsgArray = msgObj.getJSONArray("system");
58 59