陶汉栋 / ParentWork

Download as
Browse Code »

Commit c2e55796785a3387ef7e558ef119c7d1bd5d2777

Authored by wwx
1 parent d7b686ff
Exists in yxb_dev and in 2 other branches developer, wwx

no message

Showing 12 changed files with 251 additions and 117 deletions   Show diff stats
app/src/main/java/com/shunzhi/parent/bean/apply/AttendanceBean.java
  Diff comments   View file @c2e5579
... ... @@ -5,4 +5,18 @@ package com.shunzhi.parent.bean.apply;
5 5 */
6 6  
7 7 public class AttendanceBean {
  8 + String studentId;
  9 + String imgUrl;
  10 + String kaoQinNum;
  11 + String kaoQinDate;
  12 +
  13 + @Override
  14 + public String toString() {
  15 + return "AttendanceBean{" +
  16 + "studentId='" + studentId + '\'' +
  17 + ", imgUrl='" + imgUrl + '\'' +
  18 + ", kaoQinNum='" + kaoQinNum + '\'' +
  19 + ", kaoQinDate='" + kaoQinDate + '\'' +
  20 + '}';
  21 + }
8 22 }
... ...
app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
  Diff comments   View file @c2e5579
... ... @@ -27,7 +27,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment {
27 27 private RecyclerView recycle_attendance;
28 28 private AttendanceAdapter attendanceAdapter;
29 29 List<AttendanceBean> list=new ArrayList<>();
30   - private TextView tv_tips;
  30 + private TextView tv_tips,tv_kaoqin_num,tv_kaoqin_user,tv_kaoqin_date;
31 31 private LinearLayout layout_tv;
32 32  
33 33  
... ... @@ -44,6 +44,9 @@ public class ApplySigninFragment extends BaseMVPCompatFragment {
44 44 public void initUI(View view, @Nullable Bundle savedInstanceState) {
45 45 tv_tips = view.findViewById(R.id.tv_tips);
46 46 layout_tv = view.findViewById(R.id.layout_tv);
  47 + tv_kaoqin_user = view.findViewById(R.id.tv_kaoqin_user);
  48 + tv_kaoqin_date = view.findViewById(R.id.tv_kaoqin_date);
  49 + tv_kaoqin_num = view.findViewById(R.id.tv_kaoqin_num);
47 50 recycle_attendance = view.findViewById(R.id.recycle_attendance);
48 51 recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity()));
49 52 attendanceAdapter = new AttendanceAdapter(getActivity());
... ...
app/src/main/java/com/shunzhi/parent/views/OrderTipDialog.java 0 → 100644
  Diff comments   View file @c2e5579
... ... @@ -0,0 +1,27 @@
  1 +package com.shunzhi.parent.views;
  2 +
  3 +import android.app.Dialog;
  4 +import android.content.Context;
  5 +import android.os.Bundle;
  6 +import android.support.annotation.NonNull;
  7 +import android.view.View;
  8 +
  9 +import com.shunzhi.parent.R;
  10 +
  11 +/**
  12 + * Created by Administrator on 2018/4/16 0016.
  13 + */
  14 +
  15 +public class OrderTipDialog extends Dialog{
  16 +
  17 + @Override
  18 + protected void onCreate(Bundle savedInstanceState) {
  19 + super.onCreate(savedInstanceState);
  20 + setContentView(R.layout.ordertipdialog);
  21 + }
  22 +
  23 + public OrderTipDialog(@NonNull Context context) {
  24 + super(context);
  25 + }
  26 +
  27 +}
... ...
app/src/main/res/drawable/shape_order.xml 0 → 100644
  Diff comments   View file @c2e5579
... ... @@ -0,0 +1,7 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <corners android:bottomLeftRadius="@dimen/size_dp_8" android:bottomRightRadius="@dimen/size_dp_8"/>
  5 + <solid android:color="@color/light_grey2"/>
  6 +
  7 +</shape>
0 8 \ No newline at end of file
... ...
app/src/main/res/layout/fragment_apply_replacecard.xml
  Diff comments   View file @c2e5579
... ... @@ -6,8 +6,6 @@
6 6 android:background="@color/bgColor"
7 7 android:orientation="vertical"
8 8 tools:context="com.shunzhi.parent.ui.fragment.ReportFragment">
9   -
10   -
11 9 <RelativeLayout
12 10 android:layout_width="match_parent"
13 11 android:layout_height="match_parent"
... ... @@ -25,141 +23,132 @@
25 23 android:textSize="@dimen/size_dp_16" />
26 24 </RelativeLayout>
27 25  
  26 +
28 27 <LinearLayout
29 28 android:layout_width="match_parent"
30   - android:layout_height="wrap_content"
31   - android:background="@color/white"
32   - android:orientation="vertical">
  29 + android:layout_height="170dp"
  30 + android:background="@drawable/report_white"
  31 + android:orientation="vertical"
  32 + android:layout_margin="@dimen/margin_medium">
33 33  
34 34 <LinearLayout
35   - android:layout_width="wrap_content"
  35 + android:layout_width="match_parent"
36 36 android:layout_height="0dp"
37   - android:layout_weight="1"
  37 + android:layout_weight="2"
  38 + android:background="@drawable/report_white"
38 39 android:orientation="horizontal">
39 40  
40 41 <TextView
  42 + android:layout_weight="1"
41 43 android:id="@+id/tv_carduser"
42   - android:layout_width="100dp"
  44 + android:paddingLeft="@dimen/margin_small"
  45 + android:layout_width="0dp"
43 46 android:layout_height="wrap_content"
44   - android:padding="5dp"
45 47 android:text="补卡人:"
46 48 android:textColor="@color/hintTextColor"
47   - android:textSize="@dimen/textSize18" />
  49 + android:textSize="@dimen/textSize16" />
48 50  
49 51 <TextView
50 52 android:id="@+id/et_carduser"
51   - android:layout_width="200dp"
  53 + android:layout_weight="3"
  54 + android:layout_width="0dp"
52 55 android:layout_height="wrap_content"
53 56 android:gravity="center"
54 57 android:text="张三"
55 58 android:textColor="@color/hintTextColor"
56   - android:textSize="@dimen/textSize18" />
57   -
58   -
  59 + android:textSize="@dimen/textSize16" />
59 60 </LinearLayout>
60 61  
61   - <TextView
62   - android:id="@+id/tv"
63   - android:layout_width="fill_parent"
64   - android:layout_height="1dp"
65   - android:background="@color/line_color" />
66   -
67 62 <LinearLayout
68   - android:layout_width="wrap_content"
  63 + android:layout_width="match_parent"
69 64 android:layout_height="0dp"
70   - android:layout_weight="1"
  65 + android:layout_weight="2"
71 66 android:orientation="horizontal">
72 67  
73 68 <TextView
74 69 android:id="@+id/tv_cardnum"
75   - android:layout_width="100dp"
  70 + android:layout_weight="1"
  71 + android:layout_width="0dp"
76 72 android:layout_height="wrap_content"
77   - android:padding="5dp"
  73 + android:paddingLeft="@dimen/margin_small"
78 74 android:text="卡号:"
79 75 android:textColor="@color/hintTextColor"
80   - android:textSize="@dimen/textSize18" />
  76 + android:textSize="@dimen/textSize16" />
81 77  
82 78 <EditText
83 79 android:id="@+id/et_cardnum"
84   - android:layout_width="200dp"
  80 + android:layout_weight="3"
  81 + android:layout_width="0dp"
85 82 android:layout_height="wrap_content"
86 83 android:gravity="center"
87 84 android:background="@null"
88 85 android:inputType="number"
89 86 android:text="1317410119"
90 87 android:textColor="@color/hintTextColor"
91   - android:textSize="@dimen/textSize18" />
  88 + android:textSize="@dimen/textSize16" />
92 89  
93 90 </LinearLayout>
94 91  
95   - <TextView
96   - android:id="@+id/tv1"
97   - android:layout_width="fill_parent"
98   - android:layout_height="1dp"
99   - android:background="@color/line_color" />
100 92  
101 93 <LinearLayout
102   - android:layout_width="wrap_content"
  94 + android:layout_width="match_parent"
103 95 android:layout_height="0dp"
104   - android:layout_weight="1"
  96 + android:layout_weight="2"
105 97 android:orientation="horizontal">
106 98  
107 99 <TextView
108 100 android:id="@+id/tv_cardnumber"
109   - android:layout_width="100dp"
  101 + android:layout_width="0dp"
110 102 android:layout_height="wrap_content"
111   - android:padding="5dp"
  103 + android:paddingLeft="@dimen/margin_small"
  104 + android:layout_weight="1"
112 105 android:text="考勤次数:"
113 106 android:textColor="@color/hintTextColor"
114   - android:textSize="@dimen/textSize18" />
  107 + android:textSize="@dimen/textSize16" />
115 108  
116 109 <TextView
117 110 android:id="@+id/et_cardnumber"
118   - android:layout_width="200dp"
  111 + android:layout_weight="3"
  112 + android:layout_width="0dp"
119 113 android:layout_height="wrap_content"
120 114 android:gravity="center"
121 115 android:text="5次"
122 116 android:textColor="@color/hintTextColor"
123   - android:textSize="@dimen/textSize18" />
124   -
125   -
  117 + android:textSize="@dimen/textSize16" />
126 118 </LinearLayout>
127   -
128   - <TextView
129   - android:id="@+id/tv2"
130   - android:layout_width="fill_parent"
131   - android:layout_height="1dp"
132   - android:background="@color/line_color" />
  119 + <TextView
  120 + android:layout_width="fill_parent"
  121 + android:layout_height="1dp"
  122 + android:background="@color/bg_gray_pressed"/>
133 123  
134 124 <RelativeLayout
135 125 android:layout_width="wrap_content"
136 126 android:layout_height="0dp"
137 127 android:layout_margin="10dp"
138   - android:layout_weight="1.5"
  128 + android:layout_weight="2"
139 129 android:orientation="horizontal">
140 130  
141 131 <Button
142 132 android:id="@+id/bt_sure"
143 133 android:layout_width="80dp"
144 134 android:layout_height="wrap_content"
145   - android:layout_marginLeft="30dp"
  135 + android:layout_marginLeft="@dimen/dp_60"
146 136 android:layout_alignParentLeft="true"
147 137 android:text="确定"
148 138 android:textColor="@color/white"
149   - android:textSize="@dimen/textSize18"
  139 + android:textSize="@dimen/textSize16"
150 140 android:background="@drawable/button_shape"/>
151 141  
152 142 <Button
153 143 android:id="@+id/bt_cancle"
154 144 android:layout_width="80dp"
155 145 android:layout_height="wrap_content"
156   - android:layout_marginRight="30dp"
  146 + android:layout_marginRight="@dimen/dp_60"
157 147 android:layout_alignParentRight="true"
158 148 android:text="取消"
159 149 android:textColor="@color/white"
160   - android:textSize="@dimen/textSize18"
  150 + android:textSize="@dimen/textSize16"
161 151 android:background="@drawable/button_shape"/>
162 152 </RelativeLayout>
163   -
164 153 </LinearLayout>
165 154 </LinearLayout>
166 155 \ No newline at end of file
... ...
app/src/main/res/layout/fragment_apply_signin.xml
  Diff comments   View file @c2e5579
... ... @@ -24,102 +24,97 @@
24 24 android:textSize="@dimen/size_dp_16" />
25 25 </RelativeLayout>
26 26  
  27 +
27 28 <LinearLayout
28 29 android:layout_width="match_parent"
29   - android:layout_height="wrap_content"
30   - android:background="@color/white"
  30 + android:layout_height="170dp"
  31 + android:layout_margin="@dimen/margin_medium"
  32 + android:background="@drawable/report_white"
31 33 android:orientation="vertical">
32 34  
33 35 <LinearLayout
34   - android:layout_width="wrap_content"
  36 + android:layout_width="match_parent"
35 37 android:layout_height="0dp"
36 38 android:layout_weight="1"
37 39 android:orientation="horizontal">
38 40  
39 41 <TextView
40 42 android:id="@+id/tv_attendancer"
41   - android:layout_width="100dp"
  43 + android:layout_width="0dp"
42 44 android:layout_height="wrap_content"
43   - android:padding="5dp"
  45 + android:layout_weight="1"
  46 + android:paddingLeft="@dimen/margin_small"
44 47 android:text="考核对象:"
45 48 android:textColor="@color/hintTextColor"
46   - android:textSize="@dimen/textSize18" />
  49 + android:textSize="@dimen/textSize16" />
47 50  
48 51 <TextView
49   - android:id="@+id/et_attendancer"
50   - android:layout_width="200dp"
  52 + android:id="@+id/tv_kaoqin_user"
  53 + android:layout_width="0dp"
51 54 android:layout_height="wrap_content"
  55 + android:layout_weight="3"
52 56 android:gravity="center"
53 57 android:text="张三"
54 58 android:textColor="@color/hintTextColor"
55   - android:textSize="@dimen/textSize18" />
  59 + android:textSize="@dimen/textSize16" />
56 60  
57 61  
58 62 </LinearLayout>
59 63  
60   - <TextView
61   - android:id="@+id/tv"
62   - android:layout_width="fill_parent"
63   - android:layout_height="1dp"
64   - android:background="@color/line_color" />
65 64  
66 65 <LinearLayout
67   - android:layout_width="wrap_content"
  66 + android:layout_width="match_parent"
68 67 android:layout_height="0dp"
69 68 android:layout_weight="1"
70 69 android:orientation="horizontal">
71 70  
72 71 <TextView
73 72 android:id="@+id/tv_date"
74   - android:layout_width="100dp"
  73 + android:layout_width="0dp"
75 74 android:layout_height="wrap_content"
76   - android:padding="5dp"
  75 + android:layout_weight="1"
  76 + android:paddingLeft="@dimen/margin_small"
77 77 android:text="考勤日期:"
78 78 android:textColor="@color/hintTextColor"
79   - android:textSize="@dimen/textSize18" />
  79 + android:textSize="@dimen/textSize16" />
80 80  
81 81 <TextView
82   - android:id="@+id/et_date"
83   - android:layout_width="200dp"
  82 + android:id="@+id/tv_kaoqin_date"
  83 + android:layout_width="0dp"
84 84 android:layout_height="wrap_content"
  85 + android:layout_weight="3"
85 86 android:gravity="center"
86 87 android:text="2018-04-10"
87 88 android:textColor="@color/hintTextColor"
88   - android:textSize="@dimen/textSize18" />
  89 + android:textSize="@dimen/textSize16" />
89 90  
90 91 </LinearLayout>
91 92  
92   - <TextView
93   - android:id="@+id/tv1"
94   - android:layout_width="fill_parent"
95   - android:layout_height="1dp"
96   - android:background="@color/line_color" />
97   -
98 93 <LinearLayout
99   - android:layout_width="wrap_content"
  94 + android:layout_width="match_parent"
100 95 android:layout_height="0dp"
101 96 android:layout_weight="1"
102 97 android:orientation="horizontal">
103 98  
104 99 <TextView
105 100 android:id="@+id/tv_number"
106   - android:layout_width="100dp"
  101 + android:layout_width="0dp"
107 102 android:layout_height="wrap_content"
108   - android:padding="5dp"
  103 + android:layout_weight="1"
  104 + android:paddingLeft="@dimen/margin_small"
109 105 android:text="考勤次数:"
110 106 android:textColor="@color/hintTextColor"
111   - android:textSize="@dimen/textSize18" />
  107 + android:textSize="@dimen/textSize16" />
112 108  
113 109 <TextView
114   - android:id="@+id/et_number"
115   - android:layout_width="200dp"
  110 + android:id="@+id/tv_kaoqin_num"
  111 + android:layout_width="0dp"
116 112 android:layout_height="wrap_content"
  113 + android:layout_weight="3"
117 114 android:gravity="center"
118   - android:text="5次"
  115 + android:text="5"
119 116 android:textColor="@color/hintTextColor"
120   - android:textSize="@dimen/textSize18" />
121   -
122   -
  117 + android:textSize="@dimen/textSize16" />
123 118 </LinearLayout>
124 119  
125 120 <TextView
... ... @@ -131,10 +126,11 @@
131 126 <LinearLayout
132 127 android:id="@+id/layout_tv"
133 128 android:layout_width="match_parent"
134   - android:layout_height="80dp"
  129 + android:layout_height="0dp"
  130 + android:layout_weight="2"
135 131 android:gravity="center"
136 132 android:orientation="horizontal"
137   - android:visibility="gone">
  133 + android:visibility="visible">
138 134  
139 135 <TextView
140 136 android:id="@+id/tv_tips"
... ... @@ -142,9 +138,9 @@
142 138 android:layout_height="wrap_content"
143 139 android:text="张三今日无刷卡记录!"
144 140 android:textColor="@color/textRed"
145   - android:textSize="@dimen/textSize20"
146   - android:visibility="gone" />
  141 + android:textSize="@dimen/textSize20" />
147 142 </LinearLayout>
  143 +
148 144 </LinearLayout>
149 145  
150 146 <android.support.v7.widget.RecyclerView
... ... @@ -152,7 +148,8 @@
152 148 android:layout_width="match_parent"
153 149 android:layout_height="wrap_content"
154 150 android:layout_marginTop="@dimen/size_dp_10"
155   - android:background="@color/bgColor">
  151 + android:background="@color/bgColor"
  152 + android:visibility="gone">
156 153  
157 154 </android.support.v7.widget.RecyclerView>
158 155 </LinearLayout>
159 156 \ No newline at end of file
... ...
app/src/main/res/layout/fragment_report_detial.xml
  Diff comments   View file @c2e5579
... ... @@ -10,9 +10,7 @@
10 10 android:layout_width="match_parent"
11 11 android:layout_height="match_parent"
12 12 android:background="@color/white"
13   - android:visibility="gone"
14   -
15   - >
  13 + android:visibility="gone">
16 14  
17 15 <TextView
18 16 android:id="@+id/tvNoData"
... ... @@ -63,10 +61,10 @@
63 61 android:id="@+id/tv_source"
64 62 android:layout_width="wrap_content"
65 63 android:layout_height="wrap_content"
  64 + android:layout_gravity="center"
66 65 android:gravity="center"
67 66 android:padding="@dimen/size_dp_5"
68 67 android:text="4.3分"
69   - android:layout_gravity="center"
70 68 android:textColor="@color/white"
71 69 android:textSize="@dimen/dp_36" />
72 70  
... ... @@ -74,9 +72,9 @@
74 72 android:id="@+id/tv_bijiao1"
75 73 android:layout_width="wrap_content"
76 74 android:layout_height="wrap_content"
  75 + android:layout_gravity="center"
77 76 android:layout_marginTop="10dp"
78 77 android:gravity="center"
79   - android:layout_gravity="center"
80 78 android:text="同期上升1.1分"
81 79 android:textColor="@color/white"
82 80 android:textSize="@dimen/sp_16" />
... ... @@ -85,9 +83,9 @@
85 83 android:id="@+id/tv_bijiao2"
86 84 android:layout_width="wrap_content"
87 85 android:layout_height="wrap_content"
  86 + android:layout_gravity="center"
88 87 android:layout_marginTop="5dp"
89 88 android:gravity="center"
90   - android:layout_gravity="center"
91 89 android:text="高于平均分1.1分"
92 90 android:textColor="@color/white"
93 91 android:textSize="@dimen/sp_16" />
... ... @@ -116,8 +114,8 @@
116 114 android:id="@+id/tv_ranking"
117 115 android:layout_width="wrap_content"
118 116 android:layout_height="wrap_content"
119   - android:gravity="center"
120 117 android:layout_gravity="center"
  118 + android:gravity="center"
121 119 android:padding="@dimen/size_dp_5"
122 120 android:text="第三名"
123 121 android:textColor="@color/white"
... ... @@ -127,9 +125,9 @@
127 125 android:id="@+id/tv_bijiao3"
128 126 android:layout_width="wrap_content"
129 127 android:layout_height="wrap_content"
  128 + android:layout_gravity="center"
130 129 android:layout_marginTop="10dp"
131 130 android:gravity="center"
132   - android:layout_gravity="center"
133 131 android:text="同期上升5名"
134 132 android:textColor="@color/white"
135 133 android:textSize="@dimen/sp_16" />
... ... @@ -138,9 +136,9 @@
138 136 android:id="@+id/tv_bijiao4"
139 137 android:layout_width="wrap_content"
140 138 android:layout_height="wrap_content"
  139 + android:layout_gravity="center"
141 140 android:layout_marginTop="5dp"
142 141 android:gravity="center"
143   - android:layout_gravity="center"
144 142 android:text="高于平均排名1.1名"
145 143 android:textColor="@color/white"
146 144 android:textSize="@dimen/sp_16" />
... ... @@ -155,10 +153,10 @@
155 153 android:id="@+id/tv_describe"
156 154 android:layout_width="match_parent"
157 155 android:layout_height="wrap_content"
158   - android:layout_marginTop="@dimen/size_dp_30"
159 156 android:layout_marginBottom="@dimen/size_dp_20"
160 157 android:layout_marginLeft="@dimen/size_dp_25"
161 158 android:layout_marginRight="@dimen/size_dp_25"
  159 + android:layout_marginTop="@dimen/size_dp_30"
162 160 android:gravity="center"
163 161 android:lineSpacingExtra="@dimen/size_dp_5"
164 162 android:text="哎哟不错哦，德育评价打败了88%的同学！注意行为规范将更上一层"
... ... @@ -174,20 +172,19 @@
174 172 android:layout_marginTop="@dimen/size_dp_10">
175 173  
176 174 <com.share.mvpsdk.view.chartview.ChartView
177   - android:layout_width="match_parent"
178   - android:layout_height="match_parent"
179 175 android:id="@+id/chartView"
180   - />
  176 + android:layout_width="match_parent"
  177 + android:layout_height="match_parent" />
181 178  
182 179 <TextView
183   - android:visibility="gone"
184 180 android:layout_width="match_parent"
185 181 android:layout_height="200dp"
186   - android:text="图表控件"
187 182 android:layout_gravity="center"
  183 + android:background="@color/huodong_blue"
188 184 android:gravity="center"
  185 + android:text="图表控件"
189 186 android:textColor="@color/md_red_500"
190   - android:background="@color/huodong_blue" />
  187 + android:visibility="gone" />
191 188  
192 189 </FrameLayout>
193 190  
... ...
app/src/main/res/layout/fragment_report_scene.xml
  Diff comments   View file @c2e5579
... ... @@ -10,9 +10,7 @@
10 10 android:layout_width="match_parent"
11 11 android:layout_height="match_parent"
12 12 android:background="@color/white"
13   - android:visibility="gone"
14   -
15   - >
  13 + android:visibility="gone">
16 14  
17 15 <TextView
18 16 android:id="@+id/tvNoData"
... ... @@ -45,8 +43,6 @@
45 43 android:weightSum="2"
46 44 android:orientation="horizontal">
47 45  
48   -
49   -
50 46 <ImageView
51 47 android:id="@+id/image"
52 48 android:layout_width="0dp"
... ...
app/src/main/res/layout/ordertipdialog.xml 0 → 100644
  Diff comments   View file @c2e5579
... ... @@ -0,0 +1,95 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/layoutRoot"
  4 + android:layout_width="300dp"
  5 + android:layout_height="wrap_content"
  6 + android:background="@drawable/shape_order"
  7 + android:orientation="vertical"
  8 + android:windowIsFloating="true">
  9 +
  10 + <LinearLayout
  11 + android:layout_width="fill_parent"
  12 + android:layout_height="wrap_content"
  13 + android:layout_weight="2"
  14 + android:orientation="vertical"
  15 + android:layout_margin="@dimen/dp_26"
  16 + android:background="@drawable/report_white">
  17 +
  18 + <LinearLayout
  19 + android:layout_width="match_parent"
  20 + android:layout_height="wrap_content"
  21 + android:layout_margin="@dimen/dp_5"
  22 + android:layout_weight="1"
  23 + android:gravity="center"
  24 + android:orientation="horizontal">
  25 +
  26 + <TextView
  27 + android:layout_weight="1"
  28 + android:layout_width="0dp"
  29 + android:layout_height="wrap_content"
  30 + android:textColor="@color/txt_gray"
  31 + android:text="请前往 "
  32 + android:gravity="right"
  33 + android:textSize="@dimen/size_dp_18"/>
  34 + <TextView
  35 + android:layout_weight="1"
  36 + android:layout_width="0dp"
  37 + android:layout_height="wrap_content"
  38 + android:textColor="@color/txt_link_blue"
  39 + android:text="订购中心"
  40 + android:textSize="@dimen/size_dp_18"/>
  41 + </LinearLayout>
  42 +
  43 + <LinearLayout
  44 + android:layout_width="match_parent"
  45 + android:layout_height="wrap_content"
  46 + android:layout_weight="2"
  47 + android:orientation="vertical">
  48 + <TextView
  49 + android:layout_weight="1"
  50 + android:layout_width="wrap_content"
  51 + android:layout_height="0dp"
  52 + android:layout_gravity="center"
  53 + android:layout_margin="@dimen/dp_4"
  54 + android:text="订购“智能校卫"
  55 + android:textColor="@color/txt_gray"
  56 + android:textSize="@dimen/size_dp_18"/>
  57 +
  58 + <TextView
  59 + android:layout_weight="1"
  60 + android:layout_width="wrap_content"
  61 + android:layout_height="0dp"
  62 + android:layout_gravity="center"
  63 + android:layout_margin="@dimen/dp_5"
  64 + android:text="才能使用相关应用功能"
  65 + android:textColor="@color/txt_gray"
  66 + android:textSize="@dimen/size_dp_18"/>
  67 + </LinearLayout>
  68 + </LinearLayout>
  69 +
  70 + <LinearLayout
  71 + android:layout_width="match_parent"
  72 + android:layout_height="wrap_content"
  73 + android:layout_weight="1"
  74 + android:layout_marginBottom="@dimen/dp_10"
  75 + android:orientation="horizontal">
  76 +
  77 + <Button
  78 + android:layout_width="120dp"
  79 + android:layout_height="wrap_content"
  80 + android:background="@drawable/button_shape"
  81 + android:layout_marginLeft="@dimen/dp_26"
  82 + android:text="取消"
  83 + android:textSize="@dimen/size_dp_18" />
  84 +
  85 + <Button
  86 + android:layout_width="120dp"
  87 + android:layout_height="wrap_content"
  88 + android:background="@drawable/button_shape"
  89 + android:layout_marginLeft="@dimen/dp_10"
  90 + android:text="前往订购"
  91 + android:textSize="@dimen/size_dp_18" />
  92 + </LinearLayout>
  93 +
  94 +
  95 +</LinearLayout>
0 96 \ No newline at end of file
... ...
app/src/main/res/values/dimens.xml
  Diff comments   View file @c2e5579
... ... @@ -32,9 +32,15 @@
32 32  
33 33 <dimen name="dp_066">0.66dp</dimen>
34 34 <dimen name="dp_4">4dp</dimen>
  35 + <dimen name="dp_5">5dp</dimen>
35 36 <dimen name="dp_10">10dp</dimen>
36 37 <dimen name="dp_14">14dp</dimen>
  38 + <dimen name="dp_16">16dp</dimen>
37 39 <dimen name="dp_22">22dp</dimen>
  40 + <dimen name="dp_24">24dp</dimen>
  41 + <dimen name="dp_26">26dp</dimen>
  42 +
  43 + <dimen name="dp_30">30dp</dimen>
38 44 <dimen name="dp_36">36dp</dimen>
39 45 <dimen name="dp_40">40dp</dimen>
40 46 <dimen name="dp_60">60dp</dimen>
... ...
mvpsdk/src/main/res/values/colors.xml
  Diff comments   View file @c2e5579
... ... @@ -33,6 +33,7 @@
33 33 <color name="divider_gray">#cbcbcb</color>
34 34 <!-- other -->
35 35 <color name="txt_link_blue">#1ea5ff</color>
  36 + <color name="button_bg">#98f5ff</color>
36 37  
37 38 <!-- wheel -->
38 39 <color name="province_line_border">#C7C7C7</color>
... ...
mvpsdk/src/main/res/values/dimens.xml
  Diff comments   View file @c2e5579
... ... @@ -30,9 +30,11 @@
30 30  
31 31 <dimen name="dp_066">0.66dp</dimen>
32 32 <dimen name="dp_4">4dp</dimen>
  33 + <dimen name="dp_5">5dp</dimen>
33 34 <dimen name="dp_10">10dp</dimen>
34 35 <dimen name="dp_14">14dp</dimen>
35 36 <dimen name="dp_22">22dp</dimen>
  37 + <dimen name="dp_30">30dp</dimen>
36 38 <dimen name="dp_36">36dp</dimen>
37 39 <dimen name="dp_40">40dp</dimen>
38 40 <dimen name="dp_60">60dp</dimen>
... ...