Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

陶汉栋
2 parents 34c57df7 11f0c65b
Showing 14 changed files with 342 additions and 8 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
app/src/main/res/drawable-xhdpi/about.png
app/src/main/res/drawable-xhdpi/arrow_right.png
app/src/main/res/drawable-xhdpi/backgroud_top.png
app/src/main/res/drawable-xhdpi/buy.png
app/src/main/res/drawable-xhdpi/child.png
app/src/main/res/drawable-xhdpi/clean.png
app/src/main/res/drawable-xhdpi/kefu.png
app/src/main/res/drawable-xhdpi/tiaoxing.png
app/src/main/res/layout/fragment_mine.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/dimens.xml
mvpsdk/src/main/res/values/dimens.xml
 package com.shunzhi.parent.ui.fragment;
  
-import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 package com.shunzhi.parent.ui.fragment;
  
-import android.content.Context;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -8,13 +9,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="#F0eff5"
         android:orientation="vertical">
  
         <LinearLayout
             android:id="@+id/top_layout"
+            android:paddingTop="40dp"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/txt_black"
+            android:layout_height="200dp"
+            android:background="@drawable/backgroud_top"
             android:orientation="vertical">
  
             <TextView
@@ -23,9 +26,295 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:text="个人中心"
-                android:textColor="#FC5B6A"
-                />
+                android:textColor="@color/textRed"
+                android:textSize="@dimen/txtsize_headline" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <com.makeramen.roundedimageview.RoundedImageView
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="20dp"
+                    android:src="@color/white"
+                    app:riv_corner_radius="10dp" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="25dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="马铂賽"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txtsize_headline" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="账号：12345678991"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txtsize_title"
+
+                        />
+
+                </LinearLayout>
+
+                <ImageView
+                    android:layout_width="40dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="20dp"
+                    android:src="@drawable/arrow_right" />
+            </LinearLayout>
+        </LinearLayout>
+<ScrollView
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+        <LinearLayout
+            android:id="@+id/center_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="20dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:gravity="center_vertical"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="20dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/tiaoxing" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="我的订阅消息"
+                        android:textSize="@dimen/txtsize_title" />
+
+                    <TextView
+                        android:layout_width="40dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="3"
+                        android:textSize="@dimen/sp_18"
+                        android:textColor="@color/textRed"
+                        />
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@color/bottomline" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+
+                    >
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="20dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/tiaoxing" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="订购详情"
+                        android:textSize="@dimen/txtsize_title" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@color/bottomline" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+                    >
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="30dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/buy" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="家校通订购"
+                        android:textSize="@dimen/txtsize_title" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@color/bottomline" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+                    >
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="30dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/child" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="我的孩子"
+                        android:textSize="@dimen/txtsize_title" />
+
+                    <TextView
+                        android:layout_width="80dp"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:text="未绑定"
+                        android:textSize="@dimen/sp_18"
+                        android:textColor="@color/textRed"
+                        />
+                </LinearLayout>
+
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_marginTop="20dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:gravity="center_vertical"
+                    android:layout_height="40dp">
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/kefu" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="在线客服"
+                        android:textSize="@dimen/txtsize_title" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@color/bottomline" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+
+                    >
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/clean" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="清除缓存"
+                        android:textSize="@dimen/txtsize_title" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@color/bottomline" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+                    >
+
+                    <TextView
+                        android:layout_width="25dp"
+                        android:layout_height="25dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="30dp"
+                        android:background="@drawable/about" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_weight="1"
+                        android:text="关于"
+                        android:textSize="@dimen/txtsize_title" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+
+
         </LinearLayout>
+</ScrollView>
+
     </LinearLayout>
  
 </FrameLayout>
@@ -7,5 +7,7 @@
  
     <color name="hintTextColor">#C1C1C1</color>
     <color name="bottomline">#B8B8B9</color>
+    <color name="bg_main">#F0EFF5</color>
+    <color name="textRed">#FC5B6A</color>
  
 </resources>
