hy преди 4 години
родител
ревизия
446b8d515b

BIN
app/src/main/res/drawable-hdpi/app_tab_chat_icon1.png


BIN
app/src/main/res/drawable-xxhdpi/bg_tab.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_find.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_find_selected.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_index.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_index_selected.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_me_selected.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_qa.png


BIN
app/src/main/res/drawable-xxhdpi/icon_main_scan.png


BIN
app/src/main/res/drawable-xxhdpi/icon_tab_main_me.png


+ 15 - 15
app/src/main/res/layout/activity_chat.xml

4
    xmlns:tools="http://schemas.android.com/tools"
4
    xmlns:tools="http://schemas.android.com/tools"
5
    android:layout_width="match_parent"
5
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
6
    android:layout_height="match_parent"
7
    android:clipChildren="false"
7
    tools:context=".activity.ChatActivity">
8
    tools:context=".activity.ChatActivity">
8
9
9
    <RelativeLayout
10
    <RelativeLayout
85
        android:layout_above="@+id/ll_tab"
86
        android:layout_above="@+id/ll_tab"
86
        android:layout_below="@+id/act_bar"
87
        android:layout_below="@+id/act_bar"
87
        android:background="@color/ui_f4" />
88
        android:background="@color/ui_f4" />
89
    <ImageView
90
        android:layout_alignParentBottom="true"
91
        android:background="@drawable/bg_tab"
92
        android:layout_width="match_parent"
93
        android:layout_height="wrap_content"/>
88
94
89
    <!-- 底部导航 -->
95
    <!-- 底部导航 -->
90
    <LinearLayout
96
    <LinearLayout
97
        android:clipChildren="false"
98
        android:gravity="bottom"
91
        android:id="@+id/ll_tab"
99
        android:id="@+id/ll_tab"
92
        android:layout_width="match_parent"
100
        android:layout_width="match_parent"
93
        android:layout_height="49dp"
101
        android:layout_height="49dp"
119
                android:layout_gravity="center_horizontal"
127
                android:layout_gravity="center_horizontal"
120
                android:layout_marginTop="2dp"
128
                android:layout_marginTop="2dp"
121
                android:text="首页"
129
                android:text="首页"
122
                android:textColor="@color/ui_64"
130
                android:textColor="@color/color_c4c7d2"
123
                android:textSize="10sp" />
131
                android:textSize="10sp" />
124
132
125
        </LinearLayout>
133
        </LinearLayout>
145
                android:layout_gravity="center_horizontal"
153
                android:layout_gravity="center_horizontal"
146
                android:layout_marginTop="2dp"
154
                android:layout_marginTop="2dp"
147
                android:text="@string/string_tab_qa"
155
                android:text="@string/string_tab_qa"
148
                android:textColor="@color/ui_64"
156
                android:textColor="@color/color_0e0e0e"
149
                android:textSize="10sp" />
157
                android:textSize="10sp" />
150
158
151
        </LinearLayout>
159
        </LinearLayout>
152
160
153
        <LinearLayout
161
        <LinearLayout
162
            android:gravity="bottom|center_horizontal"
154
            android:id="@+id/tab_screening"
163
            android:id="@+id/tab_screening"
155
            android:layout_width="0dp"
164
            android:layout_width="0dp"
156
            android:layout_height="match_parent"
165
            android:layout_height="match_parent"
158
            android:orientation="vertical">
167
            android:orientation="vertical">
159
168
160
            <ImageView
169
            <ImageView
170
                android:layout_marginBottom="7dp"
161
                android:layout_width="wrap_content"
171
                android:layout_width="wrap_content"
162
                android:layout_height="wrap_content"
172
                android:layout_height="50dp"
163
                android:layout_gravity="center_horizontal"
173
                android:layout_gravity="center_horizontal"
164
                android:layout_marginTop="8dp"
165
                android:src="@drawable/icon_main_scan" />
