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

陶汉栋
2 parents 378663ec bcb57ba9
Showing 2 changed files with 168 additions and 1 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/views/ProgressView.java
app/src/main/res/layout/activity_child_detail.xml
@@ -17,7 +17,7 @@ import android.view.View;
 /***
  * 自定义圆弧进度条
  *
- * @author liujing
+ * @author yxb
  */
 public class ProgressView extends View {
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity">
+    <include layout="@layout/top" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/iphone_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
+            android:orientation="vertical">
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/info_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="孩子姓名："
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/child_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="学        校："
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/child_school"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="班        级："
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/child_class"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="学校所属地区："
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/school_area"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
+                android:layout_marginLeft="60dp"
+                android:layout_marginRight="60dp"
+                android:layout_marginTop="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="学生账号："
+                    android:textSize="@dimen/sp_16" />
+
+                <TextView
+                    android:id="@+id/"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@drawable/rudio_bord"
+                    android:gravity="center"
+                    android:textColor="@color/textColor" />
+
+            </LinearLayout>
+            <TextView
+                android:id="@+id/add_child"
+                android:layout_width="220dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="20dp"
+                android:background="@drawable/rudiobtn"
+                android:gravity="center"
+                android:text="确定"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txtsize_title" />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</LinearLayout>
	@@ -17,7 +17,7 @@ import android.view.View;		@@ -17,7 +17,7 @@ import android.view.View;
17	/***	17	/***
18	* 自定义圆弧进度条	18	* 自定义圆弧进度条
19	*	19	*
20	- * @author liujing	20	+ * @author yxb
21	*/	21	*/
22	public class ProgressView extends View {	22	public class ProgressView extends View {
23		23
@@ -0,0 +1,167 @@		@@ -0,0 +1,167 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
	3	+ xmlns:tools="http://schemas.android.com/tools"
	4	+ android:layout_width="match_parent"
	5	+ android:layout_height="match_parent"
	6	+ android:orientation="vertical"
	7	+ android:background="@color/white"
	8	+ tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity">
	9	+ <include layout="@layout/top" />
	10	+
	11	+ <LinearLayout
	12	+ android:layout_width="match_parent"
	13	+ android:layout_height="match_parent"
	14	+ android:orientation="vertical">
	15	+
	16	+ <LinearLayout
	17	+ android:id="@+id/iphone_layout"
	18	+ android:layout_width="match_parent"
	19	+ android:layout_height="wrap_content"
	20	+ android:layout_marginTop="80dp"
	21	+ android:orientation="vertical">
	22	+ </LinearLayout>
	23	+
	24	+ <LinearLayout
	25	+ android:id="@+id/info_layout"
	26	+ android:layout_width="match_parent"
	27	+ android:layout_height="match_parent"
	28	+ android:layout_marginTop="20dp"
	29	+ android:orientation="vertical">
	30	+
	31	+ <LinearLayout
	32	+ android:layout_width="match_parent"
	33	+ android:layout_height="30dp"
	34	+ android:layout_marginLeft="60dp"
	35	+ android:layout_marginRight="60dp"
	36	+ android:layout_marginTop="10dp">
	37	+
	38	+ <TextView
	39	+ android:layout_width="wrap_content"
	40	+ android:layout_height="wrap_content"
	41	+ android:text="孩子姓名："
	42	+ android:textSize="@dimen/sp_16" />
	43	+
	44	+ <TextView
	45	+ android:id="@+id/child_name"
	46	+ android:layout_width="wrap_content"
	47	+ android:layout_height="match_parent"
	48	+ android:layout_weight="1"
	49	+ android:background="@drawable/rudio_bord"
	50	+ android:gravity="center"
	51	+ android:textColor="@color/textColor" />
	52	+
	53	+ </LinearLayout>
	54	+
	55	+ <LinearLayout
	56	+ android:layout_width="match_parent"
	57	+ android:layout_height="30dp"
	58	+ android:layout_marginLeft="60dp"
	59	+ android:layout_marginRight="60dp"
	60	+ android:layout_marginTop="10dp">
	61	+
	62	+ <TextView
	63	+ android:layout_width="wrap_content"
	64	+ android:layout_height="wrap_content"
	65	+ android:text="学校："
	66	+ android:textSize="@dimen/sp_16" />
	67	+
	68	+ <TextView
	69	+ android:id="@+id/child_school"
	70	+ android:layout_width="wrap_content"
	71	+ android:layout_height="match_parent"
	72	+ android:layout_weight="1"
	73	+ android:background="@drawable/rudio_bord"
	74	+ android:gravity="center"
	75	+ android:textColor="@color/textColor" />
	76	+
	77	+ </LinearLayout>
	78	+
	79	+
	80	+
	81	+ <LinearLayout
	82	+ android:layout_width="match_parent"
	83	+ android:layout_height="30dp"
	84	+ android:layout_marginLeft="60dp"
	85	+ android:layout_marginRight="60dp"
	86	+ android:layout_marginTop="10dp">
	87	+
	88	+ <TextView
	89	+ android:layout_width="wrap_content"
	90	+ android:layout_height="wrap_content"
	91	+ android:text="班级："
	92	+ android:textSize="@dimen/sp_16" />
	93	+
	94	+ <TextView
	95	+ android:id="@+id/child_class"
	96	+ android:layout_width="wrap_content"
	97	+ android:layout_height="match_parent"
	98	+ android:layout_weight="1"
	99	+ android:background="@drawable/rudio_bord"
	100	+ android:gravity="center"
	101	+ android:textColor="@color/textColor" />
	102	+
	103	+ </LinearLayout>
	104	+ <LinearLayout
	105	+ android:layout_width="match_parent"
	106	+ android:layout_height="30dp"
	107	+ android:layout_marginLeft="60dp"
	108	+ android:layout_marginRight="60dp"
	109	+ android:layout_marginTop="10dp">
	110	+
	111	+ <TextView
	112	+ android:layout_width="wrap_content"
	113	+ android:layout_height="wrap_content"
	114	+ android:text="学校所属地区："
	115	+ android:textSize="@dimen/sp_16" />
	116	+
	117	+ <TextView
	118	+ android:id="@+id/school_area"
	119	+ android:layout_width="wrap_content"
	120	+ android:layout_height="match_parent"
	121	+ android:layout_weight="1"
	122	+ android:background="@drawable/rudio_bord"
	123	+ android:gravity="center"
	124	+ android:textColor="@color/textColor" />
	125	+
	126	+ </LinearLayout>
	127	+ <LinearLayout
	128	+ android:layout_width="match_parent"
	129	+ android:layout_height="30dp"
	130	+ android:layout_marginLeft="60dp"
	131	+ android:layout_marginRight="60dp"
	132	+ android:layout_marginTop="10dp">
	133	+
	134	+ <TextView
	135	+ android:layout_width="wrap_content"
	136	+ android:layout_height="wrap_content"
	137	+ android:text="学生账号："
	138	+ android:textSize="@dimen/sp_16" />
	139	+
	140	+ <TextView
	141	+ android:id="@+id/"
	142	+ android:layout_width="wrap_content"
	143	+ android:layout_height="match_parent"
	144	+ android:layout_weight="1"
	145	+ android:background="@drawable/rudio_bord"
	146	+ android:gravity="center"
	147	+ android:textColor="@color/textColor" />
	148	+
	149	+ </LinearLayout>
	150	+ <TextView
	151	+ android:id="@+id/add_child"
	152	+ android:layout_width="220dp"
	153	+ android:layout_height="40dp"
	154	+ android:layout_gravity="center_horizontal"
	155	+ android:layout_marginTop="20dp"
	156	+ android:background="@drawable/rudiobtn"
	157	+ android:gravity="center"
	158	+ android:text="确定"
	159	+ android:textColor="@color/white"
	160	+ android:textSize="@dimen/txtsize_title" />
	161	+ </LinearLayout>
	162	+
	163	+
	164	+ </LinearLayout>
	165	+
	166	+
	167	+</LinearLayout>