@@ -0,0 +1,46 @@
+<resources>
+
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <!-- margin -->
+    <dimen name="margin_tiny">4dp</dimen>
+    <dimen name="margin_small">8dp</dimen>
+    <dimen name="margin_medium">16dp</dimen>
+    <dimen name="margin_large">32dp</dimen>
+    <dimen name="margin_huge">64dp</dimen>
+    <dimen name="margin_only_txt">48dp</dimen>
+
+    <!-- txtsize -->
+    <dimen name="txtsize_display1">34sp</dimen>
+    <dimen name="txtsize_headline">24sp</dimen>
+    <dimen name="txtsize_title">20sp</dimen>
+    <dimen name="txtsize_subhead">16sp</dimen>
+    <dimen name="txtsize_body">14sp</dimen>
+    <dimen name="txtsize_caption">12sp</dimen>
+
+    <!-- other size -->
+    <dimen name="corner_radius">2dp</dimen>
+    <dimen name="banner_height">136dp</dimen>
+
+    <dimen name="def_height">50dp</dimen>
+    <dimen name="avatarSize">50dp</dimen>
+    <dimen name="smallSpace">6dp</dimen>
+
+    <dimen name="dp_066">0.66dp</dimen>
+    <dimen name="dp_4">4dp</dimen>
+    <dimen name="dp_10">10dp</dimen>
+    <dimen name="dp_14">14dp</dimen>
+    <dimen name="dp_22">22dp</dimen>
+    <dimen name="dp_36">36dp</dimen>
+    <dimen name="dp_40">40dp</dimen>
+    <dimen name="dp_60">60dp</dimen>
+    <dimen name="dp_72">72dp</dimen>
+
+    <dimen name="sp_12">12sp</dimen>
+    <dimen name="sp_14">14sp</dimen>
+    <dimen name="sp_16">16sp</dimen>
+    <dimen name="sp_18">18sp</dimen>
+
+</resources>
 \ No newline at end of file
@@ -42,4 +42,5 @@
     <dimen name="sp_14">14sp</dimen>
     <dimen name="sp_16">16sp</dimen>
     <dimen name="sp_18">18sp</dimen>
+
 </resources>
 \ No newline at end of file
1	1	package com.shunzhi.parent.ui.fragment;
2	2
3		-import android.content.Context;
4		-import android.net.Uri;
5	3	import android.os.Bundle;
6	4	import android.support.v4.app.Fragment;
7	5	import android.view.LayoutInflater;
...	...
1	1	<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
	2	+ xmlns:app="http://schemas.android.com/apk/res-auto"
2	3	xmlns:tools="http://schemas.android.com/tools"
3	4	android:layout_width="match_parent"
4	5	android:layout_height="match_parent"
...	...	@@ -8,13 +9,15 @@
8	9	<LinearLayout
9	10	android:layout_width="match_parent"
10	11	android:layout_height="match_parent"
	12	+ android:background="#F0eff5"
11	13	android:orientation="vertical">
12	14
13	15	<LinearLayout
14	16	android:id="@+id/top_layout"
	17	+ android:paddingTop="40dp"
15	18	android:layout_width="match_parent"
16		- android:layout_height="wrap_content"
17		- android:background="@color/txt_black"
	19	+ android:layout_height="200dp"
	20	+ android:background="@drawable/backgroud_top"
