陶汉栋 / ParentWork

Download as
Browse Code »

Commit 42f6a92a8c9e4c1e26ee0ba1a9ad5f61007ba4b4

Authored by 姚旭斌
1 parent d8d08286
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 17 changed files with 501 additions and 41 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @42f6a92
@@ -60,6 +60,11 @@ @@ -60,6 +60,11 @@
60 <activity android:name=".ui.activity.MyChildActivity" 60 <activity android:name=".ui.activity.MyChildActivity"
61 android:screenOrientation="portrait" 61 android:screenOrientation="portrait"
62 /> 62 />
  63 + <activity android:name=".ui.activity.PersonInfoActivity"
  64 + android:screenOrientation="portrait"
  65 +
  66 + android:windowSoftInputMode="adjustPan|stateHidden"
  67 + />
63 </application> 68 </application>
64 69
65 </manifest> 70 </manifest>
66 \ No newline at end of file 71 \ No newline at end of file
app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
  1 +package com.shunzhi.parent.contract.mine;
  2 +
  3 +import com.share.mvpsdk.base.BasePresenter;
  4 +import com.share.mvpsdk.base.IBaseActivity;
  5 +import com.share.mvpsdk.base.IBaseModel;
  6 +
  7 +/**
  8 + * Created by Administrator on 2018/3/10 0010.
  9 + */
  10 +
  11 +public interface PersonInfoContract {
  12 +
  13 + abstract class PersonInfoPresenter extends BasePresenter<IPersonInfoModel,IPersonInfoView> {
  14 +
  15 + }
  16 +
  17 +
  18 + interface IPersonInfoModel extends IBaseModel {
  19 +
  20 +
  21 + }
  22 + interface IPersonInfoView extends IBaseActivity {
  23 +
  24 +
  25 + }
  26 +
  27 +}
app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
  1 +package com.shunzhi.parent.model.mine;
  2 +
  3 +import com.share.mvpsdk.base.BaseModel;
  4 +import com.shunzhi.parent.contract.mine.PersonInfoContract;
  5 +
  6 +/**
  7 + * Created by Administrator on 2018/3/10 0010.
  8 + */
  9 +
  10 +public class PersonInfoModel extends BaseModel implements PersonInfoContract.IPersonInfoModel {
  11 + public static PersonInfoModel newInstance() {
  12 + return new PersonInfoModel();
  13 + }
  14 +}
app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,19 @@ @@ -0,0 +1,19 @@
  1 +package com.shunzhi.parent.presenter.mine;
  2 +
  3 +import com.shunzhi.parent.contract.mine.PersonInfoContract;
  4 +
  5 +/**
  6 + * Created by Administrator on 2018/3/10 0010.
  7 + */
  8 +
  9 +public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter {
  10 + @Override
  11 + public PersonInfoContract.IPersonInfoModel getModel() {
  12 + return null;
  13 + }
  14 +
  15 + @Override
  16 + public void onStart() {
  17 +
  18 + }
  19 +}
app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
  Diff comments   View file @42f6a92
@@ -5,8 +5,12 @@ import android.graphics.Color; @@ -5,8 +5,12 @@ import android.graphics.Color;
5 import android.os.Bundle; 5 import android.os.Bundle;
6 import android.support.annotation.NonNull; 6 import android.support.annotation.NonNull;
7 import android.support.v7.widget.LinearLayoutManager; 7 import android.support.v7.widget.LinearLayoutManager;
  8 +import android.view.Gravity;
  9 +import android.view.LayoutInflater;
8 import android.view.View; 10 import android.view.View;
9 import android.view.ViewGroup; 11 import android.view.ViewGroup;
  12 +import android.view.WindowManager;
  13 +import android.widget.PopupWindow;
