Commit d958596a8c20f020095ceebd6eea075057c50fb9
1 parent
eda704de
Exists in
yxb_dev
and in
2 other branches
no message
Showing
12 changed files
with
234 additions
and
7 deletions
Show diff stats
app/libs/processor.jar
No preview for this file type
app/src/main/java/com/shunzhi/parent/ui/activity/ActivationActivity.java
0 → 100644
| ... | ... | @@ -0,0 +1,31 @@ |
| 1 | +package com.shunzhi.parent.ui.activity; | |
| 2 | + | |
| 3 | +import android.os.Bundle; | |
| 4 | + | |
| 5 | +import com.share.mvpsdk.base.activity.BaseCompatActivity; | |
| 6 | +import com.shunzhi.parent.R; | |
| 7 | +import com.shunzhi.parent.ui.fragment.ActivationFragment; | |
| 8 | + | |
| 9 | +import me.yokeyword.fragmentation.SupportFragment; | |
| 10 | + | |
| 11 | +/** | |
| 12 | + * Created by Administrator on 2018/4/18 0018. | |
| 13 | + */ | |
| 14 | + | |
| 15 | +public class ActivationActivity extends BaseCompatActivity { | |
| 16 | + private SupportFragment[] mFragments = new SupportFragment[1]; | |
| 17 | + | |
| 18 | + @Override | |
| 19 | + protected void initView(Bundle savedInstanceState) { | |
| 20 | + if (savedInstanceState == null) { | |
| 21 | + loadRootFragment(R.id.frame, mFragments[0]); | |
| 22 | + } else { | |
| 23 | + mFragments[0] = findFragment(ActivationFragment.class); | |
| 24 | + } | |
| 25 | + } | |
| 26 | + | |
| 27 | + @Override | |
| 28 | + protected int getLayoutId() { | |
| 29 | + return R.layout.activity_activation; | |
| 30 | + } | |
| 31 | +} | ... | ... |
app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
| ... | ... | @@ -29,7 +29,7 @@ import java.util.List; |
| 29 | 29 | |
| 30 | 30 | public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel> |
| 31 | 31 | implements MyChildContract.IMyChildView, View.OnClickListener { |
| 32 | - TextView child_name, child_school, child_class, school_area, student_code, center_title; | |
| 32 | + TextView child_name, child_school, child_class, school_area, student_code, center_title,btn_jihuo,btn_unBinding; | |
| 33 | 33 | ImageView back; |
| 34 | 34 | |
| 35 | 35 | @Override |
| ... | ... | @@ -41,6 +41,11 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M |
| 41 | 41 | school_area = findViewById(R.id.school_area); |
| 42 | 42 | student_code = findViewById(R.id.student_code); |
| 43 | 43 | center_title = findViewById(R.id.center_title); |
| 44 | + btn_jihuo = findViewById(R.id.btn_jihuo); | |
| 45 | + btn_unBinding = findViewById(R.id.btn_unBinding); | |
| 46 | + btn_jihuo.setOnClickListener(this); | |
| 47 | + btn_unBinding.setOnClickListener(this); | |
| 48 | + | |
| 44 | 49 | center_title.setText("我的孩子"); |
| 45 | 50 | back = findViewById(R.id.back_top); |
| 46 | 51 | back.setOnClickListener(new View.OnClickListener() { |
| ... | ... | @@ -71,6 +76,11 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M |
| 71 | 76 | |
| 72 | 77 | @Override |
| 73 | 78 | public void onClick(View v) { |
| 79 | + if(v==btn_unBinding){ | |
| 80 | + delectChild(); | |
| 81 | + }else if(v==btn_jihuo){ | |
| 82 | + | |
| 83 | + } | |
| 74 | 84 | |
| 75 | 85 | } |
| 76 | 86 | ... | ... |
app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
0 → 100644
| ... | ... | @@ -0,0 +1,32 @@ |
| 1 | +package com.shunzhi.parent.ui.fragment; | |
| 2 | + | |
| 3 | +import android.os.Bundle; | |
| 4 | +import android.support.annotation.NonNull; | |
| 5 | +import android.support.annotation.Nullable; | |
| 6 | +import android.view.View; | |
| 7 | + | |
| 8 | +import com.share.mvpsdk.base.BasePresenter; | |
| 9 | +import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment; | |
| 10 | +import com.shunzhi.parent.R; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * Created by Administrator on 2018/4/19 0019. | |
| 14 | + */ | |
| 15 | + | |
| 16 | +public class ActivationFragment extends BaseMVPCompatFragment{ | |
| 17 | + @NonNull | |
| 18 | + @Override | |
| 19 | + public BasePresenter initPresenter() { | |
| 20 | + return null; | |
| 21 | + } | |
| 22 | + | |
| 23 | + @Override | |
| 24 | + public int getLayoutId() { | |
| 25 | + return R.layout.fragment_activation; | |
| 26 | + } | |
| 27 | + | |
| 28 | + @Override | |
| 29 | + public void initUI(View view, @Nullable Bundle savedInstanceState) { | |
| 30 | + | |
| 31 | + } | |
| 32 | +} | ... | ... |
app/src/main/res/drawable-xhdpi/backgroud_top.png
| ... | ... | @@ -0,0 +1,9 @@ |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | |
| 2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | + android:shape="rectangle"> | |
| 4 | + <stroke | |
| 5 | + android:width="1dp" | |
| 6 | + android:color="#00000000" /> | |
| 7 | + <solid android:color="#94bbff" /> | |
| 8 | + <corners android:radius="5dp" /> | |
| 9 | +</shape> | |
| 0 | 10 | \ No newline at end of file | ... | ... |
| ... | ... | @@ -0,0 +1,9 @@ |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | |
| 2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | + android:shape="rectangle"> | |
| 4 | + <stroke | |
| 5 | + android:width="1dp" | |
| 6 | + android:color="#00000000" /> | |
| 7 | + <solid android:color="#ff7b71" /> | |
| 8 | + <corners android:radius="5dp" /> | |
| 9 | +</shape> | |
| 0 | 10 | \ No newline at end of file | ... | ... |
| ... | ... | @@ -0,0 +1,13 @@ |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | |
| 2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | + android:layout_width="match_parent" | |
| 4 | + android:layout_height="match_parent"> | |
| 5 | + | |
| 6 | + <FrameLayout | |
| 7 | + android:id="@+id/frame" | |
| 8 | + android:layout_width="match_parent" | |
| 9 | + android:layout_height="match_parent"> | |
| 10 | + | |
| 11 | + </FrameLayout> | |
| 12 | + | |
| 13 | +</LinearLayout> | ... | ... |
app/src/main/res/layout/activity_child_detail.xml
| ... | ... | @@ -5,7 +5,7 @@ |
| 5 | 5 | android:layout_height="match_parent" |
| 6 | 6 | android:orientation="vertical" |
| 7 | 7 | android:background="@color/white" |
| 8 | - tools:context="com.shunzhi.parent.ui.activity.binding.CheckInfoActivity"> | |
| 8 | + tools:context="com.shunzhi.parent.ui.activity.ChildDetialActivity"> | |
| 9 | 9 | <include layout="@layout/top" /> |
| 10 | 10 | |
| 11 | 11 | <LinearLayout |
| ... | ... | @@ -24,7 +24,8 @@ |
| 24 | 24 | <LinearLayout |
| 25 | 25 | android:id="@+id/info_layout" |
| 26 | 26 | android:layout_width="match_parent" |
| 27 | - android:layout_height="match_parent" | |
| 27 | + android:layout_height="wrap_content" | |
| 28 | + android:layout_weight="1" | |
| 28 | 29 | android:layout_marginTop="20dp" |
| 29 | 30 | android:orientation="vertical"> |
| 30 | 31 | |
| ... | ... | @@ -77,7 +78,6 @@ |
| 77 | 78 | </LinearLayout> |
| 78 | 79 | |
| 79 | 80 | |
| 80 | - | |
| 81 | 81 | <LinearLayout |
| 82 | 82 | android:layout_width="match_parent" |
| 83 | 83 | android:layout_height="30dp" |
| ... | ... | @@ -101,6 +101,7 @@ |
| 101 | 101 | android:textColor="@color/textColor" /> |
| 102 | 102 | |
| 103 | 103 | </LinearLayout> |
| 104 | + | |
| 104 | 105 | <LinearLayout |
| 105 | 106 | android:layout_width="match_parent" |
| 106 | 107 | android:layout_height="30dp" |
| ... | ... | @@ -124,6 +125,7 @@ |
| 124 | 125 | android:textColor="@color/textColor" /> |
| 125 | 126 | |
| 126 | 127 | </LinearLayout> |
| 128 | + | |
| 127 | 129 | <LinearLayout |
| 128 | 130 | android:layout_width="match_parent" |
| 129 | 131 | android:layout_height="30dp" |
| ... | ... | @@ -148,8 +150,35 @@ |
| 148 | 150 | </LinearLayout> |
| 149 | 151 | |
| 150 | 152 | </LinearLayout> |
| 153 | + <LinearLayout | |
| 154 | + android:layout_width="match_parent" | |
| 155 | + android:layout_height="wrap_content" | |
| 156 | + android:orientation="vertical" | |
| 157 | + android:layout_margin="10dp" | |
| 158 | + > | |
| 159 | + <TextView | |
| 160 | + android:id="@+id/btn_jihuo" | |
| 161 | + android:layout_width="match_parent" | |
| 162 | + android:layout_height="wrap_content" | |
| 163 | + android:gravity="center" | |
| 164 | + android:padding="10dp" | |
| 165 | + android:text="校卡激活" | |
| 166 | + android:textColor="@color/white" | |
| 167 | + android:background="@drawable/rudiobtn_blue" | |
| 168 | + /> | |
| 169 | + <TextView | |
| 170 | + android:id="@+id/btn_unBinding" | |
| 171 | + android:layout_marginTop="10dp" | |
| 172 | + android:padding="10dp" | |
| 173 | + android:layout_width="match_parent" | |
| 174 | + android:layout_height="wrap_content" | |
| 175 | + android:gravity="center" | |
| 176 | + android:background="@drawable/rudiobtn_red" | |
| 177 | + android:textColor="@color/white" | |
| 178 | + android:text="解除绑定" | |
| 179 | + /> | |
| 151 | 180 | |
| 152 | - | |
| 181 | + </LinearLayout> | |
| 153 | 182 | </LinearLayout> |
| 154 | 183 | |
| 155 | 184 | ... | ... |
| ... | ... | @@ -0,0 +1,87 @@ |
| 1 | +<?xml version="1.0" encoding="utf-8"?> | |
| 2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | + android:layout_width="match_parent" | |
| 4 | + android:layout_height="match_parent" | |
| 5 | + android:background="@color/bg_main" | |
| 6 | + android:orientation="vertical"> | |
| 7 | + | |
| 8 | + <include layout="@layout/top" /> | |
| 9 | + | |
| 10 | + <RelativeLayout | |
| 11 | + android:layout_width="match_parent" | |
| 12 | + android:layout_height="match_parent"> | |
| 13 | + | |
| 14 | + <LinearLayout | |
| 15 | + android:layout_width="match_parent" | |
| 16 | + android:layout_height="200dp" | |
| 17 | + android:layout_centerInParent="true" | |
| 18 | + android:layout_marginLeft="20dp" | |
| 19 | + android:layout_marginRight="20dp" | |
| 20 | + android:paddingTop="30dp" | |
| 21 | + android:background="@drawable/report_white" | |
| 22 | + android:orientation="vertical"> | |
| 23 | + | |
| 24 | + <LinearLayout | |
| 25 | + android:layout_width="match_parent" | |
| 26 | + android:layout_height="wrap_content" | |
| 27 | + android:layout_margin="10dp"> | |
| 28 | + | |
| 29 | + <TextView | |
| 30 | + android:layout_width="wrap_content" | |
| 31 | + android:layout_height="wrap_content" | |
| 32 | + android:text="持卡人:" | |
| 33 | + android:textSize="@dimen/textSize18" /> | |
| 34 | + | |
| 35 | + <TextView | |
| 36 | + android:layout_width="wrap_content" | |
| 37 | + android:layout_height="wrap_content" | |
| 38 | + android:layout_weight="1" | |
| 39 | + android:gravity="center" | |
| 40 | + android:text="沈东" | |
| 41 | + android:textSize="@dimen/textSize18" /> | |
| 42 | + | |
| 43 | + | |
| 44 | + </LinearLayout> | |
| 45 | + | |
| 46 | + <LinearLayout | |
| 47 | + android:layout_width="match_parent" | |
| 48 | + android:layout_height="wrap_content" | |
| 49 | + android:layout_margin="10dp"> | |
| 50 | + | |
| 51 | + <TextView | |
| 52 | + android:layout_width="wrap_content" | |
| 53 | + android:layout_height="wrap_content" | |
| 54 | + android:text="卡 号:" | |
| 55 | + android:textSize="@dimen/textSize18" /> | |
| 56 | + | |
| 57 | + <EditText | |
| 58 | + android:layout_width="wrap_content" | |
| 59 | + android:layout_height="wrap_content" | |
| 60 | + android:layout_marginLeft="10dp" | |
| 61 | + android:layout_marginRight="10dp" | |
| 62 | + android:layout_weight="1" | |
| 63 | + android:gravity="center" | |
| 64 | + android:hint="请输入卡号" | |
| 65 | + android:textSize="@dimen/textSize18" /> | |
| 66 | + | |
| 67 | + | |
| 68 | + </LinearLayout> | |
| 69 | + <TextView | |
| 70 | + android:layout_width="wrap_content" | |
| 71 | + android:layout_height="wrap_content" | |
| 72 | + android:layout_weight="1" | |
| 73 | + /> | |
| 74 | + <TextView | |
| 75 | + android:layout_width="match_parent" | |
| 76 | + android:layout_height="wrap_content" | |
| 77 | + android:textSize="@dimen/textSize20" | |
| 78 | + android:padding="5dp" | |
| 79 | + android:background="@drawable/rudiobtn_blue" | |
| 80 | + android:text="确定" | |
| 81 | + android:textColor="@color/white" | |
| 82 | + android:gravity="center" | |
| 83 | + /> | |
| 84 | + | |
| 85 | + </LinearLayout> | |
| 86 | + </RelativeLayout> | |
| 87 | +</LinearLayout> | ... | ... |
app/src/main/res/values/colors.xml
| ... | ... | @@ -10,9 +10,9 @@ |
| 10 | 10 | <color name="bg_main">#F0EFF5</color> |
| 11 | 11 | <color name="blue">#2956FE</color> |
| 12 | 12 | <color name="green">#00CB87</color> |
| 13 | - <color name="back_top">#A6DAFF</color> | |
| 13 | + <color name="back_top">#6d9bff</color> | |
| 14 | 14 | <color name="textBlue">#ACC9FC</color> |
| 15 | - <color name="titleColor">#A6DAFF</color> | |
| 15 | + <color name="titleColor">#6d9bff</color> | |
| 16 | 16 | <color name="bgColor">#F0EFF5</color> |
| 17 | 17 | <color name="textColor">#494947</color> |
| 18 | 18 | <color name="xueqing_blue">#ABC9FF</color> | ... | ... |