diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f234b87..0e326b8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -60,6 +60,11 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java b/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java new file mode 100644 index 0000000..2efe08d --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/mine/PersonInfoContract.java @@ -0,0 +1,27 @@ +package com.shunzhi.parent.contract.mine; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.IBaseActivity; +import com.share.mvpsdk.base.IBaseModel; + +/** + * Created by Administrator on 2018/3/10 0010. + */ + +public interface PersonInfoContract { + + abstract class PersonInfoPresenter extends BasePresenter { + + } + + + interface IPersonInfoModel extends IBaseModel { + + + } + interface IPersonInfoView extends IBaseActivity { + + + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java b/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java new file mode 100644 index 0000000..8b7559e --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/mine/PersonInfoModel.java @@ -0,0 +1,14 @@ +package com.shunzhi.parent.model.mine; + +import com.share.mvpsdk.base.BaseModel; +import com.shunzhi.parent.contract.mine.PersonInfoContract; + +/** + * Created by Administrator on 2018/3/10 0010. + */ + +public class PersonInfoModel extends BaseModel implements PersonInfoContract.IPersonInfoModel { + public static PersonInfoModel newInstance() { + return new PersonInfoModel(); + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java new file mode 100644 index 0000000..5198a83 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java @@ -0,0 +1,19 @@ +package com.shunzhi.parent.presenter.mine; + +import com.shunzhi.parent.contract.mine.PersonInfoContract; + +/** + * Created by Administrator on 2018/3/10 0010. + */ + +public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter { + @Override + public PersonInfoContract.IPersonInfoModel getModel() { + return null; + } + + @Override + public void onStart() { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java index 3057d94..b2c5a9a 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java @@ -5,8 +5,12 @@ import android.graphics.Color; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.LinearLayoutManager; +import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; +import android.widget.PopupWindow; import android.widget.TextView; import com.share.mvpsdk.base.BasePresenter; @@ -32,7 +36,7 @@ import java.util.List; public class MyChildActivity extends BaseMVPCompatActivity implements MyChildContract.IMyChildView, View.OnClickListener { SwipeMenuRecyclerView child_recycle; - TextView back, center_title; + TextView back, center_title, add_child; ChildAdapter childAdapter; @NonNull @@ -44,10 +48,12 @@ public class MyChildActivity extends BaseMVPCompatActivity +implements PersonInfoContract.IPersonInfoView,View.OnClickListener{ + @NonNull + @Override + public BasePresenter initPresenter() { + return new PersonInfoPrasenter(); + } + + @Override + protected void initView(Bundle savedInstanceState) { + + } + + @Override + protected int getLayoutId() { + return R.layout.activity_personinfo; + } + + @Override + public void onClick(View v) { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java index 761a0e7..e26e48b 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java @@ -14,10 +14,11 @@ import com.shunzhi.parent.contract.loginandregister.LoginAndRegisterContract; import com.shunzhi.parent.contract.mine.MineContract; import com.shunzhi.parent.presenter.mine.MinePresenter; import com.shunzhi.parent.ui.activity.MyChildActivity; +import com.shunzhi.parent.ui.activity.PersonInfoActivity; public class MineFragment extends BaseMVPCompatFragment implements MineContract.IMineView, View.OnClickListener { - LinearLayout childlayout; + LinearLayout childlayout,personinfo; @NonNull @Override @@ -33,7 +34,9 @@ public class MineFragment extends BaseMVPCompatFragment + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_mychild.xml b/app/src/main/res/layout/activity_mychild.xml index 897f08f..878e98c 100644 --- a/app/src/main/res/layout/activity_mychild.xml +++ b/app/src/main/res/layout/activity_mychild.xml @@ -16,6 +16,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_view.xml b/app/src/main/res/layout/dialog_view.xml new file mode 100644 index 0000000..abc1809 --- /dev/null +++ b/app/src/main/res/layout/dialog_view.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 7a97420..01191a2 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -14,9 +14,9 @@ @@ -30,6 +30,7 @@ android:textSize="@dimen/txtsize_headline" /> diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml index f97eea6..e1408fe 100644 --- a/app/src/main/res/layout/fragment_report.xml +++ b/app/src/main/res/layout/fragment_report.xml @@ -5,9 +5,52 @@ tools:context="com.shunzhi.parent.ui.fragment.ReportFragment"> + + + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="马铂骞" + android:drawableRight="@drawable/pull" + android:drawablePadding="10dp" + android:textColor="@color/textColor" + android:textSize="@dimen/textSize16" + android:layout_gravity="center_vertical" + /> + + + + + + diff --git a/app/src/main/res/layout/top.xml b/app/src/main/res/layout/top.xml index b6cd327..c2dec0b 100644 --- a/app/src/main/res/layout/top.xml +++ b/app/src/main/res/layout/top.xml @@ -1,29 +1,29 @@ + android:layout_height="?android:actionBarSize" + android:background="@color/back_top" + android:padding="10dp"> - - - - - + + + \ 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 ebcde06..583d122 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,4 +17,5 @@ #ABC9FF #1BE2E5 #ACD1FB + #757575 -- libgit2 0.21.0