陶汉栋 / ParentWork

Download as
Browse Code »

Commit b808b918953e420b878a5aba61a52a34b55d7613

Authored by 陶汉栋
1 parent 08e1bf53
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 13 changed files with 363 additions and 9 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @b808b91
@@ -71,9 +71,10 @@ @@ -71,9 +71,10 @@
71 <category android:name="android.intent.category.LAUNCHER" /> 71 <category android:name="android.intent.category.LAUNCHER" />
72 </intent-filter> 72 </intent-filter>
73 </activity> 73 </activity>
74 - <activity android:name=".ui.MainActivity"  
75 - android:windowSoftInputMode="adjustPan|stateAlwaysHidden"  
76 - android:screenOrientation="portrait" /> 74 + <activity
  75 + android:name=".ui.MainActivity"
  76 + android:screenOrientation="portrait"
  77 + android:windowSoftInputMode="adjustPan|stateAlwaysHidden" />
77 <activity 78 <activity
78 android:name=".ui.activity.MyChildActivity" 79 android:name=".ui.activity.MyChildActivity"
79 android:screenOrientation="portrait" /> 80 android:screenOrientation="portrait" />
@@ -85,7 +86,7 @@ @@ -85,7 +86,7 @@
85 <activity 86 <activity
86 android:name=".ui.activity.binding.CreateChildInfoActivity" 87 android:name=".ui.activity.binding.CreateChildInfoActivity"
87 android:screenOrientation="portrait" 88 android:screenOrientation="portrait"
88 - android:windowSoftInputMode="adjustPan|stateHidden"/> 89 + android:windowSoftInputMode="adjustPan|stateHidden" />
89 <activity 90 <activity
90 android:name=".ui.activity.binding.SelectSchoolActivity" 91 android:name=".ui.activity.binding.SelectSchoolActivity"
91 android:screenOrientation="portrait" 92 android:screenOrientation="portrait"
@@ -103,10 +104,9 @@ @@ -103,10 +104,9 @@
103 android:windowSoftInputMode="adjustPan|stateHidden" /> 104 android:windowSoftInputMode="adjustPan|stateHidden" />
104 <activity 105 <activity
105 android:name=".ui.activity.binding.InviteCodeActivity" 106 android:name=".ui.activity.binding.InviteCodeActivity"
106 - android:screenOrientation="portrait"  
107 - />  
108 - <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity"></activity>  
109 - 107 + android:screenOrientation="portrait" />
  108 + <activity android:name=".ui.activity.consult.ConsultTwoLevelActivity" />
  109 + <activity android:name=".ui.activity.orderdetail.OrderDetailActivity"></activity>
110 </application> 110 </application>
111 111
112 </manifest> 112 </manifest>
113 \ No newline at end of file 113 \ No newline at end of file
app/src/main/java/com/shunzhi/parent/bean/OrderDetailBean.java 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
  1 +package com.shunzhi.parent.bean;
  2 +
  3 +import java.io.Serializable;
  4 +
  5 +/**
  6 + * Created by ToaHanDong on 2018/3/15.
  7 + */
  8 +
  9 +public class OrderDetailBean implements Serializable {
  10 +
  11 +
  12 + public String dateTime;
  13 +
  14 + public String smsName;
  15 +
  16 + public int orderStatus;
  17 +
  18 + @Override
  19 + public String toString() {
  20 + return "OrderDetailBean{" +
  21 + "dateTime='" + dateTime + '\'' +
  22 + ", smsName='" + smsName + '\'' +
  23 + ", orderStatus=" + orderStatus +
  24 + '}';
  25 + }
  26 +}