174
                android:src="@drawable/icon_main_scan" />
166
175
167
            <TextView
168
                android:layout_width="wrap_content"
169
                android:layout_height="wrap_content"
170
                android:layout_gravity="center_horizontal"
171
                android:layout_marginTop="2dp"
172
                android:text="充电"
173
                android:textColor="@color/ui_64"
174
                android:textSize="10sp" />
175
176
        </LinearLayout>
176
        </LinearLayout>
177
177
178
        <RelativeLayout
178
        <RelativeLayout
209
                android:layout_gravity="center_horizontal"
209
                android:layout_gravity="center_horizontal"
210
                android:layout_marginTop="2dp"
210
                android:layout_marginTop="2dp"
211
                android:text="发现"
211
                android:text="发现"
212
                android:textColor="@color/ui_64"
212
                android:textColor="@color/color_c4c7d2"
213
                android:textSize="10sp" />
213
                android:textSize="10sp" />
214
214
215
        </RelativeLayout>
215
        </RelativeLayout>
255
                android:layout_gravity="center_horizontal"
255
                android:layout_gravity="center_horizontal"
256
                android:layout_marginTop="2dp"
256
                android:layout_marginTop="2dp"
257
                android:text="我的"
257
                android:text="我的"
258
                android:textColor="@color/ui_64"
258
                android:textColor="@color/color_c4c7d2"
259
                android:textSize="10sp" />
259
                android:textSize="10sp" />
260
        </LinearLayout>
260
        </LinearLayout>
261
261

+ 15 - 15
app/src/main/res/layout/activity_find.xml

4
    xmlns:tools="http://schemas.android.com/tools"
4
    xmlns:tools="http://schemas.android.com/tools"
5
    android:layout_width="match_parent"
5
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
6
    android:layout_height="match_parent"
7
    android:clipChildren="false"
7
    android:background="@color/activity_bgcolor"
8
    android:background="@color/activity_bgcolor"
8
    tools:context="com.electric.chargingpile.activity.FindActivity">
9
    tools:context="com.electric.chargingpile.activity.FindActivity">
9
10
607
608
608
609
609
    </com.zhy.autolayout.AutoLinearLayout>
610
    </com.zhy.autolayout.AutoLinearLayout>
611
    <ImageView
612
        android:layout_alignParentBottom="true"
613
        android:background="@drawable/bg_tab"
614
        android:layout_width="match_parent"
615
        android:layout_height="wrap_content"/>
610
616
611
    <LinearLayout
617
    <LinearLayout
618
        android:clipChildren="false"
619
        android:gravity="bottom"
612
        android:id="@+id/ll_tab"
620
        android:id="@+id/ll_tab"
613
        android:layout_width="match_parent"
621
        android:layout_width="match_parent"
614
        android:layout_height="49dp"
622
        android:layout_height="49dp"
638
                android:layout_gravity="center_horizontal"
646
                android:layout_gravity="center_horizontal"
639
                android:layout_marginTop="2dp"
647
                android:layout_marginTop="2dp"
640
                android:text="首页"
648
                android:text="首页"
641
                android:textColor="@color/ui_64"
649
                android:textColor="@color/color_c4c7d2"
642
                android:textSize="10sp" />
650
                android:textSize="10sp" />
643
651
644
        </LinearLayout>
652
        </LinearLayout>
663
                android:layout_gravity="center_horizontal"
671
                android:layout_gravity="center_horizontal"
664
                android:layout_marginTop="2dp"
672
                android:layout_marginTop="2dp"
665
                android:text="@string/string_tab_qa"
673
                android:text="@string/string_tab_qa"
666
                android:textColor="@color/ui_64"
674
                android:textColor="@color/color_c4c7d2"
667
                android:textSize="10sp" />
675
                android:textSize="10sp" />
668
676
669
        </LinearLayout>
677
        </LinearLayout>
670
678
671
        <LinearLayout
