Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
chengzhenyu
/
lensman
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0

Pārlūkot izejas kodu
简报页UI

chengzhenyu 8 gadi atpakaļ
vecāks
517c768b99
revīzija
2a40feae4e
3 mainītis faili ar 393 papildinājumiem un 225 dzēšanām
Rādīt salīdzināšanas statistiku
  1. 1 1
      app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java
  2. 382 220
      app/src/main/res/layout/activity_briefs.xml
  3. 10 4
      app/src/main/res/values/strings.xml

+ 1 - 1
app/src/main/java/ai/pai/lensman/briefs/BriefsActivity.java
Parādīt failu 

@@ -41,7 +41,7 @@ public class BriefsActivity extends BaseActivity implements BriefsContract.View{
41 41 
             public View makeView() {
42 42 
                 TextView myText = new TextView(BriefsActivity.this);
43 43 
                 myText.setGravity(Gravity.CENTER_VERTICAL);
44 
-                myText.setTextSize(18);
44 
+                myText.setTextSize(16);
45 45 
                 myText.setTextColor(Color.parseColor("#333333"));
46 46 
                 return myText;
47 47 
             }

+ 382 - 220
app/src/main/res/layout/activity_briefs.xml
Parādīt failu 

@@ -58,233 +58,395 @@
58 58
59 59 
     </LinearLayout>
60 60
61 
-<LinearLayout
62 
-    android:layout_width="match_parent"
63 
-    android:layout_height="wrap_content"
64 
-    android:orientation="vertical"
65 
-    android:layout_below="@id/title_bar_with_back_btn">
66 
-
67 
-    <LinearLayout
68 
-        android:layout_width="match_parent"
69 
-        android:layout_height="90dp"
70 
-        android:orientation="horizontal"
71 
-        android:gravity="center_vertical"
72 
-        android:background="@color/background_white">
73 
-
74 
-        <RelativeLayout
75 
-            android:layout_width="0dp"
76 
-            android:layout_weight="1"
77 
-            android:layout_height="match_parent">
78 
-
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"/>
105 
-
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"/>
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>
134 
-    <LinearLayout
61 
+    <ScrollView
135 62 
         android:layout_width="match_parent"
136 
-        android:layout_height="90dp"
137 
-        android:orientation="horizontal"
138 
-        android:gravity="center_vertical"
139 
-        android:background="@color/background_white">
140 
-
141 
-        <RelativeLayout
142 
-            android:layout_width="0dp"
143 
-            android:layout_weight="1"
144 
-            android:layout_height="match_parent">
145 
-
146 
-            <TextView
147 
-                android:id="@+id/tv_week_origin_sold"
148 
-                android:layout_width="wrap_content"
149 
-                android:layout_height="wrap_content"
150 
-                android:layout_marginTop="15dp"
151 
-                android:textColor="@color/_7B8088"
152 
-                android:textSize="14sp"
153 
-                android:layout_centerHorizontal="true"
154 
-                android:text="@string/week_origin_sold"/>
155 
-
156 
-            <TextView
157 
-                android:id="@+id/tv_week_origin_sold_num"
158 
-                android:layout_width="wrap_content"
159 
-                android:layout_height="wrap_content"
160 
-                android:layout_below="@id/tv_week_origin_sold"
161 
-                android:layout_marginTop="12dp"
162 
-                android:textColor="@color/_EF4847"
163 
-                android:textSize="22sp"
164 
-                android:layout_centerHorizontal="true"/>
165 
-
166 
-        </RelativeLayout>
167 
-
168 
-        <View
169 
-            android:layout_width="1px"
170 
-            android:layout_height="45dp"
171 
-            android:background="@color/text_hint_grey_color"/>
172 
-
173 
-        <RelativeLayout
174 
-            android:layout_width="0dp"
175 
-            android:layout_weight="1"
176 
-            android:layout_height="match_parent">
177 
-
178 
-            <TextView
179 
-                android:id="@+id/tv_week_point"
180 
-                android:layout_width="wrap_content"
181 
-                android:layout_height="wrap_content"
182 
-                android:layout_marginTop="15dp"
183 
-                android:textColor="@color/_7B8088"
184 
-                android:textSize="14sp"
185 
-                android:layout_centerHorizontal="true"
186 
-                android:text="@string/week_point"/>
187 
-
188 
-            <TextView
189 
-                android:id="@+id/tv_week_point_amount"
190 
-                android:layout_width="wrap_content"
191 
-                android:layout_height="wrap_content"
192 
-                android:layout_below="@id/tv_week_point"
193 
-                android:layout_marginTop="12dp"
194 
-                android:textColor="@color/_EF4847"
195 
-                android:textSize="22sp"
196 
-                android:layout_centerHorizontal="true"/>
197 
-
198 
-        </RelativeLayout>
199 
-
200 
-    </LinearLayout>
201 
-
202 
-    <LinearLayout
203 
-        android:id="@+id/layout_message_part"
204 
-        android:layout_marginTop="8dp"
205 
-        android:layout_width="match_parent"
206 
-        android:layout_height="wrap_content"
207 
-        android:background="@color/background_white"
208 
-        android:orientation="vertical">
63 
+        android:layout_height="match_parent"
64 
+        android:layout_below="@id/title_bar_with_back_btn">
209 65
210 66 
         <LinearLayout
211 67 
             android:layout_width="match_parent"
212 
-            android:layout_height="32dp"
213 
-            android:orientation="horizontal">
214 
-
215 
-            <TextView
216 
-                android:layout_width="wrap_content"
68 
+            android:layout_height="wrap_content"
69 
+            android:orientation="vertical"
70 
+           >
71 
+
72 
+            <LinearLayout
73 
+                android:layout_width="match_parent"
74 
+                android:layout_height="90dp"
75 
+                android:orientation="horizontal"
76 
+                android:gravity="center_vertical"
77 
+                android:background="@color/background_white">
78 
+
79 
+                <RelativeLayout
80 
+                    android:layout_width="0dp"
81 
+                    android:layout_weight="1"
82 
+                    android:layout_height="match_parent">
83 
+
84 
+                    <TextView
85 
+                        android:id="@+id/tv_today_upload"
86 
+                        android:layout_width="wrap_content"
87 
+                        android:layout_height="wrap_content"
88 
+                        android:layout_marginTop="15dp"
89 
+                        android:textColor="@color/_7B8088"
90 
+                        android:textSize="14sp"
91 
+                        android:layout_centerHorizontal="true"
92 
+                        android:text="@string/today_capture"/>
93 
+
94 
+                    <TextView
95 
+                        android:id="@+id/tv_today_upload_num"
96 
+                        android:layout_width="wrap_content"
97 
+                        android:layout_height="wrap_content"
98 
+                        android:layout_below="@id/tv_today_upload"
99 
+                        android:layout_marginTop="12dp"
100 
+                        android:textColor="@color/_EF4847"
101 
+                        android:textSize="22sp"
102 
+                        android:layout_centerHorizontal="true"/>
103 
+
104 
+                </RelativeLayout>
105 
+
106 
+                <View
107 
+                    android:layout_width="1px"
108 
+                    android:layout_height="45dp"
109 
+                    android:background="@color/text_hint_grey_color"/>
110 
+
111 
+                <RelativeLayout
112 
+                    android:layout_width="0dp"
113 
+                    android:layout_weight="1"
114 
+                    android:layout_height="match_parent">
115 
+
116 
+                    <TextView
117 
+                        android:id="@+id/tv_today_point"
118 
+                        android:layout_width="wrap_content"
119 
+                        android:layout_height="wrap_content"
120 
+                        android:layout_marginTop="15dp"
121 
+                        android:textColor="@color/_7B8088"
122 
+                        android:textSize="14sp"
123 
+                        android:layout_centerHorizontal="true"
124 
+                        android:text="@string/today_incoming"/>
125 
+
126 
+                    <TextView
127 
+                        android:id="@+id/tv_today_point_amount"
128 
+                        android:layout_width="wrap_content"
129 
+                        android:layout_height="wrap_content"
130 
+                        android:layout_below="@id/tv_today_point"
131 
+                        android:layout_marginTop="12dp"
132 
+                        android:textColor="@color/_EF4847"
133 
+                        android:textSize="22sp"
134 
+                        android:layout_centerHorizontal="true"/>
135 
+
136 
+                </RelativeLayout>
137 
+
138 
+            </LinearLayout>
139 
+            <LinearLayout
140 
+                android:layout_width="match_parent"
141 
+                android:layout_height="90dp"
142 
+                android:orientation="horizontal"
143 
+                android:gravity="center_vertical"
144 
+                android:background="@color/background_white">
145 
+
146 
+                <RelativeLayout
147 
+                    android:layout_width="0dp"
148 
+                    android:layout_weight="1"
149 
+                    android:layout_height="match_parent">
150 
+
151 
+                    <TextView
152 
+                        android:id="@+id/tv_week_origin_sold"
153 
+                        android:layout_width="wrap_content"
154 
+                        android:layout_height="wrap_content"
155 
+                        android:layout_marginTop="15dp"
156 
+                        android:textColor="@color/_7B8088"
157 
+                        android:textSize="14sp"
158 
+                        android:layout_centerHorizontal="true"
159 
+                        android:text="@string/week_origin_sold"/>
160 
+
161 
+                    <TextView
162 
+                        android:id="@+id/tv_week_origin_sold_num"
163 
+                        android:layout_width="wrap_content"
164 
+                        android:layout_height="wrap_content"
165 
+                        android:layout_below="@id/tv_week_origin_sold"
166 
+                        android:layout_marginTop="12dp"
167 
+                        android:textColor="@color/_EF4847"
168 
+                        android:textSize="22sp"
169 
+                        android:layout_centerHorizontal="true"/>
170 
+
171 
+                </RelativeLayout>
172 
+
173 
+                <View
174 
+                    android:layout_width="1px"
175 
+                    android:layout_height="45dp"
176 
+                    android:background="@color/text_hint_grey_color"/>
177 
+
178 
+                <RelativeLayout
179 
+                    android:layout_width="0dp"
180 
+                    android:layout_weight="1"
181 
+                    android:layout_height="match_parent">
182 
+
183 
+                    <TextView
184 
+                        android:id="@+id/tv_week_point"
185 
+                        android:layout_width="wrap_content"
186 
+                        android:layout_height="wrap_content"
187 
+                        android:layout_marginTop="15dp"
188 
+                        android:textColor="@color/_7B8088"
189 
+                        android:textSize="14sp"
190 
+                        android:layout_centerHorizontal="true"
191 
+                        android:text="@string/week_point"/>
192 
+
193 
+                    <TextView
194 
+                        android:id="@+id/tv_week_point_amount"
195 
+                        android:layout_width="wrap_content"
196 
+                        android:layout_height="wrap_content"
197 
+                        android:layout_below="@id/tv_week_point"
198 
+                        android:layout_marginTop="12dp"
199 
+                        android:textColor="@color/_EF4847"
200 
+                        android:textSize="22sp"
201 
+                        android:layout_centerHorizontal="true"/>
202 
+
203 
+                </RelativeLayout>
204 
+
205 
+            </LinearLayout>
206 
+
207 
+            <LinearLayout
208 
+                android:id="@+id/layout_message_part"
209 
+                android:layout_marginTop="8dp"
210 
+                android:layout_width="match_parent"
217 211 
                 android:layout_height="wrap_content"
218 
-                android:layout_gravity="center_vertical"
219 
-                android:text="@string/message"
212 
+                android:background="@color/background_white"
213 
+                android:orientation="vertical">
214 
+
215 
+                <LinearLayout
216 
+                    android:layout_width="match_parent"
217 
+                    android:layout_height="32dp"
218 
+                    android:orientation="horizontal">
219 
+
220 
+                    <TextView
221 
+                        android:layout_width="wrap_content"
222 
+                        android:layout_height="wrap_content"
223 
+                        android:layout_gravity="center_vertical"
224 
+                        android:text="@string/message"
225 
+                        android:paddingLeft="10dp"
226 
+                        android:textColor="@color/_7B8088"
227 
+                        android:textSize="14sp"
228 
+                        />
229 
+                </LinearLayout>
230 
+
231 
+            </LinearLayout>
232 
+
233 
+            <View
234 
+                android:layout_width="match_parent"
235 
+                android:layout_height="1px"
236 
+                android:background="@color/text_hint_grey_color"/>
237 
+
238 
+            <LinearLayout
239 
+                android:layout_width="match_parent"
240 
+                android:layout_height="44dp"
220 241 
                 android:paddingLeft="10dp"
221 
-                android:textColor="@color/_7B8088"
222 
-                android:textSize="14sp"
223 
-                />
224 
-        </LinearLayout>
225 
-
226 
-    </LinearLayout>
227 
-
228 
-    <View
229 
-        android:layout_width="match_parent"
230 
-        android:layout_height="1px"
231 
-        android:background="@color/text_hint_grey_color"/>
232 
-
233 
-    <LinearLayout
234 
-        android:layout_width="match_parent"
235 
-        android:layout_height="44dp"
236 
-        android:paddingLeft="10dp"
237 
-        android:paddingRight="6dp"
238 
-        android:background="@color/background_white"
239 
-        android:orientation="horizontal">
240 
-
241 
-    <TextSwitcher
242 
-        android:id="@+id/switcher_system_msg"
243 
-        android:layout_width="0dp"
244 
-        android:inAnimation="@android:anim/slide_in_left"
245 
-        android:outAnimation="@android:anim/slide_out_right"
246 
-        android:layout_height="wrap_content"
247 
-        android:layout_gravity="center_vertical"
248 
-        android:layout_weight="1"/>
249 
-
250 
-    <ImageView
251 
-        android:layout_width="10dp"
252 
-        android:layout_height="18dp"
253 
-        android:layout_gravity="center_vertical"
254 
-        android:src="@drawable/arrow_right"/>
255 
-
256 
-</LinearLayout>
257 
-
258 
-    <View
259 
-        android:layout_width="match_parent"
260 
-        android:layout_height="1px"
261 
-        android:background="@color/text_hint_grey_color"/>
262 
-
263 
-    <LinearLayout
264 
-        android:layout_width="match_parent"
265 
-        android:layout_height="44dp"
266 
-        android:paddingLeft="10dp"
267 
-        android:paddingRight="6dp"
268 
-        android:background="@color/background_white"
269 
-        android:orientation="horizontal">
270 
-
271 
-        <TextSwitcher
272 
-            android:id="@+id/switcher_order_msg"
273 
-            android:layout_width="0dp"
274 
-            android:layout_height="wrap_content"
275 
-            android:inAnimation="@android:anim/slide_in_left"
276 
-            android:outAnimation="@android:anim/slide_out_right"
277 
-            android:layout_gravity="center_vertical"
278 
-            android:layout_weight="1"/>
279 
-
280 
-        <ImageView
281 
-            android:layout_width="10dp"
282 
-            android:layout_height="18dp"
283 
-            android:layout_gravity="center_vertical"
284 
-            android:src="@drawable/arrow_right"/>
242 
+                android:paddingRight="6dp"
243 
+                android:background="@color/background_white"
244 
+                android:orientation="horizontal">
245 
+
246 
+                <TextSwitcher
247 
+                    android:id="@+id/switcher_system_msg"
248 
+                    android:layout_width="0dp"
249 
+                    android:inAnimation="@android:anim/slide_in_left"
250 
+                    android:outAnimation="@android:anim/slide_out_right"
251 
+                    android:layout_height="wrap_content"
252 
+                    android:layout_gravity="center_vertical"
253 
+                    android:layout_weight="1"/>
254 
+
255 
+                <ImageView
256 
+                    android:layout_width="10dp"
257 
+                    android:layout_height="18dp"
258 
+                    android:layout_gravity="center_vertical"
259 
+                    android:src="@drawable/arrow_right"/>
260 
+
261 
+            </LinearLayout>
262 
+
263 
+            <View
264 
+                android:layout_width="match_parent"
265 
+                android:layout_height="1px"
266 
+                android:background="@color/text_hint_grey_color"/>
267 
+
268 
+            <LinearLayout
269 
+                android:layout_width="match_parent"
270 
+                android:layout_height="44dp"
271 
+                android:paddingLeft="10dp"
272 
+                android:paddingRight="6dp"
273 
+                android:background="@color/background_white"
274 
+                android:orientation="horizontal">
275 
+
276 
+                <TextSwitcher
277 
+                    android:id="@+id/switcher_order_msg"
278 
+                    android:layout_width="0dp"
279 
+                    android:layout_height="wrap_content"
280 
+                    android:inAnimation="@android:anim/slide_in_left"
281 
+                    android:outAnimation="@android:anim/slide_out_right"
282 
+                    android:layout_gravity="center_vertical"
283 
+                    android:layout_weight="1"/>
284 
+
285 
+                <ImageView
286 
+                    android:layout_width="10dp"
287 
+                    android:layout_height="18dp"
288 
+                    android:layout_gravity="center_vertical"
289 
+                    android:src="@drawable/arrow_right"/>
290 
+
291 
+            </LinearLayout>
292 
+
293 
+            <LinearLayout
294 
+                android:id="@+id/layout_box_part"
295 
+                android:layout_marginTop="8dp"
296 
+                android:layout_width="match_parent"
297 
+                android:layout_height="wrap_content"
298 
+                android:background="@color/background_white"
299 
+                android:orientation="vertical">
300 
+
301 
+                <LinearLayout
302 
+                    android:layout_width="match_parent"
303 
+                    android:layout_height="32dp"
304 
+                    android:orientation="horizontal">
305 
+
306 
+                    <TextView
307 
+                        android:layout_width="wrap_content"
308 
+                        android:layout_height="wrap_content"
309 
+                        android:layout_gravity="center_vertical"
310 
+                        android:text="@string/box_setting"
311 
+                        android:paddingLeft="10dp"
312 
+                        android:textColor="@color/_7B8088"
313 
+                        android:textSize="14sp"
314 
+                        />
315 
+                </LinearLayout>
316 
+
317 
+                <View
318 
+                    android:layout_width="match_parent"
319 
+                    android:layout_height="1px"
320 
+                    android:background="@color/text_hint_grey_color"/>
321 
+
322 
+                <LinearLayout
323 
+                    android:layout_width="match_parent"
324 
+                    android:layout_height="44dp"
325 
+                    android:orientation="horizontal">
326 
+
327 
+                    <TextView
328 
+                        android:layout_width="wrap_content"
329 
+                        android:layout_height="wrap_content"
330 
+                        android:layout_gravity="center_vertical"
331 
+                        android:text="@string/box_no"
332 
+                        android:paddingLeft="10dp"
333 
+                        android:textColor="@color/dark_grey"
334 
+                        android:textSize="16sp"
335 
+                        />
336 
+
337 
+                    <TextView
338 
+                        android:id="@+id/tv_box_num"
339 
+                        android:layout_width="0dp"
340 
+                        android:layout_weight="1"
341 
+                        android:layout_height="match_parent"
342 
+                        android:gravity="center_vertical|right"
343 
+                        android:text="SN89757"
344 
+                        android:paddingRight="10dp"
345 
+                        android:textColor="@color/grey"
346 
+                        android:textSize="14sp"
347 
+                        />
348 
+                </LinearLayout>
349 
+
350 
+                <View
351 
+                    android:layout_width="match_parent"
352 
+                    android:layout_height="1px"
353 
+                    android:background="@color/text_hint_grey_color"/>
354 
+
355 
+                <LinearLayout
356 
+                    android:layout_width="match_parent"
357 
+                    android:layout_height="44dp"
358 
+                    android:orientation="horizontal">
359 
+
360 
+                    <TextView
361 
+                        android:layout_width="wrap_content"
362 
+                        android:layout_height="wrap_content"
363 
+                        android:layout_gravity="center_vertical"
364 
+                        android:text="@string/box_status"
365 
+                        android:paddingLeft="10dp"
366 
+                        android:textColor="@color/dark_grey"
367 
+                        android:textSize="16sp"
368 
+                        />
369 
+
370 
+                    <TextView
371 
+                        android:id="@+id/tv_box_status"
372 
+                        android:layout_width="0dp"
373 
+                        android:layout_weight="1"
374 
+                        android:layout_height="match_parent"
375 
+                        android:gravity="center_vertical|right"
376 
+                        android:text="@string/connected_device"
377 
+                        android:paddingRight="10dp"
378 
+                        android:textColor="@color/grey"
379 
+                        android:textSize="14sp"
380 
+                        />
381 
+                </LinearLayout>
382 
+
383 
+            </LinearLayout>
384 
+
385 
+            <LinearLayout
386 
+                android:id="@+id/layout_price_part"
387 
+                android:layout_marginTop="8dp"
388 
+                android:layout_width="match_parent"
389 
+                android:layout_height="wrap_content"
390 
+                android:background="@color/background_white"
391 
+                android:orientation="vertical">
392 
+
393 
+                <LinearLayout
394 
+                    android:layout_width="match_parent"
395 
+                    android:layout_height="44dp"
396 
+                    android:paddingRight="6dp"
397 
+                    android:orientation="horizontal">
398 
+
399 
+                    <TextView
400 
+                        android:layout_width="0dp"
401 
+                        android:layout_height="wrap_content"
402 
+                        android:layout_gravity="center_vertical"
403 
+                        android:text="@string/price_manage"
404 
+                        android:paddingLeft="10dp"
405 
+                        android:textColor="@color/dark_grey"
406 
+                        android:textSize="16sp"
407 
+                        android:layout_weight="1"/>
408 
+
409 
+                    <ImageView
410 
+                        android:layout_width="10dp"
411 
+                        android:layout_height="18dp"
412 
+                        android:layout_gravity="center_vertical"
413 
+                        android:src="@drawable/arrow_right"/>
414 
+
415 
+                </LinearLayout>
416 
+
417 
+                <View
418 
+                    android:layout_width="match_parent"
419 
+                    android:layout_height="1px"
420 
+                    android:background="@color/text_hint_grey_color"/>
421 
+
422 
+                <LinearLayout
423 
+                    android:layout_width="match_parent"
424 
+                    android:layout_height="44dp"
425 
+                    android:paddingRight="6dp"
426 
+                    android:orientation="horizontal">
427 
+
428 
+                    <TextView
429 
+                        android:layout_width="0dp"
430 
+                        android:layout_height="wrap_content"
431 
+                        android:layout_gravity="center_vertical"
432 
+                        android:text="@string/platform_price_rule"
433 
+                        android:paddingLeft="10dp"
434 
+                        android:textColor="@color/dark_grey"
435 
+                        android:textSize="16sp"
436 
+                        android:layout_weight="1"/>
437 
+
438 
+                    <ImageView
439 
+                        android:layout_width="10dp"
440 
+                        android:layout_height="18dp"
441 
+                        android:layout_gravity="center_vertical"
442 
+                        android:src="@drawable/arrow_right"/>
443 
+
444 
+                </LinearLayout>
445 
+
446 
+            </LinearLayout>
285 447
286 
-    </LinearLayout>
448 
+        </LinearLayout>
449 
+    </ScrollView>
287 450
288 
-</LinearLayout>
289 451
290 452 
 </RelativeLayout>

+ 10 - 4
app/src/main/res/values/strings.xml
Parādīt failu 

@@ -49,8 +49,6 @@
49 49
50 50 
     <string name="today_capture_hour">今日拍摄</string>
51 51
52 
-    <string name="photo_upload_count">累计上传</string>
53 
-
54 52 
     <string name="week_point">周积分(元)</string>
55 53
56 54 
     <string name="message">消息</string>
 
@@ -71,8 +69,6 @@
71 69
72 70 
     <string name="query_processing">正在查询打印机状态</string>
73 71
74 
-    <string name="print_test">打印测试页</string>
75 
-
76 72 
     <string name="bluetooth_status">蓝牙状态</string>
77 73
78 74 
     <string name="bt_is_enabled">蓝牙已打开</string>
 
@@ -112,4 +108,14 @@
112 108 
     <string name="printer_service_boot_fail">打印机服务连接失败，请退出应用重试</string>
113 109
114 110 
     <string name="not_set_printer_yet">尚未设置打印机，去设置</string>
111 
+
112 
+    <string name="box_setting">盒子设置</string>
113 
+
114 
+    <string name="box_no">盒子编号</string>
115 
+
116 
+    <string name="box_status">盒子状态</string>
117 
+
118 
+    <string name="price_manage">价格管理</string>
119 
+
120 
+    <string name="platform_price_rule">分成及结算规则</string>
115 121 
 </resources>