diff --git a/代码/在这里2.0/bin/Shop.apk b/代码/在这里2.0/bin/Shop.apk index a808bed..2381fae 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 822aa05..f1b80e5 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 26a4a60..7fdfc52 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 aac24e8..2d3dee2 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 64a5014..c778e5b 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 e0468ab..17c61ca 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 519e48b..8b44f10 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 5cb4430..5cf18f8 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/classes/com/stone/shop/view/BaseActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/BaseActivity.class index 7f9c8ba..7bf92ab 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/BaseActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/BaseActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$1.class index 6be525c..11f3570 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$1.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$1.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$2.class index 7e52794..236f1ae 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$2.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$2.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$3.class index 2b5c29e..0811a7d 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$3.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$3.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class index 72a769b..a5b4454 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4.class index b6566b4..bfaa19f 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$4.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class index f4ee115..1f280fb 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity.class index a290fc5..2babce9 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineActivity.class index 254a612..daeef91 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineActivity.class differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png new file mode 100644 index 0000000..8a61e3e Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png differ diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png index a733499..2294af5 100644 Binary files a/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png and b/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png differ diff --git a/代码/在这里2.0/bin/resources.ap_ b/代码/在这里2.0/bin/resources.ap_ index 33eb04e..d9fac43 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 e1a743f..4ff5cc6 100644 --- a/代码/在这里2.0/gen/com/stone/shop/R.java +++ b/代码/在这里2.0/gen/com/stone/shop/R.java @@ -67,52 +67,55 @@ public final class R { public static final int ic_banner_image_default77=0x7f020026; public static final int ic_breakfast=0x7f020027; public static final int ic_car=0x7f020028; - public static final int ic_date=0x7f020029; - public static final int ic_hbut=0x7f02002a; - public static final int ic_hide=0x7f02002b; - public static final int ic_launcher=0x7f02002c; - public static final int ic_loc=0x7f02002d; - public static final int ic_menu_copy_holo_light=0x7f02002e; - public static final int ic_menu_find_holo_light=0x7f02002f; - public static final int ic_menu_info_details=0x7f020030; - public static final int ic_menu_myplaces=0x7f020031; - public static final int ic_menu_notifications=0x7f020032; - public static final int ic_menu_share=0x7f020033; - public static final int ic_mine=0x7f020034; - public static final int ic_page_indicator=0x7f020035; - public static final int ic_page_indicator_focused=0x7f020036; - public static final int ic_phone=0x7f020037; - public static final int ic_phone2=0x7f020038; - public static final int ic_phone3=0x7f020039; - public static final int ic_sale=0x7f02003a; - public static final int ic_search=0x7f02003b; - public static final int ic_shelf_category_divider=0x7f02003c; - public static final int ic_shop=0x7f02003d; - public static final int ic_shop_info_bg=0x7f02003e; - public static final int ic_shop_info_bg2=0x7f02003f; - public static final int ic_shop_info_bg22=0x7f020040; - public static final int ic_star_no=0x7f020041; - public static final int ic_star_yes=0x7f020042; - public static final int login_button=0x7f020043; - public static final int login_button_select=0x7f020044; - public static final int qq=0x7f020045; - public static final int qq1=0x7f020046; - public static final int shap_circle=0x7f020047; - public static final int shap_divider=0x7f020048; - public static final int shape_color_frame=0x7f020049; - public static final int shape_grid_item=0x7f02004a; - public static final int shape_left_radius_color_square=0x7f02004b; - public static final int shape_radius=0x7f02004c; - public static final int shape_radius_color_square=0x7f02004d; - public static final int shape_radius_square=0x7f02004e; - public static final int splash=0x7f02004f; - public static final int star_img1=0x7f020050; - public static final int star_img2=0x7f020051; - public static final int star_img3=0x7f020052; - public static final int star_img4=0x7f020053; - public static final int star_img5=0x7f020054; - public static final int tab_bg_selector=0x7f020055; - public static final int welcome_background=0x7f020056; + public static final int ic_car1=0x7f020029; + public static final int ic_date=0x7f02002a; + public static final int ic_hbut=0x7f02002b; + public static final int ic_hide=0x7f02002c; + public static final int ic_launcher=0x7f02002d; + public static final int ic_loc=0x7f02002e; + public static final int ic_menu_copy_holo_light=0x7f02002f; + public static final int ic_menu_find_holo_light=0x7f020030; + public static final int ic_menu_info_details=0x7f020031; + public static final int ic_menu_myplaces=0x7f020032; + public static final int ic_menu_notifications=0x7f020033; + public static final int ic_menu_share=0x7f020034; + public static final int ic_mine=0x7f020035; + public static final int ic_page_indicator=0x7f020036; + public static final int ic_page_indicator_focused=0x7f020037; + public static final int ic_phone=0x7f020038; + public static final int ic_phone2=0x7f020039; + public static final int ic_phone3=0x7f02003a; + public static final int ic_sale=0x7f02003b; + public static final int ic_sale1=0x7f02003c; + public static final int ic_search=0x7f02003d; + public static final int ic_shelf_category_divider=0x7f02003e; + public static final int ic_shop=0x7f02003f; + public static final int ic_shop1=0x7f020040; + public static final int ic_shop_info_bg=0x7f020041; + public static final int ic_shop_info_bg2=0x7f020042; + public static final int ic_shop_info_bg22=0x7f020043; + public static final int ic_star_no=0x7f020044; + public static final int ic_star_yes=0x7f020045; + public static final int login_button=0x7f020046; + 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 class id { public static final int action_settings=0x7f09009c; diff --git a/代码/在这里2.0/res/drawable/ic_app.png b/代码/在这里2.0/res/drawable/ic_app.png index cb4a403..f46e766 100644 Binary files a/代码/在这里2.0/res/drawable/ic_app.png and b/代码/在这里2.0/res/drawable/ic_app.png differ diff --git a/代码/在这里2.0/res/drawable/ic_car1.png b/代码/在这里2.0/res/drawable/ic_car1.png new file mode 100644 index 0000000..7f909f0 Binary files /dev/null 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 new file mode 100644 index 0000000..cf29bf8 Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_sale1.gif differ diff --git a/代码/在这里2.0/res/drawable/ic_search.png b/代码/在这里2.0/res/drawable/ic_search.png index 9f6df03..34e757f 100644 Binary files a/代码/在这里2.0/res/drawable/ic_search.png and b/代码/在这里2.0/res/drawable/ic_search.png differ diff --git a/代码/在这里2.0/res/drawable/ic_shop1.gif b/代码/在这里2.0/res/drawable/ic_shop1.gif new file mode 100644 index 0000000..6168669 Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_shop1.gif differ diff --git a/代码/在这里2.0/res/layout/activity_base.xml b/代码/在这里2.0/res/layout/activity_base.xml index 3fe3662..fa7a321 100644 --- a/代码/在这里2.0/res/layout/activity_base.xml +++ b/代码/在这里2.0/res/layout/activity_base.xml @@ -23,7 +23,7 @@ android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#ccDEDEDE" + android:background="#FF0000" android:layout_gravity="bottom" > \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_award.xml b/代码/在这里2.0/res/layout/header_award.xml index 370dcf8..ffa4267 100644 --- a/代码/在这里2.0/res/layout/header_award.xml +++ b/代码/在这里2.0/res/layout/header_award.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_bxt.xml b/代码/在这里2.0/res/layout/header_bxt.xml index e679c11..1aeac26 100644 --- a/代码/在这里2.0/res/layout/header_bxt.xml +++ b/代码/在这里2.0/res/layout/header_bxt.xml @@ -2,7 +2,7 @@ @@ -14,7 +14,7 @@ android:layout_centerInParent="true" android:text="博学堂" android:textSize="20sp" - android:textColor="#8B4513" + android:textColor="#FFFFFF" android:typeface="monospace"/> @@ -14,7 +14,7 @@ android:layout_centerInParent="true" android:text="博学堂讲座详情" android:textSize="20sp" - android:textColor="#8B4513" + android:textColor="#FFFFFF" android:typeface="monospace"/> \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_feedback.xml b/代码/在这里2.0/res/layout/header_feedback.xml index 3b9ac1d..ef9e7c0 100644 --- a/代码/在这里2.0/res/layout/header_feedback.xml +++ b/代码/在这里2.0/res/layout/header_feedback.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_home.xml b/代码/在这里2.0/res/layout/header_home.xml index 10e970c..ac3b936 100644 --- a/代码/在这里2.0/res/layout/header_home.xml +++ b/代码/在这里2.0/res/layout/header_home.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_mine.xml b/代码/在这里2.0/res/layout/header_mine.xml index 05ee9e5..57f0741 100644 --- a/代码/在这里2.0/res/layout/header_mine.xml +++ b/代码/在这里2.0/res/layout/header_mine.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_mine_info.xml b/代码/在这里2.0/res/layout/header_mine_info.xml index 818280d..40ac8e7 100644 --- a/代码/在这里2.0/res/layout/header_mine_info.xml +++ b/代码/在这里2.0/res/layout/header_mine_info.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_mine_info_edit.xml b/代码/在这里2.0/res/layout/header_mine_info_edit.xml index a48689f..ae9dcfb 100644 --- a/代码/在这里2.0/res/layout/header_mine_info_edit.xml +++ b/代码/在这里2.0/res/layout/header_mine_info_edit.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_news.xml b/代码/在这里2.0/res/layout/header_news.xml index 9372403..b89d24b 100644 --- a/代码/在这里2.0/res/layout/header_news.xml +++ b/代码/在这里2.0/res/layout/header_news.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_order.xml b/代码/在这里2.0/res/layout/header_order.xml index 3a1becb..aa97d59 100644 --- a/代码/在这里2.0/res/layout/header_order.xml +++ b/代码/在这里2.0/res/layout/header_order.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_order_info.xml b/代码/在这里2.0/res/layout/header_order_info.xml index 664a304..0b792fd 100644 --- a/代码/在这里2.0/res/layout/header_order_info.xml +++ b/代码/在这里2.0/res/layout/header_order_info.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/res/layout/header_shop.xml b/代码/在这里2.0/res/layout/header_shop.xml index 7f67816..447a67b 100644 --- a/代码/在这里2.0/res/layout/header_shop.xml +++ b/代码/在这里2.0/res/layout/header_shop.xml @@ -2,20 +2,10 @@ - + diff --git a/代码/在这里2.0/res/layout/header_shop_all.xml b/代码/在这里2.0/res/layout/header_shop_all.xml index a893d03..c8d0f80 100644 --- a/代码/在这里2.0/res/layout/header_shop_all.xml +++ b/代码/在这里2.0/res/layout/header_shop_all.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/代码/在这里2.0/src/com/stone/shop/view/BaseActivity.java b/代码/在这里2.0/src/com/stone/shop/view/BaseActivity.java index c5e45b2..7bef631 100644 --- a/代码/在这里2.0/src/com/stone/shop/view/BaseActivity.java +++ b/代码/在这里2.0/src/com/stone/shop/view/BaseActivity.java @@ -34,8 +34,8 @@ public class BaseActivity extends TabActivity { String[] mTitle = new String[] { "周边", "每日一抽", "我的"}; - int[] mIcon = new int[] { R.drawable.ic_shop, R.drawable.ic_sale, - R.drawable.ic_car, R.drawable.ic_mine }; + int[] mIcon = new int[] { R.drawable.ic_shop1, R.drawable.ic_sale1, + R.drawable.ic_car1, R.drawable.ic_mine }; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java b/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java index 8d76303..a45eaba 100644 --- a/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java +++ b/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java @@ -68,7 +68,6 @@ public class LoginActivity extends Activity implements OnClickListener { // QQ登陆 private static Tencent mTencent; - // private QQAuth mQQAuth; Handler mHandler = new Handler() {