10 import android.widget.TextView; 14 import android.widget.TextView;
11 15
12 import com.share.mvpsdk.base.BasePresenter; 16 import com.share.mvpsdk.base.BasePresenter;
@@ -32,7 +36,7 @@ import java.util.List; @@ -32,7 +36,7 @@ import java.util.List;
32 public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel> 36 public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChildPresenter, MyChildContract.IMyChildModel>
33 implements MyChildContract.IMyChildView, View.OnClickListener { 37 implements MyChildContract.IMyChildView, View.OnClickListener {
34 SwipeMenuRecyclerView child_recycle; 38 SwipeMenuRecyclerView child_recycle;
35 - TextView back, center_title; 39 + TextView back, center_title, add_child;
36 ChildAdapter childAdapter; 40 ChildAdapter childAdapter;
37 41
38 @NonNull 42 @NonNull
@@ -44,10 +48,12 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi @@ -44,10 +48,12 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
44 @SuppressLint("WrongViewCast") 48 @SuppressLint("WrongViewCast")
45 @Override 49 @Override
46 protected void initView(Bundle savedInstanceState) { 50 protected void initView(Bundle savedInstanceState) {
  51 + add_child = findViewById(R.id.add_child);
47 child_recycle = findViewById(R.id.child_recycle); 52 child_recycle = findViewById(R.id.child_recycle);
48 back = findViewById(R.id.back_top); 53 back = findViewById(R.id.back_top);
49 center_title = findViewById(R.id.center_title); 54 center_title = findViewById(R.id.center_title);
50 center_title.setText("我的孩子"); 55 center_title.setText("我的孩子");
  56 + add_child.setOnClickListener(this);
51 back.setOnClickListener(this); 57 back.setOnClickListener(this);
52 initRecyclerView(); 58 initRecyclerView();
53 59
@@ -60,13 +66,33 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi @@ -60,13 +66,33 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
60 child_recycle.setSwipeMenuItemClickListener(new SwipeMenuItemClickListener() { 66 child_recycle.setSwipeMenuItemClickListener(new SwipeMenuItemClickListener() {
61 @Override 67 @Override
62 public void onItemClick(SwipeMenuBridge menuBridge) { 68 public void onItemClick(SwipeMenuBridge menuBridge) {
63 -// int adapterPosition = menuBridge.getAdapterPosition();  
64 -//// mDataList.remove(adapterPosition);  
65 -// mPresenter.loadChildList();  
66 -// childAdapter.notifyItemRemoved(adapterPosition); 69 + final PopupWindow popupWindow = new PopupWindow();
  70 + popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
  71 + popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
  72 + backgroundAlpha(0.5f);
  73 + View view = LayoutInflater.from(MyChildActivity.this).inflate(R.layout.dialog_view, null);
  74 + TextView tv = view.findViewById(R.id.dialog_info);
  75 + tv.setText("是否解除绑定？");
  76 + TextView btn_cancel = view.findViewById(R.id.cancel_btn);
  77 + btn_cancel.setOnClickListener(new View.OnClickListener() {
  78 + @Override
  79 + public void onClick(View v) {
  80 + popupWindow.dismiss();
  81 + backgroundAlpha(1f);
  82 + }
  83 + });
  84 + TextView btn_right = view.findViewById(R.id.right_btn);
  85 + btn_right.setOnClickListener(new View.OnClickListener() {
  86 + @Override
  87 + public void onClick(View v) {
  88 +
  89 + }
  90 + });
  91 + popupWindow.setContentView(view);
  92 + popupWindow.showAtLocation(child_recycle, Gravity.CENTER, 0, 0);
  93 +
67 } 94 }
68 }); 95 });
69 -  
70 mPresenter.loadChildList(); 96 mPresenter.loadChildList();
71 } 97 }
72 98
@@ -77,7 +103,11 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi @@ -77,7 +103,11 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
77 103
78 @Override 104 @Override
79 public void onClick(View v) { 105 public void onClick(View v) {
80 - finish(); 106 + if (v == back) {
  107 + finish();
  108 + } else if (v == add_child) {
  109 +
  110 + }
81 } 111 }
82 112
83 @Override 113 @Override
@@ -106,4 +136,13 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi @@ -106,4 +136,13 @@ public class MyChildActivity extends BaseMVPCompatActivity&lt;MyChildContract.MyChi
106 }; 136 };
107 137
108 138
  139 +
  140 + public void backgroundAlpha(float bgAlpha)
  141 + {
  142 + WindowManager.LayoutParams lp = getWindow().getAttributes();
  143 + lp.alpha = bgAlpha; //0.0-1.0
  144 + getWindow().setAttributes(lp);
  145 + }
  146 +
  147 +