18	21	android:orientation="vertical">
19	22
20	23	<TextView
...	...	@@ -23,9 +26,295 @@
23	26	android:layout_gravity="center"
24	27	android:gravity="center"
25	28	android:text="个人中心"
26		- android:textColor="#FC5B6A"
27		- />
	29	+ android:textColor="@color/textRed"
	30	+ android:textSize="@dimen/txtsize_headline" />
	31	+
	32	+ <LinearLayout
	33	+ android:layout_width="match_parent"
	34	+ android:layout_height="wrap_content"
	35	+ android:orientation="horizontal">
	36	+
	37	+ <com.makeramen.roundedimageview.RoundedImageView
	38	+ android:layout_width="60dp"
	39	+ android:layout_height="60dp"
	40	+ android:layout_margin="20dp"
	41	+ android:src="@color/white"
	42	+ app:riv_corner_radius="10dp" />
	43	+
	44	+ <LinearLayout
	45	+ android:layout_width="wrap_content"
	46	+ android:layout_height="wrap_content"
	47	+ android:layout_marginTop="25dp"
	48	+ android:layout_weight="1"
	49	+ android:orientation="vertical">
	50	+
	51	+ <TextView
	52	+ android:layout_width="wrap_content"
	53	+ android:layout_height="wrap_content"
	54	+ android:text="马铂賽"
	55	+ android:textColor="@color/white"
	56	+ android:textSize="@dimen/txtsize_headline" />
	57	+
	58	+ <TextView
	59	+ android:layout_width="wrap_content"
	60	+ android:layout_height="wrap_content"
	61	+ android:text="账号：12345678991"
	62	+ android:textColor="@color/white"
	63	+ android:textSize="@dimen/txtsize_title"
	64	+
	65	+ />
	66	+
	67	+ </LinearLayout>
	68	+
	69	+ <ImageView
	70	+ android:layout_width="40dp"
	71	+ android:layout_height="match_parent"
	72	+ android:layout_marginRight="20dp"
	73	+ android:src="@drawable/arrow_right" />
	74	+ </LinearLayout>
	75	+ </LinearLayout>
	76	+<ScrollView
	77	+ android:layout_width="match_parent"
	78	+ android:layout_height="match_parent">
	79	+ <LinearLayout
	80	+ android:id="@+id/center_layout"
	81	+ android:layout_width="match_parent"
	82	+ android:layout_height="match_parent"
	83	+ android:layout_margin="20dp"
	84	+ android:orientation="vertical">
	85	+
	86	+ <LinearLayout
	87	+ android:layout_width="match_parent"
	88	+ android:layout_height="wrap_content"
	89	+ android:background="@color/white"
	90	+ android:orientation="vertical">
	91	+
	92	+ <LinearLayout
	93	+ android:layout_width="match_parent"
	94	+ android:gravity="center_vertical"
	95	+ android:layout_height="40dp">
	96	+
	97	+ <TextView
	98	+ android:layout_width="25dp"
	99	+ android:layout_height="20dp"
	100	+ android:layout_marginLeft="15dp"
	101	+ android:layout_marginRight="30dp"
	102	+ android:background="@drawable/tiaoxing" />
	103	+
	104	+ <TextView
	105	+ android:layout_width="wrap_content"
	106	+ android:layout_height="wrap_content"
	107	+ android:layout_gravity="center_vertical"
	108	+ android:layout_weight="1"
	109	+ android:text="我的订阅消息"
	110	+ android:textSize="@dimen/txtsize_title" />
	111	+
	112	+ <TextView
	113	+ android:layout_width="40dp"
	114	+ android:layout_height="wrap_content"
	115	+ android:layout_gravity="center_vertical"
	116	+ android:text="3"
	117	+ android:textSize="@dimen/sp_18"
	118	+ android:textColor="@color/textRed"
	119	+ />
	120	+ </LinearLayout>
	121	+
	122	+ <TextView
	123	+ android:layout_width="match_parent"
	124	+ android:layout_height="1dp"
	125	+ android:layout_marginLeft="15dp"
	126	+ android:layout_marginRight="15dp"
	127	+ android:background="@color/bottomline" />
	128	+
	129	+ <LinearLayout
	130	+ android:layout_width="match_parent"
	131	+ android:layout_height="40dp"
	132	+ android:gravity="center_vertical"
	133	+
	134	+ >
	135	+
	136	+ <TextView
	137	+ android:layout_width="25dp"
	138	+ android:layout_height="20dp"
	139	+ android:layout_marginLeft="15dp"
	140	+ android:layout_marginRight="30dp"
	141	+ android:background="@drawable/tiaoxing" />
	142	+
	143	+ <TextView
	144	+ android:layout_width="wrap_content"
	145	+ android:layout_height="wrap_content"
	146	+ android:layout_gravity="center_vertical"
	147	+ android:layout_weight="1"
	148	+ android:text="订购详情"
	149	+ android:textSize="@dimen/txtsize_title" />
	150	+
	151	+ </LinearLayout>
	152	+
	153	+ <TextView
	154	+ android:layout_width="match_parent"
	155	+ android:layout_height="1dp"
	156	+ android:layout_marginLeft="15dp"
	157	+ android:layout_marginRight="15dp"
	158	+ android:background="@color/bottomline" />
	159	+ <LinearLayout
	160	+ android:layout_width="match_parent"
	161	+ android:layout_height="40dp"
	162	+ android:gravity="center_vertical"
	163	+ >
	164	+
	165	+ <TextView
	166	+ android:layout_width="25dp"
	167	+ android:layout_height="30dp"
	168	+ android:layout_marginLeft="15dp"
	169	+ android:layout_marginRight="30dp"
	170	+ android:background="@drawable/buy" />
	171	+
	172	+ <TextView
	173	+ android:layout_width="wrap_content"
	174	+ android:layout_height="wrap_content"
	175	+ android:layout_gravity="center_vertical"
	176	+ android:layout_weight="1"
	177	+ android:text="家校通订购"
	178	+ android:textSize="@dimen/txtsize_title" />
	179	+
	180	+ </LinearLayout>
	181	+
	182	+ <TextView
	183	+ android:layout_width="match_parent"
	184	+ android:layout_height="1dp"
	185	+ android:layout_marginLeft="15dp"
	186	+ android:layout_marginRight="15dp"
	187	+ android:background="@color/bottomline" />
	188	+ <LinearLayout
	189	+ android:layout_width="match_parent"
	190	+ android:layout_height="40dp"
	191	+ android:gravity="center_vertical"
	192	+ >
	193	+
	194	+ <TextView
	195	+ android:layout_width="25dp"
	196	+ android:layout_height="30dp"
	197	+ android:layout_marginLeft="15dp"
	198	+ android:layout_marginRight="30dp"
	199	+ android:background="@drawable/child" />
	200	+
	201	+ <TextView
	202	+ android:layout_width="wrap_content"
	203	+ android:layout_height="wrap_content"
	204	+ android:layout_gravity="center_vertical"
	205	+ android:layout_weight="1"
	206	+ android:text="我的孩子"
	207	+ android:textSize="@dimen/txtsize_title" />
	208	+
	209	+ <TextView
	210	+ android:layout_width="80dp"
	211	+ android:layout_height="wrap_content"
	212	+ android:layout_gravity="center_vertical"
	213	+ android:text="未绑定"
	214	+ android:textSize="@dimen/sp_18"
	215	+ android:textColor="@color/textRed"
	216	+ />
	217	+ </LinearLayout>
	218	+
	219	+
	220	+
	221	+ </LinearLayout>
	222	+
	223	+ <LinearLayout
	224	+ android:layout_marginTop="20dp"
	225	+ android:layout_width="match_parent"
	226	+ android:layout_height="wrap_content"
	227	+ android:background="@color/white"
	228	+ android:orientation="vertical">
	229	+
	230	+ <LinearLayout
	231	+ android:layout_width="match_parent"
	232	+ android:gravity="center_vertical"
	233	+ android:layout_height="40dp">
	234	+
	235	+ <TextView
	236	+ android:layout_width="25dp"
	237	+ android:layout_height="25dp"
	238	+ android:layout_marginLeft="15dp"
	239	+ android:layout_marginRight="30dp"
	240	+ android:background="@drawable/kefu" />
	241	+
	242	+ <TextView
	243	+ android:layout_width="wrap_content"
	244	+ android:layout_height="wrap_content"
	245	+ android:layout_gravity="center_vertical"
	246	+ android:layout_weight="1"
	247	+ android:text="在线客服"
	248	+ android:textSize="@dimen/txtsize_title" />
	249	+
	250	+ </LinearLayout>
	251	+
	252	+ <TextView
	253	+ android:layout_width="match_parent"
	254	+ android:layout_height="1dp"
	255	+ android:layout_marginLeft="15dp"
	256	+ android:layout_marginRight="15dp"
	257	+ android:background="@color/bottomline" />
	258	+
	259	+ <LinearLayout
	260	+ android:layout_width="match_parent"
	261	+ android:layout_height="40dp"
	262	+ android:gravity="center_vertical"
	263	+
	264	+ >
	265	+
	266	+ <TextView
	267	+ android:layout_width="25dp"
	268	+ android:layout_height="25dp"
	269	+ android:layout_marginLeft="15dp"
	270	+ android:layout_marginRight="30dp"
	271	+ android:background="@drawable/clean" />
	272	+
	273	+ <TextView
	274	+ android:layout_width="wrap_content"
	275	+ android:layout_height="wrap_content"
	276	+ android:layout_gravity="center_vertical"
	277	+ android:layout_weight="1"
	278	+ android:text="清除缓存"
	279	+ android:textSize="@dimen/txtsize_title" />
	280	+
	281	+ </LinearLayout>
	282	+
	283	+ <TextView
	284	+ android:layout_width="match_parent"
	285	+ android:layout_height="1dp"
	286	+ android:layout_marginLeft="15dp"
	287	+ android:layout_marginRight="15dp"
	288	+ android:background="@color/bottomline" />
	289	+ <LinearLayout
	290	+ android:layout_width="match_parent"
	291	+ android:layout_height="40dp"
	292	+ android:gravity="center_vertical"
	293	+ >
	294	+
	295	+ <TextView
	296	+ android:layout_width="25dp"
	297	+ android:layout_height="25dp"
	298	+ android:layout_marginLeft="15dp"
	299	+ android:layout_marginRight="30dp"
	300	+ android:background="@drawable/about" />
	301	+
	302	+ <TextView
	303	+ android:layout_width="wrap_content"
	304	+ android:layout_height="wrap_content"
	305	+ android:layout_gravity="center_vertical"
	306	+ android:layout_weight="1"
	307	+ android:text="关于"
	308	+ android:textSize="@dimen/txtsize_title" />
	309	+
	310	+ </LinearLayout>
	311	+ </LinearLayout>
	312	+
	313	+
	314	+