679
        <LinearLayout
680
            android:gravity="bottom|center_horizontal"
672
            android:id="@+id/tab_screening"
681
            android:id="@+id/tab_screening"
673
            android:layout_width="0dp"
682
            android:layout_width="0dp"
674
            android:layout_height="match_parent"
683
            android:layout_height="match_parent"
676
            android:orientation="vertical">
685
            android:orientation="vertical">
677
686
678
            <ImageView
687
            <ImageView
688
                android:layout_marginBottom="7dp"
679
                android:layout_width="wrap_content"
689
                android:layout_width="wrap_content"
680
                android:layout_height="wrap_content"
690
                android:layout_height="50dp"
681
                android:layout_gravity="center_horizontal"
691
                android:layout_gravity="center_horizontal"
682
                android:layout_marginTop="8dp"
683
                android:src="@drawable/icon_main_scan" />
692
                android:src="@drawable/icon_main_scan" />
684
693
685
            <TextView
686
                android:layout_width="wrap_content"
687
                android:layout_height="wrap_content"
688
                android:layout_gravity="center_horizontal"
689
                android:layout_marginTop="2dp"
690
                android:text="充电"
691
                android:textColor="@color/ui_64"
692
                android:textSize="10sp" />
693
694
        </LinearLayout>
694
        </LinearLayout>
695
695
696
        <RelativeLayout
696
        <RelativeLayout
728
                android:layout_gravity="center_horizontal"
728
                android:layout_gravity="center_horizontal"
729
                android:layout_marginTop="2dp"
729
                android:layout_marginTop="2dp"
730
                android:text="发现"
730
                android:text="发现"
731
                android:textColor="@color/ui_64"
731
                android:textColor="@color/color_0e0e0e"
732
                android:textSize="10sp" />
732
                android:textSize="10sp" />
733
733
734
        </RelativeLayout>
734
        </RelativeLayout>
775
                android:layout_gravity="center_horizontal"
775
                android:layout_gravity="center_horizontal"
776
                android:layout_marginTop="2dp"
776
                android:layout_marginTop="2dp"
777
                android:text="我的"
777
                android:text="我的"
778
                android:textColor="@color/ui_64"
778
                android:textColor="@color/color_c4c7d2"
779
                android:textSize="10sp" />
779
                android:textSize="10sp" />
780
780
781
        </LinearLayout>
781
        </LinearLayout>

+ 17 - 14
app/src/main/res/layout/activity_main_map.xml

6
    android:layout_height="match_parent"
6
    android:layout_height="match_parent"
7
    android:background="@color/white"
7
    android:background="@color/white"
8
    android:focusable="true"
8
    android:focusable="true"
9
    android:clipChildren="false"
9
    tools:context="com.electric.chargingpile.activity.MainMapActivity">
10
    tools:context="com.electric.chargingpile.activity.MainMapActivity">
10
11
11
    <!-- 标题搜索栏布局 -->
12
    <!-- 标题搜索栏布局 -->
279
            android:textSize="15sp"
280
            android:textSize="15sp"
280
            android:visibility="gone" />
281
            android:visibility="gone" />
281
    </com.zhy.autolayout.AutoRelativeLayout>
282
    </com.zhy.autolayout.AutoRelativeLayout>
283
284
    <ImageView
285
        android:layout_alignParentBottom="true"
286
        android:background="@drawable/bg_tab"
287
        android:layout_width="match_parent"
288
        android:layout_height="wrap_content"/>
289
282
    <!-- 底部tab布局 -->
290
    <!-- 底部tab布局 -->
283
    <LinearLayout
291
    <LinearLayout
292
        android:clipChildren="false"
293
        android:gravity="bottom"
284
        android:id="@+id/ll_tab"
294
        android:id="@+id/ll_tab"
285
        android:layout_width="match_parent"
295
        android:layout_width="match_parent"