109 } 148 }
app/src/main/java/com/shunzhi/parent/ui/activity/PersonInfoActivity.java 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
  1 +package com.shunzhi.parent.ui.activity;
  2 +
  3 +
  4 +import android.os.Bundle;
  5 +import android.support.annotation.NonNull;
  6 +import android.view.View;
  7 +
  8 +import com.share.mvpsdk.base.BasePresenter;
  9 +import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
  10 +import com.shunzhi.parent.R;
  11 +import com.shunzhi.parent.contract.mine.PersonInfoContract;
  12 +import com.shunzhi.parent.presenter.mine.PersonInfoPrasenter;
  13 +
  14 +/**
  15 + * Created by Administrator on 2018/3/10 0010.
  16 + */
  17 +
  18 +public class PersonInfoActivity extends BaseMVPCompatActivity<PersonInfoContract.PersonInfoPresenter,PersonInfoContract.IPersonInfoModel>
  19 +implements PersonInfoContract.IPersonInfoView,View.OnClickListener{
  20 + @NonNull
  21 + @Override
  22 + public BasePresenter initPresenter() {
  23 + return new PersonInfoPrasenter();
  24 + }
  25 +
  26 + @Override
  27 + protected void initView(Bundle savedInstanceState) {
  28 +
  29 + }
  30 +
  31 + @Override
  32 + protected int getLayoutId() {
  33 + return R.layout.activity_personinfo;
  34 + }
  35 +
  36 + @Override
  37 + public void onClick(View v) {
  38 +
  39 + }
  40 +}
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @42f6a92
@@ -14,10 +14,11 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; @@ -14,10 +14,11 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract;
14 import com.shunzhi.parent.contract.mine.MineContract; 14 import com.shunzhi.parent.contract.mine.MineContract;
15 import com.shunzhi.parent.presenter.mine.MinePresenter; 15 import com.shunzhi.parent.presenter.mine.MinePresenter;
16 import com.shunzhi.parent.ui.activity.MyChildActivity; 16 import com.shunzhi.parent.ui.activity.MyChildActivity;
  17 +import com.shunzhi.parent.ui.activity.PersonInfoActivity;
17 18
18 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> 19 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
19 implements MineContract.IMineView, View.OnClickListener { 20 implements MineContract.IMineView, View.OnClickListener {
20 - LinearLayout childlayout; 21 + LinearLayout childlayout,personinfo;
21 22
22 @NonNull 23 @NonNull
23 @Override 24 @Override
@@ -33,7 +34,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -33,7 +34,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
33 @Override 34 @Override
34 public void initUI(View view, @Nullable Bundle savedInstanceState) { 35 public void initUI(View view, @Nullable Bundle savedInstanceState) {
35 childlayout = view.findViewById(R.id.childlayout); 36 childlayout = view.findViewById(R.id.childlayout);
  37 + personinfo = view.findViewById(R.id.personinfo);
36 childlayout.setOnClickListener(this); 38 childlayout.setOnClickListener(this);
  39 + personinfo.setOnClickListener(this);
37 40
38 } 41 }
39 42
@@ -44,6 +47,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -44,6 +47,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
44 case R.id.childlayout: 47 case R.id.childlayout:
45 startActivity(new Intent().setClass(getActivity(), MyChildActivity.class)); 48 startActivity(new Intent().setClass(getActivity(), MyChildActivity.class));
46 break; 49 break;
  50 + case R.id.personinfo:
  51 + startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class));
  52 + break;
47 default: 53 default:
48 break; 54 break;
49 } 55 }
app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
  Diff comments   View file @42f6a92
@@ -7,8 +7,8 @@ import android.support.annotation.Nullable; @@ -7,8 +7,8 @@ import android.support.annotation.Nullable;
7 import android.text.Editable; 7 import android.text.Editable;
8 import android.text.TextUtils; 8 import android.text.TextUtils;
9 import android.text.TextWatcher; 9 import android.text.TextWatcher;
10 -import android.util.Log;  
11 import android.view.Gravity; 10 import android.view.Gravity;
  11 +import android.view.LayoutInflater;
