no message

陶汉栋
1 parent 5d31a3b8
Showing 14 changed files with 314 additions and 10 deletions Show diff stats
app/src/main/AndroidManifest.xml
app/src/main/java/com/shunzhi/parent/AppConfig.java
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
app/src/main/res/drawable-xhdpi/camera.png
app/src/main/res/drawable-xhdpi/play.png
app/src/main/res/drawable-xhdpi/pull.png
app/src/main/res/drawable/shape_bg_radius8.xml
app/src/main/res/layout/fragment_ce_ping.xml
app/src/main/res/layout/text_and_img_show.xml
app/src/main/res/values/colors.xml
app/src/main/res/values/dimens.xml
app/src/main/res/values/strings.xml
app/src/main/res/values/styles.xml
@@ -45,7 +45,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ui.activity.LoginAndRegistActivity">
+        <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -54,7 +54,7 @@
         </activity>
         <!--<activity android:name=".ui.activity.LoginAndRegistActivity" />-->
         <activity android:name=".ui.activity.StartActivity"></activity>
-        <activity android:name=".ui.MainActivity"
+        <activity android:name=".ui.activity.LoginAndRegistActivity"
             android:screenOrientation="portrait"
             />
         <activity android:name=".ui.activity.MyChildActivity"
@@ -61,7 +61,7 @@ public class AppConfig {
     //保存键值对
     public void set(String key, String value) {
-        SharedPreferences.Editor editor = getSharedPreferences(AppContext.getContext()).edit();
+        SharedPreferences.Editor editor = getSharedPreferences(mContext).edit();
         if (TextUtils.isEmpty(value)) {
             editor.putString(key, value);
         } else {
@@ -4,13 +4,22 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.views.TextAndImgShowView;
 public class CePingFragment extends BaseMVPCompatFragment {
+    TextView tvLocalAddress;
+
+    ImageView ivCamera;
+
+    TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_ce_ping;
@@ -18,6 +27,28 @@ public class CePingFragment extends BaseMVPCompatFragment {
     @Override
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
+        ivCamera=view.findViewById(R.id.ivCamera);
+        tvLocalAddress=view.findViewById(R.id.tvLocalAddress);
+        textAndImg1=view.findViewById(R.id.textAndImg1);
+        textAndImg2=view.findViewById(R.id.textAndImg2);
+        textAndImg3=view.findViewById(R.id.textAndImg3);
+        textAndImg4=view.findViewById(R.id.textAndImg4);
+
+        textAndImg1.setTextColor(R.color.textColor);
+        textAndImg1.setText("工具一");
+        textAndImg1.setImgs(R.drawable.play,R.drawable.play);
+
+        textAndImg2.setTextColor(R.color.textColor);
+        textAndImg2.setText("工具二");
+        textAndImg2.setImgs(R.drawable.play,R.drawable.play);
+
+        textAndImg3.setTextColor(R.color.textColor);
+        textAndImg3.setText("工具三");
+        textAndImg3.setImgs(R.drawable.play,R.drawable.play);
+
+        textAndImg4.setTextColor(R.color.textColor);
+        textAndImg4.setText("工具四");
+        textAndImg4.setImgs(R.drawable.play,R.drawable.play);
     }
@@ -0,0 +1,71 @@
+package com.shunzhi.parent.views;
+
+import android.content.Context;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.shunzhi.parent.R;
+
+
+/**
+ * Created by ToaHanDong on 2018/1/22.
+ */
+
+public class TextAndImgShowView extends LinearLayout {
+    public TextAndImgShowView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public TextAndImgShowView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public TextAndImgShowView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    ImageView image;
+    TextView text;
+    FrameLayout layout;
+    int[] imgs = null;
+    boolean isSelect = false;
+
+    private void init(Context context) {
+        View view = View.inflate(context, R.layout.text_and_img_show, this);
+        image = view.findViewById(R.id.image);
+        text = view.findViewById(R.id.text);
+        layout = view.findViewById(R.id.layout);
+    }
+
+    public void setImgs(@DrawableRes int normalDrawable, @DrawableRes int selectDrawable) {
+        imgs = new int[]{normalDrawable, selectDrawable};
+    }
+
+    public void setSelect(boolean isSelect) {
+        if (isSelect) {
+            if (imgs != null && imgs.length > 1)
+                image.setImageResource(imgs[1]);
+        } else {
+            if (imgs != null && imgs.length > 1)
+                image.setImageResource(imgs[0]);
+        }
+    }
+
+
+    public void setText(String content) {
+        text.setText(content);
+    }
+
+    public void setTextColor(int color){
+        text.setTextColor(color);
+    }
+}
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/size_dp_8"/>
+    <solid android:color="@color/white"/>
+
+</shape>
 \ No newline at end of file
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="@color/bgColor"
     tools:context="com.shunzhi.parent.ui.fragment.CePingFragment">
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+        android:layout_height="?android:actionBarSize"
+        android:background="@color/titleColor"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="杭州"
+            android:gravity="center"
+            android:textColor="@color/textColor"
+            android:paddingLeft="@dimen/size_dp_15"
+            android:drawableRight="@drawable/pull"
+            android:drawablePadding="@dimen/size_dp_5"
+            android:textSize="@dimen/textSize16"
+            android:id="@+id/tvLocalAddress"
+            />
-</FrameLayout>
+        <TextView
+            style="@style/TextView_Wrap_16"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:text="@string/ceping"
+            android:textColor="@color/textColor"
+            />
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:src="@drawable/camera"
+            android:layout_gravity="right"
+            android:paddingRight="@dimen/size_dp_15"
+            android:paddingLeft="@dimen/size_dp_15"
+            android:id="@+id/ivCamera"
+            />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_bg_radius8"
+        android:orientation="vertical"
+        android:layout_margin="@dimen/size_dp_10"
+        >
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+        <com.shunzhi.parent.views.TextAndImgShowView
+            android:id="@+id/textAndImg1"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content">
+
+        </com.shunzhi.parent.views.TextAndImgShowView>
+
+            <com.shunzhi.parent.views.TextAndImgShowView
+                android:id="@+id/textAndImg2"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+            </com.shunzhi.parent.views.TextAndImgShowView>
+
+            <com.shunzhi.parent.views.TextAndImgShowView
+                android:id="@+id/textAndImg3"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+            </com.shunzhi.parent.views.TextAndImgShowView>
+
+            <com.shunzhi.parent.views.TextAndImgShowView
+                android:id="@+id/textAndImg4"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+            </com.shunzhi.parent.views.TextAndImgShowView>
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+</LinearLayout>
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="fitXY"
+            />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:gravity="center"
+            android:textColor="@color/white"
+            android:textSize="14dp"/>
+    </LinearLayout>
+
+
+</FrameLayout>
 \ No newline at end of file
@@ -10,5 +10,7 @@
     <color name="bg_main">#F0EFF5</color>
     <color name="textRed">#FC5B6A</color>
     <color name="back_top">#C6DAFF</color>
-
+    <color name="titleColor">#C6DAFF</color>
+    <color name="bgColor">#F0EFF5</color>
+    <color name="textColor">#494947</color>
 </resources>
@@ -43,4 +43,49 @@
     <dimen name="sp_16">16sp</dimen>
     <dimen name="sp_18">18sp</dimen>
+    <dimen name="textSize10">10dp</dimen>
+    <dimen name="textSize12">12dp</dimen>
+    <dimen name="textSize14">14dp</dimen>
+    <dimen name="textSize16">16dp</dimen>
+    <dimen name="textSize18">18dp</dimen>
+    <dimen name="textSize20">20dp</dimen>
+    <dimen name="textSize24">24dp</dimen>
+    <dimen name="textSize30">30dp</dimen>
+    <dimen name="size_dp_1">1dp</dimen>
+    <dimen name="size_dp_2">2dp</dimen>
+    <dimen name="size_dp_3">3dp</dimen>
+    <dimen name="size_dp_4">4dp</dimen>
+    <dimen name="size_dp_5">5dp</dimen>
+    <dimen name="size_dp_6">6dp</dimen>
+    <dimen name="size_dp_7">7dp</dimen>
+    <dimen name="size_dp_8">8dp</dimen>
+    <dimen name="size_dp_9">9dp</dimen>
+    <dimen name="size_dp_10">10dp</dimen>
+    <dimen name="size_dp_11">11dp</dimen>
+    <dimen name="size_dp_12">12dp</dimen>
+    <dimen name="size_dp_13">13dp</dimen>
+    <dimen name="size_dp_14">14dp</dimen>
+    <dimen name="size_dp_15">15dp</dimen>
+    <dimen name="size_dp_16">16dp</dimen>
+    <dimen name="size_dp_17">17.0dp</dimen>
+    <dimen name="size_dp_18">18.0dp</dimen>
+    <dimen name="size_dp_19">19dp</dimen>
+    <dimen name="size_dp_20">20dp</dimen>
+    <dimen name="size_dp_24">24dp</dimen>
+    <dimen name="size_dp_25">25dp</dimen>
+    <dimen name="size_dp_30">30dp</dimen>
+    <dimen name="size_dp_32">32dp</dimen>
+    <dimen name="size_dp_40">40dp</dimen>
+    <dimen name="size_dp_50">50dp</dimen>
+    <dimen name="size_dp_60">60dp</dimen>
+    <dimen name="size_dp_80">80dp</dimen>
+    <dimen name="size_dp_100">100dp</dimen>
+    <dimen name="size_dp_110">110dp</dimen>
+    <dimen name="size_dp_120">120dp</dimen>
+    <dimen name="size_dp_150">150dp</dimen>
+    <dimen name="size_dp_200">200dp</dimen>
+    <dimen name="size_dp_250">250dp</dimen>
+    <dimen name="size_dp_300">300dp</dimen>
+    <dimen name="size_dp_310">310dp</dimen>
+
 </resources>
 \ No newline at end of file
@@ -3,4 +3,6 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+
+    <string name="ceping">测评</string>
 </resources>
@@ -8,4 +8,29 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+
+    <style name="TextView_Wrap_16">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/textSize16</item>
+    </style>
+
+    <style name="TextView_Width_Match_16">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">@dimen/textSize16</item>
+    </style>
+
+    <style name="TextView_Height_Match_16">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">@dimen/textSize16</item>
+    </style>
+
+    <style name="TextView_Match_16">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:textSize">@dimen/textSize16</item>
+    </style>
+
 </resources>
	@@ -45,7 +45,7 @@		@@ -45,7 +45,7 @@
45	android:supportsRtl="true"	45	android:supportsRtl="true"
46	android:theme="@style/AppTheme">	46	android:theme="@style/AppTheme">
47		47
48	- <activity android:name=".ui.activity.LoginAndRegistActivity">	48	+ <activity android:name=".ui.MainActivity">
49	<intent-filter>	49	<intent-filter>
50	<action android:name="android.intent.action.MAIN" />	50	<action android:name="android.intent.action.MAIN" />
51		51
	@@ -54,7 +54,7 @@		@@ -54,7 +54,7 @@
54	</activity>	54	</activity>
55	<!--<activity android:name=".ui.activity.LoginAndRegistActivity" />-->	55	<!--<activity android:name=".ui.activity.LoginAndRegistActivity" />-->
56	<activity android:name=".ui.activity.StartActivity"></activity>	56	<activity android:name=".ui.activity.StartActivity"></activity>
57	- <activity android:name=".ui.MainActivity"	57	+ <activity android:name=".ui.activity.LoginAndRegistActivity"
58	android:screenOrientation="portrait"	58	android:screenOrientation="portrait"
59	/>	59	/>
60	<activity android:name=".ui.activity.MyChildActivity"	60	<activity android:name=".ui.activity.MyChildActivity"
	@@ -61,7 +61,7 @@ public class AppConfig {		@@ -61,7 +61,7 @@ public class AppConfig {
61		61
62	//保存键值对	62	//保存键值对
63	public void set(String key, String value) {	63	public void set(String key, String value) {
64	- SharedPreferences.Editor editor = getSharedPreferences(AppContext.getContext()).edit();	64	+ SharedPreferences.Editor editor = getSharedPreferences(mContext).edit();
65	if (TextUtils.isEmpty(value)) {	65	if (TextUtils.isEmpty(value)) {
66	editor.putString(key, value);	66	editor.putString(key, value);
67	} else {	67	} else {
	@@ -4,13 +4,22 @@ import android.os.Bundle;		@@ -4,13 +4,22 @@ import android.os.Bundle;
4	import android.support.annotation.NonNull;	4	import android.support.annotation.NonNull;
5	import android.support.annotation.Nullable;	5	import android.support.annotation.Nullable;
6	import android.view.View;	6	import android.view.View;
		7	+import android.widget.ImageView;
		8	+import android.widget.TextView;
7		9
8	import com.share.mvpsdk.base.BasePresenter;	10	import com.share.mvpsdk.base.BasePresenter;
9	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;	11	import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
10	import com.shunzhi.parent.R;	12	import com.shunzhi.parent.R;
		13	+import com.shunzhi.parent.views.TextAndImgShowView;
11		14
12	public class CePingFragment extends BaseMVPCompatFragment {	15	public class CePingFragment extends BaseMVPCompatFragment {
13		16
		17	+ TextView tvLocalAddress;
		18	+
		19	+ ImageView ivCamera;
		20	+
		21	+ TextAndImgShowView textAndImg1,textAndImg2,textAndImg3,textAndImg4;
		22	+
14	@Override	23	@Override
15	public int getLayoutId() {	24	public int getLayoutId() {
16	return R.layout.fragment_ce_ping;	25	return R.layout.fragment_ce_ping;
	@@ -18,6 +27,28 @@ public class CePingFragment extends BaseMVPCompatFragment {		@@ -18,6 +27,28 @@ public class CePingFragment extends BaseMVPCompatFragment {
18		27
19	@Override	28	@Override
20	public void initUI(View view, @Nullable Bundle savedInstanceState) {	29	public void initUI(View view, @Nullable Bundle savedInstanceState) {
		30	+ ivCamera=view.findViewById(R.id.ivCamera);
		31	+ tvLocalAddress=view.findViewById(R.id.tvLocalAddress);
		32	+ textAndImg1=view.findViewById(R.id.textAndImg1);
		33	+ textAndImg2=view.findViewById(R.id.textAndImg2);
		34	+ textAndImg3=view.findViewById(R.id.textAndImg3);
		35	+ textAndImg4=view.findViewById(R.id.textAndImg4);
		36	+
		37	+ textAndImg1.setTextColor(R.color.textColor);
		38	+ textAndImg1.setText("工具一");
		39	+ textAndImg1.setImgs(R.drawable.play,R.drawable.play);
		40	+
		41	+ textAndImg2.setTextColor(R.color.textColor);
		42	+ textAndImg2.setText("工具二");
		43	+ textAndImg2.setImgs(R.drawable.play,R.drawable.play);
		44	+
		45	+ textAndImg3.setTextColor(R.color.textColor);
		46	+ textAndImg3.setText("工具三");
		47	+ textAndImg3.setImgs(R.drawable.play,R.drawable.play);
		48	+
		49	+ textAndImg4.setTextColor(R.color.textColor);
		50	+ textAndImg4.setText("工具四");
		51	+ textAndImg4.setImgs(R.drawable.play,R.drawable.play);
21		52
22	}	53	}
23		54
@@ -0,0 +1,71 @@		@@ -0,0 +1,71 @@
	1	+package com.shunzhi.parent.views;
	2	+
	3	+import android.content.Context;
	4	+import android.support.annotation.DrawableRes;
	5	+import android.support.annotation.Nullable;
	6	+import android.util.AttributeSet;
	7	+import android.view.View;
	8	+import android.widget.FrameLayout;
	9	+import android.widget.ImageView;
	10	+import android.widget.LinearLayout;
	11	+import android.widget.TextView;
	12	+
	13	+import com.shunzhi.parent.R;
	14	+
	15	+
	16	+/**
	17	+ * Created by ToaHanDong on 2018/1/22.
	18	+ */
	19	+
	20	+public class TextAndImgShowView extends LinearLayout {
	21	+ public TextAndImgShowView(Context context) {
	22	+ super(context);
	23	+ init(context);
	24	+ }
	25	+
	26	+ public TextAndImgShowView(Context context, @Nullable AttributeSet attrs) {
	27	+ super(context, attrs);
	28	+ init(context);
	29	+ }
	30	+
	31	+ public TextAndImgShowView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
	32	+ super(context, attrs, defStyleAttr);
	33	+ init(context);
	34	+ }
	35	+
	36	+ ImageView image;
	37	+ TextView text;
	38	+ FrameLayout layout;
	39	+ int[] imgs = null;
	40	+ boolean isSelect = false;
	41	+
	42	+ private void init(Context context) {
	43	+ View view = View.inflate(context, R.layout.text_and_img_show, this);
	44	+ image = view.findViewById(R.id.image);
	45	+ text = view.findViewById(R.id.text);
	46	+ layout = view.findViewById(R.id.layout);
	47	+ }
	48	+
	49	+ public void setImgs(@DrawableRes int normalDrawable, @DrawableRes int selectDrawable) {
	50	+ imgs = new int[]{normalDrawable, selectDrawable};
	51	+ }
	52	+
	53	+ public void setSelect(boolean isSelect) {
	54	+ if (isSelect) {
	55	+ if (imgs != null && imgs.length > 1)
	56	+ image.setImageResource(imgs[1]);
	57	+ } else {
	58	+ if (imgs != null && imgs.length > 1)
	59	+ image.setImageResource(imgs[0]);
	60	+ }
	61	+ }
	62	+
	63	+
	64	+ public void setText(String content) {
	65	+ text.setText(content);
	66	+ }
	67	+
	68	+ public void setTextColor(int color){
	69	+ text.setTextColor(color);
	70	+ }
	71	+}
	@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
		1	+<?xml version="1.0" encoding="utf-8"?>
		2	+<shape xmlns:android="http://schemas.android.com/apk/res/android">
		3	+
		4	+ <corners android:radius="@dimen/size_dp_8"/>
		5	+ <solid android:color="@color/white"/>
		6	+
		7	+</shape>
0	\ No newline at end of file	8	\ No newline at end of file
1	-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"	1	+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2	xmlns:tools="http://schemas.android.com/tools"	2	xmlns:tools="http://schemas.android.com/tools"
3	android:layout_width="match_parent"	3	android:layout_width="match_parent"
4	android:layout_height="match_parent"	4	android:layout_height="match_parent"
		5	+ android:background="@color/bgColor"
5	tools:context="com.shunzhi.parent.ui.fragment.CePingFragment">	6	tools:context="com.shunzhi.parent.ui.fragment.CePingFragment">
6		7
7	- <!-- TODO: Update blank fragment layout -->
8	- <TextView	8	+ <FrameLayout
9	android:layout_width="match_parent"	9	android:layout_width="match_parent"
10	- android:layout_height="match_parent"
11	- android:text="@string/hello_blank_fragment" />	10	+ android:layout_height="?android:actionBarSize"
		11	+ android:background="@color/titleColor"
		12	+ >
		13	+ <TextView
		14	+ android:layout_width="wrap_content"
		15	+ android:layout_height="match_parent"
		16	+ android:text="杭州"
		17	+ android:gravity="center"
		18	+ android:textColor="@color/textColor"
		19	+ android:paddingLeft="@dimen/size_dp_15"
		20	+ android:drawableRight="@drawable/pull"
		21	+ android:drawablePadding="@dimen/size_dp_5"
		22	+ android:textSize="@dimen/textSize16"
		23	+ android:id="@+id/tvLocalAddress"
		24	+ />
12		25
13	-</FrameLayout>	26	+ <TextView
		27	+ style="@style/TextView_Wrap_16"
		28	+ android:layout_gravity="center"
		29	+ android:gravity="center"
		30	+ android:text="@string/ceping"
		31	+ android:textColor="@color/textColor"
		32	+ />
		33	+
		34	+
		35	+ <ImageView
		36	+ android:layout_width="wrap_content"
		37	+ android:layout_height="match_parent"
		38	+ android:src="@drawable/camera"
		39	+ android:layout_gravity="right"
		40	+ android:paddingRight="@dimen/size_dp_15"
		41	+ android:paddingLeft="@dimen/size_dp_15"
		42	+ android:id="@+id/ivCamera"
		43	+ />
		44	+
		45	+ </FrameLayout>
		46	+
		47	+ <LinearLayout
		48	+ android:layout_width="match_parent"
		49	+ android:layout_height="wrap_content"
		50	+ android:background="@drawable/shape_bg_radius8"
		51	+ android:orientation="vertical"
		52	+ android:layout_margin="@dimen/size_dp_10"
		53	+ >
		54	+
		55	+
		56	+ <LinearLayout
		57	+ android:layout_width="match_parent"
		58	+ android:layout_height="wrap_content"
		59	+ android:orientation="horizontal"
		60	+ >
		61	+
		62	+ <com.shunzhi.parent.views.TextAndImgShowView
		63	+ android:id="@+id/textAndImg1"
		64	+ android:layout_width="0dp"
		65	+ android:layout_weight="1"
		66	+ android:layout_height="wrap_content">
		67	+
		68	+ </com.shunzhi.parent.views.TextAndImgShowView>
		69	+
		70	+ <com.shunzhi.parent.views.TextAndImgShowView
		71	+ android:id="@+id/textAndImg2"
		72	+ android:layout_width="0dp"
		73	+ android:layout_weight="1"
		74	+ android:layout_height="wrap_content">
		75	+
		76	+ </com.shunzhi.parent.views.TextAndImgShowView>
		77	+
		78	+ <com.shunzhi.parent.views.TextAndImgShowView
		79	+ android:id="@+id/textAndImg3"
		80	+ android:layout_width="0dp"
		81	+ android:layout_weight="1"
		82	+ android:layout_height="wrap_content">
		83	+
		84	+ </com.shunzhi.parent.views.TextAndImgShowView>
		85	+
		86	+ <com.shunzhi.parent.views.TextAndImgShowView
		87	+ android:id="@+id/textAndImg4"
		88	+ android:layout_width="0dp"
		89	+ android:layout_weight="1"
		90	+ android:layout_height="wrap_content">
		91	+
		92	+ </com.shunzhi.parent.views.TextAndImgShowView>
		93	+
		94	+ </LinearLayout>
		95	+
		96	+
		97	+ </LinearLayout>
		98	+
		99	+</LinearLayout>
	@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
		1	+<?xml version="1.0" encoding="utf-8"?>
		2	+<FrameLayout
		3	+ xmlns:android="http://schemas.android.com/apk/res/android"
		4	+ android:id="@+id/layout"
		5	+ android:layout_width="match_parent"
		6	+ android:layout_height="match_parent"
		7	+ android:gravity="center"
		8	+ android:orientation="vertical">
		9	+
		10	+ <LinearLayout
		11	+ android:layout_width="wrap_content"
		12	+ android:layout_height="wrap_content"
		13	+ android:layout_gravity="center"
		14	+ android:gravity="center"
		15	+ android:orientation="vertical">
		16	+
		17	+ <ImageView
		18	+ android:id="@+id/image"
		19	+ android:layout_width="wrap_content"
		20	+ android:layout_height="wrap_content"
		21	+ android:scaleType="fitXY"
		22	+ />
		23	+
		24	+ <TextView
		25	+ android:id="@+id/text"
		26	+ android:layout_width="wrap_content"
		27	+ android:layout_height="wrap_content"
		28	+ android:layout_marginTop="5dp"
		29	+ android:gravity="center"
		30	+ android:textColor="@color/white"
		31	+ android:textSize="14dp"/>
		32	+ </LinearLayout>
		33	+
		34	+
		35	+</FrameLayout>
0	\ No newline at end of file	36	\ No newline at end of file
	@@ -43,4 +43,49 @@		@@ -43,4 +43,49 @@
43	<dimen name="sp_16">16sp</dimen>	43	<dimen name="sp_16">16sp</dimen>
44	<dimen name="sp_18">18sp</dimen>	44	<dimen name="sp_18">18sp</dimen>
45		45
		46	+ <dimen name="textSize10">10dp</dimen>
		47	+ <dimen name="textSize12">12dp</dimen>
		48	+ <dimen name="textSize14">14dp</dimen>
		49	+ <dimen name="textSize16">16dp</dimen>
		50	+ <dimen name="textSize18">18dp</dimen>
		51	+ <dimen name="textSize20">20dp</dimen>
		52	+ <dimen name="textSize24">24dp</dimen>
		53	+ <dimen name="textSize30">30dp</dimen>
		54	+ <dimen name="size_dp_1">1dp</dimen>
		55	+ <dimen name="size_dp_2">2dp</dimen>
		56	+ <dimen name="size_dp_3">3dp</dimen>
		57	+ <dimen name="size_dp_4">4dp</dimen>
		58	+ <dimen name="size_dp_5">5dp</dimen>
		59	+ <dimen name="size_dp_6">6dp</dimen>
		60	+ <dimen name="size_dp_7">7dp</dimen>
		61	+ <dimen name="size_dp_8">8dp</dimen>
		62	+ <dimen name="size_dp_9">9dp</dimen>
		63	+ <dimen name="size_dp_10">10dp</dimen>
		64	+ <dimen name="size_dp_11">11dp</dimen>
		65	+ <dimen name="size_dp_12">12dp</dimen>
		66	+ <dimen name="size_dp_13">13dp</dimen>
		67	+ <dimen name="size_dp_14">14dp</dimen>
		68	+ <dimen name="size_dp_15">15dp</dimen>
		69	+ <dimen name="size_dp_16">16dp</dimen>
		70	+ <dimen name="size_dp_17">17.0dp</dimen>
		71	+ <dimen name="size_dp_18">18.0dp</dimen>
		72	+ <dimen name="size_dp_19">19dp</dimen>
		73	+ <dimen name="size_dp_20">20dp</dimen>
		74	+ <dimen name="size_dp_24">24dp</dimen>
		75	+ <dimen name="size_dp_25">25dp</dimen>
		76	+ <dimen name="size_dp_30">30dp</dimen>
		77	+ <dimen name="size_dp_32">32dp</dimen>
		78	+ <dimen name="size_dp_40">40dp</dimen>
		79	+ <dimen name="size_dp_50">50dp</dimen>
		80	+ <dimen name="size_dp_60">60dp</dimen>
		81	+ <dimen name="size_dp_80">80dp</dimen>
		82	+ <dimen name="size_dp_100">100dp</dimen>
		83	+ <dimen name="size_dp_110">110dp</dimen>
		84	+ <dimen name="size_dp_120">120dp</dimen>
		85	+ <dimen name="size_dp_150">150dp</dimen>
		86	+ <dimen name="size_dp_200">200dp</dimen>
		87	+ <dimen name="size_dp_250">250dp</dimen>
		88	+ <dimen name="size_dp_300">300dp</dimen>
		89	+ <dimen name="size_dp_310">310dp</dimen>
		90	+
46	</resources>	91	</resources>
47	\ No newline at end of file	92	\ No newline at end of file
	@@ -3,4 +3,6 @@		@@ -3,4 +3,6 @@
3		3
4	<!-- TODO: Remove or change this placeholder text -->	4	<!-- TODO: Remove or change this placeholder text -->
5	<string name="hello_blank_fragment">Hello blank fragment</string>	5	<string name="hello_blank_fragment">Hello blank fragment</string>
		6	+
		7	+ <string name="ceping">测评</string>
6	</resources>	8	</resources>
	@@ -8,4 +8,29 @@		@@ -8,4 +8,29 @@
8	<item name="colorAccent">@color/colorAccent</item>	8	<item name="colorAccent">@color/colorAccent</item>
9	</style>	9	</style>
10		10
		11	+
		12	+ <style name="TextView_Wrap_16">
		13	+ <item name="android:layout_width">wrap_content</item>
		14	+ <item name="android:layout_height">wrap_content</item>
		15	+ <item name="android:textSize">@dimen/textSize16</item>
		16	+ </style>
		17	+
		18	+ <style name="TextView_Width_Match_16">
		19	+ <item name="android:layout_width">match_parent</item>
		20	+ <item name="android:layout_height">wrap_content</item>
		21	+ <item name="android:textSize">@dimen/textSize16</item>
		22	+ </style>
		23	+
		24	+ <style name="TextView_Height_Match_16">
		25	+ <item name="android:layout_width">wrap_content</item>
		26	+ <item name="android:layout_height">match_parent</item>
		27	+ <item name="android:textSize">@dimen/textSize16</item>
		28	+ </style>
		29	+
		30	+ <style name="TextView_Match_16">
		31	+ <item name="android:layout_width">match_parent</item>
		32	+ <item name="android:layout_height">match_parent</item>
		33	+ <item name="android:textSize">@dimen/textSize16</item>
		34	+ </style>
		35	+
11	</resources>	36	</resources>