diff --git a/代码/在这里2.0/bin/Shop.apk b/代码/在这里2.0/bin/Shop.apk index c773fa7..a808bed 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 10b25f7..822aa05 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 f805044..26a4a60 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 ecb56e7..aac24e8 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 5483c6e..64a5014 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 550c628..e0468ab 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 d136ba8..519e48b 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 8020699..5cb4430 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/adapter/BXTListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class index f7b5e64..4e3a714 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class index 429811b..9166ca9 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class index 981e341..cd0cb5b 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GridAdapter.class index 72d669e..d6264e7 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GridAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/GridAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class index c19e6be..4e2e165 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class index beccc78..78ac766 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class index d8390ad..d5e0d62 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class index 1b6dc47..822da36 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class index b60293d..1697fdc 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class index a77c4c5..a94fe94 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class and b/代码/在这里2.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.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 cc24a3e..7f9c8ba 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/ClassroomActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ClassroomActivity.class index c733605..98df9a7 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ClassroomActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ClassroomActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/HomeActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/HomeActivity.class index 3d93e7a..cc8432e 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/HomeActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/HomeActivity.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 9f2d5f6..6be525c 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 afcdde2..7e52794 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.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity.class index 7da1086..a290fc5 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 f74cbee..254a612 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/classes/com/stone/shop/view/MineInfoActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoActivity.class index 64d39b1..0c163c0 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class index 492c4e8..7793550 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineSoftActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineSoftActivity.class index 97a5707..3378032 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/MineSoftActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/MineSoftActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/NewsActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/NewsActivity.class index 602d437..8934983 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/NewsActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/NewsActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderActivity.class index 446f9cc..4641408 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class index 5b76eac..8cef79b 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/RegisterActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/RegisterActivity.class index 31b15c8..566236b 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/RegisterActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/RegisterActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class index ac9d906..bd78d1e 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity.class index a1e4678..fbd5be8 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopActivity.class index f4fcfe2..649c8ab 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopAllActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopAllActivity.class index 2e6bbab..425e895 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopAllActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopAllActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class index b32eee1..bcb3c47 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/SplashActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/SplashActivity.class index c88c786..3ab2776 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/SplashActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/SplashActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class index 00554a5..a387d91 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/ui/AutoScrollViewPager.class b/代码/在这里2.0/bin/classes/com/stone/ui/AutoScrollViewPager.class index 4fc4966..3c31662 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/ui/AutoScrollViewPager.class and b/代码/在这里2.0/bin/classes/com/stone/ui/AutoScrollViewPager.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/在这里2.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class index 700f05a..3f8a8f5 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class and b/代码/在这里2.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/ui/DialogOrder.class b/代码/在这里2.0/bin/classes/com/stone/ui/DialogOrder.class index 037b060..4975951 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/ui/DialogOrder.class and b/代码/在这里2.0/bin/classes/com/stone/ui/DialogOrder.class differ diff --git a/代码/在这里2.0/bin/classes/com/stone/util/Util.class b/代码/在这里2.0/bin/classes/com/stone/util/Util.class index 9c303ec..3c5a93c 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/util/Util.class and b/代码/在这里2.0/bin/classes/com/stone/util/Util.class differ diff --git a/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar b/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar index 3860a83..9b41944 100644 Binary files a/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar and b/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar differ diff --git a/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar b/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar index ae3de7d..38491a2 100644 Binary files a/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar and b/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar differ diff --git a/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar b/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar index 4336e1f..d0203e6 100644 Binary files a/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar and b/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar differ diff --git a/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar b/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar index 86d9a38..60a5143 100644 Binary files a/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar and b/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar differ diff --git a/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar b/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar index 18965e0..0d0d72d 100644 Binary files a/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar and b/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar differ diff --git a/代码/在这里2.0/bin/resources.ap_ b/代码/在这里2.0/bin/resources.ap_ index 8ed3bf4..33eb04e 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 f9fafd7..e1a743f 100644 --- a/代码/在这里2.0/gen/com/stone/shop/R.java +++ b/代码/在这里2.0/gen/com/stone/shop/R.java @@ -30,179 +30,184 @@ public final class R { public static final int abs__tab_selected_holo=0x7f020001; public static final int abs__tab_selected_pressed_holo=0x7f020002; public static final int abs__tab_unselected_pressed_holo=0x7f020003; - public static final int bg1=0x7f020004; - public static final int bg3=0x7f020005; - public static final int btn_green_normal=0x7f020006; - public static final int btn_green_pressed=0x7f020007; - public static final int checkbox_bg1=0x7f020008; - public static final int checkbox_selected=0x7f020009; - public static final int checkbox_selected_press=0x7f02000a; - public static final int checkbox_unselect=0x7f02000b; - public static final int checkbox_unselect_press=0x7f02000c; - public static final int custom_ratingbar=0x7f02000d; - public static final int ic_1=0x7f02000e; - public static final int ic_2=0x7f02000f; - public static final int ic_3=0x7f020010; - public static final int ic_41=0x7f020011; - public static final int ic_42=0x7f020012; - public static final int ic_5=0x7f020013; - public static final int ic_6=0x7f020014; - public static final int ic_7=0x7f020015; - public static final int ic_8=0x7f020016; - public static final int ic_app=0x7f020017; - public static final int ic_app1=0x7f020018; - public static final int ic_banner1=0x7f020019; - public static final int ic_banner_hide=0x7f02001a; - public static final int ic_banner_image_default1=0x7f02001b; - public static final int ic_banner_image_default11=0x7f02001c; - public static final int ic_banner_image_default2=0x7f02001d; - public static final int ic_banner_image_default22=0x7f02001e; - public static final int ic_banner_image_default3=0x7f02001f; - public static final int ic_banner_image_default4=0x7f020020; - public static final int ic_banner_image_default55=0x7f020021; - public static final int ic_banner_image_default77=0x7f020022; - public static final int ic_breakfast=0x7f020023; - public static final int ic_car=0x7f020024; - public static final int ic_date=0x7f020025; - public static final int ic_hbut=0x7f020026; - public static final int ic_hide=0x7f020027; - public static final int ic_launcher=0x7f020028; - public static final int ic_loc=0x7f020029; - public static final int ic_menu_copy_holo_light=0x7f02002a; - public static final int ic_menu_find_holo_light=0x7f02002b; - public static final int ic_menu_info_details=0x7f02002c; - public static final int ic_menu_myplaces=0x7f02002d; - public static final int ic_menu_notifications=0x7f02002e; - public static final int ic_menu_share=0x7f02002f; - public static final int ic_mine=0x7f020030; - public static final int ic_page_indicator=0x7f020031; - public static final int ic_page_indicator_focused=0x7f020032; - public static final int ic_phone=0x7f020033; - public static final int ic_phone2=0x7f020034; - public static final int ic_phone3=0x7f020035; - public static final int ic_sale=0x7f020036; - public static final int ic_search=0x7f020037; - public static final int ic_shelf_category_divider=0x7f020038; - public static final int ic_shop=0x7f020039; - public static final int ic_shop_info_bg=0x7f02003a; - public static final int ic_shop_info_bg2=0x7f02003b; - public static final int ic_shop_info_bg22=0x7f02003c; - public static final int ic_star_no=0x7f02003d; - public static final int ic_star_yes=0x7f02003e; - public static final int login_button=0x7f02003f; - public static final int login_button_select=0x7f020040; - public static final int qq=0x7f020041; - public static final int shap_circle=0x7f020042; - public static final int shap_divider=0x7f020043; - public static final int shape_color_frame=0x7f020044; - public static final int shape_grid_item=0x7f020045; - public static final int shape_left_radius_color_square=0x7f020046; - public static final int shape_radius=0x7f020047; - public static final int shape_radius_color_square=0x7f020048; - public static final int shape_radius_square=0x7f020049; - public static final int splash=0x7f02004a; - public static final int star_img1=0x7f02004b; - public static final int star_img2=0x7f02004c; - public static final int star_img3=0x7f02004d; - public static final int star_img4=0x7f02004e; - public static final int star_img5=0x7f02004f; - public static final int tab_bg_selector=0x7f020050; - public static final int welcome_background=0x7f020051; + public static final int back_blue=0x7f020004; + public static final int bg1=0x7f020005; + public static final int bg3=0x7f020006; + public static final int btn_green_normal=0x7f020007; + public static final int btn_green_pressed=0x7f020008; + public static final int checkbox_bg1=0x7f020009; + public static final int checkbox_selected=0x7f02000a; + public static final int checkbox_selected_press=0x7f02000b; + public static final int checkbox_unselect=0x7f02000c; + public static final int checkbox_unselect_press=0x7f02000d; + public static final int custom_ratingbar=0x7f02000e; + public static final int ic_1=0x7f02000f; + public static final int ic_2=0x7f020010; + public static final int ic_3=0x7f020011; + public static final int ic_41=0x7f020012; + public static final int ic_42=0x7f020013; + public static final int ic_5=0x7f020014; + public static final int ic_6=0x7f020015; + public static final int ic_7=0x7f020016; + public static final int ic_8=0x7f020017; + public static final int ic_81=0x7f020018; + public static final int ic_82=0x7f020019; + public static final int ic_app=0x7f02001a; + public static final int ic_app1=0x7f02001b; + public static final int ic_app2=0x7f02001c; + public static final int ic_banner1=0x7f02001d; + public static final int ic_banner_hide=0x7f02001e; + public static final int ic_banner_image_default1=0x7f02001f; + public static final int ic_banner_image_default11=0x7f020020; + public static final int ic_banner_image_default2=0x7f020021; + public static final int ic_banner_image_default22=0x7f020022; + public static final int ic_banner_image_default3=0x7f020023; + public static final int ic_banner_image_default4=0x7f020024; + public static final int ic_banner_image_default55=0x7f020025; + 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 class id { - public static final int action_settings=0x7f09009f; - public static final int btn_about=0x7f090042; - public static final int btn_add_good=0x7f09006b; - public static final int btn_add_news=0x7f09006c; - public static final int btn_add_shop=0x7f09006a; - public static final int btn_buy_good=0x7f090079; - public static final int btn_commit=0x7f09009e; - public static final int btn_contact=0x7f090043; - public static final int btn_dlg_ok=0x7f090075; + public static final int action_settings=0x7f09009c; + public static final int btn_about=0x7f090041; + public static final int btn_add_good=0x7f090068; + public static final int btn_add_news=0x7f090069; + public static final int btn_add_shop=0x7f090067; + public static final int btn_buy_good=0x7f090076; + public static final int btn_commit=0x7f09009b; + public static final int btn_contact=0x7f090042; + public static final int btn_dlg_ok=0x7f090072; public static final int btn_feedback_submit=0x7f090011; public static final int btn_hide_ads=0x7f090018; - public static final int btn_login=0x7f090021; - public static final int btn_look_goods=0x7f090068; - public static final int btn_look_news=0x7f090069; - public static final int btn_look_shops=0x7f090067; - public static final int btn_look_users=0x7f090066; - public static final int btn_order_count_less=0x7f09004b; - public static final int btn_order_count_more=0x7f09004d; - public static final int btn_order_submit=0x7f090052; - public static final int btn_qq=0x7f090025; - public static final int btn_reg_now=0x7f09005b; - public static final int btn_register=0x7f090024; - public static final int btn_set_time=0x7f09004f; - public static final int btn_share=0x7f090044; - public static final int cancel=0x7f0900a1; - public static final int cb_rem_psd=0x7f090023; - public static final int datepicker=0x7f090073; + public static final int btn_login=0x7f09001f; + public static final int btn_look_goods=0x7f090065; + public static final int btn_look_news=0x7f090066; + public static final int btn_look_shops=0x7f090064; + public static final int btn_look_users=0x7f090063; + public static final int btn_order_count_less=0x7f09004a; + public static final int btn_order_count_more=0x7f09004c; + public static final int btn_order_submit=0x7f090051; + public static final int btn_qq=0x7f090023; + public static final int btn_reg_now=0x7f090058; + public static final int btn_register=0x7f090022; + public static final int btn_set_time=0x7f09004e; + public static final int btn_share=0x7f090043; + public static final int cancel=0x7f09009e; + public static final int cb_rem_psd=0x7f090021; + public static final int datepicker=0x7f090070; public static final int et_award_new=0x7f090002; public static final int et_award_old=0x7f090003; - public static final int et_comfirm_psd=0x7f090056; - public static final int et_commit=0x7f09009d; + public static final int et_comfirm_psd=0x7f090054; + public static final int et_commit=0x7f09009a; public static final int et_feedback_content=0x7f090010; - public static final int et_mineinfo_cademy=0x7f090036; - public static final int et_mineinfo_dornum=0x7f090038; - public static final int et_mineinfo_dorpart=0x7f090037; - public static final int et_mineinfo_phone=0x7f090039; - public static final int et_mineinfo_qq=0x7f09003a; - public static final int et_mineinfo_school=0x7f090035; - public static final int et_mineinfo_username=0x7f090034; - public static final int et_order_phone=0x7f090050; - public static final int et_order_words=0x7f090051; - public static final int et_password=0x7f09001f; - public static final int et_phone=0x7f090059; - public static final int et_username=0x7f09001c; + public static final int et_mineinfo_cademy=0x7f090034; + public static final int et_mineinfo_dornum=0x7f090036; + public static final int et_mineinfo_dorpart=0x7f090035; + public static final int et_mineinfo_phone=0x7f090037; + public static final int et_mineinfo_qq=0x7f090038; + public static final int et_mineinfo_school=0x7f090033; + public static final int et_mineinfo_username=0x7f090032; + public static final int et_order_phone=0x7f09004f; + public static final int et_order_words=0x7f090050; + public static final int et_password=0x7f09001d; + public static final int et_phone=0x7f090056; + public static final int et_username=0x7f09001b; public static final int fl_image_ads=0x7f090016; public static final int gv_classroom=0x7f09000f; - public static final int gv_food_class=0x7f09005e; - public static final int gv_gift_class=0x7f09005d; - public static final int gv_out_class=0x7f09005f; - public static final int gv_school_class=0x7f09005c; - public static final int header_shop_all=0x7f090060; - public static final int imageview=0x7f090091; - public static final int img_call=0x7f090098; - public static final int img_chooseImage=0x7f090090; + public static final int gv_food_class=0x7f09005b; + public static final int gv_gift_class=0x7f09005a; + public static final int gv_out_class=0x7f09005c; + public static final int gv_school_class=0x7f090059; + public static final int header_shop_all=0x7f09005d; + public static final int imageview=0x7f09008e; + public static final int img_call=0x7f090095; + public static final int img_chooseImage=0x7f09008d; public static final int img_date=0x7f090013; - public static final int img_item=0x7f090080; - public static final int img_search=0x7f09007e; - public static final int img_shop=0x7f090089; + public static final int img_item=0x7f09007d; + public static final int img_search=0x7f09007b; + public static final int img_shop=0x7f090086; public static final int img_welcome=0x7f090001; public static final int listScrollView=0x7f090012; - public static final int ll_commit_parent_view=0x7f09009c; - public static final int ll_commit_son_view=0x7f090070; + public static final int ll_commit_parent_view=0x7f090099; + public static final int ll_commit_son_view=0x7f09006d; public static final int ll_row1=0x7f09001a; - public static final int ll_row2=0x7f09001d; - public static final int ll_row3=0x7f090020; - public static final int ll_row4=0x7f090057; - public static final int ll_row6=0x7f09005a; + public static final int ll_row2=0x7f09001c; + public static final int ll_row3=0x7f09001e; + public static final int ll_row4=0x7f090055; + public static final int ll_row6=0x7f090057; public static final int lv_bxt_news=0x7f090004; - public static final int lv_goods_list=0x7f090093; - public static final int lv_mine_about=0x7f09002c; - public static final int lv_mine_order=0x7f09002b; - public static final int lv_mine_soft=0x7f090064; - public static final int lv_mine_user=0x7f09002a; + public static final int lv_goods_list=0x7f090090; + public static final int lv_mine_about=0x7f09002a; + public static final int lv_mine_order=0x7f090029; + public static final int lv_mine_soft=0x7f090061; + public static final int lv_mine_user=0x7f090028; public static final int lv_news=0x7f090019; - public static final int lv_order_info=0x7f090053; - public static final int lv_shop_all=0x7f090061; - public static final int modify=0x7f0900a0; - public static final int new_login_btn=0x7f090026; - public static final int pagertab=0x7f090063; - public static final int ratingBar1=0x7f090095; - public static final int rb_rate=0x7f09008f; - public static final int relaGrid=0x7f09007a; - public static final int rl_last=0x7f090022; - public static final int rl_splash=0x7f090065; + public static final int lv_order_info=0x7f090052; + public static final int lv_shop_all=0x7f09005e; + public static final int modify=0x7f09009d; + public static final int new_login_btn=0x7f090024; + public static final int pagertab=0x7f090060; + public static final int ratingBar1=0x7f090092; + public static final int rb_rate=0x7f09008c; + public static final int relaGrid=0x7f090077; + public static final int rl_last=0x7f090020; + public static final int rl_splash=0x7f090062; public static final int rl_welcome=0x7f090000; - public static final int sp_bxt_header=0x7f09007c; - public static final int textview=0x7f090092; - public static final int timepicker=0x7f090074; - public static final int tp_dlg_time=0x7f090076; - public static final int tv_bowl=0x7f09003c; + public static final int sp_bxt_header=0x7f090079; + public static final int textview=0x7f09008f; + public static final int timepicker=0x7f090071; + public static final int tp_dlg_time=0x7f090073; + public static final int tv_bowl=0x7f09003b; public static final int tv_bxt_news_holder1=0x7f09000a; public static final int tv_bxt_news_holder2=0x7f09000b; - public static final int tv_bxt_news_item_title=0x7f09006f; + public static final int tv_bxt_news_item_title=0x7f09006c; public static final int tv_bxt_news_loc=0x7f090009; public static final int tv_bxt_news_point=0x7f09000c; public static final int tv_bxt_news_speaker=0x7f090007; @@ -210,67 +215,64 @@ public final class R { public static final int tv_bxt_news_time=0x7f090008; public static final int tv_bxt_news_title=0x7f090005; public static final int tv_bxt_news_topic=0x7f090006; - public static final int tv_cademy=0x7f09003f; - public static final int tv_chooseText=0x7f09007b; - public static final int tv_comfirm_psd=0x7f090055; - public static final int tv_commit_content=0x7f090072; - public static final int tv_commit_title=0x7f09009b; - public static final int tv_commit_user=0x7f090071; + public static final int tv_cademy=0x7f09003e; + public static final int tv_chooseText=0x7f090078; + public static final int tv_commit_content=0x7f09006f; + public static final int tv_commit_title=0x7f090098; + public static final int tv_commit_user=0x7f09006e; public static final int tv_day=0x7f090015; - public static final int tv_dorNum=0x7f090041; - public static final int tv_dorPart=0x7f090040; - public static final int tv_edit=0x7f09007d; - public static final int tv_good_name=0x7f090077; - public static final int tv_good_price=0x7f090078; - public static final int tv_item_content=0x7f090082; - public static final int tv_item_name=0x7f090081; - public static final int tv_me=0x7f09003b; - public static final int tv_mineinfo_cademy=0x7f09002f; - public static final int tv_mineinfo_dornum=0x7f090031; - public static final int tv_mineinfo_dorpart=0x7f090030; - public static final int tv_mineinfo_phone=0x7f090032; - public static final int tv_mineinfo_qq=0x7f090033; - public static final int tv_mineinfo_school=0x7f09002e; - public static final int tv_mineinfo_username=0x7f09002d; - public static final int tv_news_author=0x7f090046; - public static final int tv_news_content=0x7f090048; - public static final int tv_news_date=0x7f090084; - public static final int tv_news_time=0x7f090047; - public static final int tv_news_title=0x7f090045; - public static final int tv_news_type=0x7f090083; - public static final int tv_order_count=0x7f09004c; - public static final int tv_order_good=0x7f09004a; - public static final int tv_order_info_good_name=0x7f090085; - public static final int tv_order_info_price=0x7f090087; - public static final int tv_order_info_shop_name=0x7f090086; - public static final int tv_order_info_state=0x7f090088; - public static final int tv_order_shop=0x7f090049; - public static final int tv_order_time=0x7f09004e; - public static final int tv_password=0x7f09001e; - public static final int tv_phone=0x7f090058; - public static final int tv_reg_title=0x7f090054; - public static final int tv_res=0x7f09006e; - public static final int tv_room=0x7f09007f; - public static final int tv_school=0x7f09003e; - public static final int tv_shop_discount=0x7f09008c; - public static final int tv_shop_introduce=0x7f090099; - public static final int tv_shop_loc=0x7f09008e; - public static final int tv_shop_location=0x7f090096; - public static final int tv_shop_name=0x7f09008a; - public static final int tv_shop_paper=0x7f09008b; - public static final int tv_shop_phone=0x7f090097; - public static final int tv_shop_promotion=0x7f09009a; - public static final int tv_shop_title=0x7f090094; - public static final int tv_shop_type=0x7f09008d; - public static final int tv_title=0x7f09006d; - public static final int tv_username=0x7f09001b; + public static final int tv_dorNum=0x7f090040; + public static final int tv_dorPart=0x7f09003f; + public static final int tv_edit=0x7f09007a; + public static final int tv_good_name=0x7f090074; + public static final int tv_good_price=0x7f090075; + public static final int tv_item_content=0x7f09007f; + public static final int tv_item_name=0x7f09007e; + public static final int tv_me=0x7f09003a; + public static final int tv_mineinfo_cademy=0x7f09002d; + public static final int tv_mineinfo_dornum=0x7f09002f; + public static final int tv_mineinfo_dorpart=0x7f09002e; + public static final int tv_mineinfo_phone=0x7f090030; + public static final int tv_mineinfo_qq=0x7f090031; + public static final int tv_mineinfo_school=0x7f09002c; + public static final int tv_mineinfo_username=0x7f09002b; + public static final int tv_news_author=0x7f090045; + public static final int tv_news_content=0x7f090047; + public static final int tv_news_date=0x7f090081; + public static final int tv_news_time=0x7f090046; + public static final int tv_news_title=0x7f090044; + public static final int tv_news_type=0x7f090080; + public static final int tv_order_count=0x7f09004b; + public static final int tv_order_good=0x7f090049; + public static final int tv_order_info_good_name=0x7f090082; + public static final int tv_order_info_price=0x7f090084; + public static final int tv_order_info_shop_name=0x7f090083; + public static final int tv_order_info_state=0x7f090085; + public static final int tv_order_shop=0x7f090048; + public static final int tv_order_time=0x7f09004d; + public static final int tv_reg_title=0x7f090053; + public static final int tv_res=0x7f09006b; + public static final int tv_room=0x7f09007c; + public static final int tv_school=0x7f09003d; + public static final int tv_shop_discount=0x7f090089; + public static final int tv_shop_introduce=0x7f090096; + public static final int tv_shop_loc=0x7f09008b; + public static final int tv_shop_location=0x7f090093; + public static final int tv_shop_name=0x7f090087; + public static final int tv_shop_paper=0x7f090088; + public static final int tv_shop_phone=0x7f090094; + public static final int tv_shop_promotion=0x7f090097; + public static final int tv_shop_title=0x7f090091; + public static final int tv_shop_type=0x7f09008a; + public static final int tv_title=0x7f09006a; + public static final int tv_username=0x7f090039; public static final int tv_week=0x7f090014; - public static final int tv_xiaocai=0x7f09003d; - public static final int user_callback=0x7f090029; - public static final int user_logo=0x7f090028; - public static final int user_nickname=0x7f090027; + public static final int tv_xiaocai=0x7f09003c; + public static final int user_callback=0x7f090027; + public static final int user_logo=0x7f090026; + public static final int user_nickname=0x7f090025; public static final int view_pager=0x7f090017; - public static final int viewpager=0x7f090062; + public static final int viewpager=0x7f09005f; public static final int wv_wsq=0x7f09000e; } public static final class layout { diff --git a/代码/在这里2.0/project.properties b/代码/在这里2.0/project.properties index ef6ccd3..b0ee040 100644 --- a/代码/在这里2.0/project.properties +++ b/代码/在这里2.0/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-19 proguard.config=proguard.cfg diff --git a/代码/在这里2.0/res/layout/activity_login.xml b/代码/在这里2.0/res/layout/activity_login.xml index 89eac74..12bc88f 100644 --- a/代码/在这里2.0/res/layout/activity_login.xml +++ b/代码/在这里2.0/res/layout/activity_login.xml @@ -2,6 +2,7 @@ @@ -20,7 +21,7 @@ android:layout_marginBottom="10dp" android:contentDescription="欢迎登陆" android:src="@drawable/ic_app" /> - + + + - - - - + @@ -71,27 +65,19 @@ android:layout_marginTop="20dp" android:orientation="horizontal" > - + @@ -107,10 +93,10 @@ android:id="@+id/btn_login" android:layout_width="match_parent" android:layout_height="45dp" - android:background="@drawable/shape_radius_color_square" + android:background="#FFFFFF" android:text="登录" - android:textColor="#FFFFFF" - android:textSize="18sp" /> + android:textColor="#20B2AA" + android:textSize="24.0sp"/>