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 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 + + + + + \ 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 @@ + + + + + + \ 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 @@ + + + + + + + + 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"> @@ -77,7 +78,6 @@ - + + + + + - + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + 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 @@ #F0EFF5 #2956FE #00CB87 - #A6DAFF + #6d9bff #ACC9FC - #A6DAFF + #6d9bff #F0EFF5 #494947 #ABC9FF -- libgit2 0.21.0