286
        android:layout_height="49dp"
296
        android:layout_height="49dp"
311
                android:layout_gravity="center_horizontal"
321
                android:layout_gravity="center_horizontal"
312
                android:layout_marginTop="2dp"
322
                android:layout_marginTop="2dp"
313
                android:text="首页"
323
                android:text="首页"
314
                android:textColor="@color/ui_64"
324
                android:textColor="@color/color_0e0e0e"
315
                android:textSize="10sp" />
325
                android:textSize="10sp" />
316
        </LinearLayout>
326
        </LinearLayout>
317
327
335
                android:layout_gravity="center_horizontal"
345
                android:layout_gravity="center_horizontal"
336
                android:layout_marginTop="2dp"
346
                android:layout_marginTop="2dp"
337
                android:text="@string/string_tab_qa"
347
                android:text="@string/string_tab_qa"
338
                android:textColor="@color/ui_64"
348
                android:textColor="@color/color_c4c7d2"
339
                android:textSize="10sp" />
349
                android:textSize="10sp" />
340
350
341
        </LinearLayout>
351
        </LinearLayout>
342
352
343
        <LinearLayout
353
        <LinearLayout
354
            android:gravity="bottom|center_horizontal"
344
            android:id="@+id/tab_screening"
355
            android:id="@+id/tab_screening"
345
            android:layout_width="0dp"
356
            android:layout_width="0dp"
346
            android:layout_height="match_parent"
357
            android:layout_height="match_parent"
348
            android:orientation="vertical">
359
            android:orientation="vertical">
349
360
350
            <ImageView
361
            <ImageView
362
                android:layout_marginBottom="7dp"
351
                android:layout_width="wrap_content"
363
                android:layout_width="wrap_content"
352
                android:layout_height="wrap_content"
364
                android:layout_height="50dp"
353
                android:layout_gravity="center_horizontal"
365
                android:layout_gravity="center_horizontal"
354
                android:layout_marginTop="8dp"
355
                android:src="@drawable/icon_main_scan" />
366
                android:src="@drawable/icon_main_scan" />
356
367
357
            <TextView
358
                android:layout_width="wrap_content"
359
                android:layout_height="wrap_content"
360
                android:layout_gravity="center_horizontal"
361
                android:layout_marginTop="2dp"
362
                android:text="充电"
363
                android:textColor="@color/ui_64"
364
                android:textSize="10sp" />
365
368
366
        </LinearLayout>
369
        </LinearLayout>
367
370
398
                android:layout_gravity="center_horizontal"
401
                android:layout_gravity="center_horizontal"
399
                android:layout_marginTop="2dp"
402
                android:layout_marginTop="2dp"
400
                android:text="发现"
403
                android:text="发现"
401
                android:textColor="@color/ui_64"
404
                android:textColor="@color/color_c4c7d2"
402
                android:textSize="10sp" />
405
                android:textSize="10sp" />
403
406
404
        </RelativeLayout>
407
        </RelativeLayout>
446
                android:layout_gravity="center_horizontal"
449
                android:layout_gravity="center_horizontal"
447
                android:layout_marginTop="2dp"
450
                android:layout_marginTop="2dp"
448
                android:text="我的"
451
                android:text="我的"
449
                android:textColor="@color/ui_64"
452
                android:textColor="@color/color_c4c7d2"
450
                android:textSize="10sp" />
453
                android:textSize="10sp" />
451
454
452
455

+ 16 - 16
app/src/main/res/layout/activity_qa.xml

5
    android:layout_width="match_parent"
5
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
6
    android:layout_height="match_parent"
7
    xmlns:ptr="http://schemas.android.com/apk/res-auto"
7
    xmlns:ptr="http://schemas.android.com/apk/res-auto"
8
    android:clipChildren="false"
8
    tools:context="com.electric.chargingpile.activity.QaActivity">
9
    tools:context="com.electric.chargingpile.activity.QaActivity">
