Commit 0d40485baa416e3bbdc25fcd6af08d6eb29204a8

Authored by 陶汉栋
1 parent 6b5379b8

no message

app/src/main/java/com/shunzhi/parent/ui/activity/orderdetail/OrderDetailActivity.java
... ... @@ -168,6 +168,9 @@ public class OrderDetailActivity extends BaseMVPCompatActivity<OrderDetailContra
168 168 case 2://交易关闭
169 169 tvPayState.setText("交易关闭");
170 170 break;
  171 + case 3:
  172 + tvPayState.setText("支付失败");
  173 + break;
171 174 }
172 175 }
173 176 }
... ...
app/src/main/res/layout/activity_mychild.xml
... ... @@ -2,6 +2,7 @@
2 2 <LinearLayout
3 3 xmlns:android="http://schemas.android.com/apk/res/android"
4 4 android:layout_width="match_parent"
  5 + android:background="@color/bgColor"
5 6 android:layout_height="match_parent"
6 7 android:orientation="vertical"
7 8 >
... ... @@ -24,6 +25,7 @@
24 25 android:text="添加绑定账号"
25 26 android:textColor="@color/white"
26 27 android:textSize="@dimen/txtsize_title"
  28 + android:layout_marginBottom="@dimen/size_dp_10"
27 29 android:gravity="center"
28 30 android:background="@drawable/rudiobtn"
29 31 />
... ...
app/src/main/res/layout/fragment_login_and_regist.xml
... ... @@ -21,7 +21,7 @@
21 21 android:layout_width="60dp"
22 22 android:layout_height="20dp"
23 23 android:visibility="invisible"
24   - android:src="@drawable/arrow_left"
  24 + android:src="@drawable/back"
25 25 />
26 26 </LinearLayout>
27 27  
... ...
app/src/main/res/layout/item_childlist.xml
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
  4 + android:background="@color/white"
  5 + android:divider="@color/divider_gray"
  6 + android:layout_marginTop="@dimen/size_dp_10"
4 7 android:layout_height="wrap_content">
5 8  
6 9 <LinearLayout
... ...
app/src/main/res/layout/item_order_list.xml
... ... @@ -3,6 +3,7 @@
3 3 android:layout_width="match_parent"
4 4 android:orientation="vertical"
5 5 android:elevation="@dimen/size_dp_5"
  6 + android:layout_margin="@dimen/size_dp_5"
6 7 android:background="@drawable/shape_xueqing_radius8"
7 8 android:id="@+id/layout_order_list"
8 9 android:layout_height="wrap_content">
... ...
app/src/main/res/values/colors.xml
... ... @@ -5,7 +5,7 @@
5 5 <color name="colorAccent">#FF4081</color>
6 6  
7 7  
8   - <color name="hintTextColor">#C1C1C1</color>
  8 + <color name="hintTextColor">#494947</color>
9 9 <color name="bottomline">#B8B8B9</color>
10 10 <color name="bg_main">#F0EFF5</color>
11 11 <color name="textRed">#FC5B6A</color>
... ...