diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java index 35513ac..c4ae4ef 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java @@ -1,7 +1,5 @@ package com.shunzhi.parent.ui.fragment; -import android.content.Context; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index e12b719..c930742 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -1,7 +1,5 @@ package com.shunzhi.parent.ui.fragment; -import android.content.Context; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java index d8be1c3..3648fda 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java @@ -1,7 +1,5 @@ package com.shunzhi.parent.ui.fragment; -import android.content.Context; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; diff --git a/app/src/main/res/drawable-xhdpi/backgroud_top.png b/app/src/main/res/drawable-xhdpi/backgroud_top.png new file mode 100644 index 0000000..ba62025 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/backgroud_top.png differ diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index 6a97069..22dee1b 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -14,9 +14,10 @@ <LinearLayout android:id="@+id/top_layout" + android:paddingTop="40dp" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/txt_black" + android:layout_height="200dp" + android:background="@drawable/backgroud_top" android:orientation="vertical"> <TextView @@ -52,26 +53,29 @@ android:layout_height="wrap_content" android:text="马铂賽" android:textColor="@color/white" - android:textSize="@dimen/sp_18" /> + android:textSize="@dimen/txtsize_headline" /> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="账号:12345678991" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/txtsize_title" /> </LinearLayout> <ImageView - android:layout_width="30dp" + android:layout_width="40dp" android:layout_height="match_parent" + android:layout_marginRight="20dp" android:src="@drawable/arrow_right" /> </LinearLayout> </LinearLayout> - +<ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> <LinearLayout android:id="@+id/center_layout" android:layout_width="match_parent" @@ -87,15 +91,14 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:gravity="center_vertical" + android:layout_height="40dp"> <TextView android:layout_width="25dp" - android:layout_height="wrap_content" - android:layout_marginBottom="15dp" + android:layout_height="20dp" android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="15dp" + android:layout_marginRight="30dp" android:background="@drawable/tiaoxing" /> <TextView @@ -107,7 +110,7 @@ android:textSize="@dimen/txtsize_title" /> <TextView - android:layout_width="20dp" + android:layout_width="40dp" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="3" @@ -125,15 +128,16 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="40dp" + android:gravity="center_vertical" + + > <TextView android:layout_width="25dp" - android:layout_height="wrap_content" - android:layout_marginBottom="15dp" + android:layout_height="20dp" android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="15dp" + android:layout_marginRight="30dp" android:background="@drawable/tiaoxing" /> <TextView @@ -152,12 +156,164 @@ android:layout_marginLeft="15dp" android:layout_marginRight="15dp" android:background="@color/bottomline" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="40dp" + android:gravity="center_vertical" + > + + <TextView + android:layout_width="25dp" + android:layout_height="30dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="30dp" + android:background="@drawable/buy" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="家校通订购" + android:textSize="@dimen/txtsize_title" /> + + </LinearLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/bottomline" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="40dp" + android:gravity="center_vertical" + > + + <TextView + android:layout_width="25dp" + android:layout_height="30dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="30dp" + android:background="@drawable/child" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="我的孩子" + android:textSize="@dimen/txtsize_title" /> + + <TextView + android:layout_width="80dp" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="未绑定" + android:textSize="@dimen/sp_18" + android:textColor="@color/textRed" + /> + </LinearLayout> + </LinearLayout> - </LinearLayout> + <LinearLayout + android:layout_marginTop="20dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/white" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:gravity="center_vertical" + android:layout_height="40dp"> + <TextView + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="30dp" + android:background="@drawable/kefu" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="在线客服" + android:textSize="@dimen/txtsize_title" /> + + </LinearLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/bottomline" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="40dp" + android:gravity="center_vertical" + + > + + <TextView + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="30dp" + android:background="@drawable/clean" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="清除缓存" + android:textSize="@dimen/txtsize_title" /> + + </LinearLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:background="@color/bottomline" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="40dp" + android:gravity="center_vertical" + > + + <TextView + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_marginLeft="15dp" + android:layout_marginRight="30dp" + android:background="@drawable/about" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="关于" + android:textSize="@dimen/txtsize_title" /> + + </LinearLayout> + </LinearLayout> + + + + </LinearLayout> +</ScrollView> </LinearLayout> -- libgit2 0.21.0