陶汉栋 / ParentWork

Download as
Browse Code »

Commit bcb57ba985591b618d120b4a2c5a7c0bdad4b013

Authored by 姚旭斌
2 parents b21e283f 6a57d64f
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev

Showing 16 changed files with 383 additions and 25 deletions   Show diff stats
app/src/main/AndroidManifest.xml
  Diff comments   View file @bcb57ba
... ... @@ -71,9 +71,10 @@
71 71 <category android:name="android.intent.category.LAUNCHER" />
72 72 </intent-filter>
73 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 78 <activity
78 79 android:name=".ui.activity.MyChildActivity"
79 80 android:screenOrientation="portrait" />
... ... @@ -85,7 +86,7 @@
85 86 <activity
86 87 android:name=".ui.activity.binding.CreateChildInfoActivity"
87 88 android:screenOrientation="portrait"
88   - android:windowSoftInputMode="adjustPan|stateHidden"/>
  89 + android:windowSoftInputMode="adjustPan|stateHidden" />
89 90 <activity
90 91 android:name=".ui.activity.binding.SelectSchoolActivity"
91 92 android:screenOrientation="portrait"
... ... @@ -103,10 +104,9 @@
103 104 android:windowSoftInputMode="adjustPan|stateHidden" />
104 105 <activity
105 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 110 </application>
111 111  
112 112 </manifest>
113 113 \ No newline at end of file
... ...
app/src/main/java/com/shunzhi/parent/bean/OrderDetailBean.java 0 → 100644
  Diff comments   View file @bcb57ba
... ... @@ -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 @bcb57ba
... ... @@ -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 @bcb57ba
... ... @@ -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 @bcb57ba
... ... @@ -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/MainActivity.java
  Diff comments   View file @bcb57ba
... ... @@ -85,10 +85,10 @@ public class MainActivity extends BaseCompatActivity implements PermissionUtils.
85 85 .add(R.id.frame, consultFragment)
86 86 .add(R.id.frame, reportFragment)
87 87 .add(R.id.frame, mineFragment)
88   - .show(mineFragment)
  88 + .show(cePingFragment)
89 89 .hide(consultFragment)
90 90 .hide(reportFragment)
91   - .hide(cePingFragment)
  91 + .hide(mineFragment)
92 92 .commit();
93 93 }
94 94  
... ...
app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java 0 → 100644
  Diff comments   View file @bcb57ba
... ... @@ -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 @bcb57ba
... ... @@ -5,11 +5,8 @@ import android.content.Context;
5 5 import android.content.Intent;
6 6 import android.content.IntentFilter;
7 7 import android.os.Bundle;
8   -import android.os.Handler;
9   -import android.os.Message;
10 8 import android.support.annotation.NonNull;
11 9 import android.support.annotation.Nullable;
12   -import android.util.Log;
13 10 import android.view.View;
14 11 import android.widget.ImageView;
15 12 import android.widget.LinearLayout;
... ... @@ -22,8 +19,6 @@ import com.shunzhi.parent.AppContext;
22 19 import com.shunzhi.parent.R;
23 20 import com.shunzhi.parent.contract.consult.ConsultContract;
24 21 import com.shunzhi.parent.presenter.consult.ConsultPresenter;
25   -import com.shunzhi.parent.ui.activity.consult.ConsultOneLevelActivity;
26   -import com.shunzhi.parent.views.TextAndImgShowView;
27 22 import com.stx.xhb.xbanner.XBanner;
28 23  
29 24 import java.io.ByteArrayOutputStream;
... ... @@ -52,6 +47,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
52 47 LinearLayout layout_control;
53 48  
54 49 CityPicker cityPicker=null;
  50 +
