|
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>
|
|
|
|
@@ -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
|
|