Accueil Explorer Aide
Inscription Connexion
chengzhenyu
/
lensman
Suivre 1
Voter 0
Embranchement 0

Parcourir la Source
简报页UI

chengzhenyu 9 ans auparavant
Parent
4cbc07176e
Commettre
517c768b99
3 fichiers modifiés avec 80 ajouts et 153 suppressions
Afficher les stats Diff
  1. 8 12
      app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java
  2. 69 138
      app/src/main/res/layout/activity_briefs.xml
  3. 3 3
      app/src/main/res/values/strings.xml

+ 8 - 12
app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java
Voir le fichier 

@@ -21,12 +21,10 @@ import butterknife.OnClick;
21 21
22 22 
 public class BriefsActivity extends BaseActivity implements BriefsContract.View{
23 23
24 
-    @BindView(R.id.tv_upload_photo_num)        TextView uploadPhotoNumText;
25 
-    @BindView(R.id.tv_today_capture_num)       TextView captureNumText;
26 
-    @BindView(R.id.tv_average_money_amount)    TextView weekIncomeText;
27 
-    @BindView(R.id.tv_today_incoming_account)  TextView todayIncomingText;
28 
-    @BindView(R.id.tv_total_incoming_account)  TextView totalIncomingText;
29 
-    @BindView(R.id.tv_today_capture_hours_account) TextView todayCaptureHoursText;
24 
+    @BindView(R.id.tv_today_upload_num)       TextView todayUploadNumText;
25 
+    @BindView(R.id.tv_today_point_amount)    TextView todayPointAmountText;
26 
+    @BindView(R.id.tv_week_origin_sold_num)  TextView weekOriginSoldNumText;
27 
+    @BindView(R.id.tv_week_point_amount)  TextView weekPotinAmountText;
30 28 
     @BindView(R.id.switcher_order_msg)         TextSwitcher orderMsgSwitch;
31 29 
     @BindView(R.id.switcher_system_msg)         TextSwitcher systemMsgSwitch;
32 30 
 
@@ -73,12 +71,10 @@ public class BriefsActivity extends BaseActivity implements BriefsContract.View{
73 71
74 72 
     @Override
75 73 
     public void updateUserInfo(BriefsBean bean) {
76 
-        uploadPhotoNumText.setText(String.valueOf(bean.todayUpload));
77 
-        captureNumText.setText(String.valueOf(bean.todayUpload));
78 
-        weekIncomeText.setText(String.valueOf(bean.weekIncome));
79 
-        todayIncomingText.setText(String.valueOf(bean.todayIncome));
80 
-        totalIncomingText.setText(String.valueOf(bean.todayIncome));
81 
-        todayCaptureHoursText.setText(String.valueOf(bean.todayUpload));
74 
+        todayUploadNumText.setText(String.valueOf(bean.todayUpload));
75 
+        weekPotinAmountText.setText(String.valueOf(bean.weekIncome));
76 
+        todayPointAmountText.setText(String.valueOf(bean.todayIncome));
77 
+        weekOriginSoldNumText.setText(String.valueOf(bean.weekSold));
82 78 
     }
83 79
84 80 
     @Override

+ 69 - 138
app/src/main/res/layout/activity_briefs.xml
Voir le fichier 

@@ -64,33 +64,73 @@
64 64 
     android:orientation="vertical"
65 65 
     android:layout_below="@id/title_bar_with_back_btn">
66 66
67 
-    <RelativeLayout
67 
+    <LinearLayout
68 68 
         android:layout_width="match_parent"
69 
-        android:layout_height="120dp"
69 
+        android:layout_height="90dp"
70 
+        android:orientation="horizontal"
71 
+        android:gravity="center_vertical"
70 72 
         android:background="@color/background_white">
71 73
72 
-        <TextView
73 
-            android:id="@+id/tv_today_incoming"
74 
-            android:layout_width="wrap_content"
75 
-            android:layout_height="wrap_content"
76 
-            android:layout_marginTop="15dp"
77 
-            android:textColor="@color/_7B8088"
78 
-            android:textSize="14sp"
79 
-            android:layout_centerHorizontal="true"
80 
-            android:text="@string/today_incoming"/>
74 
+        <RelativeLayout
75 
+            android:layout_width="0dp"
76 
+            android:layout_weight="1"
77 
+            android:layout_height="match_parent">
81 78
82 
-        <TextView
83 
-            android:id="@+id/tv_today_incoming_account"
84 
-            android:layout_width="wrap_content"
85 
-            android:layout_height="wrap_content"
86 
-            android:layout_below="@id/tv_today_incoming"
87 
-            android:layout_marginTop="12dp"
88 
-            android:textColor="@color/_EF4847"
89 
-            android:textSize="60sp"
90 
-            android:layout_centerHorizontal="true"/>
79 
+            <TextView
80 
+                android:id="@+id/tv_today_upload"
81 
+                android:layout_width="wrap_content"
82 
+                android:layout_height="wrap_content"
83 
+                android:layout_marginTop="15dp"
84 
+                android:textColor="@color/_7B8088"
85 
+                android:textSize="14sp"
86 
+                android:layout_centerHorizontal="true"
87 
+                android:text="@string/today_capture"/>
88 
+
89 
+            <TextView
90 
+                android:id="@+id/tv_today_upload_num"
91 
+                android:layout_width="wrap_content"
92 
+                android:layout_height="wrap_content"
93 
+                android:layout_below="@id/tv_today_upload"
94 
+                android:layout_marginTop="12dp"
95 
+                android:textColor="@color/_EF4847"
96 
+                android:textSize="22sp"
97 
+                android:layout_centerHorizontal="true"/>
98 
+
99 
+        </RelativeLayout>
100 
+
101 
+        <View
102 
+            android:layout_width="1px"
103 
+            android:layout_height="45dp"
104 
+            android:background="@color/text_hint_grey_color"/>
91 105
92 
-    </RelativeLayout>
106 
+        <RelativeLayout
107 
+            android:layout_width="0dp"
108 
+            android:layout_weight="1"
109 
+            android:layout_height="match_parent">
110 
+
111 
+            <TextView
112 
+                android:id="@+id/tv_today_point"
113 
+                android:layout_width="wrap_content"
114 
+                android:layout_height="wrap_content"
115 
+                android:layout_marginTop="15dp"
116 
+                android:textColor="@color/_7B8088"
117 
+                android:textSize="14sp"
118 
+                android:layout_centerHorizontal="true"
119 
+                android:text="@string/today_incoming"/>
93 120
121 
+            <TextView
122 
+                android:id="@+id/tv_today_point_amount"
123 
+                android:layout_width="wrap_content"
124 
+                android:layout_height="wrap_content"
125 
+                android:layout_below="@id/tv_today_point"
126 
+                android:layout_marginTop="12dp"
127 
+                android:textColor="@color/_EF4847"
128 
+                android:textSize="22sp"
129 
+                android:layout_centerHorizontal="true"/>
130 
+
131 
+        </RelativeLayout>
132 
+
133 
+    </LinearLayout>
94 134 
     <LinearLayout
95 135 
         android:layout_width="match_parent"
96 136 
         android:layout_height="90dp"
 
@@ -104,20 +144,20 @@
104 144 
             android:layout_height="match_parent">
105 145
106 146 
             <TextView
107 
-                android:id="@+id/tv_today_capture"
147 
+                android:id="@+id/tv_week_origin_sold"
108 148 
                 android:layout_width="wrap_content"
109 149 
                 android:layout_height="wrap_content"
110 150 
                 android:layout_marginTop="15dp"
111 151 
                 android:textColor="@color/_7B8088"
112 152 
                 android:textSize="14sp"
113 153 
                 android:layout_centerHorizontal="true"
114 
-                android:text="@string/today_capture"/>
154 
+                android:text="@string/week_origin_sold"/>
115 155
116 156 
             <TextView
117 
-                android:id="@+id/tv_today_capture_num"
157 
+                android:id="@+id/tv_week_origin_sold_num"
118 158 
                 android:layout_width="wrap_content"
119 159 
                 android:layout_height="wrap_content"
120 
-                android:layout_below="@id/tv_today_capture"
160 
+                android:layout_below="@id/tv_week_origin_sold"
121 161 
                 android:layout_marginTop="12dp"
122 162 
                 android:textColor="@color/_EF4847"
123 163 
                 android:textSize="22sp"
 
@@ -136,20 +176,20 @@
136 176 
             android:layout_height="match_parent">
137 177
138 178 
             <TextView
139 
-                android:id="@+id/tv_average_money"
179 
+                android:id="@+id/tv_week_point"
140 180 
                 android:layout_width="wrap_content"
141 181 
                 android:layout_height="wrap_content"
142 182 
                 android:layout_marginTop="15dp"
143 183 
                 android:textColor="@color/_7B8088"
144 184 
                 android:textSize="14sp"
145 185 
                 android:layout_centerHorizontal="true"
146 
-                android:text="@string/average_money"/>
186 
+                android:text="@string/week_point"/>
147 187
148 188 
             <TextView
149 
-                android:id="@+id/tv_average_money_amount"
189 
+                android:id="@+id/tv_week_point_amount"
150 190 
                 android:layout_width="wrap_content"
151 191 
                 android:layout_height="wrap_content"
152 
-                android:layout_below="@id/tv_average_money"
192 
+                android:layout_below="@id/tv_week_point"
153 193 
                 android:layout_marginTop="12dp"
154 194 
                 android:textColor="@color/_EF4847"
155 195 
                 android:textSize="22sp"
 
@@ -245,115 +285,6 @@
245 285
246 286 
     </LinearLayout>
247 287
248 
-    <LinearLayout
249 
-        android:id="@+id/layout_history_statistic_part"
250 
-        android:layout_marginTop="8dp"
251 
-        android:layout_width="match_parent"
252 
-        android:layout_height="130dp"
253 
-        android:gravity="center_vertical"
254 
-        android:background="@color/background_white"
255 
-        android:orientation="horizontal">
256 
-
257 
-        <RelativeLayout
258 
-            android:layout_width="0dp"
259 
-            android:layout_weight="1"
260 
-            android:layout_height="match_parent">
261 
-
262 
-            <TextView
263 
-                android:id="@+id/tv_today_capture_hours"
264 
-                android:layout_width="wrap_content"
265 
-                android:layout_height="wrap_content"
266 
-                android:layout_marginTop="20dp"
267 
-                android:textColor="@color/_7B8088"
268 
-                android:textSize="14sp"
269 
-                android:drawablePadding="4dp"
270 
-                android:layout_centerHorizontal="true"
271 
-                android:drawableTop="@drawable/capture_today"
272 
-                android:text="@string/today_capture"/>
273 
-
274 
-            <TextView
275 
-                android:id="@+id/tv_today_capture_hours_account"
276 
-                android:layout_width="wrap_content"
277 
-                android:layout_height="wrap_content"
278 
-                android:layout_below="@id/tv_today_capture_hours"
279 
-                android:layout_marginTop="12dp"
280 
-                android:textColor="@color/_333333"
281 
-                android:textSize="16sp"
282 
-                android:layout_centerHorizontal="true"/>
283 
-
284 
-        </RelativeLayout>
285 
-
286 
-        <View
287 
-            android:layout_width="1px"
288 
-            android:layout_height="45dp"
289 
-            android:background="@color/text_hint_grey_color"/>
290 
-
291 
-        <RelativeLayout
292 
-            android:layout_width="0dp"
293 
-            android:layout_weight="1"
294 
-            android:layout_height="match_parent">
295 
-
296 
-            <TextView
297 
-                android:id="@+id/tv_upload_photo"
298 
-                android:layout_width="wrap_content"
299 
-                android:layout_height="wrap_content"
300 
-                android:layout_marginTop="20dp"
301 
-                android:textColor="@color/_7B8088"
302 
-                android:textSize="14sp"
303 
-                android:drawablePadding="4dp"
304 
-                android:layout_centerHorizontal="true"
305 
-                android:drawableTop="@drawable/upload"
306 
-                android:text="@string/photo_upload_count"/>
307 
-
308 
-            <TextView
309 
-                android:id="@+id/tv_upload_photo_num"
310 
-                android:layout_width="wrap_content"
311 
-                android:layout_height="wrap_content"
312 
-                android:layout_below="@id/tv_upload_photo"
313 
-                android:layout_marginTop="12dp"
314 
-                android:textColor="@color/_333333"
315 
-                android:textSize="16sp"
316 
-                android:layout_centerHorizontal="true"/>
317 
-
318 
-        </RelativeLayout>
319 
-
320 
-        <View
321 
-            android:layout_width="1px"
322 
-            android:layout_height="45dp"
323 
-            android:background="@color/text_hint_grey_color"/>
324 
-
325 
-        <RelativeLayout
326 
-            android:layout_width="0dp"
327 
-            android:layout_weight="1"
328 
-            android:layout_height="match_parent">
329 
-
330 
-            <TextView
331 
-                android:id="@+id/tv_total_incoming"
332 
-                android:layout_width="wrap_content"
333 
-                android:layout_height="wrap_content"
334 
-                android:layout_marginTop="20dp"
335 
-                android:textColor="@color/_7B8088"
336 
-                android:textSize="14sp"
337 
-                android:drawablePadding="4dp"
338 
-                android:layout_centerHorizontal="true"
339 
-                android:drawableTop="@drawable/incoming_today"
340 
-                android:text="@string/total_incoming"/>
341 
-
342 
-            <TextView
343 
-                android:id="@+id/tv_total_incoming_account"
344 
-                android:layout_width="wrap_content"
345 
-                android:layout_height="wrap_content"
346 
-                android:layout_below="@id/tv_total_incoming"
347 
-                android:layout_marginTop="12dp"
348 
-                android:textColor="@color/_333333"
349 
-                android:textSize="16sp"
350 
-                android:layout_centerHorizontal="true"/>
351 
-
352 
-        </RelativeLayout>
353 
-
354 
-    </LinearLayout>
355 
-
356 
-
357 288 
 </LinearLayout>
358 289
359 290 
 </RelativeLayout>

+ 3 - 3
app/src/main/res/values/strings.xml
Voir le fichier 

@@ -41,17 +41,17 @@
41 41
42 42 
     <string name="app_exit_hint">再按一次退出拍爱</string>
43 43
44 
-    <string name="today_incoming">今日收入(元)</string>
44 
+    <string name="today_incoming">今日工分(元)</string>
45 45
46 46 
     <string name="today_capture">今日拍摄(张)</string>
47 47
48 
-    <string name="average_money">平均每张</string>
48 
+    <string name="week_origin_sold">周高清图售出(张)</string>
49 49
50 50 
     <string name="today_capture_hour">今日拍摄</string>
51 51
52 52 
     <string name="photo_upload_count">累计上传</string>
53 53
54 
-    <string name="total_incoming">累计收入</string>
54 
+    <string name="week_point">周积分(元)</string>
55 55
56 56 
     <string name="message">消息</string>
57 57