12 import android.view.View; 12 import android.view.View;
13 import android.view.ViewGroup; 13 import android.view.ViewGroup;
14 import android.widget.EditText; 14 import android.widget.EditText;
@@ -95,13 +95,11 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist @@ -95,13 +95,11 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment&lt;LoginAndRegist
95 95
96 @Override 96 @Override
97 public void getUserInfo() { 97 public void getUserInfo() {
98 - Log.e("sss","sss");  
99 PopupWindow popupWindow=new PopupWindow(); 98 PopupWindow popupWindow=new PopupWindow();
100 popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT); 99 popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
101 popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT); 100 popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
102 - TextView textView=new TextView(getActivity());  
103 - textView.setText("注册成功");  
104 - popupWindow.setContentView(textView); 101 + View view= LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view,null);
  102 + popupWindow.setContentView(view);
105 popupWindow.showAtLocation(main_login, Gravity.CENTER,0,0); 103 popupWindow.showAtLocation(main_login, Gravity.CENTER,0,0);
106 104
107 105
app/src/main/res/drawable-xhdpi/screen.png 0 → 100644
View file @42f6a92

395 Bytes
app/src/main/res/drawable/rudiobtn_white.xml 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <stroke android:color="#00000000" android:width="1dp"/>
  4 + <solid android:color="@color/white" />
  5 + <corners android:radius="20dp"/>
  6 +</shape>
0 \ No newline at end of file 7 \ No newline at end of file
app/src/main/res/layout/activity_mychild.xml
  Diff comments   View file @42f6a92
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 </com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView> 16 </com.yanzhenjie.recyclerview.swipe.SwipeMenuRecyclerView>
17 17
18 <TextView 18 <TextView
  19 + android:id="@+id/add_child"