9
10
10
    <RelativeLayout
11
    <RelativeLayout
71
        android:layout_marginRight="15dp"
72
        android:layout_marginRight="15dp"
72
        android:layout_marginBottom="22dp"
73
        android:layout_marginBottom="22dp"
73
        android:src="@drawable/icon_qa_ask"/>
74
        android:src="@drawable/icon_qa_ask"/>
75
    <ImageView
76
        android:layout_alignParentBottom="true"
77
        android:background="@drawable/bg_tab"
78
        android:layout_width="match_parent"
79
        android:layout_height="wrap_content"/>
74
80
75
    <LinearLayout
81
    <LinearLayout
82
        android:clipChildren="false"
83
        android:gravity="bottom"
76
        android:id="@+id/ll_tab"
84
        android:id="@+id/ll_tab"
77
        android:layout_width="match_parent"
85
        android:layout_width="match_parent"
78
        android:layout_height="49dp"
86
        android:layout_height="49dp"
104
                android:layout_gravity="center_horizontal"
112
                android:layout_gravity="center_horizontal"
105
                android:layout_marginTop="2dp"
113
                android:layout_marginTop="2dp"
106
                android:text="首页"
114
                android:text="首页"
107
                android:textColor="@color/ui_64"
115
                android:textColor="@color/color_c4c7d2"
108
                android:textSize="10sp" />
116
                android:textSize="10sp" />
109
117
110
        </LinearLayout>
118
        </LinearLayout>
120
                android:layout_width="wrap_content"
128
                android:layout_width="wrap_content"
121
                android:layout_height="wrap_content"
129
                android:layout_height="wrap_content"
122
                android:layout_gravity="center_horizontal"
130
                android:layout_gravity="center_horizontal"
123
                android:layout_marginTop="8dp"
131
                android:layout_marginTop="10dp"
124
                android:src="@drawable/icon_main_qa_selected" />
132
                android:src="@drawable/icon_main_qa_selected" />
125
133
126
            <TextView
134
            <TextView
129
                android:layout_gravity="center_horizontal"
137
                android:layout_gravity="center_horizontal"
130
                android:layout_marginTop="2dp"
138
                android:layout_marginTop="2dp"
131
                android:text="@string/string_tab_qa"
139
                android:text="@string/string_tab_qa"
132
                android:textColor="@color/ui_64"
140
                android:textColor="@color/color_0e0e0e"
133
                android:textSize="10sp" />
141
                android:textSize="10sp" />
134
142
135
        </LinearLayout>
143
        </LinearLayout>
136
144
137
        <LinearLayout
145
        <LinearLayout
146
            android:gravity="bottom|center_horizontal"
138
            android:id="@+id/tab_screening"
147
            android:id="@+id/tab_screening"
139
            android:layout_width="0dp"
148
            android:layout_width="0dp"
140
            android:layout_height="match_parent"
149
            android:layout_height="match_parent"
142
            android:orientation="vertical">
151
            android:orientation="vertical">
143
152
144
            <ImageView
153
            <ImageView
154
                android:layout_marginBottom="7dp"
145
                android:layout_width="wrap_content"
155
                android:layout_width="wrap_content"
146
                android:layout_height="wrap_content"
156
                android:layout_height="50dp"
147
                android:layout_gravity="center_horizontal"
157
                android:layout_gravity="center_horizontal"
148
                android:layout_marginTop="8dp"
149
                android:src="@drawable/icon_main_scan" />
158
                android:src="@drawable/icon_main_scan" />
150
159
151
            <TextView
152
                android:layout_width="wrap_content"
153
                android:layout_height="wrap_content"
154
                android:layout_gravity="center_horizontal"
155
                android:layout_marginTop="2dp"
156
                android:text="充电"
157
                android:textColor="@color/ui_64"
158
                android:textSize="10sp" />
159
160
        </LinearLayout>