55 51 @Override
56 52 public int getLayoutId() {
57 53 return R.layout.fragment_zi_xun;
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
  Diff comments   View file @bcb57ba
... ... @@ -22,10 +22,11 @@ import com.shunzhi.parent.contract.mine.MineContract;
22 22 import com.shunzhi.parent.presenter.mine.MinePresenter;
23 23 import com.shunzhi.parent.ui.activity.MyChildActivity;
24 24 import com.shunzhi.parent.ui.activity.PersonInfoActivity;
  25 +import com.shunzhi.parent.ui.activity.orderdetail.OrderDetailActivity;
25 26  
26 27 public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract.LoginPresenter, LoginAndRegisterContract.ILoginModel>
27 28 implements MineContract.IMineView, View.OnClickListener {
28   - LinearLayout childlayout, personinfo;
  29 + LinearLayout childlayout, personinfo,layout_orderDetail;
29 30 RoundedImageView user_photo;
30 31 TextView user_name, user_mobile;
31 32  
... ... @@ -44,8 +45,10 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
44 45 public void initUI(View view, @Nullable Bundle savedInstanceState) {
45 46 childlayout = view.findViewById(R.id.childlayout);
46 47 personinfo = view.findViewById(R.id.personinfo);
  48 + layout_orderDetail=view.findViewById(R.id.layout_orderDetail);
47 49 childlayout.setOnClickListener(this);
48 50 personinfo.setOnClickListener(this);
  51 + layout_orderDetail.setOnClickListener(this);
49 52 user_photo = view.findViewById(R.id.user_photo);
50 53 user_name = view.findViewById(R.id.user_name);
51 54 user_mobile = view.findViewById(R.id.user_mobile);
... ... @@ -78,6 +81,9 @@ public class MineFragment extends BaseMVPCompatFragment&lt;LoginAndRegisterContract
78 81 case R.id.personinfo:
79 82 startActivity(new Intent().setClass(getActivity(), PersonInfoActivity.class));
80 83 break;
  84 + case R.id.layout_orderDetail:
  85 + startNewActivity(OrderDetailActivity.class);
  86 + break;
81 87 default:
82 88 break;
83 89 }
... ...
app/src/main/res/drawable-xhdpi/sms_bage.png 0 → 100644
View file @bcb57ba

3.59 KB
app/src/main/res/layout/activity_order_detail.xml 0 → 100644
  Diff comments   View file @bcb57ba
... ... @@ -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 @bcb57ba
... ... @@ -132,6 +132,7 @@
132 132 android:background="@color/bottomline" />
133 133  
134 134 <LinearLayout
  135 + android:id="@+id/layout_orderDetail"
135 136 android:layout_width="match_parent"
136 137 android:layout_height="40dp"
137 138 android:gravity="center_vertical"
... ...
app/src/main/res/layout/fragment_zi_xun.xml
  Diff comments   View file @bcb57ba
... ... @@ -14,16 +14,25 @@
14 14 android:layout_height="0dp"
15 15 android:layout_weight="2"></com.stx.xhb.xbanner.XBanner>
16 16  
17   -<include layout="@layout/layout_textandimgshow"/>
  17 + <LinearLayout
  18 + android:layout_width="wrap_content"
  19 + android:layout_height="wrap_content"
  20 + android:layout_marginLeft="@dimen/size_dp_10"
  21 + android:layout_marginRight="@dimen/size_dp_10"
  22 + >
  23 +<include layout="@layout/layout_textandimgshow"
  24 + />
  25 + </LinearLayout>
18 26 <LinearLayout
19 27 android:layout_width="match_parent"
20 28 android:layout_height="wrap_content"
  29 + android:paddingLeft="@dimen/size_dp_10"
  30 + android:paddingRight="@dimen/size_dp_10"
21 31 android:orientation="vertical">
22 32  
23 33 <TextView
24 34 android:layout_width="wrap_content"
25 35 android:layout_height="wrap_content"
26   - android:layout_marginLeft="@dimen/size_dp_10"
27 36 android:text="@string/consult_huati"
28 37 android:textColor="@color/xueqing_blue"
29 38 android:textSize="@dimen/textSize16" />
... ...
app/src/main/res/layout/item_order_detail.xml 0 → 100644
  Diff comments   View file @bcb57ba
... ... @@ -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 25 \ No newline at end of file
... ...
app/src/main/res/layout/item_report.xml
  Diff comments   View file @bcb57ba
... ... @@ -3,10 +3,10 @@
3 3 android:layout_width="match_parent"
4 4 android:layout_height="match_parent">
5 5  
6   - <LinearLayout
  6 + <LinearLayout
7 7 android:layout_width="match_parent"
8   - android:layout_marginTop="@dimen/size_dp_10"
9 8 android:layout_height="250dp"
  9 + android:layout_marginTop="@dimen/size_dp_10"
10 10 android:background="@drawable/report_white"
11 11 android:orientation="vertical">
12 12  
... ... @@ -20,7 +20,7 @@
20 20 android:textColor="#20519f"
21 21 android:textSize="@dimen/sp_16" />
22 22  
23   - <RelativeLayout
  23 + <RelativeLayout
24 24 android:layout_width="match_parent"
25 25 android:layout_height="wrap_content"
26 26 android:layout_weight="1"
... ... @@ -52,10 +52,10 @@
52 52 <LinearLayout
53 53 android:layout_width="wrap_content"
54 54 android:layout_height="match_parent"
55   - android:layout_weight="1"
56 55 android:layout_centerInParent="true"
57   - android:gravity="center_horizontal"
58   - >
  56 + android:layout_weight="1"
  57 + android:gravity="center_horizontal">
  58 +
59 59 <com.shunzhi.parent.views.ProgressView
60 60 android:id="@+id/ring"
61 61 android:layout_width="160dp"
... ... @@ -66,8 +66,8 @@
66 66 <LinearLayout
67 67 android:layout_width="80dp"
68 68 android:layout_height="match_parent"
69   - android:layout_marginTop="10dp"
70 69 android:layout_alignParentRight="true"
  70 + android:layout_marginTop="10dp"
71 71 android:orientation="vertical">
72 72  
73 73 <TextView
... ...
app/src/main/res/values/strings.xml
  Diff comments   View file @bcb57ba
... ... @@ -6,4 +6,5 @@
6 6  
7 7 <string name="ceping">测评</string>
8 8 <string name="consult_huati">咨询话题</string>
  9 + <string name="order_detail">订单详情</string>
9 10 </resources>
... ...