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