diff --git a/logo/logo.png b/logo/logo.png index b33b6df..d0b2b33 100644 Binary files a/logo/logo.png and b/logo/logo.png 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 496e81c..6066440 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 ebfa1b5..9f19e1b 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 fb26397..5cc60f1 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 cfe8272..d8a91a5 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 948076d..aed716c 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 fcc9538..24076e0 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 7bf92ab..966e88a 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/HomeActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/HomeActivity.class index cc8432e..a03c2d6 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$BaseUiListener.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class index 1f280fb..9cc7951 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 2babce9..b2f2d49 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 daeef91..10aa430 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/RegisterActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/RegisterActivity.class index 566236b..4ddecda 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.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ReservationActivity.class index fbd5be8..8e470aa 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/ShopItemActivity$1.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class index c27431f..75a5946 100644 Binary files a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.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 bcb3c47..660ba91 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/gen/com/stone/shop/R.java b/代码/在这里2.0/gen/com/stone/shop/R.java index 558945f..e0aa73e 100644 --- a/代码/在这里2.0/gen/com/stone/shop/R.java +++ b/代码/在这里2.0/gen/com/stone/shop/R.java @@ -55,68 +55,69 @@ public final class R { 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_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 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 int ic_app6=0x7f02001d; + public static final int ic_banner1=0x7f02001e; + public static final int ic_banner_hide=0x7f02001f; + public static final int ic_banner_image_default1=0x7f020020; + public static final int ic_banner_image_default11=0x7f020021; + public static final int ic_banner_image_default2=0x7f020022; + public static final int ic_banner_image_default22=0x7f020023; + public static final int ic_banner_image_default3=0x7f020024; + public static final int ic_banner_image_default4=0x7f020025; + public static final int ic_banner_image_default55=0x7f020026; + public static final int ic_banner_image_default77=0x7f020027; + public static final int ic_breakfast=0x7f020028; + public static final int ic_car=0x7f020029; + public static final int ic_car1=0x7f02002a; + public static final int ic_date=0x7f02002b; + public static final int ic_hbut=0x7f02002c; + public static final int ic_hide=0x7f02002d; + public static final int ic_launcher=0x7f02002e; + public static final int ic_loc=0x7f02002f; + public static final int ic_menu_copy_holo_light=0x7f020030; + public static final int ic_menu_find_holo_light=0x7f020031; + public static final int ic_menu_info_details=0x7f020032; + public static final int ic_menu_myplaces=0x7f020033; + public static final int ic_menu_notifications=0x7f020034; + public static final int ic_menu_share=0x7f020035; + public static final int ic_mine=0x7f020036; + public static final int ic_page_indicator=0x7f020037; + public static final int ic_page_indicator_focused=0x7f020038; + public static final int ic_phone=0x7f020039; + public static final int ic_phone2=0x7f02003a; + public static final int ic_phone3=0x7f02003b; + public static final int ic_sale=0x7f02003c; + public static final int ic_sale1=0x7f02003d; + public static final int ic_search=0x7f02003e; + public static final int ic_shelf_category_divider=0x7f02003f; + public static final int ic_shop=0x7f020040; + public static final int ic_shop1=0x7f020041; + public static final int ic_shop_info_bg=0x7f020042; + public static final int ic_shop_info_bg2=0x7f020043; + public static final int ic_shop_info_bg22=0x7f020044; + public static final int ic_star_no=0x7f020045; + public static final int ic_star_yes=0x7f020046; + public static final int login_button=0x7f020047; + public static final int login_button_select=0x7f020048; + public static final int qq=0x7f020049; + public static final int qq1=0x7f02004a; + public static final int sgbf=0x7f02004b; + public static final int shap_circle=0x7f02004c; + public static final int shap_divider=0x7f02004d; + public static final int shape_color_frame=0x7f02004e; + public static final int shape_grid_item=0x7f02004f; + public static final int shape_left_radius_color_square=0x7f020050; + public static final int shape_radius=0x7f020051; + public static final int shape_radius_color_square=0x7f020052; + public static final int shape_radius_square=0x7f020053; + public static final int splash=0x7f020054; + public static final int star_img1=0x7f020055; + public static final int star_img2=0x7f020056; + public static final int star_img3=0x7f020057; + public static final int star_img4=0x7f020058; + public static final int star_img5=0x7f020059; + public static final int tab_bg_selector=0x7f02005a; + public static final int welcome_background=0x7f02005b; } public static final class id { public static final int action_settings=0x7f09009c; @@ -130,7 +131,7 @@ public final class R { 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=0x7f09001f; + public static final int btn_login=0x7f09001d; public static final int btn_look_goods=0x7f090065; public static final int btn_look_news=0x7f090066; public static final int btn_look_shops=0x7f090064; @@ -138,13 +139,13 @@ public final class R { 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_qq=0x7f090022; public static final int btn_reg_now=0x7f090058; - public static final int btn_register=0x7f090022; + public static final int btn_register=0x7f090021; 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 cb_rem_psd=0x7f090020; public static final int datepicker=0x7f090070; public static final int et_award_new=0x7f090002; public static final int et_award_old=0x7f090003; @@ -160,9 +161,9 @@ public final class R { 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_password=0x7f09001b; public static final int et_phone=0x7f090056; - public static final int et_username=0x7f09001b; + public static final int et_username=0x7f090027; public static final int fl_image_ads=0x7f090016; public static final int gv_classroom=0x7f09000f; public static final int gv_food_class=0x7f09005b; @@ -196,12 +197,12 @@ public final class R { 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 new_login_btn=0x7f090023; 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_last=0x7f09001f; public static final int rl_splash=0x7f090062; public static final int rl_welcome=0x7f090000; public static final int sp_bxt_header=0x7f090079; @@ -272,9 +273,9 @@ public final class R { public static final int tv_username=0x7f090039; public static final int tv_week=0x7f090014; 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 user_callback=0x7f090026; + public static final int user_logo=0x7f090025; + public static final int user_nickname=0x7f090024; public static final int view_pager=0x7f090017; public static final int viewpager=0x7f09005f; public static final int wv_wsq=0x7f09000e; diff --git a/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java b/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java index a45eaba..a4323ed 100644 --- a/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java +++ b/代码/在这里2.0/src/com/stone/shop/view/LoginActivity.java @@ -230,7 +230,7 @@ public class LoginActivity extends Activity implements OnClickListener { return; } JSONObject jsonResponse = (JSONObject) response; - if (null != jsonResponse && jsonResponse.length() == 0) { + if (jsonResponse.length() == 0) { Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败"); return; } diff --git a/代码/在这里2.0/src/com/stone/shop/view/ShopItemActivity.java b/代码/在这里2.0/src/com/stone/shop/view/ShopItemActivity.java index 2aaa72e..53a919c 100644 --- a/代码/在这里2.0/src/com/stone/shop/view/ShopItemActivity.java +++ b/代码/在这里2.0/src/com/stone/shop/view/ShopItemActivity.java @@ -44,7 +44,6 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte private View view1, view2; // 需要滑动的页卡 private ViewPagerCompat viewPager; // viewpager private ViewPagerAdapter shopViewPagerAdapter; - private PagerTitleStrip pagerTitleStrip; // viewpager的标题 private PagerTabStrip pagerTabStrip; // 一个viewpager的指示器，效果就是一个横的粗的下划线 private List viewList; // 把需要滑动的页卡添加到这个list中 private List titleList; // viewpager的标题 @@ -52,7 +51,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte // 店铺商品列表 private ListView lvGoodsList; private GoodsListAdapter goodsListAdapter; - private Button btnBuyGood; + // 店铺简介页中的控件 private TextView tvShopName; // 店铺名 @@ -70,7 +69,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte private static List goodsList; // 从上级页面中传入的数据 - private Shop shop; // 当期选择的Shop + private Shop shop; // 当期选择的Shop private Good selectGood; private String shopID; // 当前选择的Shop的ID @@ -142,7 +141,6 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte @Override public void onSuccess(List goods) { - // toast("查询商品成功, 共" + goods.size()); if (goods.size() == 0) { toast("该店还没有添加商品"); } @@ -209,39 +207,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte tvContent = null; } -// public void clickBuyGood(View v) { -// Intent toOrderActivity = new Intent(ShopItemActivity.this, OrderActivity.class); -// Bundle bundle = new Bundle(); -// bundle.putSerializable("shop", shop ); -// bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null -// toOrderActivity.putExtras(bundle); -// startActivity(toOrderActivity); -// //------------------------------------------------------------------- -// toast("亲， 记得在弹出的对话框中选择数量哦"); -// Animation shake = AnimationUtils.loadAnimation(this, R.anim.shake); -// lvGoodsList.startAnimation(shake); -// -// // 显示订单对话框 -// orderDlg = new DialogOrder(this, R.style.MyDialog); -// orderDlg.show(); -// // 得到订单对话框的View -// LayoutInflater factory = LayoutInflater.from(this); -// dlgOrderView = factory.inflate(R.layout.dlg_order, null); -// tvOrderCount = (TextView) dlgOrderView -// .findViewById(R.id.tv_order_count); -// etOrderPhone = (EditText) dlgOrderView -// .findViewById(R.id.et_order_phone); -// etOrderWords = (EditText) dlgOrderView -// .findViewById(R.id.et_order_phone); -// ; -// btnOrderCount = (Button) dlgOrderView -// .findViewById(R.id.btn_order_count); -// btnOrderSubmit = (Button) dlgOrderView -// .findViewById(R.id.btn_order_submit); -// btnOrderCount.setOnClickListener(this); -// btnOrderSubmit.setOnClickListener(this); -// //------------------------------------------------------------------- -// } + @Override public void onClick(View v) { @@ -286,17 +252,6 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null toOrderActivity.putExtras(bundle); startActivity(toOrderActivity); - //toast("点击了Position " + position); -// if(view.getId() == R.id.btn_buy_good) { -// toast("点击了购买按钮"); -// Intent toOrderActivity = new Intent(ShopItemActivity.this, OrderActivity.class); -// Bundle bundle = new Bundle(); -// bundle.putSerializable("shop", shop ); -// bundle.putSerializable("good", selectGood); -// bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null -// toOrderActivity.putExtras(bundle); -// startActivity(toOrderActivity); -// } break; case 1: break;