160
        </LinearLayout>
161
161
162
        <RelativeLayout
162
        <RelativeLayout
194
                android:layout_centerHorizontal="true"
194
                android:layout_centerHorizontal="true"
195
                android:layout_marginTop="2dp"
195
                android:layout_marginTop="2dp"
196
                android:text="发现"
196
                android:text="发现"
197
                android:textColor="@color/ui_64"
197
                android:textColor="@color/color_c4c7d2"
198
                android:textSize="10sp" />
198
                android:textSize="10sp" />
199
199
200
        </RelativeLayout>
200
        </RelativeLayout>
241
                android:layout_gravity="center_horizontal"
241
                android:layout_gravity="center_horizontal"
242
                android:layout_marginTop="2dp"
242
                android:layout_marginTop="2dp"
243
                android:text="我的"
243
                android:text="我的"
244
                android:textColor="@color/ui_64"
244
                android:textColor="@color/color_c4c7d2"
245
                android:textSize="10sp" />
245
                android:textSize="10sp" />
246
246
247
        </LinearLayout>
247
        </LinearLayout>

+ 15 - 15
app/src/main/res/layout/activity_talk.xml

4
    xmlns:tools="http://schemas.android.com/tools"
4
    xmlns:tools="http://schemas.android.com/tools"
5
    android:layout_width="match_parent"
5
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
6
    android:layout_height="match_parent"
7
    android:clipChildren="false"
7
    xmlns:ptr="http://schemas.android.com/apk/res-auto"
8
    xmlns:ptr="http://schemas.android.com/apk/res-auto"
8
    tools:context="com.electric.chargingpile.activity.TalkActivity">
9
    tools:context="com.electric.chargingpile.activity.TalkActivity">
9
10
84
        android:layout_below="@+id/rl_title"
85
        android:layout_below="@+id/rl_title"
85
        android:background="#f4f4f4"
86
        android:background="#f4f4f4"
86
        android:layout_above="@+id/ll_tab"/>
87
        android:layout_above="@+id/ll_tab"/>
88
    <ImageView
89
        android:layout_alignParentBottom="true"
90
        android:background="@drawable/bg_tab"
91
        android:layout_width="match_parent"
92
        android:layout_height="wrap_content"/>
87
93
88
    <LinearLayout
94
    <LinearLayout
95
        android:clipChildren="false"
96
        android:gravity="bottom"
89
        android:id="@+id/ll_tab"
97
        android:id="@+id/ll_tab"
90
        android:layout_width="match_parent"
98
        android:layout_width="match_parent"
91
        android:layout_height="49dp"
99
        android:layout_height="49dp"
117
                android:layout_gravity="center_horizontal"
125
                android:layout_gravity="center_horizontal"
118
                android:layout_marginTop="2dp"
126
                android:layout_marginTop="2dp"
119
                android:text="首页"
127
                android:text="首页"
120
                android:textColor="@color/ui_64"
128
                android:textColor="@color/color_c4c7d2"
121
                android:textSize="10sp" />
129
                android:textSize="10sp" />
122
130
123
        </LinearLayout>
131
        </LinearLayout>
143
                android:layout_gravity="center_horizontal"
151
                android:layout_gravity="center_horizontal"
144
                android:layout_marginTop="2dp"
152
                android:layout_marginTop="2dp"
145
                android:text="@string/string_tab_qa"
153
                android:text="@string/string_tab_qa"
146
                android:textColor="@color/ui_64"
154
                android:textColor="@color/color_0e0e0e"
147
                android:textSize="10sp" />
155
                android:textSize="10sp" />
148
156
149
        </LinearLayout>
157
        </LinearLayout>
150
158
151
        <LinearLayout
159
        <LinearLayout
160
            android:gravity="bottom|center_horizontal"
152
            android:id="@+id/tab_screening"
161
            android:id="@+id/tab_screening"
153
            android:layout_width="0dp"
