From 5ade1fb7aa1a32cfea3ec2a36f832d042ace21ac Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Fri, 9 Mar 2018 13:15:15 +0800
Subject: [PATCH] no message

---
 app/src/main/AndroidManifest.xml                                     |  4 ++--
 app/src/main/java/com/shunzhi/parent/AppConfig.java                  |  2 +-
 app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java | 31 +++++++++++++++++++++++++++++++
 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java   | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/drawable-xhdpi/camera.png                           | Bin 0 -> 1070 bytes
 app/src/main/res/drawable-xhdpi/play.png                             | Bin 0 -> 2670 bytes
 app/src/main/res/drawable-xhdpi/pull.png                             | Bin 0 -> 603 bytes
 app/src/main/res/drawable/shape_bg_radius8.xml                       |  7 +++++++
 app/src/main/res/layout/fragment_ce_ping.xml                         | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 app/src/main/res/layout/text_and_img_show.xml                        | 35 +++++++++++++++++++++++++++++++++++
 app/src/main/res/values/colors.xml                                   |  4 +++-
 app/src/main/res/values/dimens.xml                                   | 45 +++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/values/strings.xml                                  |  2 ++
 app/src/main/res/values/styles.xml                                   | 25 +++++++++++++++++++++++++
 14 files changed, 314 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
 create mode 100644 app/src/main/res/drawable-xhdpi/camera.png
 create mode 100644 app/src/main/res/drawable-xhdpi/play.png
 create mode 100644 app/src/main/res/drawable-xhdpi/pull.png
 create mode 100644 app/src/main/res/drawable/shape_bg_radius8.xml
 create mode 100644 app/src/main/res/layout/text_and_img_show.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c13312a..f234b87 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.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"
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index 0e5bb86..23a7005 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -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 {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
index caf8305..bbe5c78 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
@@ -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);
 
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
new file mode 100644
index 0000000..1bf115e
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java
@@ -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);
+    }
+}
diff --git a/app/src/main/res/drawable-xhdpi/camera.png b/app/src/main/res/drawable-xhdpi/camera.png
new file mode 100644
index 0000000..d3acf84
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/camera.png differ
diff --git a/app/src/main/res/drawable-xhdpi/play.png b/app/src/main/res/drawable-xhdpi/play.png
new file mode 100644
index 0000000..22e4723
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/play.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pull.png b/app/src/main/res/drawable-xhdpi/pull.png
new file mode 100644
index 0000000..10fe0b4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/pull.png differ
diff --git a/app/src/main/res/drawable/shape_bg_radius8.xml b/app/src/main/res/drawable/shape_bg_radius8.xml
new file mode 100644
index 0000000..f166255
--- /dev/null
+++ b/app/src/main/res/drawable/shape_bg_radius8.xml
@@ -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
diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml
index 67700f1..0b03906 100644
--- a/app/src/main/res/layout/fragment_ce_ping.xml
+++ b/app/src/main/res/layout/fragment_ce_ping.xml
@@ -1,13 +1,99 @@
-<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>
diff --git a/app/src/main/res/layout/text_and_img_show.xml b/app/src/main/res/layout/text_and_img_show.xml
new file mode 100644
index 0000000..14cb0cf
--- /dev/null
+++ b/app/src/main/res/layout/text_and_img_show.xml
@@ -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
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index df65f7c..2599014 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -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>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5b72ea0..7b92db3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b577c32..adab0e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5885930..78fa2a2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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>
--
libgit2 0.21.0