diff --git a/代码/在这里2.0/bin/Shop.apk b/代码/在这里2.0/bin/Shop.apk index 2381fae..f560479 100644 Binary files a/代码/在这里2.0/bin/Shop.apk and b/代码/在这里2.0/bin/Shop.apk differ diff --git a/代码/在这里2.0/bin/classes.dex b/代码/在这里2.0/bin/classes.dex index f1b80e5..a1ed530 100644 Binary files a/代码/在这里2.0/bin/classes.dex and b/代码/在这里2.0/bin/classes.dex differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$drawable.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$drawable.class index 7fdfc52..496e81c 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$drawable.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$drawable.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$id.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$id.class index 2d3dee2..ebfa1b5 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$id.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$id.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$layout.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$layout.class index c778e5b..fb26397 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$layout.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$layout.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$menu.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$menu.class index 17c61ca..cfe8272 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$menu.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$menu.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$string.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$string.class index 8b44f10..948076d 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$string.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$string.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/R$style.class b/代码/在这里2.0/bin/classes/com/stone/shop/R$style.class index 5cf18f8..fcc9538 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/R$style.class and b/代码/在这里2.0/bin/classes/com/stone/shop/R$style.class differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png index 8a61e3e..b68aff8 100644 Binary files a/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png and b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png new file mode 100644 index 0000000..e731aba Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png new file mode 100644 index 0000000..7870d41 Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png b/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png new file mode 100644 index 0000000..123848f Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png differ diff --git a/代码/在这里2.0/bin/resources.ap_ b/代码/在这里2.0/bin/resources.ap_ index d9fac43..0383c11 100644 Binary files a/代码/在这里2.0/bin/resources.ap_ and b/代码/在这里2.0/bin/resources.ap_ differ diff --git a/代码/在这里2.0/gen/com/stone/shop/R.java b/代码/在这里2.0/gen/com/stone/shop/R.java index 4ff5cc6..558945f 100644 --- a/代码/在这里2.0/gen/com/stone/shop/R.java +++ b/代码/在这里2.0/gen/com/stone/shop/R.java @@ -100,22 +100,23 @@ public final class R { public static final int login_button_select=0x7f020047; public static final int qq=0x7f020048; public static final int qq1=0x7f020049; - public static final int shap_circle=0x7f02004a; - public static final int shap_divider=0x7f02004b; - public static final int shape_color_frame=0x7f02004c; - public static final int shape_grid_item=0x7f02004d; - public static final int shape_left_radius_color_square=0x7f02004e; - public static final int shape_radius=0x7f02004f; - public static final int shape_radius_color_square=0x7f020050; - public static final int shape_radius_square=0x7f020051; - public static final int splash=0x7f020052; - public static final int star_img1=0x7f020053; - public static final int star_img2=0x7f020054; - public static final int star_img3=0x7f020055; - public static final int star_img4=0x7f020056; - public static final int star_img5=0x7f020057; - public static final int tab_bg_selector=0x7f020058; - public static final int welcome_background=0x7f020059; + public static final int sgbf=0x7f02004a; + public static final int shap_circle=0x7f02004b; + public static final int shap_divider=0x7f02004c; + public static final int shape_color_frame=0x7f02004d; + public static final int shape_grid_item=0x7f02004e; + public static final int shape_left_radius_color_square=0x7f02004f; + public static final int shape_radius=0x7f020050; + public static final int shape_radius_color_square=0x7f020051; + public static final int shape_radius_square=0x7f020052; + public static final int splash=0x7f020053; + public static final int star_img1=0x7f020054; + public static final int star_img2=0x7f020055; + public static final int star_img3=0x7f020056; + public static final int star_img4=0x7f020057; + public static final int star_img5=0x7f020058; + public static final int tab_bg_selector=0x7f020059; + public static final int welcome_background=0x7f02005a; } public static final class id { public static final int action_settings=0x7f09009c; diff --git a/代码/在这里2.0/res/drawable/ic_car1.png b/代码/在这里2.0/res/drawable/ic_car1.png index 7f909f0..fb2348d 100644 Binary files a/代码/在这里2.0/res/drawable/ic_car1.png and b/代码/在这里2.0/res/drawable/ic_car1.png differ diff --git a/代码/在这里2.0/res/drawable/ic_sale1.gif b/代码/在这里2.0/res/drawable/ic_sale1.gif deleted file mode 100644 index cf29bf8..0000000 Binary files a/代码/在这里2.0/res/drawable/ic_sale1.gif and /dev/null differ diff --git a/代码/在这里2.0/res/drawable/ic_sale1.png b/代码/在这里2.0/res/drawable/ic_sale1.png new file mode 100644 index 0000000..c250abf Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_sale1.png differ diff --git a/代码/在这里2.0/res/drawable/ic_shop1.gif b/代码/在这里2.0/res/drawable/ic_shop1.gif deleted file mode 100644 index 6168669..0000000 Binary files a/代码/在这里2.0/res/drawable/ic_shop1.gif and /dev/null differ diff --git a/代码/在这里2.0/res/drawable/ic_shop1.png b/代码/在这里2.0/res/drawable/ic_shop1.png new file mode 100644 index 0000000..1ef3cff Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_shop1.png differ diff --git a/代码/在这里2.0/res/drawable/sgbf.png b/代码/在这里2.0/res/drawable/sgbf.png new file mode 100644 index 0000000..9caf9d9 Binary files /dev/null and b/代码/在这里2.0/res/drawable/sgbf.png differ diff --git a/代码/在这里2.0/res/layout/activity_award.xml b/代码/在这里2.0/res/layout/activity_award.xml index d7c8743..a5b8cb3 100644 --- a/代码/在这里2.0/res/layout/activity_award.xml +++ b/代码/在这里2.0/res/layout/activity_award.xml @@ -18,7 +18,7 @@ android:layout_marginTop="10dp" android:gravity="center" android:text="今日中奖名单" - android:textColor="#FFFF8833" + android:textColor="#FF0000" android:textSize="16sp" android:typeface="monospace" /> @@ -27,7 +27,7 @@ android:layout_height="1.5dp" android:layout_gravity="center" android:layout_marginBottom="5dp" - android:background="#FFFF8833" /> + android:background="#FF0000" /> @@ -54,7 +54,7 @@ android:layout_height="1.5dp" android:layout_gravity="center" android:layout_marginBottom="5dp" - android:background="#FFFF8833" /> + android:background="#FF0000" /> @@ -38,7 +38,7 @@ android:layout_marginBottom="5dp" android:layout_marginTop="10dp" android:text="讲座主题" - android:textColor="#FF8C00" + android:textColor="#FF0000" android:textSize="14sp" /> diff --git a/代码/在这里2.0/res/layout/activity_home.xml b/代码/在这里2.0/res/layout/activity_home.xml index 87b9ba7..8645050 100644 --- a/代码/在这里2.0/res/layout/activity_home.xml +++ b/代码/在这里2.0/res/layout/activity_home.xml @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="120dp" android:layout_margin="5dp" - android:background="@drawable/shape_radius_square" + android:background="#FAF0E6" android:padding="5dp" > + android:background="#F5DEB3" /> diff --git a/代码/在这里2.0/res/layout/activity_mine_info.xml b/代码/在这里2.0/res/layout/activity_mine_info.xml index 7a44f76..95cdac4 100644 --- a/代码/在这里2.0/res/layout/activity_mine_info.xml +++ b/代码/在这里2.0/res/layout/activity_mine_info.xml @@ -47,12 +47,12 @@ android:layout_marginBottom="2dp" android:layout_marginTop="15dp" android:text="资料" - android:textColor="#FF8833" /> + android:textColor="#FF0000" /> + android:background="#FF0000" /> + android:textColor="#FF0000" /> + android:background="#FF0000" /> + android:textColor="#FF0000" /> + android:background="#FF0000" /> + android:textColor="#FF0000" /> + android:background="#FF0000" /> @@ -97,7 +97,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginLeft="30dp" - android:background="#FF8833" + android:background="#FF0000" android:text="+" android:textColor="#FFFFFF" android:textSize="22sp" /> @@ -132,7 +132,7 @@ android:layout_height="30dp" android:padding="3dp" android:layout_alignParentRight="true" - android:background="#FF8833" + android:background="#FF0000" android:textColor="#FFFFFF" android:textSize="16sp" android:text="设置时间"/> @@ -210,7 +210,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="10dp" - android:background="#FF8833" + android:background="#FF0000" android:text="提交订单" android:textColor="#FFFFFF" android:textSize="16sp" /> diff --git a/代码/在这里2.0/res/layout/activity_shop.xml b/代码/在这里2.0/res/layout/activity_shop.xml index 05efaf5..93e7d66 100644 --- a/代码/在这里2.0/res/layout/activity_shop.xml +++ b/代码/在这里2.0/res/layout/activity_shop.xml @@ -33,7 +33,7 @@ android:layout_marginLeft="5dp" android:layout_marginBottom="2dp" android:text="学 习" - android:textColor="#FFFF8833" + android:textColor="#FF0000" android:textSize="16sp" android:typeface="monospace" /> @@ -42,7 +42,7 @@ android:layout_height="1.5dp" android:layout_marginLeft="5dp" android:layout_marginBottom="5dp" - android:background="#FFFF8833"/> + android:background="#FF0000"/> @@ -83,7 +83,7 @@ android:layout_height="1.5dp" android:layout_marginLeft="5dp" android:layout_marginBottom="5dp" - android:background="#FFFF8833"/> + android:background="#FF0000"/> @@ -123,7 +123,7 @@ android:layout_height="1.5dp" android:layout_marginLeft="5dp" android:layout_marginBottom="5dp" - android:background="#FFFF8833"/> + android:background="#FF0000"/> - - - + + + + \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/dlg_order_settime.xml b/代码/在这里2.0/res/layout/dlg_order_settime.xml index 974cfd6..165d2ee 100644 --- a/代码/在这里2.0/res/layout/dlg_order_settime.xml +++ b/代码/在这里2.0/res/layout/dlg_order_settime.xml @@ -7,7 +7,7 @@