app/src/main/java/com/shunzhi/parent/contract/orderdetail/OrderDetailContract.java 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,31 @@ @@ -0,0 +1,31 @@
  1 +package com.shunzhi.parent.contract.orderdetail;
  2 +
  3 +import com.share.mvpsdk.base.BasePresenter;
  4 +import com.share.mvpsdk.base.IBaseActivity;
  5 +import com.share.mvpsdk.base.IBaseModel;
  6 +import com.shunzhi.parent.bean.OrderDetailBean;
  7 +
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * Created by ToaHanDong on 2018/3/15.
  12 + */
  13 +
  14 +public interface OrderDetailContract {
  15 +
  16 + abstract class OrderDetailPreenter extends BasePresenter<IOrderDetailModel,IOrderDetailView>{
  17 +
  18 + public abstract void showOrederDetails();
  19 +
  20 + }
  21 +
  22 + interface IOrderDetailView extends IBaseActivity{
  23 +
  24 + void showOrderDetais(List<OrderDetailBean> orderDetailBeanList);
  25 +
  26 + }
  27 + interface IOrderDetailModel extends IBaseModel{
  28 + void getOrderDetails();
  29 + }
  30 +
  31 +}
app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +package com.shunzhi.parent.model.orderdetail;
  2 +
  3 +import com.share.mvpsdk.base.BaseModel;
  4 +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract;
  5 +
  6 +/**
  7 + * Created by ToaHanDong on 2018/3/15.
  8 + */
  9 +
  10 +public class OrderDetailModel extends BaseModel implements OrderDetailContract.IOrderDetailModel {
  11 +
  12 +
  13 + public static OrderDetailModel newInstance(){
  14 + return new OrderDetailModel();
  15 + }
  16 +
  17 + @Override
  18 + public void getOrderDetails() {
  19 +
  20 + }
  21 +}
app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
  1 +package com.shunzhi.parent.presenter.orederdetail;
  2 +
  3 +import com.share.mvpsdk.base.BasePresenter;
  4 +import com.shunzhi.parent.bean.OrderDetailBean;
  5 +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract;
  6 +import com.shunzhi.parent.model.orderdetail.OrderDetailModel;
  7 +
  8 +import java.util.ArrayList;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * Created by ToaHanDong on 2018/3/15.
  13 + */
  14 +
  15 +public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreenter {
  16 + @Override
  17 + public OrderDetailContract.IOrderDetailModel getModel() {
  18 + return OrderDetailModel.newInstance();
  19 + }
  20 +
  21 + @Override
  22 + public void onStart() {
  23 +
  24 + }
  25 +
  26 + @Override
  27 + public void showOrederDetails() {
  28 +
  29 + List<OrderDetailBean> orderDetailBeanList=new ArrayList<>();
  30 +
  31 + for (int i = 0; i < 10; i++) {
  32 + OrderDetailBean orderDetailBean=new OrderDetailBean();
  33 + orderDetailBean.smsName="平安短信"+i;
  34 + orderDetailBean.dateTime="3月"+(i+1)+"号";
  35 + orderDetailBean.orderStatus=i%3;
  36 + orderDetailBeanList.add(orderDetailBean);
  37 + }
  38 +
  39 + mIView.showOrderDetais(orderDetailBeanList);
  40 +
  41 + }
  42 +}
