@Override 55 55 
     public void updateUserInfo(BriefsBean bean) {
56 
-
56 
+        uploadPhotoNumText.setText(String.valueOf(bean.todayUpload));
57 
+        captureNumText.setText(String.valueOf(bean.todayUpload));
58 
+        averageMoneyText.setText(String.valueOf(bean.avgIncome));
59 
+        todayIncomingText.setText(String.valueOf(bean.todayIncome));
60 
+        totalIncomingText.setText(String.valueOf(bean.todayIncome));
61 
+        todayCaptureHoursText.setText(String.valueOf(bean.todayUpload));
57 62 
     }
58 63
59 64 
 }

+ 46 - 1
app/src/main/java/ai/pai/lensman/briefs/BriefsInteractor.java
Vedi File 

@@ -3,13 +3,19 @@ package ai.pai.lensman.briefs;
3 3 
 import android.os.AsyncTask;
4 4
5 5 
 import com.android.common.executors.ThreadExecutor;
6 
+import com.android.common.utils.JSONParseUtils;
6 7
8 
+import org.json.JSONArray;
7 9 
 import org.json.JSONObject;
8 10
11 
+import java.util.ArrayList;
9 12 
 import java.util.HashMap;
10 13
11 14 
 import ai.pai.lensman.base.BaseInteractor;
12 15 
 import ai.pai.lensman.bean.BriefsBean;
16 
+import ai.pai.lensman.bean.GroupPhotoItem;
17 
+import ai.pai.lensman.bean.MessageBean;
18 
+import ai.pai.lensman.bean.SystemMessageBean;
13 19 
 import ai.pai.lensman.db.Preferences;
14 20 
 import ai.pai.lensman.utils.HttpPostTask;
15 21 
 import ai.pai.lensman.utils.UrlContainer;
 
@@ -42,7 +48,46 @@ public class BriefsInteractor implements BaseInteractor {
42 48 
                     JSONObject json = new JSONObject(response);
43 49 
                     int status = json.getInt("status");
44 50 
                     if(status == 200){
51 
+                        JSONObject data = json.getJSONObject("data");
45 52 
                         bean = new BriefsBean();
53 
+                        bean.avgIncome =(float)data.getDouble("avg_income");
54 
+                        bean.todayIncome = (float)data.getDouble("today_income");
55 
+                        bean.todayUpload = data.getInt("today_upload");
56 
+                        JSONObject msgObj = data.getJSONObject("messages");
57 
+                        JSONArray systemMsgArray = msgObj.getJSONArray("system");
58 
+
59 
+                        if(systemMsgArray!=null && systemMsgArray.length()>0){
60 
+                            ArrayList<SystemMessageBean> systemMsgList = new ArrayList<>();
61 
+                            for(int k = 0 ;k<systemMsgArray.length();k++){
62 
+                                JSONObject systemMsgObj = systemMsgArray.getJSONObject(k);
63 
+                                SystemMessageBean bean = new SystemMessageBean();
64 
+                                bean.content = JSONParseUtils.getJSONString(systemMsgObj.getString("content"));
65 
+                                bean.isRead = systemMsgObj.getBoolean("read");
66 
+                                bean.url = JSONParseUtils.getJSONString(systemMsgObj.getString("url"));
67 
+                                bean.msgId =JSONParseUtils.getJSONString(systemMsgObj.getString("pk"));
68 
+                                bean.title = JSONParseUtils.getJSONString(systemMsgObj.getString("title"));
69 
+                                systemMsgList.add(bean);
70 
+                            }
71 
+                            bean.systemMsgList = systemMsgList;
72 
+                        }
73 
+                        JSONArray msgArray = msgObj.getJSONArray("orders");
74 
+                        if(msgArray!=null && msgArray.length()>0){
75 
+                            ArrayList<MessageBean> msgList = new ArrayList<>();
76 
+                            for(int count = 0; count<msgArray.length();count++){
77 
+                                JSONObject childMsg = msgArray.getJSONObject(count);
78 
+                                MessageBean childBean = new MessageBean();
79 
+                                childBean.createTime = JSONParseUtils.getJSONString(childMsg.getString("created_at"));
80 
+                                childBean.isRead = childMsg.getBoolean("read");
81 
+                                childBean.msgId = childMsg.getString("pk");
82 
+                                childBean.senderName = JSONParseUtils.getJSONString(childMsg.getString("from_nickname"));
83 
+                                childBean.senderAvatarUrl = JSONParseUtils.getJSONString(childMsg.getString("from_avatar"));
84 
+                                childBean.content = JSONParseUtils.getJSONString(childMsg.getString("msg_content"));
85 
+                                JSONObject photoObj = childMsg.getJSONObject("group_photo_info");
86 
+                                childBean.photoItem = GroupPhotoItem.parseFromJSON(photoObj);
87 
+                                msgList.add(childBean);
88 
+                            }
89 
+                            bean.msgList = msgList;
90 
+                        }
46 91 
                         return true;
47 92 
                     }else{
48 93 
                         message = json.getString("message");
 
@@ -65,7 +110,7 @@ public class BriefsInteractor implements BaseInteractor {
65 110 
                 listener.onInteractSuccess(bean);
66 111 
             }
67 112 
         };
68 
-        fetchInfoTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.SESSION_IDS_CREATE);
113 
+        fetchInfoTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.BRIEFS_URL);
69 114 
     }
