Commit 11f0c65b6cad77493559dc16a101642f119d42e3
1 parent
a87a6743
Exists in
yxb_dev
and in
2 other branches
no message
Showing
5 changed files
with
174 additions
and
24 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
| 1 | package com.shunzhi.parent.ui.fragment; | 1 | package com.shunzhi.parent.ui.fragment; |
| 2 | 2 | ||
| 3 | -import android.content.Context; | ||
| 4 | -import android.net.Uri; | ||
| 5 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 6 | import android.support.v4.app.Fragment; | 4 | import android.support.v4.app.Fragment; |
| 7 | import android.view.LayoutInflater; | 5 | import android.view.LayoutInflater; |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| 1 | package com.shunzhi.parent.ui.fragment; | 1 | package com.shunzhi.parent.ui.fragment; |
| 2 | 2 | ||
| 3 | -import android.content.Context; | ||
| 4 | -import android.net.Uri; | ||
| 5 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 6 | import android.support.v4.app.Fragment; | 4 | import android.support.v4.app.Fragment; |
| 7 | import android.view.LayoutInflater; | 5 | import android.view.LayoutInflater; |
app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
| 1 | package com.shunzhi.parent.ui.fragment; | 1 | package com.shunzhi.parent.ui.fragment; |
| 2 | 2 | ||
| 3 | -import android.content.Context; | ||
| 4 | -import android.net.Uri; | ||
| 5 | import android.os.Bundle; | 3 | import android.os.Bundle; |
| 6 | import android.support.v4.app.Fragment; | 4 | import android.support.v4.app.Fragment; |
| 7 | import android.view.LayoutInflater; | 5 | import android.view.LayoutInflater; |
88.4 KB
app/src/main/res/layout/fragment_mine.xml
| @@ -14,9 +14,10 @@ | @@ -14,9 +14,10 @@ | ||
| 14 | 14 | ||
| 15 | <LinearLayout | 15 | <LinearLayout |
| 16 | android:id="@+id/top_layout" | 16 | android:id="@+id/top_layout" |
| 17 | + android:paddingTop="40dp" | ||
| 17 | android:layout_width="match_parent" | 18 | android:layout_width="match_parent" |
| 18 | - android:layout_height="wrap_content" | ||
| 19 | - android:background="@color/txt_black" | 19 | + android:layout_height="200dp" |
| 20 | + android:background="@drawable/backgroud_top" | ||
| 20 | android:orientation="vertical"> | 21 | android:orientation="vertical"> |
| 21 | 22 | ||
| 22 | <TextView | 23 | <TextView |
| @@ -52,26 +53,29 @@ | @@ -52,26 +53,29 @@ | ||
| 52 | android:layout_height="wrap_content" | 53 | android:layout_height="wrap_content" |
| 53 | android:text="马铂賽" | 54 | android:text="马铂賽" |
| 54 | android:textColor="@color/white" | 55 | android:textColor="@color/white" |
| 55 | - android:textSize="@dimen/sp_18" /> | 56 | + android:textSize="@dimen/txtsize_headline" /> |
| 56 | 57 | ||
| 57 | <TextView | 58 | <TextView |
| 58 | android:layout_width="wrap_content" | 59 | android:layout_width="wrap_content" |
| 59 | android:layout_height="wrap_content" | 60 | android:layout_height="wrap_content" |
| 60 | android:text="账号：12345678991" | 61 | android:text="账号：12345678991" |
| 61 | android:textColor="@color/white" | 62 | android:textColor="@color/white" |
| 62 | - android:textSize="@dimen/sp_16" | 63 | + android:textSize="@dimen/txtsize_title" |
| 63 | 64 | ||
| 64 | /> | 65 | /> |
| 65 | 66 | ||
| 66 | </LinearLayout> | 67 | </LinearLayout> |
| 67 | 68 | ||
| 68 | <ImageView | 69 | <ImageView |
| 69 | - android:layout_width="30dp" | 70 | + android:layout_width="40dp" |
| 70 | android:layout_height="match_parent" | 71 | android:layout_height="match_parent" |
| 72 | + android:layout_marginRight="20dp" | ||
| 71 | android:src="@drawable/arrow_right" /> | 73 | android:src="@drawable/arrow_right" /> |
| 72 | </LinearLayout> | 74 | </LinearLayout> |
| 73 | </LinearLayout> | 75 | </LinearLayout> |
| 74 | - | 76 | +<ScrollView |
| 77 | + android:layout_width="match_parent" | ||
| 78 | + android:layout_height="match_parent"> | ||
| 75 | <LinearLayout | 79 | <LinearLayout |
| 76 | android:id="@+id/center_layout" | 80 | android:id="@+id/center_layout" |
| 77 | android:layout_width="match_parent" | 81 | android:layout_width="match_parent" |
| @@ -87,15 +91,14 @@ | @@ -87,15 +91,14 @@ | ||
| 87 | 91 | ||
| 88 | <LinearLayout | 92 | <LinearLayout |
| 89 | android:layout_width="match_parent" | 93 | android:layout_width="match_parent" |
| 90 | - android:layout_height="wrap_content"> | 94 | + android:gravity="center_vertical" |
| 95 | + android:layout_height="40dp"> | ||
| 91 | 96 | ||
| 92 | <TextView | 97 | <TextView |
| 93 | android:layout_width="25dp" | 98 | android:layout_width="25dp" |
| 94 | - android:layout_height="wrap_content" | ||
| 95 | - android:layout_marginBottom="15dp" | 99 | + android:layout_height="20dp" |
| 96 | android:layout_marginLeft="15dp" | 100 | android:layout_marginLeft="15dp" |
| 97 | - android:layout_marginRight="15dp" | ||
| 98 | - android:layout_marginTop="15dp" | 101 | + android:layout_marginRight="30dp" |
| 99 | android:background="@drawable/tiaoxing" /> | 102 | android:background="@drawable/tiaoxing" /> |
| 100 | 103 | ||
| 101 | <TextView | 104 | <TextView |
| @@ -107,7 +110,7 @@ | @@ -107,7 +110,7 @@ | ||
| 107 | android:textSize="@dimen/txtsize_title" /> | 110 | android:textSize="@dimen/txtsize_title" /> |
| 108 | 111 | ||
| 109 | <TextView | 112 | <TextView |
| 110 | - android:layout_width="20dp" | 113 | + android:layout_width="40dp" |
| 111 | android:layout_height="wrap_content" | 114 | android:layout_height="wrap_content" |
| 112 | android:layout_gravity="center_vertical" | 115 | android:layout_gravity="center_vertical" |
| 113 | android:text="3" | 116 | android:text="3" |
| @@ -125,15 +128,16 @@ | @@ -125,15 +128,16 @@ | ||
| 125 | 128 | ||
| 126 | <LinearLayout | 129 | <LinearLayout |
| 127 | android:layout_width="match_parent" | 130 | android:layout_width="match_parent" |
| 128 | - android:layout_height="wrap_content"> | 131 | + android:layout_height="40dp" |
| 132 | + android:gravity="center_vertical" | ||
| 133 | + | ||
| 134 | + > | ||
| 129 | 135 | ||
| 130 | <TextView | 136 | <TextView |
| 131 | android:layout_width="25dp" | 137 | android:layout_width="25dp" |
| 132 | - android:layout_height="wrap_content" | ||
| 133 | - android:layout_marginBottom="15dp" | 138 | + android:layout_height="20dp" |
| 134 | android:layout_marginLeft="15dp" | 139 | android:layout_marginLeft="15dp" |
| 135 | - android:layout_marginRight="15dp" | ||
| 136 | - android:layout_marginTop="15dp" | 140 | + android:layout_marginRight="30dp" |
| 137 | android:background="@drawable/tiaoxing" /> | 141 | android:background="@drawable/tiaoxing" /> |
| 138 | 142 | ||
| 139 | <TextView | 143 | <TextView |
| @@ -152,12 +156,164 @@ | @@ -152,12 +156,164 @@ | ||
| 152 | android:layout_marginLeft="15dp" | 156 | android:layout_marginLeft="15dp" |
| 153 | android:layout_marginRight="15dp" | 157 | android:layout_marginRight="15dp" |
| 154 | android:background="@color/bottomline" /> | 158 | android:background="@color/bottomline" /> |
| 159 | + <LinearLayout | ||
| 160 | + android:layout_width="match_parent" | ||
| 161 | + android:layout_height="40dp" | ||
| 162 | + android:gravity="center_vertical" | ||
| 163 | + > | ||
| 164 | + | ||
| 165 | + <TextView | ||
| 166 | + android:layout_width="25dp" | ||
| 167 | + android:layout_height="30dp" | ||
| 168 | + android:layout_marginLeft="15dp" | ||
| 169 | + android:layout_marginRight="30dp" | ||
| 170 | + android:background="@drawable/buy" /> | ||
| 171 | + | ||
| 172 | + <TextView | ||
| 173 | + android:layout_width="wrap_content" | ||
| 174 | + android:layout_height="wrap_content" | ||
| 175 | + android:layout_gravity="center_vertical" | ||
| 176 | + android:layout_weight="1" | ||
| 177 | + android:text="家校通订购" | ||
| 178 | + android:textSize="@dimen/txtsize_title" /> | ||
| 179 | + | ||
| 180 | + </LinearLayout> | ||
| 181 | + | ||
| 182 | + <TextView | ||
| 183 | + android:layout_width="match_parent" | ||
| 184 | + android:layout_height="1dp" | ||
| 185 | + android:layout_marginLeft="15dp" | ||
| 186 | + android:layout_marginRight="15dp" | ||
| 187 | + android:background="@color/bottomline" /> | ||
| 188 | + <LinearLayout | ||
| 189 | + android:layout_width="match_parent" | ||
| 190 | + android:layout_height="40dp" | ||
| 191 | + android:gravity="center_vertical" | ||
| 192 | + > | ||
| 193 | + | ||
| 194 | + <TextView | ||
| 195 | + android:layout_width="25dp" | ||
| 196 | + android:layout_height="30dp" | ||
| 197 | + android:layout_marginLeft="15dp" | ||
| 198 | + android:layout_marginRight="30dp" | ||
| 199 | + android:background="@drawable/child" /> | ||
| 200 | + | ||
| 201 | + <TextView | ||
| 202 | + android:layout_width="wrap_content" | ||
| 203 | + android:layout_height="wrap_content" | ||
| 204 | + android:layout_gravity="center_vertical" | ||
| 205 | + android:layout_weight="1" | ||
| 206 | + android:text="我的孩子" | ||
| 207 | + android:textSize="@dimen/txtsize_title" /> | ||
| 208 | + | ||
| 209 | + <TextView | ||
| 210 | + android:layout_width="80dp" | ||
| 211 | + android:layout_height="wrap_content" | ||
| 212 | + android:layout_gravity="center_vertical" | ||
| 213 | + android:text="未绑定" | ||
| 214 | + android:textSize="@dimen/sp_18" | ||
| 215 | + android:textColor="@color/textRed" | ||
| 216 | + /> | ||
| 217 | + </LinearLayout> | ||
| 218 | + | ||
| 155 | 219 | ||
| 156 | 220 | ||
| 157 | </LinearLayout> | 221 | </LinearLayout> |
| 158 | 222 | ||
| 159 | - </LinearLayout> | 223 | + <LinearLayout |
| 224 | + android:layout_marginTop="20dp" | ||
| 225 | + android:layout_width="match_parent" | ||
| 226 | + android:layout_height="wrap_content" | ||
| 227 | + android:background="@color/white" | ||
| 228 | + android:orientation="vertical"> | ||
| 229 | + | ||
| 230 | + <LinearLayout | ||
| 231 | + android:layout_width="match_parent" | ||
| 232 | + android:gravity="center_vertical" | ||
| 233 | + android:layout_height="40dp"> | ||
| 160 | 234 | ||
| 235 | + <TextView | ||
| 236 | + android:layout_width="25dp" | ||
| 237 | + android:layout_height="25dp" | ||
| 238 | + android:layout_marginLeft="15dp" | ||
| 239 | + android:layout_marginRight="30dp" | ||
| 240 | + android:background="@drawable/kefu" /> | ||
| 241 | + | ||
| 242 | + <TextView | ||
| 243 | + android:layout_width="wrap_content" | ||
| 244 | + android:layout_height="wrap_content" | ||
| 245 | + android:layout_gravity="center_vertical" | ||
| 246 | + android:layout_weight="1" | ||
| 247 | + android:text="在线客服" | ||
| 248 | + android:textSize="@dimen/txtsize_title" /> | ||
| 249 | + | ||
| 250 | + </LinearLayout> | ||
| 251 | + | ||
| 252 | + <TextView | ||
| 253 | + android:layout_width="match_parent" | ||
| 254 | + android:layout_height="1dp" | ||
| 255 | + android:layout_marginLeft="15dp" | ||
| 256 | + android:layout_marginRight="15dp" | ||
| 257 | + android:background="@color/bottomline" /> | ||
| 258 | + | ||
| 259 | + <LinearLayout | ||
| 260 | + android:layout_width="match_parent" | ||
| 261 | + android:layout_height="40dp" | ||
| 262 | + android:gravity="center_vertical" | ||
| 263 | + | ||
| 264 | + > | ||
| 265 | + | ||
| 266 | + <TextView | ||
| 267 | + android:layout_width="25dp" | ||
| 268 | + android:layout_height="25dp" | ||
| 269 | + android:layout_marginLeft="15dp" | ||
| 270 | + android:layout_marginRight="30dp" | ||
| 271 | + android:background="@drawable/clean" /> | ||
| 272 | + | ||
| 273 | + <TextView | ||
| 274 | + android:layout_width="wrap_content" | ||
| 275 | + android:layout_height="wrap_content" | ||
| 276 | + android:layout_gravity="center_vertical" | ||
| 277 | + android:layout_weight="1" | ||
| 278 | + android:text="清除缓存" | ||
| 279 | + android:textSize="@dimen/txtsize_title" /> | ||
| 280 | + | ||
| 281 | + </LinearLayout> | ||
| 282 | + | ||
| 283 | + <TextView | ||
| 284 | + android:layout_width="match_parent" | ||
| 285 | + android:layout_height="1dp" | ||
| 286 | + android:layout_marginLeft="15dp" | ||
| 287 | + android:layout_marginRight="15dp" | ||
| 288 | + android:background="@color/bottomline" /> | ||
| 289 | + <LinearLayout | ||
| 290 | + android:layout_width="match_parent" | ||
| 291 | + android:layout_height="40dp" | ||
| 292 | + android:gravity="center_vertical" | ||
| 293 | + > | ||
| 294 | + | ||
| 295 | + <TextView | ||
| 296 | + android:layout_width="25dp" | ||
| 297 | + android:layout_height="25dp" | ||
| 298 | + android:layout_marginLeft="15dp" | ||
| 299 | + android:layout_marginRight="30dp" | ||
| 300 | + android:background="@drawable/about" /> | ||
| 301 | + | ||
| 302 | + <TextView | ||
| 303 | + android:layout_width="wrap_content" | ||
| 304 | + android:layout_height="wrap_content" | ||
| 305 | + android:layout_gravity="center_vertical" | ||
| 306 | + android:layout_weight="1" | ||
| 307 | + android:text="关于" | ||
| 308 | + android:textSize="@dimen/txtsize_title" /> | ||
| 309 | + | ||
| 310 | + </LinearLayout> | ||
| 311 | + </LinearLayout> | ||
| 312 | + | ||
| 313 | + | ||
| 314 | + | ||
| 315 | + </LinearLayout> | ||
| 316 | +</ScrollView> | ||
| 161 | 317 | ||
| 162 | </LinearLayout> | 318 | </LinearLayout> |
| 163 | 319 |