From d958596a8c20f020095ceebd6eea075057c50fb9 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Thu, 19 Apr 2018 13:14:23 +0800
Subject: [PATCH] no message

---
 app/libs/processor.jar                                                    | Bin 5681 -> 0 bytes
 app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java  | 31 +++++++++++++++++++++++++++++++
 app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java | 12 +++++++++++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java  | 32 ++++++++++++++++++++++++++++++++
 app/src/main/res/drawable-xhdpi/backgroud_top.png                         | Bin 90548 -> 0 bytes
 app/src/main/res/drawable/rudiobtn_blue.xml                               |  9 +++++++++
 app/src/main/res/drawable/rudiobtn_red.xml                                |  9 +++++++++
 app/src/main/res/layout/activity_activation.xml                           | 13 +++++++++++++
 app/src/main/res/layout/activity_child_detail.xml                         | 37 +++++++++++++++++++++++++++++++++----
 app/src/main/res/layout/fragment_activation.xml                           | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/src/main/res/layout/fragment_isactivation.xml                         |  7 +++++++
 app/src/main/res/values/colors.xml                                        |  4 ++--
 12 files changed, 234 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
 create mode 100644 app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
 create mode 100644 app/src/main/res/drawable/rudiobtn_blue.xml
 create mode 100644 app/src/main/res/drawable/rudiobtn_red.xml
 create mode 100644 app/src/main/res/layout/activity_activation.xml
 create mode 100644 app/src/main/res/layout/fragment_activation.xml
 create mode 100644 app/src/main/res/layout/fragment_isactivation.xml

diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index adae491..46b1996 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
new file mode 100644
index 0000000..75fedb0
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
@@ -0,0 +1,31 @@
+package com.shunzhi.parent.ui.activity;
+
+import android.os.Bundle;
+
+import com.share.mvpsdk.base.activity.BaseCompatActivity;
+import com.shunzhi.parent.R;
+import com.shunzhi.parent.ui.fragment.ActivationFragment;
+
+import me.yokeyword.fragmentation.SupportFragment;
+
+/**
+ * Created by Administrator on 2018/4/18 0018.
+ */
+
+public class ActivationActivity extends BaseCompatActivity {
+    private SupportFragment[] mFragments = new SupportFragment[1];
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            loadRootFragment(R.id.frame, mFragments[0]);
+        } else {
+            mFragments[0] = findFragment(ActivationFragment.class);
+        }
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_activation;
+    }
+}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
index eafb3e7..e2e7ace 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
@@ -29,7 +29,7 @@ import java.util.List;
 
 public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel>
         implements MyChildContract.IMyChildView, View.OnClickListener {
-    TextView child_name, child_school, child_class, school_area, student_code, center_title;
+    TextView child_name, child_school, child_class, school_area, student_code, center_title,btn_jihuo,btn_unBinding;
     ImageView back;
 
     @Override
@@ -41,6 +41,11 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
         school_area = findViewById(R.id.school_area);
         student_code = findViewById(R.id.student_code);
         center_title = findViewById(R.id.center_title);
+        btn_jihuo = findViewById(R.id.btn_jihuo);
+        btn_unBinding = findViewById(R.id.btn_unBinding);
+        btn_jihuo.setOnClickListener(this);
+        btn_unBinding.setOnClickListener(this);
+
         center_title.setText("我的孩子");
         back = findViewById(R.id.back_top);
         back.setOnClickListener(new View.OnClickListener() {
@@ -71,6 +76,11 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
 
     @Override
     public void onClick(View v) {
+        if(v==btn_unBinding){
+            delectChild();
+        }else if(v==btn_jihuo){
+
+        }
 
     }
 
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
new file mode 100644
index 0000000..bf79288
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
@@ -0,0 +1,32 @@
+package com.shunzhi.parent.ui.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.share.mvpsdk.base.BasePresenter;
+import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by Administrator on 2018/4/19 0019.
+ */
+
+public class ActivationFragment extends BaseMVPCompatFragment{
+    @NonNull
+    @Override
+    public BasePresenter initPresenter() {
+        return null;
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_activation;
+    }
+
+    @Override
+    public void initUI(View view, @Nullable Bundle savedInstanceState) {
+
+    }
+}
diff --git a/app/src/main/res/drawable-xhdpi/backgroud_top.png b/app/src/main/res/drawable-xhdpi/backgroud_top.png
index ba62025..aee58ee 100644
Binary files a/app/src/main/res/drawable-xhdpi/backgroud_top.png and b/app/src/main/res/drawable-xhdpi/backgroud_top.png differ
diff --git a/app/src/main/res/drawable/rudiobtn_blue.xml b/app/src/main/res/drawable/rudiobtn_blue.xml
new file mode 100644
index 0000000..c3143cb
--- /dev/null
+++ b/app/src/main/res/drawable/rudiobtn_blue.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#00000000" />
+    <solid android:color="#94bbff" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rudiobtn_red.xml b/app/src/main/res/drawable/rudiobtn_red.xml
new file mode 100644
index 0000000..ec150e0
--- /dev/null
+++ b/app/src/main/res/drawable/rudiobtn_red.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#00000000" />
+    <solid android:color="#ff7b71" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_activation.xml b/app/src/main/res/layout/activity_activation.xml
new file mode 100644
index 0000000..a4d1f62
--- /dev/null
+++ b/app/src/main/res/layout/activity_activation.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </FrameLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_child_detail.xml b/app/src/main/res/layout/activity_child_detail.xml
index e5b6acd..433f658 100644
--- a/app/src/main/res/layout/activity_child_detail.xml
+++ b/app/src/main/res/layout/activity_child_detail.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white"
-    tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity">
+    tools:context="com.shunzhi.parent.ui.activity.ChildDetialActivity">
     <include layout="@layout/top" />
 
     <LinearLayout
@@ -24,7 +24,8 @@
         <LinearLayout
             android:id="@+id/info_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:layout_marginTop="20dp"
             android:orientation="vertical">
 
@@ -77,7 +78,6 @@
             </LinearLayout>
 
 
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
@@ -101,6 +101,7 @@
                     android:textColor="@color/textColor" />
 
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
@@ -124,6 +125,7 @@
                     android:textColor="@color/textColor" />
 
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="30dp"
@@ -148,8 +150,35 @@
             </LinearLayout>
 
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_margin="10dp"
+            >
+            <TextView
+                android:id="@+id/btn_jihuo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="校卡激活"
+                android:textColor="@color/white"
+                android:background="@drawable/rudiobtn_blue"
+                />
+            <TextView
+                android:id="@+id/btn_unBinding"
+                android:layout_marginTop="10dp"
+                android:padding="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:background="@drawable/rudiobtn_red"
+                android:textColor="@color/white"
+                android:text="解除绑定"
+                />
 
-
+        </LinearLayout>
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_activation.xml b/app/src/main/res/layout/fragment_activation.xml
new file mode 100644
index 0000000..6df816e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_activation.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bg_main"
+    android:orientation="vertical">
+
+    <include layout="@layout/top" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="200dp"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:paddingTop="30dp"
+            android:background="@drawable/report_white"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="持卡人："
+                    android:textSize="@dimen/textSize18" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="沈东"
+                    android:textSize="@dimen/textSize18" />
+
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="卡    号："
+                    android:textSize="@dimen/textSize18" />
+
+                <EditText
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:hint="请输入卡号"
+                    android:textSize="@dimen/textSize18" />
+
+
+            </LinearLayout>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/textSize20"
+                android:padding="5dp"
+                android:background="@drawable/rudiobtn_blue"
+                android:text="确定"
+                android:textColor="@color/white"
+                android:gravity="center"
+                />
+
+        </LinearLayout>
+    </RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_isactivation.xml b/app/src/main/res/layout/fragment_isactivation.xml
new file mode 100644
index 0000000..ae9361b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_isactivation.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 26671fd..b3d2596 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,9 +10,9 @@
     <color name="bg_main">#F0EFF5</color>
     <color name="blue">#2956FE</color>
     <color name="green">#00CB87</color>
-    <color name="back_top">#A6DAFF</color>
+    <color name="back_top">#6d9bff</color>
     <color name="textBlue">#ACC9FC</color>
-    <color name="titleColor">#A6DAFF</color>
+    <color name="titleColor">#6d9bff</color>
     <color name="bgColor">#F0EFF5</color>
     <color name="textColor">#494947</color>
     <color name="xueqing_blue">#ABC9FF</color>
--
libgit2 0.21.0