162
            android:layout_width="0dp"
154
            android:layout_height="match_parent"
163
            android:layout_height="match_parent"
155
            android:layout_weight="1"
164
            android:layout_weight="1"
156
            android:orientation="vertical">
165
            android:orientation="vertical">
157
158
            <ImageView
166
            <ImageView
167
                android:layout_marginBottom="7dp"
159
                android:layout_width="wrap_content"
168
                android:layout_width="wrap_content"
160
                android:layout_height="wrap_content"
169
                android:layout_height="50dp"
161
                android:layout_gravity="center_horizontal"
170
                android:layout_gravity="center_horizontal"
162
                android:layout_marginTop="8dp"
163
                android:src="@drawable/icon_main_scan" />
171
                android:src="@drawable/icon_main_scan" />
164
172
165
            <TextView
166
                android:layout_width="wrap_content"
167
                android:layout_height="wrap_content"
168
                android:layout_gravity="center_horizontal"
169
                android:layout_marginTop="2dp"
170
                android:text="充电"
171
                android:textColor="@color/ui_64"
172
                android:textSize="10sp" />
173
173
174
        </LinearLayout>
174
        </LinearLayout>
175
175
208
                android:layout_centerHorizontal="true"
208
                android:layout_centerHorizontal="true"
209
                android:layout_marginTop="2dp"
209
                android:layout_marginTop="2dp"
210
                android:text="发现"
210
                android:text="发现"
211
                android:textColor="@color/ui_64"
211
                android:textColor="@color/color_c4c7d2"
212
                android:textSize="10sp" />
212
                android:textSize="10sp" />
213
213
214
        </RelativeLayout>
214
        </RelativeLayout>
255
                android:layout_gravity="center_horizontal"
255
                android:layout_gravity="center_horizontal"
256
                android:layout_marginTop="2dp"
256
                android:layout_marginTop="2dp"
257
                android:text="我的"
257
                android:text="我的"
258
                android:textColor="@color/ui_64"
258
                android:textColor="@color/color_c4c7d2"
259
                android:textSize="10sp" />
259
                android:textSize="10sp" />
260
260
261
        </LinearLayout>
261
        </LinearLayout>

+ 15 - 13
app/src/main/res/layout/activity_user_center.xml

5
    xmlns:app="http://schemas.android.com/apk/res-auto"
5
    xmlns:app="http://schemas.android.com/apk/res-auto"
6
    android:background="@color/activity_bgcolor"
6
    android:background="@color/activity_bgcolor"
7
    android:focusable="true"
7
    android:focusable="true"
8
    android:clipChildren="false"
8
    android:focusableInTouchMode="true">
9
    android:focusableInTouchMode="true">
9
10
10
11
961
962
962
    <!--</ScrollView>-->
963
    <!--</ScrollView>-->
963
964
965
    <ImageView
966
        android:layout_alignParentBottom="true"
967
        android:background="@drawable/bg_tab"
968
        android:layout_width="match_parent"
969
        android:layout_height="wrap_content"/>
964
970
965
    <LinearLayout
971
    <LinearLayout
972
        android:clipChildren="false"
973
        android:gravity="bottom"
966
        android:layout_width="match_parent"
974
        android:layout_width="match_parent"
967
        android:layout_height="49dp"
975
        android:layout_height="49dp"
968
        android:layout_alignParentBottom="true"
976
        android:layout_alignParentBottom="true"
993
                android:layout_gravity="center_horizontal"
1001
                android:layout_gravity="center_horizontal"
994
                android:layout_marginTop="2dp"
1002
                android:layout_marginTop="2dp"
995
                android:text="首页"
1003
                android:text="首页"
996
                android:textColor="@color/ui_64"
1004
                android:textColor="@color/color_c4c7d2"
997
                android:textSize="10sp" />
1005
                android:textSize="10sp" />
998
1006
999
        </LinearLayout>