19 android:layout_width="match_parent" 20 android:layout_width="match_parent"
20 android:layout_height="40dp" 21 android:layout_height="40dp"
21 android:layout_marginLeft="10dp" 22 android:layout_marginLeft="10dp"
app/src/main/res/layout/activity_personinfo.xml 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,214 @@ @@ -0,0 +1,214 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:background="#F0eff5"
  7 + android:orientation="vertical">
  8 +
  9 + <LinearLayout
  10 + android:layout_width="match_parent"
  11 + android:layout_height="wrap_content"
  12 + android:layout_weight="1"
  13 + android:background="#F0eff5"
  14 + android:orientation="vertical">
  15 +
  16 + <RelativeLayout
  17 + android:layout_width="match_parent"
  18 + android:layout_height="match_parent">
  19 +
  20 + <RelativeLayout
  21 + android:layout_width="match_parent"
  22 + android:layout_height="360dp">
  23 +
  24 + <LinearLayout
  25 + android:id="@+id/top_layout"
  26 + android:layout_width="match_parent"
  27 + android:layout_height="180dp"
  28 + android:background="@drawable/backgroud_top"
  29 + android:orientation="vertical"
  30 + android:paddingTop="20dp">
  31 +
  32 + <TextView
  33 + android:layout_width="match_parent"
  34 + android:layout_height="wrap_content"
  35 + android:layout_gravity="center"
  36 + android:gravity="center"
  37 + android:text="个人资料"
  38 + android:textColor="@color/white"
  39 + android:textSize="@dimen/txtsize_headline" />
  40 +
  41 +
  42 + </LinearLayout>
  43 +
  44 + <FrameLayout
  45 + android:id="@+id/photoImage"
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_centerInParent="true">
  49 +
  50 + <com.makeramen.roundedimageview.RoundedImageView
  51 + android:layout_width="100dp"
  52 + android:layout_height="100dp"
  53 + android:src="@color/white"
  54 + app:riv_corner_radius="20dp" />
  55 + </FrameLayout>
  56 +
  57 + <LinearLayout
  58 + android:id="@+id/zhnaghaoxinxi"
  59 + android:layout_width="match_parent"
  60 + android:layout_height="wrap_content"
  61 + android:layout_below="@id/photoImage"
  62 + android:layout_marginTop="10dp"
  63 + android:layout_weight="1"
  64 + android:gravity="center"
  65 + android:orientation="vertical">
  66 +
  67 + <TextView
  68 + android:layout_width="wrap_content"
  69 + android:layout_height="wrap_content"
  70 + android:text="马铂骞"
  71 + android:textSize="@dimen/txtsize_title" />
  72 +
  73 + <TextView
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:text="账号：12345678991"
  77 + android:textSize="@dimen/sp_18" />
  78 + </LinearLayout>
  79 +
  80 + </RelativeLayout>
  81 +
  82 + <ScrollView
  83 + android:layout_width="match_parent"
  84 + android:layout_height="match_parent"
  85 + android:layout_marginTop="300dp">
  86 +
  87 + <LinearLayout
  88 + android:id="@+id/center_layout"
  89 + android:layout_width="match_parent"
  90 + android:layout_height="match_parent"
  91 + android:layout_margin="20dp"
  92 + android:orientation="vertical">
  93 +
  94 + <LinearLayout
  95 + android:layout_width="match_parent"
  96 + android:layout_height="wrap_content"
  97 + android:background="@color/white"
  98 + android:orientation="vertical">
  99 +
  100 + <LinearLayout
  101 + android:layout_width="match_parent"
  102 + android:layout_height="40dp"
  103 + android:gravity="center_vertical">
  104 +
  105 + <TextView
  106 + android:layout_width="wrap_content"
  107 + android:layout_height="wrap_content"
  108 + android:layout_gravity="center"
  109 + android:layout_marginLeft="15dp"
  110 + android:layout_marginRight="30dp"
  111 + android:text="用户名"
  112 + android:textColor="@color/text_color"
  113 + android:textSize="@dimen/txtsize_title" />
  114 +
  115 + <TextView
  116 + android:layout_width="0dp"
  117 + android:layout_height="wrap_content"
  118 + android:layout_weight="1"
  119 +
  120 + />
  121 +
  122 + <EditText
  123 + android:id="@+id/et_name"
  124 + android:layout_width="wrap_content"
  125 + android:layout_height="wrap_content"
  126 + android:layout_gravity="center_vertical"
  127 + android:layout_marginRight="15dp"
  128 + android:background="@null"
  129 + android:focusable="false"
  130 + android:text="马铂骞"
  131 + android:textColor="@color/text_color"
  132 + android:textSize="@dimen/txtsize_title" />
  133 +
  134 + </LinearLayout>
  135 +
  136 + <TextView
  137 + android:layout_width="match_parent"
  138 + android:layout_height="0.5dp"
  139 + android:layout_marginLeft="15dp"
  140 + android:layout_marginRight="15dp"
  141 + android:background="@color/bottomline" />
  142 +
  143 + <LinearLayout
  144 + android:layout_width="match_parent"
  145 + android:layout_height="40dp"
  146 + android:gravity="center_vertical"
  147 +
  148 + >
  149 +
  150 + <TextView
  151 + android:layout_width="wrap_content"
  152 + android:layout_height="wrap_content"
  153 + android:layout_marginLeft="15dp"
  154 + android:layout_marginRight="30dp"
  155 + android:text="性别"
  156 + android:textSize="@dimen/txtsize_title" />
  157 +
  158 + <TextView
  159 + android:layout_width="wrap_content"
  160 + android:layout_height="wrap_content"
  161 + android:layout_gravity="center_vertical"
  162 + android:layout_weight="1"
  163 + android:textSize="@dimen/txtsize_title" />
  164 +
  165 + <RadioGroup
  166 + android:layout_width="wrap_content"
  167 + android:layout_height="wrap_content"
  168 + android:orientation="horizontal">
  169 +
  170 + <RadioButton
  171 + android:layout_width="wrap_content"
  172 + android:layout_height="wrap_content"
  173 + android:button="@null"
  174 + android:drawablePadding="10dp"
  175 + android:drawableRight="@android:drawable/btn_radio"
  176 + android:text="男"
  177 + android:textColor="@color/text_color"
  178 + android:textSize="@dimen/txtsize_title" />
  179 +
  180 + <RadioButton
  181 + android:layout_width="wrap_content"
  182 + android:layout_height="wrap_content"
  183 + android:layout_marginLeft="10dp"
  184 + android:button="@null"
  185 + android:drawablePadding="10dp"
  186 + android:drawableRight="@android:drawable/btn_radio"
  187 + android:text="女"
  188 + android:textColor="@color/text_color"
  189 + android:textSize="@dimen/txtsize_title" />
  190 +
  191 + </RadioGroup>
  192 +
  193 + </LinearLayout>
  194 +
  195 +
  196 + </LinearLayout>
  197 +
  198 +
  199 + </LinearLayout>
  200 + </ScrollView>
  201 +
  202 + </RelativeLayout>
  203 + </LinearLayout>
  204 +
  205 + <TextView
  206 + android:layout_width="match_parent"
  207 + android:layout_height="40dp"
  208 + android:layout_margin="20dp"
  209 + android:background="@drawable/rudiobtn"
  210 + android:gravity="center"
  211 + android:text="确认"
  212 + android:textColor="@color/white"
  213 + android:textSize="@dimen/txtsize_title" />
  214 +</LinearLayout>