70 115
71 116 
     @Override

+ 2 - 0
app/src/main/java/ai/pai/lensman/utils/UrlContainer.java
Vedi File 

@@ -35,6 +35,8 @@ public class UrlContainer {
35 35 
      */
36 36 
     public static final String WX_LOGIN_URL = HOST_URL+"l/wx/authorize";
37 37
38 
+    public static final String BRIEFS_URL = HOST_URL+"l/brief";
39 
+
38 40
39 41
40 42 
 }

+ 14 - 1
app/src/main/res/layout/activity_settings.xml
Vedi File 

@@ -34,7 +34,6 @@
34 34 
             android:gravity="center"
35 35 
             android:paddingLeft="10dp"
36 36 
             android:paddingRight="10dp"
37 
-            android:singleLine="true"
38 37 
             android:text="@string/settings"
39 38 
             android:textColor="@color/text_white"
40 39 
             android:textSize="@dimen/action_bar_title_medium_text_size" />
 
@@ -59,5 +58,19 @@
59 58
60 59 
     </LinearLayout>
61 60
61 
+    <ScrollView
62 
+        android:layout_below="@id/title_bar_with_back_btn"
63 
+        android:layout_width="match_parent"
64 
+        android:layout_height="match_parent">
65 
+
66 
+        <LinearLayout
67 
+            android:layout_width="match_parent"
68 
+            android:layout_height="wrap_content"
69 
+            android:orientation="vertical">
70 
+
71 
+
72 
+        </LinearLayout>
73 
+    </ScrollView>
74 
+
62 75
63 76 
 </RelativeLayout>

Kodo/kodo - Gogs: Go Git Service
Inicio Explorar Ayuda
Registro Iniciar sesión
Kodo
/
kodo
Vigilar 2
Destacar 0
Fork 0
Incidencias 0 Pull Requests 0 Commits 961 Releases 0

21 Commits (4b46537a511e0789f952e001d6f068417d6c8b4d)

Autor SHA1 Mensaje Fecha
  Kimi.Huang dfca004d3e Opt %!s(int64=6) %!d(string=hace) años
  Brightcells 597ee33ba6 Pai2 => Kodo %!s(int64=7) %!d(string=hace) años
  Brightcells 018d52f61d Update package django_xxx %!s(int64=7) %!d(string=hace) años
  Brightcells a7cbbf15a7 Update max_length for CharField %!s(int64=7) %!d(string=hace) años
  Brightcells d28dca92ff CreateUpdateMixin => BaseModelMixin %!s(int64=7) %!d(string=hace) años
  Brightcells 268aa4ebe3 Add unique_together = (('user_id', 'msg_id'),) for SystemMessageReadInfo/SystemMessageDeleteInfo %!s(int64=8) %!d(string=hace) años
  Brightcells b6ab791315 Change relative pk to photo_id %!s(int64=8) %!d(string=hace) años
  Brightcells 2eba3ed7f9 Add guest login for tourguide %!s(int64=8) %!d(string=hace) años
  Brightcells ad69866b26 Add tour guide's name and phone in GroupInfo %!s(int64=8) %!d(string=hace) años
  Brightcells 27d3ec8fb1 add src for LatestAppInfo/SplashInfo %!s(int64=9) %!d(string=hace) años
  Brightcells ee7388cd15 add src for SystemMessageInfo %!s(int64=9) %!d(string=hace) años
  Brightcells f72ccb1875 isort import %!s(int64=9) %!d(string=hace) años
  Brightcells 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field %!s(int64=9) %!d(string=hace) años
  Brightcells 02373a6dff return complete group_photo_info for api message_list_api/message_type_list_api %!s(int64=9) %!d(string=hace) años
  Brightcells 165424743a modify message relative apis %!s(int64=9) %!d(string=hace) años
  Brightcells b3b9639df8 add comment_num/thumbup_num in message_list_api/message_type_list_api %!s(int64=9) %!d(string=hace) años
  Brightcells ff0a63215f Fix Bug: redis .replace(microsecond=0) %!s(int64=9) %!d(string=hace) años
  Brightcells 62ef679981 add ret photo_url and photo_thumbnail_url %!s(int64=9) %!d(string=hace) años
  Brightcells d3088e1fec add ret msg_type_desc %!s(int64=9) %!d(string=hace) años
  Brightcells 928a51477c 'UserMessageInfo' object has no attribute 'title' %!s(int64=9) %!d(string=hace) años
  Brightcells 30daca135b add api message_list_api/message_type_list_api/message_read_api %!s(int64=9) %!d(string=hace) años