1007
        </LinearLayout>
1018
                android:layout_gravity="center_horizontal"
1026
                android:layout_gravity="center_horizontal"
1019
                android:layout_marginTop="2dp"
1027
                android:layout_marginTop="2dp"
1020
                android:text="@string/string_tab_qa"
1028
                android:text="@string/string_tab_qa"
1021
                android:textColor="@color/ui_64"
1029
                android:textColor="@color/color_c4c7d2"
1022
                android:textSize="10sp" />
1030
                android:textSize="10sp" />
1023
1031
1024
        </LinearLayout>
1032
        </LinearLayout>
1025
1033
1026
        <LinearLayout
1034
        <LinearLayout
1035
            android:gravity="bottom|center_horizontal"
1027
            android:id="@+id/tab_screening"
1036
            android:id="@+id/tab_screening"
1028
            android:layout_width="0dp"
1037
            android:layout_width="0dp"
1029
            android:layout_height="match_parent"
1038
            android:layout_height="match_parent"
1031
            android:orientation="vertical">
1040
            android:orientation="vertical">
1032
1041
1033
            <ImageView
1042
            <ImageView
1043
                android:layout_marginBottom="7dp"
1034
                android:layout_width="wrap_content"
1044
                android:layout_width="wrap_content"
1035
                android:layout_height="wrap_content"
1045
                android:layout_height="50dp"
1036
                android:layout_gravity="center_horizontal"
1046
                android:layout_gravity="center_horizontal"
1037
                android:layout_marginTop="8dp"
1047
                android:layout_marginTop="8dp"
1038
                android:src="@drawable/icon_main_scan" />
1048
                android:src="@drawable/icon_main_scan" />
1039
1049
1040
            <TextView
1041
                android:layout_width="wrap_content"
1042
                android:layout_height="wrap_content"
1043
                android:layout_gravity="center_horizontal"
1044
                android:layout_marginTop="2dp"
1045
                android:text="充电"
1046
                android:textColor="@color/ui_64"
1047
                android:textSize="10sp" />
1048
1050
1049
        </LinearLayout>
1051
        </LinearLayout>
1050
1052
1083
                android:layout_centerHorizontal="true"
1085
                android:layout_centerHorizontal="true"
1084
                android:layout_marginTop="2dp"
1086
                android:layout_marginTop="2dp"
1085
                android:text="发现"
1087
                android:text="发现"
1086
                android:textColor="@color/ui_64"
1088
                android:textColor="@color/color_c4c7d2"
1087
                android:textSize="10sp" />
1089
                android:textSize="10sp" />
1088
1090
1089
        </RelativeLayout>
1091
        </RelativeLayout>
1182
                android:layout_gravity="center_horizontal"
1184
                android:layout_gravity="center_horizontal"
1183
                android:layout_marginTop="2dp"
1185
                android:layout_marginTop="2dp"
1184
                android:text="我的"
1186
                android:text="我的"
1185
                android:textColor="@color/ui_64"
1187
                android:textColor="@color/color_0e0e0e"
1186
                android:textSize="10sp" />
1188
                android:textSize="10sp" />
1187
1189
1188
1190

+ 2 - 0
app/src/main/res/values/color.xml

188
    <color name="color_888888">#888888</color>
188
    <color name="color_888888">#888888</color>
189
    <color name="color_fb9349">#fb9349</color>
189
    <color name="color_fb9349">#fb9349</color>
190
    <color name="color_1bb637">#1bb637</color>
190
    <color name="color_1bb637">#1bb637</color>
191
    <color name="color_0e0e0e">#0E0E0E</color>
192
    <color name="color_c4c7d2">#C4C7D2</color>
191

193

192
    <color name="sv_black">#FF000000</color>
194
    <color name="sv_black">#FF000000</color>
193
    <color name="sv_white">#FFFFFF</color>
195
    <color name="sv_white">#FFFFFF</color>