0 \ No newline at end of file 215 \ No newline at end of file
app/src/main/res/layout/dialog_view.xml 0 → 100644
  Diff comments   View file @42f6a92
@@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="300dp"
  4 + android:layout_gravity="center"
  5 + android:layout_height="wrap_content"
  6 + android:background="#00000000"
  7 + android:orientation="vertical">
  8 +
  9 + <TextView
  10 + android:id="@+id/dialog_info"
  11 + android:layout_width="300dp"
  12 + android:layout_height="200dp"
  13 + android:gravity="center"
  14 + android:textSize="@dimen/txtsize_headline"
  15 + android:layout_gravity="center"
  16 + android:background="@drawable/rudiobtn_white" />
  17 +
  18 + <LinearLayout
  19 + android:layout_width="match_parent"
  20 + android:layout_height="wrap_content"
  21 + android:layout_marginTop="10dp">
  22 +
  23 + <TextView
  24 + android:id="@+id/cancel_btn"
  25 + android:layout_width="140dp"
  26 + android:layout_height="40dp"
  27 + android:gravity="center"
  28 + android:textColor="@color/white"
  29 + android:textSize="@dimen/txtsize_title"
  30 + android:background="@drawable/rudiobtn"
  31 + android:text="取消" />
  32 +
  33 + <TextView
  34 + android:id="@+id/right_btn"
  35 + android:layout_marginLeft="20dp"
  36 + android:layout_width="140dp"
  37 + android:layout_height="40dp"
  38 + android:gravity="center"
  39 + android:textColor="@color/white"
  40 + android:textSize="@dimen/txtsize_title"
  41 + android:background="@drawable/rudiobtn"
  42 + android:text="确定" />
  43 + </LinearLayout>
  44 +
  45 +
  46 +</LinearLayout>
app/src/main/res/layout/fragment_mine.xml
  Diff comments   View file @42f6a92
@@ -14,9 +14,9 @@ @@ -14,9 +14,9 @@
14 14
15 <LinearLayout 15 <LinearLayout
16 android:id="@+id/top_layout" 16 android:id="@+id/top_layout"
17 - android:paddingTop="40dp" 17 + android:paddingTop="20dp"
18 android:layout_width="match_parent" 18 android:layout_width="match_parent"
19 - android:layout_height="200dp" 19 + android:layout_height="180dp"
20 android:background="@drawable/backgroud_top" 20 android:background="@drawable/backgroud_top"
21 android:orientation="vertical"> 21 android:orientation="vertical">
22 22
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 android:textSize="@dimen/txtsize_headline" /> 30 android:textSize="@dimen/txtsize_headline" />
31 31
32 <LinearLayout 32 <LinearLayout
  33 + android:id="@+id/personinfo"
33 android:layout_width="match_parent" 34 android:layout_width="match_parent"
34 android:layout_height="wrap_content" 35 android:layout_height="wrap_content"
35 android:orientation="horizontal"> 36 android:orientation="horizontal">
app/src/main/res/layout/fragment_report.xml
  Diff comments   View file @42f6a92
@@ -5,9 +5,52 @@ @@ -5,9 +5,52 @@
5 tools:context="com.shunzhi.parent.ui.fragment.ReportFragment"> 5 tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
6 6
7 <!-- TODO: Update blank fragment layout --> 7 <!-- TODO: Update blank fragment layout -->
  8 +<LinearLayout
  9 + android:layout_width="match_parent"
  10 + android:layout_height="match_parent"
  11 + android:orientation="vertical"
  12 + >
  13 +<LinearLayout
  14 + android:id="@+id/top_layout"
  15 + android:layout_width="match_parent"
  16 + android:layout_height="?android:actionBarSize"
  17 + android:orientation="horizontal"
  18 + android:padding="10dp"
  19 + android:background="@color/back_top"
  20 + >
  21 +