app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,158 @@ @@ -0,0 +1,158 @@
  1 +package com.shunzhi.parent.ui.activity.orderdetail;
  2 +
  3 +import android.support.annotation.NonNull;
  4 +import android.support.v7.app.AppCompatActivity;
  5 +import android.os.Bundle;
  6 +import android.support.v7.widget.LinearLayoutManager;
  7 +import android.support.v7.widget.RecyclerView;
  8 +import android.view.Gravity;
  9 +import android.view.LayoutInflater;
  10 +import android.view.View;
  11 +import android.view.ViewGroup;
  12 +import android.widget.ImageView;
  13 +import android.widget.LinearLayout;
  14 +import android.widget.TextView;
  15 +
  16 +import com.share.mvpsdk.base.BasePresenter;
  17 +import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
  18 +import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter;
  19 +import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder;
  20 +import com.share.mvpsdk.utils.DisplayUtils;
  21 +import com.shunzhi.parent.R;
  22 +import com.shunzhi.parent.bean.OrderDetailBean;
  23 +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract;
  24 +import com.shunzhi.parent.presenter.orederdetail.OrderDetailPresenter;
  25 +
  26 +import java.util.List;
  27 +
  28 +public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContract.OrderDetailPreenter,OrderDetailContract.IOrderDetailModel>
  29 + implements View.OnClickListener,OrderDetailContract.IOrderDetailView{
  30 +
  31 + ImageView iv_back;
  32 +
  33 + RecyclerView recyclerView;
  34 +
  35 + MyOrderDetailAdapter myOrderDetailAdapter=null;
  36 +
  37 + @Override
  38 + protected void initView(Bundle savedInstanceState) {
  39 +
  40 + initViews();
  41 +
  42 + }
  43 +
  44 + private void initViews() {
  45 +
  46 + iv_back=findViewById(R.id.iv_back);
  47 + iv_back.setOnClickListener(this);
  48 +
  49 + recyclerView=findViewById(R.id.recyclerView);
  50 + mPresenter.showOrederDetails();
  51 + }
  52 +
  53 + @Override
  54 + protected int getLayoutId() {
  55 + return R.layout.activity_order_detail;
  56 + }
  57 +
  58 + @NonNull
  59 + @Override
  60 + public BasePresenter initPresenter() {
  61 + return new OrderDetailPresenter();
  62 + }
  63 +
  64 + @Override
  65 + public void onClick(View view) {
  66 + switch (view.getId()){
  67 + case R.id.iv_back:
  68 + finish();
  69 + break;
  70 + }
  71 + }
  72 +
  73 + @Override
  74 + public void showOrderDetais(List<OrderDetailBean> orderDetailBeanList) {
  75 + if (null==myOrderDetailAdapter)myOrderDetailAdapter=new MyOrderDetailAdapter();
  76 + if (null==recyclerView.getAdapter())recyclerView.setAdapter(myOrderDetailAdapter);
  77 + myOrderDetailAdapter.addAll(orderDetailBeanList);
  78 + }
  79 +
  80 +
  81 + private class MyOrderDetailAdapter extends BaseRecyclerViewAdapter<OrderDetailBean>{
  82 +
  83 + @Override
  84 + public void onAttachedToRecyclerView(RecyclerView recyclerView) {
  85 + super.onAttachedToRecyclerView(recyclerView);
  86 + LinearLayoutManager layoutManager=new LinearLayoutManager(OrderDetailActivity.this);
  87 + layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
  88 + recyclerView.setLayoutManager(layoutManager);
  89 + }
  90 +
  91 + @Override
  92 + public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
  93 + View view= LayoutInflater.from(OrderDetailActivity.this).inflate(R.layout.item_order_detail,parent,false);
  94 + return new MyOrderDetailViewHolder(view);
  95 + }
  96 +
  97 +
  98 + private class MyOrderDetailViewHolder extends BaseRecyclerViewHolder<OrderDetailBean>{
  99 +
  100 + private LinearLayout layout_orders;
  101 +
  102 + private TextView tvDate;
  103 +
  104 + public MyOrderDetailViewHolder(View itemView) {
  105 + super(itemView);
  106 + layout_orders=itemView.findViewById(R.id.layout_orders);
  107 + tvDate=itemView.findViewById(R.id.tvDate);
  108 + }
  109 +
  110 + @Override
  111 + public void onBindViewHolder(OrderDetailBean object, int position) {
  112 +
  113 + tvDate.setText(object.dateTime);
  114 + LinearLayout linearLayout=new LinearLayout(OrderDetailActivity.this);
  115 + linearLayout.setBackground(getResources().getDrawable(R.drawable.shape_xueqing_radius8));
  116 + linearLayout.setOrientation(LinearLayout.VERTICAL);
  117 + LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(-1,-1);
  118 + params.width= DisplayUtils.getScreenWidthPixels(OrderDetailActivity.this)/4;
  119 + params.height= LinearLayout.LayoutParams.WRAP_CONTENT;
  120 + params.setMargins(10,0,10,0);
  121 + linearLayout.setLayoutParams(params);
  122 +
  123 + TextView textView=new TextView(OrderDetailActivity.this);
  124 + textView.setText(object.dateTime);
  125 + textView.setTextColor(getResources().getColor(R.color.huodong_blue));
  126 + textView.setBackgroundColor(getResources().getColor(R.color.white));
  127 + textView.setTextSize(getResources().getDimension(R.dimen.size_dp_16));
  128 + textView.setGravity(Gravity.CENTER_HORIZONTAL);
  129 + textView.setPadding(0,5,0,5);
  130 + linearLayout.addView(textView);
  131 +
  132 + TextView textView1=new TextView(OrderDetailActivity.this);
  133 + textView1.setText(object.smsName);
  134 + textView1.setTextColor(getResources().getColor(R.color.white));
  135 + textView1.setTextSize(getResources().getDimension(R.dimen.size_dp_16));
  136 + textView1.setGravity(Gravity.CENTER_HORIZONTAL);
  137 + textView1.setPadding(0,5,0,5);
  138 + linearLayout.addView(textView1);
  139 +
  140 + ImageView imageView=new ImageView(OrderDetailActivity.this);
  141 + imageView.setImageDrawable(getResources().getDrawable(R.drawable.sms_bage));
  142 + linearLayout.addView(imageView);
  143 +
  144 + TextView textView2=new TextView(OrderDetailActivity.this);
  145 + textView2.setText("订购成功");
  146 + textView2.setTextColor(getResources().getColor(R.color.huodong_blue));
  147 + textView2.setBackgroundColor(getResources().getColor(R.color.white));
  148 + textView2.setTextSize(getResources().getDimension(R.dimen.size_dp_16));
  149 + textView2.setGravity(Gravity.CENTER_HORIZONTAL);
  150 + textView2.setPadding(0,5,0,5);
  151 + linearLayout.addView(textView2);
  152 +
  153 +
  154 + }
  155 + }
  156 + }
  157 +
  158 +}
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
  Diff comments   View file @b808b91
