diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 45208a7..48d7a43 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -71,9 +71,10 @@ - + @@ -85,7 +86,7 @@ + android:windowSoftInputMode="adjustPan|stateHidden" /> - - + android:screenOrientation="portrait" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/shunzhi/parent/bean/OrderDetailBean.java b/app/src/main/java/com/shunzhi/parent/bean/OrderDetailBean.java new file mode 100644 index 0000000..19e4c81 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/bean/OrderDetailBean.java @@ -0,0 +1,26 @@ +package com.shunzhi.parent.bean; + +import java.io.Serializable; + +/** + * Created by ToaHanDong on 2018/3/15. + */ + +public class OrderDetailBean implements Serializable { + + + public String dateTime; + + public String smsName; + + public int orderStatus; + + @Override + public String toString() { + return "OrderDetailBean{" + + "dateTime='" + dateTime + '\'' + + ", smsName='" + smsName + '\'' + + ", orderStatus=" + orderStatus + + '}'; + } +} diff --git a/app/src/main/java/com/shunzhi/parent/contract/orderdetail/OrderDetailContract.java b/app/src/main/java/com/shunzhi/parent/contract/orderdetail/OrderDetailContract.java new file mode 100644 index 0000000..ac2cb29 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/contract/orderdetail/OrderDetailContract.java @@ -0,0 +1,31 @@ +package com.shunzhi.parent.contract.orderdetail; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.IBaseActivity; +import com.share.mvpsdk.base.IBaseModel; +import com.shunzhi.parent.bean.OrderDetailBean; + +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/15. + */ + +public interface OrderDetailContract { + + abstract class OrderDetailPreenter extends BasePresenter{ + + public abstract void showOrederDetails(); + + } + + interface IOrderDetailView extends IBaseActivity{ + + void showOrderDetais(List orderDetailBeanList); + + } + interface IOrderDetailModel extends IBaseModel{ + void getOrderDetails(); + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java b/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java new file mode 100644 index 0000000..e90852c --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/model/orderdetail/OrderDetailModel.java @@ -0,0 +1,21 @@ +package com.shunzhi.parent.model.orderdetail; + +import com.share.mvpsdk.base.BaseModel; +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract; + +/** + * Created by ToaHanDong on 2018/3/15. + */ + +public class OrderDetailModel extends BaseModel implements OrderDetailContract.IOrderDetailModel { + + + public static OrderDetailModel newInstance(){ + return new OrderDetailModel(); + } + + @Override + public void getOrderDetails() { + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java new file mode 100644 index 0000000..55b1a8d --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/presenter/orederdetail/OrderDetailPresenter.java @@ -0,0 +1,42 @@ +package com.shunzhi.parent.presenter.orederdetail; + +import com.share.mvpsdk.base.BasePresenter; +import com.shunzhi.parent.bean.OrderDetailBean; +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract; +import com.shunzhi.parent.model.orderdetail.OrderDetailModel; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by ToaHanDong on 2018/3/15. + */ + +public class OrderDetailPresenter extends OrderDetailContract.OrderDetailPreenter { + @Override + public OrderDetailContract.IOrderDetailModel getModel() { + return OrderDetailModel.newInstance(); + } + + @Override + public void onStart() { + + } + + @Override + public void showOrederDetails() { + + List orderDetailBeanList=new ArrayList<>(); + + for (int i = 0; i < 10; i++) { + OrderDetailBean orderDetailBean=new OrderDetailBean(); + orderDetailBean.smsName="平安短信"+i; + orderDetailBean.dateTime="3月"+(i+1)+"号"; + orderDetailBean.orderStatus=i%3; + orderDetailBeanList.add(orderDetailBean); + } + + mIView.showOrderDetais(orderDetailBeanList); + + } +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java new file mode 100644 index 0000000..0890b55 --- /dev/null +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java @@ -0,0 +1,158 @@ +package com.shunzhi.parent.ui.activity.orderdetail; + +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.share.mvpsdk.base.BasePresenter; +import com.share.mvpsdk.base.activity.BaseMVPCompatActivity; +import com.share.mvpsdk.base.adapter.BaseRecyclerViewAdapter; +import com.share.mvpsdk.base.adapter.BaseRecyclerViewHolder; +import com.share.mvpsdk.utils.DisplayUtils; +import com.shunzhi.parent.R; +import com.shunzhi.parent.bean.OrderDetailBean; +import com.shunzhi.parent.contract.orderdetail.OrderDetailContract; +import com.shunzhi.parent.presenter.orederdetail.OrderDetailPresenter; + +import java.util.List; + +public class OrderDetailActivity extends BaseMVPCompatActivity + implements View.OnClickListener,OrderDetailContract.IOrderDetailView{ + + ImageView iv_back; + + RecyclerView recyclerView; + + MyOrderDetailAdapter myOrderDetailAdapter=null; + + @Override + protected void initView(Bundle savedInstanceState) { + + initViews(); + + } + + private void initViews() { + + iv_back=findViewById(R.id.iv_back); + iv_back.setOnClickListener(this); + + recyclerView=findViewById(R.id.recyclerView); + mPresenter.showOrederDetails(); + } + + @Override + protected int getLayoutId() { + return R.layout.activity_order_detail; + } + + @NonNull + @Override + public BasePresenter initPresenter() { + return new OrderDetailPresenter(); + } + + @Override + public void onClick(View view) { + switch (view.getId()){ + case R.id.iv_back: + finish(); + break; + } + } + + @Override + public void showOrderDetais(List orderDetailBeanList) { + if (null==myOrderDetailAdapter)myOrderDetailAdapter=new MyOrderDetailAdapter(); + if (null==recyclerView.getAdapter())recyclerView.setAdapter(myOrderDetailAdapter); + myOrderDetailAdapter.addAll(orderDetailBeanList); + } + + + private class MyOrderDetailAdapter extends BaseRecyclerViewAdapter{ + + @Override + public void onAttachedToRecyclerView(RecyclerView recyclerView) { + super.onAttachedToRecyclerView(recyclerView); + LinearLayoutManager layoutManager=new LinearLayoutManager(OrderDetailActivity.this); + layoutManager.setOrientation(LinearLayoutManager.VERTICAL); + recyclerView.setLayoutManager(layoutManager); + } + + @Override + public BaseRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view= LayoutInflater.from(OrderDetailActivity.this).inflate(R.layout.item_order_detail,parent,false); + return new MyOrderDetailViewHolder(view); + } + + + private class MyOrderDetailViewHolder extends BaseRecyclerViewHolder{ + + private LinearLayout layout_orders; + + private TextView tvDate; + + public MyOrderDetailViewHolder(View itemView) { + super(itemView); + layout_orders=itemView.findViewById(R.id.layout_orders); + tvDate=itemView.findViewById(R.id.tvDate); + } + + @Override + public void onBindViewHolder(OrderDetailBean object, int position) { + + tvDate.setText(object.dateTime); + LinearLayout linearLayout=new LinearLayout(OrderDetailActivity.this); + linearLayout.setBackground(getResources().getDrawable(R.drawable.shape_xueqing_radius8)); + linearLayout.setOrientation(LinearLayout.VERTICAL); + LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(-1,-1); + params.width= DisplayUtils.getScreenWidthPixels(OrderDetailActivity.this)/4; + params.height= LinearLayout.LayoutParams.WRAP_CONTENT; + params.setMargins(10,0,10,0); + linearLayout.setLayoutParams(params); + + TextView textView=new TextView(OrderDetailActivity.this); + textView.setText(object.dateTime); + textView.setTextColor(getResources().getColor(R.color.huodong_blue)); + textView.setBackgroundColor(getResources().getColor(R.color.white)); + textView.setTextSize(getResources().getDimension(R.dimen.size_dp_16)); + textView.setGravity(Gravity.CENTER_HORIZONTAL); + textView.setPadding(0,5,0,5); + linearLayout.addView(textView); + + TextView textView1=new TextView(OrderDetailActivity.this); + textView1.setText(object.smsName); + textView1.setTextColor(getResources().getColor(R.color.white)); + textView1.setTextSize(getResources().getDimension(R.dimen.size_dp_16)); + textView1.setGravity(Gravity.CENTER_HORIZONTAL); + textView1.setPadding(0,5,0,5); + linearLayout.addView(textView1); + + ImageView imageView=new ImageView(OrderDetailActivity.this); + imageView.setImageDrawable(getResources().getDrawable(R.drawable.sms_bage)); + linearLayout.addView(imageView); + + TextView textView2=new TextView(OrderDetailActivity.this); + textView2.setText("订购成功"); + textView2.setTextColor(getResources().getColor(R.color.huodong_blue)); + textView2.setBackgroundColor(getResources().getColor(R.color.white)); + textView2.setTextSize(getResources().getDimension(R.dimen.size_dp_16)); + textView2.setGravity(Gravity.CENTER_HORIZONTAL); + textView2.setPadding(0,5,0,5); + linearLayout.addView(textView2); + + + } + } + } + +} diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 9efdedf..918a06d 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -47,6 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment implements MineContract.IMineView, View.OnClickListener { - LinearLayout childlayout, personinfo; + LinearLayout childlayout, personinfo,layout_orderDetail; RoundedImageView user_photo; TextView user_name, user_mobile; @@ -44,8 +45,10 @@ public class MineFragment extends BaseMVPCompatFragment + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index e967a1b..ee64846 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -132,6 +132,7 @@ android:background="@color/bottomline" /> + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e8e16c..6612e41 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,4 +6,5 @@ 测评 咨询话题 + 订单详情 -- libgit2 0.21.0