8 <TextView 22 <TextView
9 - android:layout_width="match_parent"  
10 - android:layout_height="match_parent"  
11 - android:text="@string/hello_blank_fragment" /> 23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:text="马铂骞"
  26 + android:drawableRight="@drawable/pull"
  27 + android:drawablePadding="10dp"
  28 + android:textColor="@color/textColor"
  29 + android:textSize="@dimen/textSize16"
  30 + android:layout_gravity="center_vertical"
  31 + />
  32 +<TextView
  33 + android:layout_width="wrap_content"
  34 + android:layout_height="wrap_content"
  35 + android:layout_weight="1"
  36 + android:text="2018年3月"
  37 + android:gravity="center_horizontal"
  38 + android:layout_gravity="center_vertical"
  39 + android:textColor="@color/textColor"
  40 + android:textSize="@dimen/textSize16"
  41 + />
  42 + <TextView
  43 + android:layout_width="wrap_content"
  44 + android:layout_height="wrap_content"
  45 + android:text="筛选"
  46 + android:layout_gravity="center_vertical"
  47 + android:textColor="@color/textColor"
  48 + android:textSize="@dimen/textSize16"
  49 + android:drawableRight="@drawable/screen"
  50 + />
  51 +</LinearLayout>
  52 +
  53 +
  54 +</LinearLayout>
12 55
13 </FrameLayout> 56 </FrameLayout>
app/src/main/res/layout/top.xml
  Diff comments   View file @42f6a92
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 - android:layout_height="?android:actionBarSize"> 4 + android:layout_height="?android:actionBarSize"
  5 + android:background="@color/back_top"
  6 + android:padding="10dp">
5 7
6 - <RelativeLayout  
7 - android:layout_width="match_parent"  
8 - android:layout_height="wrap_content"  
9 - android:background="@color/back_top"  
10 - android:paddingBottom="10dp"  
11 - >  
12 - <TextView  
13 - android:id="@+id/back_top"  
14 - android:layout_width="40dp"  
15 - android:layout_height="40dp"  
16 - android:layout_alignParentBottom="true"  
17 - android:background="@drawable/arrow_left" />  
18 -  
19 - <TextView  
20 - android:id="@+id/center_title"  
21 - android:layout_width="wrap_content"  
22 - android:layout_height="wrap_content"  
23 - android:textSize="@dimen/txtsize_headline"  
24 - android:layout_centerHorizontal="true"  
25 - android:layout_alignParentBottom="true"  
26 - android:text="主题" />  
27 - </RelativeLayout> 8 + <TextView
  9 + android:id="@+id/back_top"
  10 + android:layout_width="30dp"
  11 + android:layout_height="30dp"
  12 + android:layout_gravity="center_vertical"
  13 + android:background="@drawable/arrow_left" />
28 14
  15 + <TextView
  16 + android:id="@+id/center_title"
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="match_parent"
  19 + android:layout_weight="1"
  20 + android:text="主题"
  21 + android:gravity="center"
  22 + android:textColor="@color/textColor"
  23 + android:textSize="@dimen/textSize16" />
  24 + <TextView
  25 + android:layout_width="30dp"
  26 + android:layout_height="30dp"
  27 + android:layout_gravity="center_vertical"
  28 + />
29 </LinearLayout> 29 </LinearLayout>
30 \ No newline at end of file 30 \ No newline at end of file
app/src/main/res/values/colors.xml
  Diff comments   View file @42f6a92
@@ -17,4 +17,5 @@ @@ -17,4 +17,5 @@
17 <color name="xueqing_blue">#ABC9FF</color> 17 <color name="xueqing_blue">#ABC9FF</color>
18 <color name="zxlx">#1BE2E5</color> 18 <color name="zxlx">#1BE2E5</color>
19 <color name="huodong_blue">#ACD1FB</color> 19 <color name="huodong_blue">#ACD1FB</color>
  20 + <color name="text_color">#757575</color>
20 </resources> 21 </resources>