@@ -47,6 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu @@ -47,6 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
47 LinearLayout layout_control; 47 LinearLayout layout_control;
48 48
49 CityPicker cityPicker=null; 49 CityPicker cityPicker=null;
  50 +
50 @Override 51 @Override
51 public int getLayoutId() { 52 public int getLayoutId() {
52 return R.layout.fragment_zi_xun; 53 return R.layout.fragment_zi_xun;
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @b808b91
@@ -22,10 +22,11 @@ import com.shunzhi.parent.contract.mine.MineContract; @@ -22,10 +22,11 @@ import com.shunzhi.parent.contract.mine.MineContract;
22 import com.shunzhi.parent.presenter.mine.MinePresenter; 22 import com.shunzhi.parent.presenter.mine.MinePresenter;
23 import com.shunzhi.parent.ui.activity.MyChildActivity; 23 import com.shunzhi.parent.ui.activity.MyChildActivity;
24 import com.shunzhi.parent.ui.activity.PersonInfoActivity; 24 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
  25 +import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
25 26
26 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel> 27 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
27 implements MineContract.IMineView, View.OnClickListener { 28 implements MineContract.IMineView, View.OnClickListener {
28 - LinearLayout childlayout, personinfo; 29 + LinearLayout childlayout, personinfo,layout_orderDetail;
29 RoundedImageView user_photo; 30 RoundedImageView user_photo;
30 TextView user_name, user_mobile; 31 TextView user_name, user_mobile;
31 32
@@ -44,8 +45,10 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -44,8 +45,10 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
44 public void initUI(View view, @Nullable Bundle savedInstanceState) { 45 public void initUI(View view, @Nullable Bundle savedInstanceState) {
45 childlayout = view.findViewById(R.id.childlayout); 46 childlayout = view.findViewById(R.id.childlayout);
46 personinfo = view.findViewById(R.id.personinfo); 47 personinfo = view.findViewById(R.id.personinfo);
  48 + layout_orderDetail=view.findViewById(R.id.layout_orderDetail);
47 childlayout.setOnClickListener(this); 49 childlayout.setOnClickListener(this);
48 personinfo.setOnClickListener(this); 50 personinfo.setOnClickListener(this);
  51 + layout_orderDetail.setOnClickListener(this);
49 user_photo = view.findViewById(R.id.user_photo); 52 user_photo = view.findViewById(R.id.user_photo);
50 user_name = view.findViewById(R.id.user_name); 53 user_name = view.findViewById(R.id.user_name);
51 user_mobile = view.findViewById(R.id.user_mobile); 54 user_mobile = view.findViewById(R.id.user_mobile);
@@ -78,6 +81,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract @@ -78,6 +81,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
78 case R.id.personinfo: 81 case R.id.personinfo:
79 startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class)); 82 startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class));
80 break; 83 break;
  84 + case R.id.layout_orderDetail:
  85 + startNewActivity(OrderDetailActivity.class);
  86 + break;
81 default: 87 default:
82 break; 88 break;
83 } 89 }
app/src/main/res/drawable-xhdpi/sms_bage.png 0 → 100644
View file @b808b91