28	315	</LinearLayout>
	316	+</ScrollView>
	317	+
29	318	</LinearLayout>
30	319
31	320	</FrameLayout>
...	...
...	...	@@ -7,5 +7,7 @@
7	7
8	8	<color name="hintTextColor">#C1C1C1</color>
9	9	<color name="bottomline">#B8B8B9</color>
	10	+ <color name="bg_main">#F0EFF5</color>
	11	+ <color name="textRed">#FC5B6A</color>
10	12
11	13	</resources>
...	...
...	...	@@ -0,0 +1,46 @@
	1	+<resources>
	2	+
	3	+ <!-- Default screen margins, per the Android Design guidelines. -->
	4	+ <dimen name="activity_horizontal_margin">16dp</dimen>
	5	+ <dimen name="activity_vertical_margin">16dp</dimen>
	6	+
	7	+ <!-- margin -->
	8	+ <dimen name="margin_tiny">4dp</dimen>
	9	+ <dimen name="margin_small">8dp</dimen>
	10	+ <dimen name="margin_medium">16dp</dimen>
	11	+ <dimen name="margin_large">32dp</dimen>
	12	+ <dimen name="margin_huge">64dp</dimen>
	13	+ <dimen name="margin_only_txt">48dp</dimen>
	14	+
	15	+ <!-- txtsize -->
	16	+ <dimen name="txtsize_display1">34sp</dimen>
	17	+ <dimen name="txtsize_headline">24sp</dimen>
	18	+ <dimen name="txtsize_title">20sp</dimen>
	19	+ <dimen name="txtsize_subhead">16sp</dimen>
	20	+ <dimen name="txtsize_body">14sp</dimen>
	21	+ <dimen name="txtsize_caption">12sp</dimen>
	22	+
	23	+ <!-- other size -->
	24	+ <dimen name="corner_radius">2dp</dimen>
	25	+ <dimen name="banner_height">136dp</dimen>
	26	+
	27	+ <dimen name="def_height">50dp</dimen>
	28	+ <dimen name="avatarSize">50dp</dimen>
	29	+ <dimen name="smallSpace">6dp</dimen>
	30	+
	31	+ <dimen name="dp_066">0.66dp</dimen>
	32	+ <dimen name="dp_4">4dp</dimen>
	33	+ <dimen name="dp_10">10dp</dimen>
	34	+ <dimen name="dp_14">14dp</dimen>
	35	+ <dimen name="dp_22">22dp</dimen>
	36	+ <dimen name="dp_36">36dp</dimen>
	37	+ <dimen name="dp_40">40dp</dimen>
	38	+ <dimen name="dp_60">60dp</dimen>
	39	+ <dimen name="dp_72">72dp</dimen>
	40	+
	41	+ <dimen name="sp_12">12sp</dimen>
	42	+ <dimen name="sp_14">14sp</dimen>
	43	+ <dimen name="sp_16">16sp</dimen>
	44	+ <dimen name="sp_18">18sp</dimen>
	45	+
	46	+</resources>
0	47	\ No newline at end of file
...	...
...	...	@@ -42,4 +42,5 @@
42	42	<dimen name="sp_14">14sp</dimen>
43	43	<dimen name="sp_16">16sp</dimen>
44	44	<dimen name="sp_18">18sp</dimen>
	45	+
45	46	</resources>
46	47	\ No newline at end of file
...	...