3.59 KB
app/src/main/res/layout/activity_order_detail.xml 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
  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 + xmlns:tools="http://schemas.android.com/tools"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + android:orientation="vertical"
  8 + android:background="@color/bgColor"
  9 + tools:context="com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity">
  10 +
  11 + <FrameLayout
  12 + android:layout_width="match_parent"
  13 + android:layout_height="?android:actionBarSize"
  14 + android:background="@color/titleColor">
  15 +
  16 + <ImageView
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="match_parent"
  19 + android:src="@drawable/back"
  20 + android:paddingLeft="@dimen/size_dp_15"
  21 + android:paddingRight="@dimen/size_dp_15"
  22 + android:id="@+id/iv_back"
  23 + />
  24 +
  25 + <TextView
  26 + style="@style/TextView_Wrap_16"
  27 + android:layout_gravity="center"
  28 + android:gravity="center"
  29 + android:text="@string/order_detail"
  30 + android:textSize="@dimen/textSize18"
  31 + android:textColor="@color/white" />
  32 +
  33 + </FrameLayout>
  34 +
  35 + <android.support.v7.widget.RecyclerView
  36 + android:layout_width="match_parent"
  37 + android:layout_height="match_parent"
  38 + android:layout_margin="@dimen/size_dp_10"
  39 + android:id="@+id/recyclerView"
  40 + ></android.support.v7.widget.RecyclerView>
  41 +
  42 +
  43 +</LinearLayout>
app/src/main/res/layout/fragment_mine.xml
  Diff comments   View file @b808b91
@@ -132,6 +132,7 @@ @@ -132,6 +132,7 @@
132 android:background="@color/bottomline" /> 132 android:background="@color/bottomline" />
133 133
134 <LinearLayout 134 <LinearLayout
  135 + android:id="@+id/layout_orderDetail"
135 android:layout_width="match_parent" 136 android:layout_width="match_parent"
136 android:layout_height="40dp" 137 android:layout_height="40dp"
137 android:gravity="center_vertical" 138 android:gravity="center_vertical"
app/src/main/res/layout/item_order_detail.xml 0 → 100644
  Diff comments   View file @b808b91
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
  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 + <TextView
  7 + android:id="@+id/tvDate"
  8 + android:layout_width="wrap_content"
  9 + android:layout_height="wrap_content"
  10 + android:layout_marginBottom="@dimen/size_dp_10"
  11 + android:layout_marginTop="@dimen/size_dp_10"
  12 + android:text="今天 3月7号"
  13 + android:textColor="@color/textColor"
  14 + android:textSize="@dimen/textSize16" />
  15 +
  16 + <LinearLayout
  17 + android:id="@+id/layout_orders"
  18 + android:layout_width="match_parent"
  19 + android:layout_height="wrap_content"
  20 + android:background="@color/white"
  21 + android:orientation="horizontal">
  22 +
  23 + </LinearLayout>
  24 +</LinearLayout>
0 \ No newline at end of file 25 \ No newline at end of file
app/src/main/res/values/strings.xml
  Diff comments   View file @b808b91
@@ -6,4 +6,5 @@ @@ -6,4 +6,5 @@
6 6
7 <string name="ceping">测评</string> 7 <string name="ceping">测评</string>
8 <string name="consult_huati">咨询话题</string> 8 <string name="consult_huati">咨询话题</string>
  9 + <string name="order_detail">订单详情</string>
9 </resources> 10 </resources>