diff --git a/代码/Shop 1.2最终修改版/.DS_Store b/代码/Shop 1.2最终修改版/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/代码/Shop 1.2最终修改版/.DS_Store and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/.classpath b/代码/Shop 1.2最终修改版/.classpath
deleted file mode 100644
index 0461652..0000000
--- a/代码/Shop 1.2最终修改版/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/.project b/代码/Shop 1.2最终修改版/.project
deleted file mode 100644
index b261c40..0000000
--- a/代码/Shop 1.2最终修改版/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Shop
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/代码/Shop 1.2最终修改版/.settings/org.eclipse.core.resources.prefs b/代码/Shop 1.2最终修改版/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/代码/Shop 1.2最终修改版/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/代码/Shop 1.2最终修改版/.settings/org.eclipse.jdt.core.prefs b/代码/Shop 1.2最终修改版/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ef8a789..0000000
--- a/代码/Shop 1.2最终修改版/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/代码/Shop 1.2最终修改版/AndroidManifest.xml b/代码/Shop 1.2最终修改版/AndroidManifest.xml
deleted file mode 100644
index c328205..0000000
--- a/代码/Shop 1.2最终修改版/AndroidManifest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/bin/AndroidManifest.xml b/代码/Shop 1.2最终修改版/bin/AndroidManifest.xml
deleted file mode 100644
index c328205..0000000
--- a/代码/Shop 1.2最终修改版/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/bin/Shop.apk b/代码/Shop 1.2最终修改版/bin/Shop.apk
deleted file mode 100644
index c773fa7..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/Shop.apk and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes.dex b/代码/Shop 1.2最终修改版/bin/classes.dex
deleted file mode 100644
index 10b25f7..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes.dex and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/MessageDef.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/MessageDef.class
deleted file mode 100644
index 22f75d6..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/MessageDef.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/TypeDef.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/TypeDef.class
deleted file mode 100644
index 2ad309c..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/date/TypeDef.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/BuildConfig.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/BuildConfig.class
deleted file mode 100644
index 1387198..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/BuildConfig.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$anim.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$anim.class
deleted file mode 100644
index 302d8ec..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$anim.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$attr.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$attr.class
deleted file mode 100644
index b1c0a95..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$attr.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$dimen.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$dimen.class
deleted file mode 100644
index 9aebad5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$dimen.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$drawable.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$drawable.class
deleted file mode 100644
index f805044..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$drawable.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$id.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$id.class
deleted file mode 100644
index ecb56e7..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$id.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$layout.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$layout.class
deleted file mode 100644
index 5483c6e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$layout.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$menu.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$menu.class
deleted file mode 100644
index 550c628..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$menu.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$string.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$string.class
deleted file mode 100644
index d136ba8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$string.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$style.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$style.class
deleted file mode 100644
index 8020699..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R$style.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R.class
deleted file mode 100644
index 0a31b19..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/R.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
deleted file mode 100644
index f7b5e64..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
deleted file mode 100644
index e1ff9fa..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
deleted file mode 100644
index de38d75..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
deleted file mode 100644
index 429811b..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsHolder.class
deleted file mode 100644
index e3bc779..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
deleted file mode 100644
index 981e341..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GridAdapter.class
deleted file mode 100644
index 72d669e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/GridAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
deleted file mode 100644
index 2f908a5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListAdapter.class
deleted file mode 100644
index c19e6be..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListHolder.class
deleted file mode 100644
index 73eb151..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineListHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
deleted file mode 100644
index beccc78..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
deleted file mode 100644
index ab8cdff..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsHolder.class
deleted file mode 100644
index 2e0aca3..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
deleted file mode 100644
index d8390ad..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
deleted file mode 100644
index 2202ce8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
deleted file mode 100644
index 1b6dc47..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SComHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SComHolder.class
deleted file mode 100644
index 1d74fb9..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SComHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
deleted file mode 100644
index b60293d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopHolder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopHolder.class
deleted file mode 100644
index 32685bc..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
deleted file mode 100644
index a77c4c5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
deleted file mode 100644
index 99fa505..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/BXTNews.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/BXTNews.class
deleted file mode 100644
index d6e8093..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/BXTNews.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Classroom.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Classroom.class
deleted file mode 100644
index 964077d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Classroom.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/FeedBack.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/FeedBack.class
deleted file mode 100644
index 2e29dc3..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/FeedBack.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Good.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Good.class
deleted file mode 100644
index 64769d9..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Good.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/LuckyUser.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/LuckyUser.class
deleted file mode 100644
index 15990c3..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/LuckyUser.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/News.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/News.class
deleted file mode 100644
index d206387..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/News.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Order.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Order.class
deleted file mode 100644
index 021c4be..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Order.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Reservation.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Reservation.class
deleted file mode 100644
index 1db5f15..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Reservation.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/SComment.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/SComment.class
deleted file mode 100644
index be7ff20..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/SComment.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Shop.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Shop.class
deleted file mode 100644
index 469f145..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/Shop.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/User.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/User.class
deleted file mode 100644
index 79a6879..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/model/User.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AboutActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AboutActivity.class
deleted file mode 100644
index a5ddd38..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AboutActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$1.class
deleted file mode 100644
index 7183b3f..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$2.class
deleted file mode 100644
index 34ab0ff..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity.class
deleted file mode 100644
index bebea1a..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/AwardActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity$1.class
deleted file mode 100644
index 8f8b7f7..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity.class
deleted file mode 100644
index 5b5459e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTNewsActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTNewsActivity.class
deleted file mode 100644
index d0e1b18..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BXTNewsActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BaseActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BaseActivity.class
deleted file mode 100644
index cc24a3e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/BaseActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
deleted file mode 100644
index d092ad3..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity.class
deleted file mode 100644
index c733605..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ClassroomActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
deleted file mode 100644
index 7e8f5ff..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity.class
deleted file mode 100644
index 16450ef..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/FeedBackActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity$1.class
deleted file mode 100644
index 787be71..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity.class
deleted file mode 100644
index 3d93e7a..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/HomeActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$1.class
deleted file mode 100644
index 9f2d5f6..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$2.class
deleted file mode 100644
index afcdde2..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$3.class
deleted file mode 100644
index 2b5c29e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$3.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
deleted file mode 100644
index 72a769b..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4.class
deleted file mode 100644
index b6566b4..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$4.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
deleted file mode 100644
index f4ee115..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity.class
deleted file mode 100644
index 7da1086..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/LoginActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$1.class
deleted file mode 100644
index 32158be..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$2.class
deleted file mode 100644
index 784b166..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity.class
deleted file mode 100644
index f74cbee..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
deleted file mode 100644
index edd28ab..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
deleted file mode 100644
index d1cefb5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity.class
deleted file mode 100644
index 64d39b1..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
deleted file mode 100644
index 7a78ecb..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
deleted file mode 100644
index 6d853e0..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
deleted file mode 100644
index 6d2dcf0..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
deleted file mode 100644
index 492c4e8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineSoftActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineSoftActivity.class
deleted file mode 100644
index 97a5707..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/MineSoftActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/NewsActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/NewsActivity.class
deleted file mode 100644
index 602d437..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/NewsActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$1.class
deleted file mode 100644
index 0415ea2..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$2.class
deleted file mode 100644
index c0cbaae..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity.class
deleted file mode 100644
index 446f9cc..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
deleted file mode 100644
index 5c74559..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
deleted file mode 100644
index 4df351b..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity.class
deleted file mode 100644
index 5b76eac..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/OrderInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity$1.class
deleted file mode 100644
index f60e7ec..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity.class
deleted file mode 100644
index 31b15c8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/RegisterActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$1.class
deleted file mode 100644
index ac9d906..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
deleted file mode 100644
index 7a87894..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
deleted file mode 100644
index 02934e8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2.class
deleted file mode 100644
index 1673255..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity.class
deleted file mode 100644
index a1e4678..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ReservationActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopActivity.class
deleted file mode 100644
index f4fcfe2..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
deleted file mode 100644
index 61fac18..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity.class
deleted file mode 100644
index 2e6bbab..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopAllActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
deleted file mode 100644
index c27431f..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity.class
deleted file mode 100644
index b32eee1..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/ShopItemActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity$1.class
deleted file mode 100644
index da6b059..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity.class
deleted file mode 100644
index c88c786..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/SplashActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/UserInfoActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/UserInfoActivity.class
deleted file mode 100644
index 7e44ad4..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/UserInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity$1.class
deleted file mode 100644
index 56d7d00..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity.class
deleted file mode 100644
index fec7d74..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/WsqActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
deleted file mode 100644
index 53167c8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
deleted file mode 100644
index 7483558..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity.class
deleted file mode 100644
index 00554a5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/shop/view/old/OldMineActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
deleted file mode 100644
index 75e985d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager.class
deleted file mode 100644
index 4fc4966..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/AutoScrollViewPager.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/CustomDurationScroller.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/CustomDurationScroller.class
deleted file mode 100644
index cb8dd98..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/CustomDurationScroller.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
deleted file mode 100644
index dd4d7e1..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
deleted file mode 100644
index ecdb945..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
deleted file mode 100644
index ecd71fa..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
deleted file mode 100644
index 700f05a..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
deleted file mode 100644
index dbb56fc..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder.class
deleted file mode 100644
index 037b060..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/DialogOrder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ListScrollView.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ListScrollView.class
deleted file mode 100644
index a1467e5..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ListScrollView.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/MyGridView.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/MyGridView.class
deleted file mode 100644
index 7aaf8ed..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/MyGridView.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ViewPagerCompat.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ViewPagerCompat.class
deleted file mode 100644
index ddc619a..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/ui/ViewPagerCompat.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util$1.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util$1.class
deleted file mode 100644
index db560d7..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util.class b/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util.class
deleted file mode 100644
index 9c303ec..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/classes/com/stone/util/Util.class and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/dexedLibs/android-support-v4-648ea4e7f6d0fa45bb52edd92b1ac983.jar b/代码/Shop 1.2最终修改版/bin/dexedLibs/android-support-v4-648ea4e7f6d0fa45bb52edd92b1ac983.jar
deleted file mode 100644
index e10bb64..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/dexedLibs/android-support-v4-648ea4e7f6d0fa45bb52edd92b1ac983.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/dexedLibs/bmobPush_0.1beta-2c8cf7ac085ee0e116557766aea15194.jar b/代码/Shop 1.2最终修改版/bin/dexedLibs/bmobPush_0.1beta-2c8cf7ac085ee0e116557766aea15194.jar
deleted file mode 100644
index e9b8224..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/dexedLibs/bmobPush_0.1beta-2c8cf7ac085ee0e116557766aea15194.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/dexedLibs/bmob_v3.1.0beta-6814ce07df97831ee0a0e3cf272508ec.jar b/代码/Shop 1.2最终修改版/bin/dexedLibs/bmob_v3.1.0beta-6814ce07df97831ee0a0e3cf272508ec.jar
deleted file mode 100644
index 583be11..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/dexedLibs/bmob_v3.1.0beta-6814ce07df97831ee0a0e3cf272508ec.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/dexedLibs/mta-sdk-1.6.2-30258b520fdbeacbaf6da52c750822d4.jar b/代码/Shop 1.2最终修改版/bin/dexedLibs/mta-sdk-1.6.2-30258b520fdbeacbaf6da52c750822d4.jar
deleted file mode 100644
index 26de36d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/dexedLibs/mta-sdk-1.6.2-30258b520fdbeacbaf6da52c750822d4.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/dexedLibs/open_sdk_r5756-8a3d61ef452a3782e9d7fbc05269a8ef.jar b/代码/Shop 1.2最终修改版/bin/dexedLibs/open_sdk_r5756-8a3d61ef452a3782e9d7fbc05269a8ef.jar
deleted file mode 100644
index b88f7eb..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/dexedLibs/open_sdk_r5756-8a3d61ef452a3782e9d7fbc05269a8ef.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/proguard.txt b/代码/Shop 1.2最终修改版/bin/proguard.txt
deleted file mode 100644
index eafe13e..0000000
--- a/代码/Shop 1.2最终修改版/bin/proguard.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-# view res/layout/activity_shop_item.xml #generated:12
--keep class android.support.v4.view.PagerTabStrip { (...); }
-
-# view AndroidManifest.xml #generated:145
--keep class com.stone.shop.view.AboutActivity { (...); }
-
-# view AndroidManifest.xml #generated:109
--keep class com.stone.shop.view.AwardActivity { (...); }
-
-# view AndroidManifest.xml #generated:151
--keep class com.stone.shop.view.BXTActivity { (...); }
-
-# view AndroidManifest.xml #generated:155
--keep class com.stone.shop.view.BXTNewsActivity { (...); }
-
-# view AndroidManifest.xml #generated:65
--keep class com.stone.shop.view.BaseActivity { (...); }
-
-# view AndroidManifest.xml #generated:73
--keep class com.stone.shop.view.ClassroomActivity { (...); }
-
-# view AndroidManifest.xml #generated:133
--keep class com.stone.shop.view.FeedBackActivity { (...); }
-
-# view AndroidManifest.xml #generated:101
--keep class com.stone.shop.view.HomeActivity { (...); }
-
-# view AndroidManifest.xml #generated:69
--keep class com.stone.shop.view.LoginActivity { (...); }
-
-# view AndroidManifest.xml #generated:113
--keep class com.stone.shop.view.MineActivity { (...); }
-
-# view AndroidManifest.xml #generated:121
--keep class com.stone.shop.view.MineInfoActivity { (...); }
-
-# view AndroidManifest.xml #generated:125
--keep class com.stone.shop.view.MineInfoEditActivity { (...); }
-
-# view AndroidManifest.xml #generated:129
--keep class com.stone.shop.view.MineSoftActivity { (...); }
-
-# view AndroidManifest.xml #generated:141
--keep class com.stone.shop.view.NewsActivity { (...); }
-
-# view AndroidManifest.xml #generated:93
--keep class com.stone.shop.view.OrderActivity { (...); }
-
-# view AndroidManifest.xml #generated:97
--keep class com.stone.shop.view.OrderInfoActivity { (...); }
-
-# view AndroidManifest.xml #generated:77
--keep class com.stone.shop.view.RegisterActivity { (...); }
-
-# view AndroidManifest.xml #generated:117
--keep class com.stone.shop.view.ReservationActivity { (...); }
-
-# view AndroidManifest.xml #generated:81
--keep class com.stone.shop.view.ShopActivity { (...); }
-
-# view AndroidManifest.xml #generated:85
--keep class com.stone.shop.view.ShopAllActivity { (...); }
-
-# view AndroidManifest.xml #generated:89
--keep class com.stone.shop.view.ShopItemActivity { (...); }
-
-# view AndroidManifest.xml #generated:56
--keep class com.stone.shop.view.SplashActivity { (...); }
-
-# view AndroidManifest.xml #generated:105
--keep class com.stone.shop.view.WsqActivity { (...); }
-
-# view AndroidManifest.xml #generated:137
--keep class com.stone.shop.view.old.OldMineActivity { (...); }
-
-# view res/layout/activity_home.xml #generated:85
--keep class com.stone.ui.AutoScrollViewPager { (...); }
-
-# view res/layout/activity_home.xml #generated:12
--keep class com.stone.ui.ListScrollView { (...); }
-
-# view res/layout/activity_shop.xml #generated:128
-# view res/layout/activity_shop.xml #generated:160
-# view res/layout/activity_shop.xml #generated:47
-# view res/layout/activity_shop.xml #generated:88
--keep class com.stone.ui.MyGridView { (...); }
-
-# view res/layout/activity_shop_item.xml #generated:6
--keep class com.stone.ui.ViewPagerCompat { (...); }
-
-# view AndroidManifest.xml #generated:173
--keep class com.tencent.connect.common.AssistActivity { (...); }
-
-# view AndroidManifest.xml #generated:159
--keep class com.tencent.tauth.AuthActivity { (...); }
-
-# onClick res/layout/header_mine_info.xml #generated:8
--keepclassmembers class * { *** clickBack(...); }
-
-# onClick res/layout/header_mine_info_edit.xml #generated:8
--keepclassmembers class * { *** clickCancel(...); }
-
-# onClick res/layout/header_mine_info.xml #generated:32
--keepclassmembers class * { *** clickEdit(...); }
-
-# onClick res/layout/header_feedback.xml #generated:8
--keepclassmembers class * { *** clickFeedBack(...); }
-
-# onClick res/layout/header_mine_info_edit.xml #generated:32
--keepclassmembers class * { *** clickSave(...); }
-
-# onClick res/layout/header_soft.xml #generated:8
--keepclassmembers class * { *** clickSoftBack(...); }
-
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_normal.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_normal.png
deleted file mode 100644
index b3f82a9..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_normal.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_pressed.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_pressed.png
deleted file mode 100644
index d54cb65..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/btn_green_pressed.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected.png
deleted file mode 100644
index 59a4760..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected_press.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected_press.png
deleted file mode 100644
index c9c464c..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_selected_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect.png
deleted file mode 100644
index 6566e07..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect_press.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect_press.png
deleted file mode 100644
index c8dbe40..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/checkbox_unselect_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_1.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_1.png
deleted file mode 100644
index a6c4ff3..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_2.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_2.png
deleted file mode 100644
index 5010305..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_3.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_3.png
deleted file mode 100644
index bd0a6dc..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_5.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_5.png
deleted file mode 100644
index fc8a37d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_5.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_6.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_6.png
deleted file mode 100644
index 941abb9..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_6.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_7.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_7.png
deleted file mode 100644
index f132646..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_7.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_8.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_8.png
deleted file mode 100644
index d6cf0f0..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_8.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_breakfast.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_breakfast.png
deleted file mode 100644
index 2bc04b4..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_breakfast.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_car.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_car.png
deleted file mode 100644
index 83d6810..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_car.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_date.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_date.png
deleted file mode 100644
index 9df2a0e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_date.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hbut.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hbut.png
deleted file mode 100644
index 775cc41..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hbut.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hide.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hide.png
deleted file mode 100644
index ca30710..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_loc.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_loc.png
deleted file mode 100644
index b2e74dc..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_loc.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png
deleted file mode 100644
index 7fc9af0..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_find_holo_light.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_find_holo_light.png
deleted file mode 100644
index e8a9f98..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_find_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_info_details.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_info_details.png
deleted file mode 100644
index eaf9443..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_info_details.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_myplaces.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_myplaces.png
deleted file mode 100644
index 2692e0b..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_myplaces.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_notifications.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_notifications.png
deleted file mode 100644
index 684dd2e..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_notifications.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_share.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_share.png
deleted file mode 100644
index ad2d66d..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_menu_share.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_mine.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_mine.png
deleted file mode 100644
index a1727ef..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_mine.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator.png
deleted file mode 100644
index 84a19a8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator_focused.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator_focused.png
deleted file mode 100644
index 3faf9a6..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_page_indicator_focused.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone.png
deleted file mode 100644
index aacbb6f..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone2.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone2.png
deleted file mode 100644
index 52055b8..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone3.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone3.png
deleted file mode 100644
index 6acfc0b..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_phone3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_sale.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_sale.png
deleted file mode 100644
index 7a0e775..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_sale.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_search.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_search.png
deleted file mode 100644
index a733499..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_search.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shelf_category_divider.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shelf_category_divider.png
deleted file mode 100644
index 836688a..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shelf_category_divider.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shop.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shop.png
deleted file mode 100644
index b51d593..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_shop.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_no.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_no.png
deleted file mode 100644
index 7b4db74..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_no.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_yes.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_yes.png
deleted file mode 100644
index 7343288..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/ic_star_yes.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button.png
deleted file mode 100644
index 535dbf0..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button_select.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button_select.png
deleted file mode 100644
index 5a17161..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/login_button_select.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/qq.png b/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/qq.png
deleted file mode 100644
index 8510143..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/res/crunch/drawable/qq.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/bin/resources.ap_ b/代码/Shop 1.2最终修改版/bin/resources.ap_
deleted file mode 100644
index 8ed3bf4..0000000
Binary files a/代码/Shop 1.2最终修改版/bin/resources.ap_ and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/gen/com/stone/shop/BuildConfig.java b/代码/Shop 1.2最终修改版/gen/com/stone/shop/BuildConfig.java
deleted file mode 100644
index f1eddbc..0000000
--- a/代码/Shop 1.2最终修改版/gen/com/stone/shop/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.stone.shop;
-
-public final class BuildConfig {
- public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/gen/com/stone/shop/R.java b/代码/Shop 1.2最终修改版/gen/com/stone/shop/R.java
deleted file mode 100644
index f9fafd7..0000000
--- a/代码/Shop 1.2最终修改版/gen/com/stone/shop/R.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package com.stone.shop;
-
-public final class R {
- public static final class anim {
- public static final int cycle_7=0x7f040000;
- public static final int scale=0x7f040001;
- public static final int shake=0x7f040002;
- }
- public static final class attr {
- }
- public static final class dimen {
- /** Default screen margins, per the Android Design guidelines.
-
- Customize dimensions originally defined in res/values/dimens.xml (such as
- screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-
- */
- public static final int activity_horizontal_margin=0x7f050000;
- public static final int activity_vertical_margin=0x7f050001;
- }
- public static final class drawable {
- public static final int abs__tab_selected_focused_holo=0x7f020000;
- 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 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 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 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_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 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 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_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_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 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_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 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 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_loc=0x7f090009;
- public static final int tv_bxt_news_point=0x7f09000c;
- public static final int tv_bxt_news_speaker=0x7f090007;
- public static final int tv_bxt_news_speaker_info=0x7f09000d;
- 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_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_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 view_pager=0x7f090017;
- public static final int viewpager=0x7f090062;
- public static final int wv_wsq=0x7f09000e;
- }
- public static final class layout {
- public static final int activity_about=0x7f030000;
- public static final int activity_award=0x7f030001;
- public static final int activity_base=0x7f030002;
- public static final int activity_bxt=0x7f030003;
- public static final int activity_bxt_news=0x7f030004;
- public static final int activity_car=0x7f030005;
- public static final int activity_classroom=0x7f030006;
- public static final int activity_feedback=0x7f030007;
- public static final int activity_home=0x7f030008;
- public static final int activity_login=0x7f030009;
- public static final int activity_mine=0x7f03000a;
- public static final int activity_mine_info=0x7f03000b;
- public static final int activity_mine_info_edit=0x7f03000c;
- public static final int activity_mine_old=0x7f03000d;
- public static final int activity_news=0x7f03000e;
- public static final int activity_order=0x7f03000f;
- public static final int activity_order_info=0x7f030010;
- public static final int activity_reg=0x7f030011;
- public static final int activity_shop=0x7f030012;
- public static final int activity_shop_all=0x7f030013;
- public static final int activity_shop_item=0x7f030014;
- public static final int activity_soft=0x7f030015;
- public static final int activity_splash=0x7f030016;
- public static final int activity_test=0x7f030017;
- public static final int activity_userinfo=0x7f030018;
- public static final int bxt_list_item=0x7f030019;
- public static final int commit=0x7f03001a;
- public static final int common_datetime=0x7f03001b;
- public static final int dlg_order_settime=0x7f03001c;
- public static final int goods_list_item=0x7f03001d;
- public static final int gv_item_classroom=0x7f03001e;
- public static final int header_award=0x7f03001f;
- public static final int header_bxt=0x7f030020;
- public static final int header_bxt_news=0x7f030021;
- public static final int header_feedback=0x7f030022;
- public static final int header_home=0x7f030023;
- public static final int header_mine=0x7f030024;
- public static final int header_mine_info=0x7f030025;
- public static final int header_mine_info_edit=0x7f030026;
- public static final int header_news=0x7f030027;
- public static final int header_order=0x7f030028;
- public static final int header_order_info=0x7f030029;
- public static final int header_shop=0x7f03002a;
- public static final int header_shop_all=0x7f03002b;
- public static final int header_soft=0x7f03002c;
- public static final int layout_reservation=0x7f03002d;
- public static final int mine_list_item=0x7f03002e;
- public static final int mine_soft_list_item=0x7f03002f;
- public static final int news_list_item=0x7f030030;
- public static final int order_info_list_item=0x7f030031;
- public static final int popmenu=0x7f030032;
- public static final int scom_list_item=0x7f030033;
- public static final int shop_all_list_item=0x7f030034;
- public static final int shop_grid_item=0x7f030035;
- public static final int tab_widget_item=0x7f030036;
- public static final int viewpager_menu=0x7f030037;
- public static final int viewpager_shopinfo=0x7f030038;
- }
- public static final class menu {
- public static final int main=0x7f080000;
- public static final int popup=0x7f080001;
- }
- public static final class string {
- public static final int action_settings=0x7f060001;
- public static final int app_name=0x7f060000;
- public static final int hello_world=0x7f060002;
- }
- public static final class style {
- /**
- Base application theme for API 11+. This theme completely replaces
- AppBaseTheme from res/values/styles.xml on API 11+ devices.
-
- API 11 theme customizations can go here.
-
- Base application theme for API 14+. This theme completely replaces
- AppBaseTheme from BOTH res/values/styles.xml and
- res/values-v11/styles.xml on API 14+ devices.
-
- API 14 theme customizations can go here.
- */
- public static final int AppBaseTheme=0x7f070000;
- public static final int AppNoTitleBarTheme=0x7f070003;
- public static final int AppTheme=0x7f070001;
- /** 自定义对话框的样式
- */
- public static final int MyDialog=0x7f070004;
- public static final int NoTitleBarTheme=0x7f070002;
- /** 自定义RatingBar样式
- */
- public static final int custom_ratingbar_style=0x7f070005;
- }
-}
diff --git a/代码/Shop 1.2最终修改版/ic_launcher-web.png b/代码/Shop 1.2最终修改版/ic_launcher-web.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/ic_launcher-web.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/libs/android-support-v4.jar b/代码/Shop 1.2最终修改版/libs/android-support-v4.jar
deleted file mode 100644
index 9056828..0000000
Binary files a/代码/Shop 1.2最终修改版/libs/android-support-v4.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/libs/bmobPush_0.1beta.jar b/代码/Shop 1.2最终修改版/libs/bmobPush_0.1beta.jar
deleted file mode 100644
index 1d64f33..0000000
Binary files a/代码/Shop 1.2最终修改版/libs/bmobPush_0.1beta.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/libs/bmob_v3.1.0beta.jar b/代码/Shop 1.2最终修改版/libs/bmob_v3.1.0beta.jar
deleted file mode 100644
index 1882b21..0000000
Binary files a/代码/Shop 1.2最终修改版/libs/bmob_v3.1.0beta.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/libs/mta-sdk-1.6.2.jar b/代码/Shop 1.2最终修改版/libs/mta-sdk-1.6.2.jar
deleted file mode 100644
index 49b7787..0000000
Binary files a/代码/Shop 1.2最终修改版/libs/mta-sdk-1.6.2.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/libs/open_sdk_r5756.jar b/代码/Shop 1.2最终修改版/libs/open_sdk_r5756.jar
deleted file mode 100644
index 72daab6..0000000
Binary files a/代码/Shop 1.2最终修改版/libs/open_sdk_r5756.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/lint.xml b/代码/Shop 1.2最终修改版/lint.xml
deleted file mode 100644
index 9d72abb..0000000
--- a/代码/Shop 1.2最终修改版/lint.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/proguard-project.txt b/代码/Shop 1.2最终修改版/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/代码/Shop 1.2最终修改版/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/代码/Shop 1.2最终修改版/project.properties b/代码/Shop 1.2最终修改版/project.properties
deleted file mode 100644
index ef6ccd3..0000000
--- a/代码/Shop 1.2最终修改版/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-proguard.config=proguard.cfg
diff --git a/代码/Shop 1.2最终修改版/res/anim/cycle_7.xml b/代码/Shop 1.2最终修改版/res/anim/cycle_7.xml
deleted file mode 100644
index 57932a8..0000000
--- a/代码/Shop 1.2最终修改版/res/anim/cycle_7.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/代码/Shop 1.2最终修改版/res/anim/scale.xml b/代码/Shop 1.2最终修改版/res/anim/scale.xml
deleted file mode 100644
index 77cdc91..0000000
--- a/代码/Shop 1.2最终修改版/res/anim/scale.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/anim/shake.xml b/代码/Shop 1.2最终修改版/res/anim/shake.xml
deleted file mode 100644
index 4352ab2..0000000
--- a/代码/Shop 1.2最终修改版/res/anim/shake.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/drawable-hdpi/ic_launcher.png b/代码/Shop 1.2最终修改版/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable-mdpi/ic_launcher.png b/代码/Shop 1.2最终修改版/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable-xhdpi/ic_launcher.png b/代码/Shop 1.2最终修改版/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable-xxhdpi/ic_launcher.png b/代码/Shop 1.2最终修改版/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_focused_holo.9.png b/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index 140ebfd..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_holo.9.png b/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_holo.9.png
deleted file mode 100644
index a94f098..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_pressed_holo.9.png b/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 25ec789..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_unselected_pressed_holo.9.png b/代码/Shop 1.2最终修改版/res/drawable/abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 3e7f9e4..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/bg1.jpg b/代码/Shop 1.2最终修改版/res/drawable/bg1.jpg
deleted file mode 100644
index cbb06e0..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/bg1.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/bg3.jpg b/代码/Shop 1.2最终修改版/res/drawable/bg3.jpg
deleted file mode 100644
index 69333a7..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/bg3.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/btn_green_normal.png b/代码/Shop 1.2最终修改版/res/drawable/btn_green_normal.png
deleted file mode 100644
index 3297518..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/btn_green_normal.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/btn_green_pressed.png b/代码/Shop 1.2最终修改版/res/drawable/btn_green_pressed.png
deleted file mode 100644
index a2c1e43..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/btn_green_pressed.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/checkbox_bg1.xml b/代码/Shop 1.2最终修改版/res/drawable/checkbox_bg1.xml
deleted file mode 100644
index 24e98f1..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/checkbox_bg1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected.png b/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected.png
deleted file mode 100644
index 54b74dc..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected_press.png b/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected_press.png
deleted file mode 100644
index 6d5756a..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/checkbox_selected_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect.png b/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect.png
deleted file mode 100644
index 9185ada..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect_press.png b/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect_press.png
deleted file mode 100644
index 0bf72e9..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/checkbox_unselect_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/custom_ratingbar.xml b/代码/Shop 1.2最终修改版/res/drawable/custom_ratingbar.xml
deleted file mode 100644
index ab2cf58..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/custom_ratingbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_1.png b/代码/Shop 1.2最终修改版/res/drawable/ic_1.png
deleted file mode 100644
index 9ccc4da..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_2.png b/代码/Shop 1.2最终修改版/res/drawable/ic_2.png
deleted file mode 100644
index bc9f9ff..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_3.png b/代码/Shop 1.2最终修改版/res/drawable/ic_3.png
deleted file mode 100644
index 1192560..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_41.png b/代码/Shop 1.2最终修改版/res/drawable/ic_41.png
deleted file mode 100644
index 2809275..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_41.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_42.png b/代码/Shop 1.2最终修改版/res/drawable/ic_42.png
deleted file mode 100644
index c4c3fe5..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_42.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_5.png b/代码/Shop 1.2最终修改版/res/drawable/ic_5.png
deleted file mode 100644
index 32e9ab3..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_5.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_6.png b/代码/Shop 1.2最终修改版/res/drawable/ic_6.png
deleted file mode 100644
index 4172b94..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_6.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_7.png b/代码/Shop 1.2最终修改版/res/drawable/ic_7.png
deleted file mode 100644
index ccfabb4..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_7.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_8.png b/代码/Shop 1.2最终修改版/res/drawable/ic_8.png
deleted file mode 100644
index 609d322..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_8.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_app.png b/代码/Shop 1.2最终修改版/res/drawable/ic_app.png
deleted file mode 100644
index cb4a403..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_app.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_app1.png b/代码/Shop 1.2最终修改版/res/drawable/ic_app1.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_app1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner1.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner1.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_hide.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_hide.png
deleted file mode 100644
index cb4a403..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default1.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default1.png
deleted file mode 100644
index 5f4b680..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default11.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default11.png
deleted file mode 100644
index 48b457e..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default11.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default2.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default2.png
deleted file mode 100644
index 51cdab6..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default22.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default22.png
deleted file mode 100644
index 90c6304..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default22.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default3.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default3.png
deleted file mode 100644
index 9c265c7..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default4.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default4.png
deleted file mode 100644
index a2a3229..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default4.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default55.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default55.png
deleted file mode 100644
index 4ce9b4f..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default55.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default77.png b/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default77.png
deleted file mode 100644
index 49bda9c..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_banner_image_default77.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_breakfast.png b/代码/Shop 1.2最终修改版/res/drawable/ic_breakfast.png
deleted file mode 100644
index 82a0eae..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_breakfast.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_car.png b/代码/Shop 1.2最终修改版/res/drawable/ic_car.png
deleted file mode 100644
index f6e6b53..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_car.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_date.png b/代码/Shop 1.2最终修改版/res/drawable/ic_date.png
deleted file mode 100644
index 1ce7f73..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_date.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_hbut.png b/代码/Shop 1.2最终修改版/res/drawable/ic_hbut.png
deleted file mode 100644
index dfc211b..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_hbut.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_hide.png b/代码/Shop 1.2最终修改版/res/drawable/ic_hide.png
deleted file mode 100644
index f6b6fb9..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_loc.png b/代码/Shop 1.2最终修改版/res/drawable/ic_loc.png
deleted file mode 100644
index 080c76a..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_loc.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_copy_holo_light.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_copy_holo_light.png
deleted file mode 100644
index 0dd8865..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_copy_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_find_holo_light.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_find_holo_light.png
deleted file mode 100644
index efee6df..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_find_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_info_details.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_info_details.png
deleted file mode 100644
index 6a7a1e9..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_info_details.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_myplaces.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_myplaces.png
deleted file mode 100644
index ade7532..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_myplaces.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_notifications.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_notifications.png
deleted file mode 100644
index ded4323..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_notifications.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_share.png b/代码/Shop 1.2最终修改版/res/drawable/ic_menu_share.png
deleted file mode 100644
index 2837615..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_menu_share.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_mine.png b/代码/Shop 1.2最终修改版/res/drawable/ic_mine.png
deleted file mode 100644
index 08e701b..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_mine.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator.png b/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator.png
deleted file mode 100644
index 6204a24..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator_focused.png b/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator_focused.png
deleted file mode 100644
index f75c2e1..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_page_indicator_focused.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_phone.png b/代码/Shop 1.2最终修改版/res/drawable/ic_phone.png
deleted file mode 100644
index 91d3d2b..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_phone.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_phone2.png b/代码/Shop 1.2最终修改版/res/drawable/ic_phone2.png
deleted file mode 100644
index 19c6769..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_phone2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_phone3.png b/代码/Shop 1.2最终修改版/res/drawable/ic_phone3.png
deleted file mode 100644
index c3c55dc..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_phone3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_sale.png b/代码/Shop 1.2最终修改版/res/drawable/ic_sale.png
deleted file mode 100644
index 1c4518e..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_sale.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_search.png b/代码/Shop 1.2最终修改版/res/drawable/ic_search.png
deleted file mode 100644
index 9f6df03..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_search.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_shelf_category_divider.png b/代码/Shop 1.2最终修改版/res/drawable/ic_shelf_category_divider.png
deleted file mode 100644
index 836688a..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_shelf_category_divider.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_shop.png b/代码/Shop 1.2最终修改版/res/drawable/ic_shop.png
deleted file mode 100644
index 129e2c2..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_shop.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg.jpg b/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg.jpg
deleted file mode 100644
index 2d84e7c..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg2.jpg b/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg2.jpg
deleted file mode 100644
index 566f0e1..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg2.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg22.jpg b/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg22.jpg
deleted file mode 100644
index 9ec3fd3..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_shop_info_bg22.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_star_no.png b/代码/Shop 1.2最终修改版/res/drawable/ic_star_no.png
deleted file mode 100644
index 303c979..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_star_no.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/ic_star_yes.png b/代码/Shop 1.2最终修改版/res/drawable/ic_star_yes.png
deleted file mode 100644
index add85d5..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/ic_star_yes.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/login_button.png b/代码/Shop 1.2最终修改版/res/drawable/login_button.png
deleted file mode 100644
index 756a4ce..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/login_button.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/login_button_select.png b/代码/Shop 1.2最终修改版/res/drawable/login_button_select.png
deleted file mode 100644
index 5e946a4..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/login_button_select.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/qq.png b/代码/Shop 1.2最终修改版/res/drawable/qq.png
deleted file mode 100644
index c65c220..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/qq.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shap_circle.xml b/代码/Shop 1.2最终修改版/res/drawable/shap_circle.xml
deleted file mode 100644
index 5da73a6..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shap_circle.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shap_divider.xml b/代码/Shop 1.2最终修改版/res/drawable/shap_divider.xml
deleted file mode 100644
index 01c2205..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shap_divider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_color_frame.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_color_frame.xml
deleted file mode 100644
index 43ddd6e..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_color_frame.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_grid_item.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_grid_item.xml
deleted file mode 100644
index 2f9482e..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_grid_item.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_left_radius_color_square.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_left_radius_color_square.xml
deleted file mode 100644
index 7c6d37b..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_left_radius_color_square.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_radius.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_radius.xml
deleted file mode 100644
index ac0596b..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_radius.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_radius_color_square.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_radius_color_square.xml
deleted file mode 100644
index 6693a5e..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_radius_color_square.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/shape_radius_square.xml b/代码/Shop 1.2最终修改版/res/drawable/shape_radius_square.xml
deleted file mode 100644
index 041ac07..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/shape_radius_square.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/splash.png b/代码/Shop 1.2最终修改版/res/drawable/splash.png
deleted file mode 100644
index e9755b2..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/splash.png and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/star_img1.jpg b/代码/Shop 1.2最终修改版/res/drawable/star_img1.jpg
deleted file mode 100644
index e0692fb..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/star_img1.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/star_img2.jpg b/代码/Shop 1.2最终修改版/res/drawable/star_img2.jpg
deleted file mode 100644
index 391c24d..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/star_img2.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/star_img3.jpg b/代码/Shop 1.2最终修改版/res/drawable/star_img3.jpg
deleted file mode 100644
index db58906..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/star_img3.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/star_img4.jpg b/代码/Shop 1.2最终修改版/res/drawable/star_img4.jpg
deleted file mode 100644
index eb52ecd..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/star_img4.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/star_img5.jpg b/代码/Shop 1.2最终修改版/res/drawable/star_img5.jpg
deleted file mode 100644
index 8b48b57..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/star_img5.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/drawable/tab_bg_selector.xml b/代码/Shop 1.2最终修改版/res/drawable/tab_bg_selector.xml
deleted file mode 100644
index 8efcdbf..0000000
--- a/代码/Shop 1.2最终修改版/res/drawable/tab_bg_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/drawable/welcome_background.jpg b/代码/Shop 1.2最终修改版/res/drawable/welcome_background.jpg
deleted file mode 100644
index e9755b2..0000000
Binary files a/代码/Shop 1.2最终修改版/res/drawable/welcome_background.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_about.xml b/代码/Shop 1.2最终修改版/res/layout/activity_about.xml
deleted file mode 100644
index 43e2ee5..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_about.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_award.xml b/代码/Shop 1.2最终修改版/res/layout/activity_award.xml
deleted file mode 100644
index d7c8743..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_award.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_base.xml b/代码/Shop 1.2最终修改版/res/layout/activity_base.xml
deleted file mode 100644
index 3fe3662..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_base.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_bxt.xml b/代码/Shop 1.2最终修改版/res/layout/activity_bxt.xml
deleted file mode 100644
index dc32da0..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_bxt.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_bxt_news.xml b/代码/Shop 1.2最终修改版/res/layout/activity_bxt_news.xml
deleted file mode 100644
index 56290df..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_bxt_news.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_car.xml b/代码/Shop 1.2最终修改版/res/layout/activity_car.xml
deleted file mode 100644
index 9ec7023..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_car.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_classroom.xml b/代码/Shop 1.2最终修改版/res/layout/activity_classroom.xml
deleted file mode 100644
index c6c244d..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_classroom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_feedback.xml b/代码/Shop 1.2最终修改版/res/layout/activity_feedback.xml
deleted file mode 100644
index cb08bab..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_feedback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_home.xml b/代码/Shop 1.2最终修改版/res/layout/activity_home.xml
deleted file mode 100644
index 87b9ba7..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_home.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_login.xml b/代码/Shop 1.2最终修改版/res/layout/activity_login.xml
deleted file mode 100644
index 89eac74..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_login.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_mine.xml b/代码/Shop 1.2最终修改版/res/layout/activity_mine.xml
deleted file mode 100644
index a1ac1d6..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_mine.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_mine_info.xml b/代码/Shop 1.2最终修改版/res/layout/activity_mine_info.xml
deleted file mode 100644
index 7a44f76..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_mine_info.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_mine_info_edit.xml b/代码/Shop 1.2最终修改版/res/layout/activity_mine_info_edit.xml
deleted file mode 100644
index e7fa0b8..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_mine_info_edit.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_mine_old.xml b/代码/Shop 1.2最终修改版/res/layout/activity_mine_old.xml
deleted file mode 100644
index a4d3ca6..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_mine_old.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_news.xml b/代码/Shop 1.2最终修改版/res/layout/activity_news.xml
deleted file mode 100644
index ae1fd9c..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_news.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_order.xml b/代码/Shop 1.2最终修改版/res/layout/activity_order.xml
deleted file mode 100644
index 458b689..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_order.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_order_info.xml b/代码/Shop 1.2最终修改版/res/layout/activity_order_info.xml
deleted file mode 100644
index 2617a2e..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_order_info.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_reg.xml b/代码/Shop 1.2最终修改版/res/layout/activity_reg.xml
deleted file mode 100644
index 3654ab2..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_reg.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_shop.xml b/代码/Shop 1.2最终修改版/res/layout/activity_shop.xml
deleted file mode 100644
index 05efaf5..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_shop.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_shop_all.xml b/代码/Shop 1.2最终修改版/res/layout/activity_shop_all.xml
deleted file mode 100644
index 363ab03..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_shop_all.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_shop_item.xml b/代码/Shop 1.2最终修改版/res/layout/activity_shop_item.xml
deleted file mode 100644
index aca5ee3..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_shop_item.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_soft.xml b/代码/Shop 1.2最终修改版/res/layout/activity_soft.xml
deleted file mode 100644
index 292f1f1..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_soft.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_splash.xml b/代码/Shop 1.2最终修改版/res/layout/activity_splash.xml
deleted file mode 100644
index b675293..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_splash.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_test.xml b/代码/Shop 1.2最终修改版/res/layout/activity_test.xml
deleted file mode 100644
index d7e28cf..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_test.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/activity_userinfo.xml b/代码/Shop 1.2最终修改版/res/layout/activity_userinfo.xml
deleted file mode 100644
index 0ae99aa..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/activity_userinfo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/bxt_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/bxt_list_item.xml
deleted file mode 100644
index d361af5..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/bxt_list_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/commit.xml b/代码/Shop 1.2最终修改版/res/layout/commit.xml
deleted file mode 100644
index 5367094..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/commit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/common_datetime.xml b/代码/Shop 1.2最终修改版/res/layout/common_datetime.xml
deleted file mode 100644
index 07c3415..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/common_datetime.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/dlg_order_settime.xml b/代码/Shop 1.2最终修改版/res/layout/dlg_order_settime.xml
deleted file mode 100644
index 974cfd6..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/dlg_order_settime.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/goods_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/goods_list_item.xml
deleted file mode 100644
index 5a0fb97..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/goods_list_item.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/gv_item_classroom.xml b/代码/Shop 1.2最终修改版/res/layout/gv_item_classroom.xml
deleted file mode 100644
index 4c8cc0e..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/gv_item_classroom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_award.xml b/代码/Shop 1.2最终修改版/res/layout/header_award.xml
deleted file mode 100644
index 370dcf8..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_award.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_bxt.xml b/代码/Shop 1.2最终修改版/res/layout/header_bxt.xml
deleted file mode 100644
index e679c11..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_bxt.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_bxt_news.xml b/代码/Shop 1.2最终修改版/res/layout/header_bxt_news.xml
deleted file mode 100644
index 72032ab..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_bxt_news.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_feedback.xml b/代码/Shop 1.2最终修改版/res/layout/header_feedback.xml
deleted file mode 100644
index 3b9ac1d..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_feedback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_home.xml b/代码/Shop 1.2最终修改版/res/layout/header_home.xml
deleted file mode 100644
index 10e970c..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_home.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_mine.xml b/代码/Shop 1.2最终修改版/res/layout/header_mine.xml
deleted file mode 100644
index 05ee9e5..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_mine.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_mine_info.xml b/代码/Shop 1.2最终修改版/res/layout/header_mine_info.xml
deleted file mode 100644
index 818280d..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_mine_info.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_mine_info_edit.xml b/代码/Shop 1.2最终修改版/res/layout/header_mine_info_edit.xml
deleted file mode 100644
index a48689f..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_mine_info_edit.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_news.xml b/代码/Shop 1.2最终修改版/res/layout/header_news.xml
deleted file mode 100644
index 9372403..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_news.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_order.xml b/代码/Shop 1.2最终修改版/res/layout/header_order.xml
deleted file mode 100644
index 3a1becb..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_order.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_order_info.xml b/代码/Shop 1.2最终修改版/res/layout/header_order_info.xml
deleted file mode 100644
index 664a304..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_order_info.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_shop.xml b/代码/Shop 1.2最终修改版/res/layout/header_shop.xml
deleted file mode 100644
index 7f67816..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_shop.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_shop_all.xml b/代码/Shop 1.2最终修改版/res/layout/header_shop_all.xml
deleted file mode 100644
index a893d03..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_shop_all.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/header_soft.xml b/代码/Shop 1.2最终修改版/res/layout/header_soft.xml
deleted file mode 100644
index a7530c7..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/header_soft.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/layout_reservation.xml b/代码/Shop 1.2最终修改版/res/layout/layout_reservation.xml
deleted file mode 100644
index 30ebbd0..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/layout_reservation.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/mine_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/mine_list_item.xml
deleted file mode 100644
index b98c2d4..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/mine_list_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/mine_soft_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/mine_soft_list_item.xml
deleted file mode 100644
index b403c2a..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/mine_soft_list_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/news_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/news_list_item.xml
deleted file mode 100644
index 169372f..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/news_list_item.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/order_info_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/order_info_list_item.xml
deleted file mode 100644
index e46624a..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/order_info_list_item.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/popmenu.xml b/代码/Shop 1.2最终修改版/res/layout/popmenu.xml
deleted file mode 100644
index 435138e..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/popmenu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/scom_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/scom_list_item.xml
deleted file mode 100644
index 5367094..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/scom_list_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/shop_all_list_item.xml b/代码/Shop 1.2最终修改版/res/layout/shop_all_list_item.xml
deleted file mode 100644
index aa1c0c1..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/shop_all_list_item.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/shop_grid_item.xml b/代码/Shop 1.2最终修改版/res/layout/shop_grid_item.xml
deleted file mode 100644
index 97252d3..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/shop_grid_item.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/tab_widget_item.xml b/代码/Shop 1.2最终修改版/res/layout/tab_widget_item.xml
deleted file mode 100644
index 6c54957..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/tab_widget_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/layout/viewpager_menu.xml b/代码/Shop 1.2最终修改版/res/layout/viewpager_menu.xml
deleted file mode 100644
index c9e0fe8..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/viewpager_menu.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/layout/viewpager_shopinfo.xml b/代码/Shop 1.2最终修改版/res/layout/viewpager_shopinfo.xml
deleted file mode 100644
index 5696e20..0000000
--- a/代码/Shop 1.2最终修改版/res/layout/viewpager_shopinfo.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/res/menu/main.xml b/代码/Shop 1.2最终修改版/res/menu/main.xml
deleted file mode 100644
index c002028..0000000
--- a/代码/Shop 1.2最终修改版/res/menu/main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/代码/Shop 1.2最终修改版/res/menu/popup.xml b/代码/Shop 1.2最终修改版/res/menu/popup.xml
deleted file mode 100644
index c75aecd..0000000
--- a/代码/Shop 1.2最终修改版/res/menu/popup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values-sw600dp/dimens.xml b/代码/Shop 1.2最终修改版/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 44f01db..0000000
--- a/代码/Shop 1.2最终修改版/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values-sw720dp-land/dimens.xml b/代码/Shop 1.2最终修改版/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 61e3fa8..0000000
--- a/代码/Shop 1.2最终修改版/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 128dp
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values-v11/styles.xml b/代码/Shop 1.2最终修改版/res/values-v11/styles.xml
deleted file mode 100644
index 3c02242..0000000
--- a/代码/Shop 1.2最终修改版/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values-v14/styles.xml b/代码/Shop 1.2最终修改版/res/values-v14/styles.xml
deleted file mode 100644
index a91fd03..0000000
--- a/代码/Shop 1.2最终修改版/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values/dimens.xml b/代码/Shop 1.2最终修改版/res/values/dimens.xml
deleted file mode 100644
index 55c1e59..0000000
--- a/代码/Shop 1.2最终修改版/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- 16dp
- 16dp
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values/strings.xml b/代码/Shop 1.2最终修改版/res/values/strings.xml
deleted file mode 100644
index ebd7dfb..0000000
--- a/代码/Shop 1.2最终修改版/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 在这里
- Settings
- Hello world!
-
-
-
diff --git a/代码/Shop 1.2最终修改版/res/values/styles.xml b/代码/Shop 1.2最终修改版/res/values/styles.xml
deleted file mode 100644
index 5a0bc8b..0000000
--- a/代码/Shop 1.2最终修改版/res/values/styles.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/date/MessageDef.java b/代码/Shop 1.2最终修改版/src/com/stone/date/MessageDef.java
deleted file mode 100644
index 1128511..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/date/MessageDef.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.date;
-
-
-public class MessageDef {
-
- //查询用户订单成功完成
- public static final int MINE_FINISH_LOAD_DATA = 401;
-
- //查询用户成功完成
- public static final int MINE_INFO_FINISH_FIND_USER = 402;
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/date/TypeDef.java b/代码/Shop 1.2最终修改版/src/com/stone/date/TypeDef.java
deleted file mode 100644
index 8770ae5..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/date/TypeDef.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stone.date;
-
-/**
- * 类型分类汇总
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class TypeDef {
-
- //父分类
- public static final String[] typeDadList = { "学习", "点餐", "校园服务", "娱乐" };
-
- //子分类--学习小菜
- public static final String[] typeSonList1 = { "教室", "图书馆" };
-
- //子分类--吃饭小菜
- public static final String[] typeSonList2 = { "一食堂", "二食堂" };
-
- //子分类--购物小菜
- public static final String[] typeSonList3 = {"博学堂", "打印", "理发", "宾馆", "自行车", "生日蛋糕", "宿舍超市"};
-
- //子分类--疯狂小菜
- public static final String[] typeSonList4 = { "兼职", "景点门票", "租车", "旅游",
- "聚餐", "宾馆", "KTV" };
-
- public static final String[] chDayOfWeek = {"天","一","二","三","四","五","六"};
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTListAdapter.java
deleted file mode 100644
index df02860..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTListAdapter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
-import com.stone.shop.model.Good;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座列表适配器
- *
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTListAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public BXTListAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- Log.i("BXTNewsAdapter", "Adapter刷新数据");
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- BXTNewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.bxt_list_item, null);
- newsHolder = new BXTNewsHolder();
- newsHolder.tvBXTNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_bxt_news_item_title);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (BXTNewsHolder) convertView.getTag();
- }
- newsHolder.tvBXTNewsTitle.setText(mNewsList.get(position).getTitle());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTNewsHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTNewsHolder.java
deleted file mode 100644
index 976395b..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/BXTNewsHolder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class BXTNewsHolder {
-
- public TextView tvBXTNewsTitle; //博学堂讲座标题
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ClassroomAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ClassroomAdapter.java
deleted file mode 100644
index 7deb441..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ClassroomAdapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Classroom;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ClassroomAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public ClassroomAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder viewHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.gv_item_classroom, null);
- viewHolder = new ViewHolder();
- viewHolder.tv_chooseText = (TextView) convertView.findViewById(R.id.tv_chooseText);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- viewHolder.tv_chooseText.setText(mNewsList.get(position).getName());
- return convertView;
- }
-
- class ViewHolder {
-
- public TextView tv_chooseText; // 博学堂讲座标题
-
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsHolder.java
deleted file mode 100644
index 0a4e852..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsHolder.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * 商品视图
- * @date 2014-4-26
- * @author Stone
- */
-public class GoodsHolder {
-
- public TextView tvName; //商品名称
- public TextView tvPrice; //商品单价
- public TextView btnBuyGood; //购买按钮
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsListAdapter.java
deleted file mode 100644
index 0befe9a..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GoodsListAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-
-public class GoodsListAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mGoodsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public GoodsListAdapter(Context context, List goodsList) {
- mContext = context;
- mGoodsList = goodsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mGoodsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mGoodsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mGoodsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- GoodsHolder goodHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.goods_list_item, null);
- goodHolder = new GoodsHolder();
- goodHolder.tvName = (TextView) convertView
- .findViewById(R.id.tv_good_name);
- goodHolder.tvPrice = (TextView) convertView
- .findViewById(R.id.tv_good_price);
- goodHolder.btnBuyGood = (TextView) convertView
- .findViewById(R.id.btn_buy_good);
- convertView.setTag(goodHolder);
- } else {
- goodHolder = (GoodsHolder) convertView.getTag();
- }
- goodHolder.tvName.setText(mGoodsList.get(position).getName());
- goodHolder.tvPrice.setText("¥"+mGoodsList.get(position).getPrice());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GridAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GridAdapter.java
deleted file mode 100644
index 9cc78c8..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/GridAdapter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.R.integer;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-
-/**
- * 生活-- 网格布局(ImageView+TextView)适配器
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class GridAdapter extends BaseAdapter {
-
- private Context mContext;
- private int mIndex = 0; // 代表当前需要适配页面中第几个GridView
-
- //学习小菜
- public static String[] mSchoolTexts = TypeDef.typeSonList1;
- private int[] mSchoolImages = { R.drawable.ic_8, R.drawable.ic_8 };
-
- //吃饭小菜
- public static String[] mFoodTexts = TypeDef.typeSonList2;
- private int[] mFoodImages = { R.drawable.ic_41, R.drawable.ic_42};
-
- //购物小菜
- public static String[] mGiftTexts = TypeDef.typeSonList3;
- private int[] mGiftImages = { R.drawable.ic_7, R.drawable.ic_7,
- R.drawable.ic_7, R.drawable.ic_7, R.drawable.ic_7,
- R.drawable.ic_7, R.drawable.ic_7};
-
- //疯狂小菜
- public static String[] mOutTexts = TypeDef.typeSonList4;
- private int[] mOutImages = { R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3 };
-
- public GridAdapter(Context context, int index) {
- mContext = context;
- mIndex = index;
- }
-
- @Override
- public int getCount() {
- int count = 0;
- switch (mIndex) {
- case 0:
- count = mFoodImages.length;
- break;
- case 1:
- count = mGiftImages.length;
- break;
- case 2:
- count = mOutImages.length;
- break;
- case 3:
- count = mSchoolImages.length;
- break;
- default:
- break;
- }
- return count;
- }
-
- @Override
- public Object getItem(int position) {
- return null;
- }
-
- @Override
- public long getItemId(int position) {
- return 0;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- View view = View.inflate(mContext, R.layout.shop_grid_item, null);
- // RelativeLayout rl = (RelativeLayout)
- // view.findViewById(R.id.relaGrid);
-
- ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage);
- TextView text = (TextView) view.findViewById(R.id.tv_chooseText);
- switch (mIndex) {
- case 0:
- image.setImageResource(mFoodImages[position]);
- text.setText(mFoodTexts[position]);
- break;
- case 1:
- image.setImageResource(mGiftImages[position]);
- text.setText(mGiftTexts[position]);
- break;
- case 2:
- image.setImageResource(mOutImages[position]);
- text.setText(mOutTexts[position]);
- break;
- case 3:
- image.setImageResource(mSchoolImages[position]);
- text.setText(mSchoolTexts[position]);
- break;
- default:
- break;
- }
-
- return view;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ImagePagerAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ImagePagerAdapter.java
deleted file mode 100644
index c73ef5a..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ImagePagerAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-
-/**
- * 首页--图片轮播AutoScrollViewPager适配器
- * @author Stone
- */
-public class ImagePagerAdapter extends PagerAdapter {
-
- private List mImgViews;
-
- public ImagePagerAdapter(Context context, List imgViews) {
- this.mImgViews = imgViews;
- }
-
- @Override
- public int getCount() {
- if(mImgViews != null){
- return mImgViews.size();
- }
- return 0;
- }
-
- @Override
- public Object instantiateItem(View arg0, int arg1) {
- ((ViewPager) arg0).addView(mImgViews.get(arg1));
- return mImgViews.get(arg1);
- }
-
- @Override
- public void destroyItem(View arg0, int arg1, Object arg2) {
- ((ViewPager) arg0).removeView(mImgViews.get(arg1));
- }
-
- @Override
- public boolean isViewFromObject(View arg0, Object arg1) {
- return arg0 == arg1;
- }
-
- @Override
- public void restoreState(Parcelable arg0, ClassLoader arg1) {
-
- }
-
- @Override
- public Parcelable saveState() {
- return null;
- }
-
- @Override
- public void startUpdate(View arg0) {
-
- }
-
- @Override
- public void finishUpdate(View arg0) {
-
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListAdapter.java
deleted file mode 100644
index 29a2f69..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListAdapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineListAdapter extends BaseAdapter {
-
- private Context mContext;
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private int[] mItemImgIds; // 项目列表Icon
- private LayoutInflater mInflater = null;
-
- public MineListAdapter(Context context, String[] names, String[] contents, int[] imgIds) {
- mContext = context;
- mItemNames = names;
- mItemContents = contents;
- mItemImgIds = imgIds;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_list_item, null);
- holder = new MineListHolder();
- holder.imgItem = (ImageView) convertView.findViewById(R.id.img_item);
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.imgItem.setBackgroundResource(mItemImgIds[position]);
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListHolder.java
deleted file mode 100644
index eb315fe..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineListHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class MineListHolder {
-
- public ImageView imgItem; //项目Icon
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftAdapter.java
deleted file mode 100644
index 9dae107..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftAdapter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineSoftAdapter extends BaseAdapter {
-
- private Context mContext;
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private LayoutInflater mInflater = null;
-
- public MineSoftAdapter(Context context, String[] names, String[] contents) {
- mContext = context;
- mItemNames = names;
- mItemContents = contents;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_soft_list_item, null);
- holder = new MineListHolder();
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftHolder.java
deleted file mode 100644
index d3ed1ac..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/MineSoftHolder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class MineSoftHolder {
-
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsHolder.java
deleted file mode 100644
index b49850d..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsHolder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class NewsHolder {
-
- public TextView tvNewsType; //新闻分类
- public TextView tvNewsTitle; //新闻标题
- public TextView tvNewsDate; //新闻时间
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsListAdapter.java
deleted file mode 100644
index 92264ca..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/NewsListAdapter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.News;
-
-import android.R.integer;
-import android.content.Context;
-import android.graphics.pdf.PdfDocument.Page;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 新闻列表适配器
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class NewsListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mNewsList = null; // 所选分类下的所有店铺列表
-
- public NewsListAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(ArrayList list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- NewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.news_list_item, null);
- newsHolder = new NewsHolder();
- newsHolder.tvNewsType = (TextView) convertView
- .findViewById(R.id.tv_news_type);
- newsHolder.tvNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_news_title);
- newsHolder.tvNewsDate = (TextView) convertView
- .findViewById(R.id.tv_news_date);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (NewsHolder) convertView.getTag();
- }
- //拆分字符串,只取年月日
- String[] ss = new String[2];
- ss = mNewsList.get(position).getCreatedAt().split(" ");
- newsHolder.tvNewsType.setText(mNewsList.get(position).getType()); //新闻类型
- newsHolder.tvNewsTitle.setText(mNewsList.get(position).getTitle()); //新闻标题
- newsHolder.tvNewsDate.setText(ss[0]); //新闻发布日期
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoHolder.java
deleted file mode 100644
index 7b94ec6..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class OrderInfoHolder {
-
- public TextView tvOrderInfoGoodName;
- public TextView tvOrderInfoShopName;
- public TextView tvOrderInfoPrice;
- public TextView tvOrderInfoState;
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoListAdapter.java
deleted file mode 100644
index 35c9294..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/OrderInfoListAdapter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.GetListener;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Order;
-import com.stone.shop.model.Shop;
-import com.stone.shop.view.OrderInfoActivity;
-
-/**
- * 适配器--适配订单列表中的数据
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mOrderList = null; // 所选分类下的所有店铺列表
- private String mType; // 商店的分类
-
- public OrderInfoListAdapter(Context context, List orderList) {
- mContext = context;
- mOrderList = orderList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mOrderList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mOrderList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- public void refresh(List list) {
- mOrderList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- OrderInfoHolder orderInfoHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.order_info_list_item, null);
- orderInfoHolder = new OrderInfoHolder();
- orderInfoHolder.tvOrderInfoGoodName = (TextView) convertView
- .findViewById(R.id.tv_order_info_good_name);
- orderInfoHolder.tvOrderInfoShopName = (TextView) convertView
- .findViewById(R.id.tv_order_info_shop_name);
- orderInfoHolder.tvOrderInfoPrice = (TextView) convertView
- .findViewById(R.id.tv_order_info_price);
- orderInfoHolder.tvOrderInfoState = (TextView) convertView
- .findViewById(R.id.tv_order_info_state);
- convertView.setTag(orderInfoHolder);
- } else {
- orderInfoHolder = (OrderInfoHolder) convertView.getTag();
- }
- orderInfoHolder.tvOrderInfoGoodName.setText(mOrderList.get(position).getGoodName());
- orderInfoHolder.tvOrderInfoShopName.setText(mOrderList.get(position).getShopName());
- orderInfoHolder.tvOrderInfoPrice.setText("¥" + mOrderList.get(position).getPrice());
- orderInfoHolder.tvOrderInfoState.setText(mOrderList.get(position).getState());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SComHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SComHolder.java
deleted file mode 100644
index 5bf60e8..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SComHolder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class SComHolder {
-
- public TextView tvComUser;
- public TextView tvComContent;
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SCommentAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SCommentAdapter.java
deleted file mode 100644
index 98cf470..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/SCommentAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.SComment;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 店铺评论列表适配器
- * @date 2014-5-3
- * @author Stone
- */
-public class SCommentAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mSComList = null; // 所选分类下的所有店铺列表
-
- public SCommentAdapter(Context context, List list) {
- mContext = context;
- mSComList = list;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mSComList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mSComList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- SComHolder scomHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.scom_list_item, null);
- scomHolder = new SComHolder();
- scomHolder.tvComUser = (TextView) convertView
- .findViewById(R.id.tv_commit_user);
- scomHolder.tvComContent = (TextView) convertView
- .findViewById(R.id.tv_commit_content);
- convertView.setTag(scomHolder);
- } else {
- scomHolder = (SComHolder) convertView.getTag();
- }
- scomHolder.tvComUser.setText(mSComList.get(position).getUserName());
- scomHolder.tvComContent.setText(mSComList.get(position).getContent());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopHolder.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopHolder.java
deleted file mode 100644
index f0c3de3..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopHolder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-/**
- * 商店视图
- * @date 2014-4-29
- * @author Stone
- */
-public class ShopHolder {
-
- public TextView tvShopName;
- public TextView tvShopType;
- public TextView tvShopLoc;
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopListAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopListAdapter.java
deleted file mode 100644
index 539a17f..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ShopListAdapter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.model.Shop;
-
-/**
- * 适配器--适配某一分类下的店铺列表数据
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class ShopListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private ArrayList mShopList = null; // 所选分类下的所有店铺列表
- private String mType; // 商店的分类
-
- public ShopListAdapter(Context context, ArrayList shopList,
- String type) {
- mContext = context;
- mShopList = shopList;
- mType = type;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mShopList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mShopList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(ArrayList list) {
- mShopList = list;
- //将数字的类型编号转换为文字
- exchangeType(mType);
- notifyDataSetChanged();
- }
-
- /**
- * 根据当前的type类型, 转换成相应的文字
- * @date 2014-4-29
- * @param typeString
- */
- private void exchangeType(String typeString) {
-
- int type = Integer.parseInt(typeString);
- int fatherType = type / 10; //父类型编号
- int sonType = type % 10; //子类型编号
-
- Iterator iterator = mShopList.iterator();
- while (iterator.hasNext()) {
- switch (fatherType) {
- case 1:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList1[sonType-1]);
- break;
- case 2:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList2[sonType-1]);
- break;
- case 3:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList3[sonType-1]);
- break;
- case 4:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList4[sonType-1]);
- break;
- default:
- break;
- }
-
- }
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ShopHolder shopHodler;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.shop_all_list_item, null);
- shopHodler = new ShopHolder();
- shopHodler.tvShopName = (TextView) convertView
- .findViewById(R.id.tv_shop_name);
- shopHodler.tvShopType = (TextView) convertView
- .findViewById(R.id.tv_shop_type);
- shopHodler.tvShopLoc = (TextView) convertView
- .findViewById(R.id.tv_shop_loc);
- convertView.setTag(shopHodler);
- } else {
- shopHodler = (ShopHolder) convertView.getTag();
- }
- shopHodler.tvShopName.setText(mShopList.get(position).getName());
- // 商店的类型需要单独处理
- shopHodler.tvShopType.setText(mShopList.get(position).getType());
- shopHodler.tvShopLoc.setText("二食堂");
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ViewPagerAdapter.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ViewPagerAdapter.java
deleted file mode 100644
index 38dedc2..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/adapter/ViewPagerAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.view.ShopItemActivity;
-import com.stone.ui.ViewPagerCompat;
-
-import android.support.v4.view.PagerAdapter;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-
-/**
- * 商铺详情页--ViewPagerCompat适配器
- * @author Stone
- */
-public class ViewPagerAdapter extends PagerAdapter {
-
- private List mListViews;
- private List mTitleList;
-
- public ViewPagerAdapter(List mListViews, List mTitleList) {
- this.mListViews = mListViews;
- this.mTitleList = mTitleList;
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- container.removeView(mListViews.get(position));//删除页卡
- }
-
- @Override
- public CharSequence getPageTitle(int position) {
-
- return mTitleList.get(position);//直接用适配器来完成标题的显示,所以从上面可以看到,我们没有使用PagerTitleStrip。当然你可以使用。
- }
-
-
- @Override
- public Object instantiateItem(ViewGroup container, int position) { //这个方法用来实例化页卡
- container.addView(mListViews.get(position), 0);//添加页卡
- return mListViews.get(position);
- }
-
- @Override
- public int getCount() {
- return mListViews.size();//返回页卡的数量
- }
-
- @Override
- public boolean isViewFromObject(View arg0, Object arg1) {
- return arg0==arg1;//官方提示这样写
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/BXTNews.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/BXTNews.java
deleted file mode 100644
index fb8f926..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/BXTNews.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Classroom.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Classroom.java
deleted file mode 100644
index 85c64eb..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Classroom.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Classroom extends BmobObject {
-
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "ClassRoom [name=" + name + "]";
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/FeedBack.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/FeedBack.java
deleted file mode 100644
index 9461f41..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/FeedBack.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 用户反馈信息
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBack extends BmobObject {
-
- private String username;
- private String phone;
- private String email;
- private String content;
-
- public String getUsername() {
- return username;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Good.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Good.java
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Good.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/LuckyUser.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/LuckyUser.java
deleted file mode 100644
index 4600723..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/LuckyUser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 中奖用户
- * @date 2014-5-28
- * @author Stone
- */
-public class LuckyUser extends BmobObject {
-
- private String username;
- private String award;
-
- public String getUsername() {
- return username;
- }
- public String getAward() {
- return award;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public void setAward(String award) {
- this.award = award;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/News.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/News.java
deleted file mode 100644
index b169779..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/News.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Order.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Order.java
deleted file mode 100644
index 4879ef3..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Order.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 订单实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Order extends BmobObject {
-
- private String userName;
- private String goodID; // 商品ID
- private String goodName;
- private String shopID; // 商店ID
- private String shopName;
- private String count; // 数量
- private String price; // 价格
- private String time; // 取餐时间
- private String phone; // 联系电话
- private String state = "未取餐"; // 订单状态(已取, 未取)
- private String tips; // 附加信息
-
- public String getGoodID() {
- return goodID;
- }
- public String getGoodName() {
- return goodName;
- }
- public String getUserName() {
- return userName;
- }
- public String getShopID() {
- return shopID;
- }
- public String getShopName() {
- return shopName;
- }
- public String getCount() {
- return count;
- }
- public String getPrice() {
- return price;
- }
- public String getTime() {
- return time;
- }
- public String getPhone() {
- return phone;
- }
- public String getState() {
- return state;
- }
- public String getTips() {
- return tips;
- }
- public void setGoodID(String goodID) {
- this.goodID = goodID;
- }
- public void setGoodName(String goodName) {
- this.goodName = goodName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
- public void setCount(String count) {
- this.count = count;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setPrice(String price) {
- this.price = price;
- }
- public void setPhone(String phone) {
- this.phone = phone;
- }
- public void setState(String state) {
- this.state = state;
- }
- public void setTips(String tips) {
- this.tips = tips;
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Reservation.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Reservation.java
deleted file mode 100644
index d1fafaa..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Reservation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Reservation extends BmobObject {
-
- private String roomId;
- private String roomName;
- private String userId;
- private String dateTime;
-
- public String getRoomId() {
- return roomId;
- }
-
- public void setRoomId(String roomId) {
- this.roomId = roomId;
- }
-
- public String getRoomName() {
- return roomName;
- }
-
- public void setRoomName(String roomName) {
- this.roomName = roomName;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getDateTime() {
- return dateTime;
- }
-
- public void setDateTime(String dateTime) {
- this.dateTime = dateTime;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/SComment.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/SComment.java
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/SComment.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Shop.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Shop.java
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/Shop.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/User.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/model/User.java
deleted file mode 100644
index 33baeff..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/model/User.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AboutActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AboutActivity.java
deleted file mode 100644
index 1e5944c..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AboutActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * 关于软件
- * @author Stone
- */
-public class AboutActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_about);
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AwardActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AwardActivity.java
deleted file mode 100644
index 54cd361..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/AwardActivity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.LuckyUser;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 每日一抽页面
- * @date 2014-5-18
- * @author Stone
- */
-public class AwardActivity extends Activity {
-
- private EditText etAwardNew;
- private EditText etAwardOld;
-
- private String awardNew;
- private String awardOld;
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 0:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_award);
-
- initData();
- }
-
- private void initView() {
- etAwardNew = (EditText) findViewById(R.id.et_award_new);
- etAwardOld = (EditText) findViewById(R.id.et_award_old);
-
- etAwardNew.setText(awardNew);
- etAwardOld.setText(awardOld);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.order("-updateAt");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List list) {
- awardNew = list.get(0).getUsername()+" " +list.get(0).getAward();
- awardOld = list.get(1).getUsername()+" " +list.get(1).getAward();
- Message msg = new Message();
- msg.what = 0;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取中奖名单失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTActivity.java
deleted file mode 100644
index b2fcb93..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTActivity.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.BXTListAdapter;
-import com.stone.shop.model.BXTNews;
-import com.stone.shop.model.Classroom;
-import com.stone.shop.model.BXTNews;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.renderscript.Element;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-/**
- * 教学类-博学堂界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "BXTActivity";
-
- private ListView lvBXTNews;
- private BXTListAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (ListView) findViewById(R.id.lv_bxt_news);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new BXTListAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- //toast("查询商品成功, 共" + newsList.size());
- if(newsList.size()==0)
- toast("亲, 暂时还木有讲座哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toBXTNewsActivity = new Intent(BXTActivity.this, BXTNewsActivity.class);
- toBXTNewsActivity.putExtra("title", mBXTNewsList.get(position).getTitle());
- toBXTNewsActivity.putExtra("topic", mBXTNewsList.get(position).getTopic());
- toBXTNewsActivity.putExtra("speaker", mBXTNewsList.get(position).getSpeaker());
- toBXTNewsActivity.putExtra("time", mBXTNewsList.get(position).getTime());
- toBXTNewsActivity.putExtra("location", mBXTNewsList.get(position).getLocation());
- toBXTNewsActivity.putExtra("holder1", mBXTNewsList.get(position).getHolder1());
- toBXTNewsActivity.putExtra("holder2", mBXTNewsList.get(position).getHolder2());
- toBXTNewsActivity.putExtra("points", mBXTNewsList.get(position).getPoints());
- toBXTNewsActivity.putExtra("speakerinfo", mBXTNewsList.get(position).getSpeakerinfo());
- startActivity(toBXTNewsActivity);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTNewsActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTNewsActivity.java
deleted file mode 100644
index a39c090..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BXTNewsActivity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座详情界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNewsActivity extends Activity {
-
- private static final String TAG = "BXTNewsActivity";
-
- private BXTNews news;
- private TextView tvBXTNewsTitle;
- private TextView tvBXTNewsTopic;
- private TextView tvBXTNewsSpeaker;
- private TextView tvBXTNewsTime;
- private TextView tvBXTNewsLoc;
- private TextView tvBXTNewsHolder1;
- private TextView tvBXTNewsHolder2;
- private TextView tvBXTNewsPoints;
- private TextView tvBXTNewsSpeakerInfo;
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt_news);
-
- initView();
- }
-
- private void initView() {
-
- tvBXTNewsTitle = (TextView) findViewById(R.id.tv_bxt_news_title);
- tvBXTNewsTopic = (TextView) findViewById(R.id.tv_bxt_news_topic);
- tvBXTNewsSpeaker = (TextView) findViewById(R.id.tv_bxt_news_speaker);
- tvBXTNewsTime = (TextView) findViewById(R.id.tv_bxt_news_time);
- tvBXTNewsLoc = (TextView) findViewById(R.id.tv_bxt_news_loc);
- tvBXTNewsHolder1 = (TextView) findViewById(R.id.tv_bxt_news_holder1);
- tvBXTNewsHolder2 = (TextView) findViewById(R.id.tv_bxt_news_holder2);
- tvBXTNewsPoints = (TextView) findViewById(R.id.tv_bxt_news_point);
- tvBXTNewsSpeakerInfo = (TextView) findViewById(R.id.tv_bxt_news_speaker_info);
-
- tvBXTNewsTitle.setText(getIntent().getStringExtra("title"));
- tvBXTNewsTopic.setText(getIntent().getStringExtra("topic"));
- tvBXTNewsSpeaker.setText(getIntent().getStringExtra("speaker"));
- tvBXTNewsTime.setText(getIntent().getStringExtra("time"));
- tvBXTNewsLoc.setText(getIntent().getStringExtra("location"));
- tvBXTNewsHolder1.setText(getIntent().getStringExtra("holder1"));
- tvBXTNewsHolder2.setText(getIntent().getStringExtra("holder2"));
- tvBXTNewsPoints.setText(getIntent().getStringExtra("points"));
- tvBXTNewsSpeakerInfo.setText(getIntent().getStringExtra("speakerinfo"));
-
- }
-
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BaseActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BaseActivity.java
deleted file mode 100644
index c5e45b2..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/BaseActivity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stone.shop.view;
-
-import cn.bmob.v3.Bmob;
-
-import com.stone.shop.R;
-import com.stone.shop.view.old.OldMineActivity;
-
-import android.os.Bundle;
-import android.app.TabActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Space;
-import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 应用主界面
- * @date 2014-4-24
- * @author Stone
- */
-@SuppressWarnings("deprecation")
-public class BaseActivity extends TabActivity {
-
- private static final String TAG = "BaseActivity";
-
- private TabHost tabHost;
- private LayoutInflater layoutInflater;
-
-
- String[] mTitle = new String[] { "周边", "每日一抽", "我的"};
- int[] mIcon = new int[] { R.drawable.ic_shop, R.drawable.ic_sale,
- R.drawable.ic_car, R.drawable.ic_mine };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_base);
-
- initTabView();
-
-
- }
-
- public View getTabItemView(int i) {
- // TODO Auto-generated method stub
- View view = layoutInflater.inflate(R.layout.tab_widget_item, null);
- ImageView imageView = (ImageView) view.findViewById(R.id.imageview);
- imageView.setImageResource(mIcon[i]);
- TextView textView = (TextView) view.findViewById(R.id.textview);
- textView.setText(mTitle[i]);
- return view;
- }
-
- public void initTabView() {
-
- /**
- * tabHost.newTabSpec("artist")创建一个标签项,其中artist为它的标签标识符,相当于jsp页面标签的name属性
- * setIndicator("艺术标签",resources.getDrawable(R.drawable.ic_tab))设置标签显示文本以及标签上的图标(该图标并不是一个图片,而是一个xml文件哦)
- * setContent(intent)为当前标签指定一个意图
- * tabHost.addTab(spec); 将标签项添加到标签中
- */
-
- tabHost = getTabHost();
- layoutInflater = LayoutInflater.from(this);
- TabHost.TabSpec spec;
-
- Intent intent1 = new Intent(this, ShopActivity.class);
- spec = tabHost.newTabSpec(mTitle[0]).setIndicator( getTabItemView(0) ).setContent(intent1);
- tabHost.addTab(spec);
-
- Intent intent2 = new Intent(this, AwardActivity.class);
- spec = tabHost.newTabSpec(mTitle[1]).setIndicator( getTabItemView(1) ).setContent(intent2);
- tabHost.addTab(spec);
-
- Intent intent3 = new Intent(this, MineActivity.class);
- spec = tabHost.newTabSpec(mTitle[2]).setIndicator( getTabItemView(2) ).setContent(intent3);
- tabHost.addTab(spec);
-
- /*
- Intent intent3 = new Intent(this, WsqActivity.class);
- spec = tabHost.newTabSpec(mTitle[2]).setIndicator( getTabItemView(2) ).setContent(intent3);
- tabHost.addTab(spec);
-
- Intent intent4 = new Intent(this, OldMineActivity.class);
- spec = tabHost.newTabSpec(mTitle[3]).setIndicator( getTabItemView(3) ).setContent(intent4);
- tabHost.addTab(spec); */
-
- tabHost.setCurrentTab(0);
- }
-
- @Override
- public void onBackPressed() {
- Toast.makeText(this, "确定要退出在这里么?", Toast.LENGTH_LONG).show();
- //super.onBackPressed();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ClassroomActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ClassroomActivity.java
deleted file mode 100644
index 7707d63..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ClassroomActivity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.BXTListAdapter;
-import com.stone.shop.adapter.ClassroomAdapter;
-import com.stone.shop.model.Classroom;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class ClassroomActivity extends Activity implements OnItemClickListener {
-
- private static final String TAG = "BXTActivity";
-
- private GridView lvBXTNews;
- private ClassroomAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_classroom);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (GridView) findViewById(R.id.gv_classroom);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new ClassroomAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室");
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- // toast("查询商品成功, 共" + newsList.size());
- if (newsList.size() == 0)
- toast("亲, 暂时还木有教室哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- Intent intent = new Intent(ClassroomActivity.this, ReservationActivity.class);
- Classroom classroom = mBXTNewsList.get(position);
- intent.putExtra("roomId", classroom.getObjectId());
- intent.putExtra("roomName", classroom.getName());
- startActivity(intent);
-
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/FeedBackActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/FeedBackActivity.java
deleted file mode 100644
index ac8cc27..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/FeedBackActivity.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.stone.shop.view;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.FeedBack;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-/**
- * 意见反馈界面
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBackActivity extends Activity implements OnClickListener{
-
- private static final String TAG = "FeedBackActivity";
-
- private EditText etContent;
- private Button btnSubmit;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_feedback);
-
- initView();
- }
-
- private void initView() {
- etContent = (EditText) findViewById(R.id.et_feedback_content);
- btnSubmit = (Button) findViewById(R.id.btn_feedback_submit);
- btnSubmit.setOnClickListener(this);
- }
-
- /**
- * 提交用户的反馈信息
- */
- private void submit() {
- String content = etContent.getText().toString();
- if(content.equals("")) {
- toast("亲,请先写点东西吧");
- } else {
- BmobUser user = BmobUser.getCurrentUser(this);
- FeedBack fb = new FeedBack();
- fb.setUsername(user.getUsername());
- fb.setEmail(user.getEmail());
- fb.setContent(content);
- fb.insertObject(this, new InsertListener() {
-
- @Override
- public void onSuccess() {
- toast("提交成功, 在这里会尽快回复");
- back();
- }
-
- @Override
- public void onFailure(String arg0) {
- toast("提交失败");
- }
- });
-
- }
-
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_feedback_submit:
- submit();
- break;
-
- default:
- break;
- }
- }
-
- private void back() {
- finish();
- }
-
- public void clickFeedBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/HomeActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/HomeActivity.java
deleted file mode 100644
index ef4e9c5..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/HomeActivity.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.opengl.Visibility;
-import android.os.Bundle;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ImageView.ScaleType;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import cn.bmob.v3.Bmob;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.GetServerTimeListener;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.ImagePagerAdapter;
-import com.stone.shop.adapter.NewsListAdapter;
-import com.stone.shop.model.News;
-import com.stone.shop.model.Shop;
-import com.stone.ui.AutoScrollViewPager;
-import com.stone.ui.ListScrollView;
-
-/**
- * 主界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class HomeActivity extends Activity implements OnClickListener,
- OnItemClickListener {
-
- private static final String TAG = "HomeActivity";
-
- private ListScrollView listScrollView;
-
- // 校历
- private TextView tvWeek; // 周次和星期
- private TextView tvDay; // 年月日
-
- // 图片轮播
- private FrameLayout flImageAds;
- private AutoScrollViewPager viewPager;
- private List mImgViews;
- private ImageButton btnHideAds;
- private int[] mImgResId = { R.drawable.ic_banner1, R.drawable.ic_banner1,
- R.drawable.ic_banner1, R.drawable.ic_banner1 };
-
- // 校园新闻
- private ListView lvNewsList;
- private List newsList = new ArrayList();
- private NewsListAdapter newsListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_home);
-
- // 解决ScrollView和ListView之间的冲突
- listScrollView = (ListScrollView) findViewById(R.id.listScrollView);
- lvNewsList = (ListView) findViewById(R.id.lv_news);
- listScrollView.setListView(lvNewsList);
-
- flImageAds = (FrameLayout) findViewById(R.id.fl_image_ads);
- viewPager = (AutoScrollViewPager) findViewById(R.id.view_pager);
- btnHideAds = (ImageButton) findViewById(R.id.btn_hide_ads);
-
- mImgViews = new ArrayList();
- for (int i = 0; i < mImgResId.length; i++) {
- ImageView imageView = new ImageView(this);
- imageView.setImageResource(mImgResId[i]);
- imageView.setScaleType(ScaleType.CENTER_CROP);
- mImgViews.add(imageView);
- }
-
- btnHideAds.setOnClickListener(this);
-
- viewPager.setAdapter(new ImagePagerAdapter(this, mImgViews));
- viewPager.setInterval(3000); // 设置自动滚动的间隔时间,单位为毫秒
- viewPager.setDirection(AutoScrollViewPager.RIGHT); // 设置自动滚动的方向,默认向右
- viewPager.setCycle(true); // 是否自动循环轮播,默认为true
- viewPager.setScrollDurationFactor(3); // 设置ViewPager滑动动画间隔时间的倍率,达到减慢动画或改变动画速度的效果
- viewPager.setStopScrollWhenTouch(true); // 当手指碰到ViewPager时是否停止自动滚动,默认为true
- viewPager.setBorderAnimation(true); // 设置循环滚动时滑动到从边缘滚动到下一个是否需要动画,默认为true
- viewPager
- .setSlideBorderMode(AutoScrollViewPager.SLIDE_BORDER_MODE_NONE);// 滑动到第一个或最后一个Item的处理方式,支持没有任何操作、轮播以及传递到父View三种模式
-
- viewPager.startAutoScroll();
-
- // 校历
- tvWeek = (TextView) findViewById(R.id.tv_week);
- tvDay = (TextView) findViewById(R.id.tv_day);
- setTime();
-
- // 新闻
- newsListAdapter = new NewsListAdapter(this, newsList);
- lvNewsList.setAdapter(newsListAdapter);
- lvNewsList.setOnItemClickListener(this);
-
- getNewsData();
- }
-
- /**
- * 设置校历中日期的时间
- */
- public void setTime() {
- Calendar calendar = Calendar.getInstance();
- String year = calendar.get(Calendar.YEAR)+"";
- String month = calendar.get(Calendar.MONTH)+1+"";
- String day = calendar.get(Calendar.DAY_OF_MONTH)+"";
- String week = calendar.get(Calendar.WEEK_OF_YEAR)-9+"";
- String dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK)+"";
- String chDayOfWeek = TypeDef.chDayOfWeek[Integer.parseInt(dayOfWeek)-1];
- toast(year+"-"+month+"-"+day+" "+" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvWeek.setText(" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvDay.setText(year+" 年 "+month+" 月 "+day+" 日");
- }
-
- /**
- * 初始化新闻列表数据
- * @date 2014-5-3
- * @author Stone
- */
- public void getNewsData() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- newsList = object;
- // 通知Adapter数据更新
- newsListAdapter.refresh((ArrayList) newsList);
- newsListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("对不起, 获取数据失败了");
- }
- });
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- // start auto scroll when onResume
- viewPager.startAutoScroll();
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_hide_ads:
- flImageAds.setVisibility(View.GONE);
- break;
-
- default:
- break;
- }
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toNewsDetail = new Intent(HomeActivity.this, NewsActivity.class);
- toNewsDetail.putExtra("NewsTitle", newsList.get(position).getTitle());
- toNewsDetail.putExtra("NewsAuthor", newsList.get(position).getAuthor());
- toNewsDetail.putExtra("NewsTime", newsList.get(position).getCreatedAt());
- toNewsDetail.putExtra("NewsContent", newsList.get(position).getContent());
- startActivity(toNewsDetail);
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/LoginActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/LoginActivity.java
deleted file mode 100644
index 8d76303..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/LoginActivity.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.stone.shop.view;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.Bmob;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-import com.tencent.connect.UserInfo;
-import com.tencent.connect.auth.QQAuth;
-import com.tencent.connect.common.Constants;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
-import com.tencent.tauth.UiError;
-
-/**
- * 登陆界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class LoginActivity extends Activity implements OnClickListener {
-
- private static final String TAG = "LoginActicity";
-
- private Button btnLogin;
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
-
- private String username;
- private String password;
-
- private static final String APP_ID = "222222";
- private UserInfo mInfo;
- private TextView mUserInfo;
- private ImageView mUserLogo;
- private ImageView mNewLoginButton;
- private TextView backInfo;
-
- // QQ登陆
- private static Tencent mTencent;
- // private QQAuth mQQAuth;
-
- Handler mHandler = new Handler() {
-
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == 0) {
- JSONObject response = (JSONObject) msg.obj;
- if (response.has("nickname")) {
- try {
- mUserInfo.setVisibility(android.view.View.VISIBLE);
- mUserInfo.setText(response.getString("nickname"));
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
-
- } else if (msg.what == 1) {
- Bitmap bitmap = (Bitmap) msg.obj;
- mUserLogo.setImageBitmap(bitmap);
- mUserLogo.setVisibility(android.view.View.VISIBLE);
- }
- }
-
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // 初始化 Bmob SDK
- // 使用时请将第二个参数Application ID替换成你在Bmob服务器端创建的Application ID
- Bmob.initialize(this, "252a2c58d0dc9a78a5411501c62ce0de");
- setContentView(R.layout.activity_login);
-
- // QQ登陆, 获取实例
- // mQQAuth = QQAuth.createInstance(APP_ID,
- // this.getApplicationContext());
- mTencent = Tencent.createInstance(APP_ID, this.getApplicationContext());
-
- btnLogin = (Button) findViewById(R.id.btn_login);
- btnReg = (Button) findViewById(R.id.btn_register);
-
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
-
- btnLogin.setOnClickListener(this);
- btnReg.setOnClickListener(this);
-
- findViewById(R.id.btn_qq).setOnClickListener(this);
-
- mUserInfo = (TextView) findViewById(R.id.user_nickname);
- mUserLogo = (ImageView) findViewById(R.id.user_logo);
- mNewLoginButton = (ImageView) findViewById(R.id.new_login_btn);
- mNewLoginButton.setOnClickListener(this);
- backInfo = (TextView) findViewById(R.id.user_callback);
-
- getUserInfo();
-
- }
-
- private void getUserInfo() {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- etUsername.setText(sp.getString("username", null));
- etPassword.setText(sp.getString("password", null));
- }
-
- // 保存用户的登陆记录
- private void saveUserInfo(String username, String password) {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- Editor editor = sp.edit();
- editor.putString("username", username);
- editor.putString("password", password);
- editor.commit();
- }
-
- public void onClickLogin() {
- if (!mTencent.isSessionValid()) {
- mTencent.login(this, "all", loginListener);
- Log.d("SDKQQAgentPref", "FirstLaunch_SDK:" + SystemClock.elapsedRealtime());
- } else {
-
- mTencent.logout(this);
- updateUserInfo();
- }
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- // 登陆
- case R.id.btn_login:
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
-
- if (!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if (username.equals("") || password.equals("")) {
- toast("请输入账号和密码");
- break;
- } else {
- final User bu2 = new User();
- bu2.setUsername(username);
- bu2.setPassword(password);
- bu2.login(this, new InsertListener() {
- @Override
- public void onSuccess() {
- toast("欢迎进入 在这里 服务系统");
- // 保存用户信息
- saveUserInfo(username, password);
- // 跳转到主页
- User.userId = bu2.getObjectId();
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();
-
- }
-
- @Override
- public void onFailure(String msg) {
- toast("用户名或密码错误");
- }
- });
- }
- break;
-
- case R.id.btn_register:
- Intent toReg = new Intent(LoginActivity.this, RegisterActivity.class);
- startActivity(toReg);
- break;
- case R.id.btn_qq:
-
- onClickLogin();
-
- break;
-
- default:
- break;
-
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- IUiListener loginListener = new BaseUiListener() {
- @Override
- protected void doComplete(JSONObject values) {
- Log.d("SDKQQAgentPref", "AuthorSwitch_SDK:" + SystemClock.elapsedRealtime());
- initOpenidAndToken(values);
- updateUserInfo();
- }
- };
-
- private class BaseUiListener implements IUiListener {
-
- @Override
- public void onComplete(Object response) {
- if (null == response) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
- JSONObject jsonResponse = (JSONObject) response;
- if (null != jsonResponse && jsonResponse.length() == 0) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
-// Util.showResultDialog(LoginActivity.this, response.toString(), "登录成功");
- doComplete((JSONObject) response);
- try {
- User.userId = jsonResponse.getString("openid");
- } catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();
- }
-
- protected void doComplete(JSONObject values) {
-
- }
-
- @Override
- public void onError(UiError e) {
- Util.toastMessage(LoginActivity.this, "onError: " + e.errorDetail);
- Util.dismissDialog();
- }
-
- @Override
- public void onCancel() {
- Util.toastMessage(LoginActivity.this, "onCancel: ");
- Util.dismissDialog();
- }
- }
-
- private void updateUserInfo() {
- if (mTencent != null && mTencent.isSessionValid()) {
- IUiListener listener = new IUiListener() {
-
- @Override
- public void onError(UiError e) {
-
- }
-
- @Override
- public void onComplete(final Object response) {
- Message msg = new Message();
- msg.obj = response;
- msg.what = 0;
- mHandler.sendMessage(msg);
- new Thread() {
-
- @Override
- public void run() {
- JSONObject json = (JSONObject) response;
- if (json.has("figureurl")) {
- Bitmap bitmap = null;
- try {
- bitmap = Util.getbitmap(json.getString("figureurl_qq_2"));
- } catch (JSONException e) {
-
- }
- Message msg = new Message();
- msg.obj = bitmap;
- msg.what = 1;
- mHandler.sendMessage(msg);
- }
- }
-
- }.start();
- }
-
- @Override
- public void onCancel() {
-
- }
- };
- mInfo = new UserInfo(this, mTencent.getQQToken());
- mInfo.getUserInfo(listener);
-
- } else {
- mUserInfo.setText("");
- mUserInfo.setVisibility(android.view.View.GONE);
- mUserLogo.setVisibility(android.view.View.GONE);
- }
- }
-
- public static void initOpenidAndToken(JSONObject jsonObject) {
- try {
- String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN);
- String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN);
- String openId = jsonObject.getString(Constants.PARAM_OPEN_ID);
- if (!TextUtils.isEmpty(token) && !TextUtils.isEmpty(expires) && !TextUtils.isEmpty(openId)) {
- mTencent.setAccessToken(token, expires);
- mTencent.setOpenId(openId);
- }
- } catch (Exception e) {
- }
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- Log.d(TAG, "-->onActivityResult " + requestCode + " resultCode=" + resultCode);
- if (requestCode == Constants.REQUEST_LOGIN ||
- requestCode == Constants.REQUEST_APPBAR) {
- Tencent.onActivityResultData(requestCode,resultCode,data,loginListener);
- }
-
- super.onActivityResult(requestCode, resultCode, data);
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineActivity.java
deleted file mode 100644
index 5e612f4..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineActivity.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.stone.shop.view;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.CountListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 个人中心主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class MineActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "MineActivity" ;
-
- private String[] userItemNames = {"stonekity"} ;
- private String[] userItemContents = {""} ;
- private String[] orderItemNames = {"当前订单", "历史订单"};
- private String[] orderItemContents = {"*", ""};
- private String[] aboutItemNames = {"通知中心", "软件相关", "推荐给朋友", "退出账号"};
- private String[] aboutItemContents = {"", "", "", ""};
-
- private int[] userImgIds = {R.drawable.ic_menu_myplaces};
- private int[] orderImgIds = {R.drawable.ic_menu_find_holo_light, R.drawable.ic_menu_copy_holo_light};
- private int[] aboutImgIds = {R.drawable.ic_menu_notifications, R.drawable.ic_menu_info_details, R.drawable.ic_menu_share, R.drawable.ic_star_yes};
-
- private ListView lvMineUser;
- private ListView lvMineOrder;
- private ListView lvMineAbout;
- private MineListAdapter userListAdapter;
- private MineListAdapter orderListAdapter;
- private MineListAdapter aboutListAdapter;
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_FINISH_LOAD_DATA:
- //toast("Handler 收到数据加载完成的消息");
- orderListAdapter.notifyDataSetChanged();
- break;
- default:
- break;
- }
- }
-};
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine);
-
- initData("已取餐");
- initData("未取餐");
- initView();
- }
-
- private void initView() {
-
- lvMineUser = (ListView) findViewById(R.id.lv_mine_user);
- lvMineOrder = (ListView) findViewById(R.id.lv_mine_order);
- lvMineAbout = (ListView) findViewById(R.id.lv_mine_about);
-
- userListAdapter = new MineListAdapter(this, userItemNames, userItemContents, userImgIds);
- orderListAdapter = new MineListAdapter(this, orderItemNames, orderItemContents, orderImgIds);
- aboutListAdapter = new MineListAdapter(this, aboutItemNames, aboutItemContents, aboutImgIds);
-
- lvMineUser.setAdapter(userListAdapter);
- lvMineOrder.setAdapter(orderListAdapter);
- lvMineAbout.setAdapter(aboutListAdapter);
-
- lvMineUser.setOnItemClickListener(this);
- lvMineOrder.setOnItemClickListener(this);
- lvMineAbout.setOnItemClickListener(this);
-
- }
-
- //初始化列表菜单中数据
- public void initData(final String type) {
- //获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
- userItemNames[0] = user.getUsername();
-
- //获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- query.addWhereEqualTo("state", type);
- query.count(this, Order.class, new CountListener() {
-
- @Override
- public void onSuccess(int count) {
- if(type.equals("未取餐")) {
- orderItemContents[0] ="( " +count+ " )";
- }
- if(type.equals("已取餐")) {
- orderItemContents[1] ="( " +count+ " )";
- }
- Message msg = new Message();
- msg.what = MessageDef.MINE_FINISH_LOAD_DATA;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
-
- //个人资料
- if(parent.getId() == R.id.lv_mine_user) {
- switch (position) {
- case 0: //资料卡
- //toast("点击个人资料");
- Intent toMineInfo = new Intent(MineActivity.this, MineInfoActivity.class);
- startActivity(toMineInfo);
- break;
-
- default:
- break;
- }
- }
-
- //小菜订单
- if(parent.getId() == R.id.lv_mine_order) {
- //toast("点击了订单区域");
- Intent toOrderInfo;
- switch (position) {
- case 0:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "now");
- startActivity(toOrderInfo);
- break;
- case 1:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "old");
- startActivity(toOrderInfo);
- break;
- default:
- break;
- }
- }
-
- //其他
- if(parent.getId() == R.id.lv_mine_about) {
-
- switch (position) {
- case 1: //软件相关
- Intent toMineSoft = new Intent(MineActivity.this, MineSoftActivity.class);
- startActivity(toMineSoft);
- break;
- case 2: //推荐给朋友
- Intent toShare = new Intent(Intent.ACTION_SEND);
- toShare.setType("text/plain");
- toShare.putExtra(Intent.EXTRA_SUBJECT, "分享");
- toShare.putExtra(Intent.EXTRA_TEXT, "校园小菜-HBUT版" +"\n" + "针对湖工大的校园小菜测试版上线了,赶紧下载体验吧"
- + "http://xiaocai.bmob.cn");
- startActivity(Intent.createChooser(toShare, "分享到"));
- break;
- case 3: //退出当期账号
- BmobUser.logOut(this);
- Intent toLogin = new Intent(MineActivity.this, LoginActivity.class);
- startActivity(toLogin);
- finish();
- break;
-
- default:
- //toast("点击了通知区域");
- break;
- }
-
- }
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoActivity.java
deleted file mode 100644
index d5ce189..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoActivity.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 个人资料卡
- * @date 2014-5-21
- * @author Stone
- */
-public class MineInfoActivity extends Activity {
-
- private TextView tvUsername;
- private TextView tvSchool;
- private TextView tvCademy;
- private TextView tvDorPart;
- private TextView tvDorNum;
- private TextView tvPhone;
- private TextView tvQQ;
-
- private User curUser = new User();
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_INFO_FINISH_FIND_USER:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info);
-
- getCurUser();
- }
-
- private void initView() {
- tvUsername = (TextView) findViewById(R.id.tv_mineinfo_username);
- tvSchool = (TextView) findViewById(R.id.tv_mineinfo_school);
- tvCademy = (TextView) findViewById(R.id.tv_mineinfo_cademy);
- tvDorPart = (TextView) findViewById(R.id.tv_mineinfo_dorpart);
- tvDorNum = (TextView) findViewById(R.id.tv_mineinfo_dornum);
- tvPhone = (TextView) findViewById(R.id.tv_mineinfo_phone);
- tvQQ = (TextView) findViewById(R.id.tv_mineinfo_qq);
-
- tvUsername.setText(curUser.getUsername());
- tvSchool.setText(curUser.getSchool());
- tvCademy.setText(curUser.getCademy());
- tvDorPart.setText(curUser.getDorPart());
- tvDorNum.setText(curUser.getDorNum());
- tvPhone.setText(curUser.getPhone());
- tvQQ.setText(curUser.getQQ());
-
- }
-
- private void getCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("亲, 获取当前用户失败");
- }
- });
-
- }
-
- public void clickEdit(View v) {
- Intent toEditMineInfo = new Intent(MineInfoActivity.this, MineInfoEditActivity.class);
-// Bundle bundle = new Bundle();
-// bundle.putString("username", curUser.getUsername());
-// bundle.putString("school", curUser.getSchool());
-// bundle.putString("cademy", curUser.getCademy());
-// bundle.putString("dorpart", curUser.getDorPart());
-// bundle.putString("dornum", curUser.getDorNum());
-// bundle.putString("phone", curUser.getPhone());
-// bundle.putString("qq", curUser.getQQ());
-// toEditMineInfo.putExtras(bundle);
- startActivity(toEditMineInfo);
- }
-
- public void clickBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoEditActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoEditActivity.java
deleted file mode 100644
index 39902ea..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineInfoEditActivity.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.UpdateListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 修改个人资料卡
- * @date 2014-5-28
- * @author Stone
- */
-public class MineInfoEditActivity extends Activity {
-
- private EditText etUsername;
- private EditText etSchool;
- private EditText etCademy;
- private EditText etDorPart;
- private EditText etDorNum;
- private EditText etPhone;
- private EditText etQQ;
-
- private User curUser;
- private Bundle bundle;
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_INFO_FINISH_FIND_USER:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info_edit);
-
- setCurUser();
- }
-
- private void initView() {
- etUsername = (EditText) findViewById(R.id.et_mineinfo_username);
- etSchool = (EditText) findViewById(R.id.et_mineinfo_school);
- etCademy = (EditText) findViewById(R.id.et_mineinfo_cademy);
- etDorPart = (EditText) findViewById(R.id.et_mineinfo_dorpart);
- etDorNum = (EditText) findViewById(R.id.et_mineinfo_dornum);
- etPhone = (EditText) findViewById(R.id.et_mineinfo_phone);
- etQQ = (EditText) findViewById(R.id.et_mineinfo_qq);
-
- etUsername.setText(curUser.getUsername());
- etSchool.setText(curUser.getSchool());
- etCademy.setText(curUser.getCademy());
- etDorPart.setText(curUser.getDorPart());
- etDorNum.setText(curUser.getDorNum());
- etPhone.setText(curUser.getPhone());
- etQQ.setText(curUser.getQQ());
- }
-
- private void setCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- //toast("查询到用户 " + object.size());
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取当前用户失败");
- }
- });
-
- }
-
- private void saveUserInfo() {
- if(curUser == null) {
- toast("curUser为空");
- } else {
- toast("当前用户为 " + curUser.getUsername());
- }
- Log.i("当前用户的ID: ", curUser.getObjectId());
- curUser.setUsername(etUsername.getText().toString());
- curUser.setSchool(etSchool.getText().toString());
- curUser.setCademy(etCademy.getText().toString());
- curUser.setDorPart(etDorPart.getText().toString());
- curUser.setDorNum(etDorNum.getText().toString());
- curUser.setPhone(etPhone.getText().toString());
- curUser.setQQ(etQQ.getText().toString());
- curUser.update(this, curUser.getObjectId(), new UpdateListener() {
-
- @Override
- public void onSuccess() {
- toast("更新成功");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("更新失败");
- }
- });
- }
-
- public void clickSave(View v) {
- saveUserInfo();
- finish();
- }
-
- public void clickCancel(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineSoftActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineSoftActivity.java
deleted file mode 100644
index c1960fd..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/MineSoftActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.adapter.MineSoftAdapter;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 软件相关
- * @date 2014-5-21
- * @author Stone
- */
-public class MineSoftActivity extends Activity implements OnItemClickListener{
-
-
- private String[] softItemNames = {"意见反馈", "检查更新", "使用协议", "关于我们"};
- private String[] softItemContents = {"", "", "", ""};
- private ListView lvMineSoft;
-
- private MineSoftAdapter softListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_soft);
-
- initView();
- }
-
- private void initView() {
- lvMineSoft = (ListView) findViewById(R.id.lv_mine_soft);
- softListAdapter = new MineSoftAdapter(this, softItemNames, softItemContents);
- lvMineSoft.setAdapter(softListAdapter);
- lvMineSoft.setOnItemClickListener(this);
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- switch (position) {
- case 0:
- Intent toFeedBack = new Intent(MineSoftActivity.this, FeedBackActivity.class);
- startActivity(toFeedBack);
- break;
- case 1:
- toast("已经是最新版本");
- break;
- case 2:
- break;
- case 3:
- Intent toAboutSoft = new Intent(MineSoftActivity.this, AboutActivity.class);
- startActivity(toAboutSoft);
- break;
-
- default:
- break;
- }
-
- }
-
- public void clickSoftBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/NewsActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/NewsActivity.java
deleted file mode 100644
index 2014960..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/NewsActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 新闻内容显示界面
- * @date 2014-5-8
- * @author Stone
- */
-public class NewsActivity extends Activity {
-
- private static String TAG = "NewsActivity";
-
- private TextView tvNewsTitle;
- private TextView tvNewsAuthor;
- private TextView tvNewsTime;
- private TextView tvNewsContent;
-
- private String newsTitle;
- private String newsAuthor;
- private String newsTime;
- private String newsContent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_news);
-
- getIntentData();
- initView();
- }
-
- //获取Intent中传入的新闻数据
- private void getIntentData() {
- newsTitle = getIntent().getStringExtra("NewsTitle");
- newsAuthor = getIntent().getStringExtra("NewsAuthor");
- newsTime = getIntent().getStringExtra("NewsTime");
- newsContent = getIntent().getStringExtra("NewsContent");
-
- newsTitle = splitString(newsTitle); //拆分字符串, 将新闻标题设置为 "】" 后面的内容
- }
-
- private String splitString(String str) {
- String[] strs = null;
- if(str.equals("")){
- return "";
- } else if ( !(str.contains("【") || str.contains("】")) ) {
- return str;
- }
- strs = str.split("】");
- return strs[1];
- }
-
- private void initView() {
- tvNewsTitle = (TextView) findViewById(R.id.tv_news_title);
- tvNewsAuthor = (TextView) findViewById(R.id.tv_news_author);
- tvNewsTime = (TextView) findViewById(R.id.tv_news_time);
- tvNewsContent = (TextView) findViewById(R.id.tv_news_content);
-
- tvNewsTitle.setText(newsTitle);
- tvNewsAuthor.setText("作者: "+newsAuthor);
- tvNewsTime.setText("发布日期 : "+newsTime);
- tvNewsContent.setText(newsContent);
- }
-
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderActivity.java
deleted file mode 100644
index 07cde0c..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderActivity.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.Calendar;
-
-import android.app.Activity;
-import android.app.TimePickerDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TimePicker;
-import android.widget.Toast;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Order;
-import com.stone.shop.model.Shop;
-import com.stone.ui.DialogOrder;
-import com.stone.util.Util;
-
-/**
- * 应用主界面
- * @date 2014-5-13
- * @author Stone
- */
-public class OrderActivity extends Activity implements OnClickListener{
-
- private TextView tvOrderShop; // 店名
- private TextView tvOrderGood; // 菜名
- private TextView tvOrderCount; // 数量
- private TextView tvOrderTime; // 取餐时间
- private TimePicker tpOrderTime; // 时间选择控件
- private EditText etOrderPhone; // 联系电话
- private EditText etOrderWords; // 附加留言
- private Button btnOrderCountMore; // 增加数量
- private Button btnOrderCountLess; // 减少数量
-
- private Button btnOrderSetTime; // 设置时间
- private Button btnDlgOk; // 设置时间完成
- private Button btnOrderSubmit; // 提交订单
-
-// private DialogOrder dlgSetOrderTime;
-// private View dlgOrderView;
- private int mHour;
- private int mMinute;
- private String time = "12 : 30";
- private TimePickerDialog dlgSetOrderTime;
- private TimePickerDialog.OnTimeSetListener mTimeSetListener =
- new TimePickerDialog.OnTimeSetListener() {
-
- public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
- mHour = hourOfDay;
- mMinute = minute;
- updateDisplay();
- }
- };
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good good; //当前选择的商品
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order);
-
- shop = (Shop) getIntent().getSerializableExtra("shop");
- good = (Good) getIntent().getSerializableExtra("good");
- shopID = getIntent().getStringExtra("shopID");
-
- initView();
- //initDlgView();
- }
-
- private void initView() {
-
- tvOrderShop = (TextView) findViewById(R.id.tv_order_shop);
- tvOrderGood = (TextView) findViewById(R.id.tv_order_good);
- tvOrderCount = (TextView) findViewById(R.id.tv_order_count);
- tvOrderTime = (TextView) findViewById(R.id.tv_order_time);
- tvOrderShop.setText(shop.getName());
- tvOrderGood.setText(good.getName());
-
-
- etOrderPhone = (EditText) findViewById(R.id.et_order_phone);
- etOrderWords = (EditText) findViewById(R.id.et_order_words);
-
- btnOrderCountMore = (Button) findViewById(R.id.btn_order_count_more);
- btnOrderCountLess = (Button) findViewById(R.id.btn_order_count_less);
- btnOrderSetTime = (Button) findViewById(R.id.btn_set_time);
- btnOrderSubmit = (Button) findViewById(R.id.btn_order_submit);
- btnOrderCountMore.setOnClickListener(this);
- btnOrderCountLess.setOnClickListener(this);
- btnOrderSetTime.setOnClickListener(this);
- btnOrderSubmit.setOnClickListener(this);
-
- }
-
-// private void initDlgView() {
-// LayoutInflater inflater = LayoutInflater.from(this);
-// dlgOrderView = inflater.inflate(R.layout.dlg_order_settime, null);
-// tpOrderTime = (TimePicker) dlgOrderView.findViewById(R.id.tp_dlg_time);
-// tpOrderTime.setIs24HourView(true);
-// btnDlgOk = (Button) dlgOrderView.findViewById(R.id.btn_dlg_ok);
-// btnDlgOk.setOnClickListener(this);
-// }
-
- @Override
- public void onClick(View v) {
- int count = 1;
- switch (v.getId()) {
- case R.id.btn_order_count_more:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 4) {
- toast("每份订单数量不能超过 4");
- } else {
- tvOrderCount.setText( (count+1)+"");
- }
- break;
- case R.id.btn_order_count_less:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 1) {
- toast("每份订单数量至少为 1 ");
- } else {
- tvOrderCount.setText( (count-1)+"");
- }
- break;
- case R.id.btn_set_time:
-// dlgSetOrderTime = new DialogOrder(this, R.style.MyDialog);
-// dlgSetOrderTime.show();
- final Calendar c = Calendar.getInstance();
- mHour = c.get(Calendar.HOUR_OF_DAY);
- mMinute = c.get(Calendar.MINUTE);
- dlgSetOrderTime = new TimePickerDialog(this, mTimeSetListener, mHour, mMinute, true);
- dlgSetOrderTime.show();
- break;
- case R.id.btn_dlg_ok:
- time = tpOrderTime.getCurrentHour()+ " : " + tpOrderTime.getCurrentMinute();
- dlgSetOrderTime.dismiss();
- case R.id.btn_order_submit:
- //toast("小菜订单提交成功");
- postOrder();
- finish();
- //back();
- break;
- default:
- break;
- }
-
- }
-
- /**
- * 提交订单数据
- */
- private void postOrder() {
- String count = tvOrderCount.getText().toString();
- String phone = etOrderPhone.getText().toString();
- String words = etOrderWords.getText().toString();
- float price = Integer.parseInt(count)* Float.parseFloat(good.getPrice());
- if( !Util.isPhoneNumberValid(phone) ) {
- toast("请输入正确的联系电话, 方便取餐");
- } else {
- Order order = new Order();
- BmobUser user = BmobUser.getCurrentUser(this);
- order.setUserName(user.getUsername());
- order.setGoodID(good.getObjectId());
- order.setGoodName(good.getName());
- order.setShopID(shop.getObjectId());
- order.setShopName(shop.getName());
- order.setCount(count);
- order.setTime(time);
- order.setPrice(price+"");
- order.setPhone(phone);
- order.setTips(words);
- order.insertObject(this, new InsertListener() {
-
- @Override
- public void onSuccess() {
- toast("订单提交成功");
- }
-
- @Override
- public void onFailure(String arg0) {
- toast("订单提交失败");
- }
- });
-
- }
- }
-
- private void updateDisplay() {
- time = mHour + " : " + mMinute;
- tvOrderTime.setText(time);
- }
-
- private void back() {
- Intent back = new Intent(OrderActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shop );
- bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null
- back.putExtras(bundle);
- startActivity(back);
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderInfoActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderInfoActivity.java
deleted file mode 100644
index e3c3d26..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/OrderInfoActivity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.OrderInfoListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 订单详情页面
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoActivity extends Activity implements OnItemLongClickListener{
-
- private static final String TAG = "OrderInfoActivity";
-
- private ListView lvOrderInfo;
- private OrderInfoListAdapter orderInfoListAdapter;
- private List orderList = new ArrayList();
-
- private String type = ""; // now-当前订单 old-历史订单
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order_info);
-
- type = getIntent().getStringExtra("type");
-
- initData();
- initView();
- }
-
- private void initView() {
- lvOrderInfo = (ListView) findViewById(R.id.lv_order_info);
- orderInfoListAdapter = new OrderInfoListAdapter(this, orderList);
- lvOrderInfo.setAdapter(orderInfoListAdapter);
- lvOrderInfo.setOnItemLongClickListener(this);
- }
-
- // 初始化列表菜单中数据
- public void initData() {
- // 获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
-
- // 获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- if(type.equals("now")) {
- query.addWhereEqualTo("state", "未取餐");
- } else if(type.equals("old")) {
- query.addWhereEqualTo("state", "已取餐");
- } else {
- // do nothing
- }
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- if (object.size() == 0)
- toast("您还没有订单");
- orderList = object;
- // 通知Adapter数据更新
- orderInfoListAdapter.refresh(orderList);
- orderInfoListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- //订单长按响应事件
- @Override
- public boolean onItemLongClick(AdapterView> parent, View view,
- int position, long id) {
- PopupMenu popup = new PopupMenu(this, lvOrderInfo);
- popup.getMenuInflater().inflate(R.menu.popup, popup.getMenu());
-
- popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Toast.makeText(OrderInfoActivity.this, "Clicked popup menu item " + item.getTitle(),
- Toast.LENGTH_SHORT).show();
- return true;
- }
- });
-
- popup.show();
- return false;
- };
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/RegisterActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/RegisterActivity.java
deleted file mode 100644
index a19d0db..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/RegisterActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-import cn.bmob.v3.listener.InsertListener;
-
-/**
- * 注册界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class RegisterActivity extends Activity implements OnClickListener {
-
- private static final String TAG = "RegisterActivity";
-
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
- private EditText etComfirmPsd;
- private EditText etPhone;
-
- private String username = null;
- private String password = null;
- private String comfirmPsd = null;
- private String phone = null;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_reg);
-
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
- etComfirmPsd = (EditText) findViewById(R.id.et_comfirm_psd);
- etPhone = (EditText) findViewById(R.id.et_phone);
-
- btnReg = (Button) findViewById(R.id.btn_reg_now);
- btnReg.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_reg_now:
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
- comfirmPsd = etComfirmPsd.getText().toString();
- phone = etPhone.getText().toString();
- if(!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if (username.equals("") || password.equals("")
- || comfirmPsd.equals("") || phone.equals("")) {
- toast("不填完整不能拿到身份证, ~~~~(>_<)~~~~ ");
- } else if (!comfirmPsd.equals(password)) {
- toast("两次密码输入不一致");
- } else if(!Util.isPhoneNumberValid(phone)) {
- toast("请输入正确的手机号码");
- }else {
- // 开始提交注册信息
- User bu = new User();
- bu.setUsername(username);
- bu.setPassword(password);
- bu.setPhone(phone);
- bu.signUp(this, new InsertListener() {
- @Override
- public void onSuccess() {
- toast("拿到身份证了,快登陆吧");
- Intent backLogin = new Intent(RegisterActivity.this,
- LoginActivity.class);
- startActivity(backLogin);
- RegisterActivity.this.finish();
- }
-
- @Override
- public void onFailure(String msg) {
- toast("该名字已被人使用,换个名字吧.");
- }
- });
- }
- break;
-
- default:
- break;
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ReservationActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ReservationActivity.java
deleted file mode 100644
index 90bf398..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ReservationActivity.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Reservation;
-import com.stone.shop.model.User;
-import com.stone.ui.DateTimePickDialogUtil;
-import com.stone.ui.DateTimePickDialogUtil.DateTimeListener;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.DeleteListener;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.SaveListener;
-
-public class ReservationActivity extends Activity {
-
- private Button btn_login;
- private SimpleDateFormat dateFormat;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layout_reservation);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室预定");
-
- final String roomId = getIntent().getStringExtra("roomId");
- final String roomName = getIntent().getStringExtra("roomName");
-
- TextView tv_room = (TextView) findViewById(R.id.tv_room);
- tv_room.setText("教室:" + roomName);
-
- btn_login = (Button) findViewById(R.id.btn_login);
-
- dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- // 查找Person表里面id为6b6c11c537的数据
- BmobQuery bmobQuery = new BmobQuery();
- bmobQuery.addWhereEqualTo("userId", User.userId);
- bmobQuery.addWhereEqualTo("roomId", roomId);
- bmobQuery.findObjects(ReservationActivity.this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- // toast("查询商品成功, 共" + newsList.size());
- if (newsList.size() != 0) {
-
- String dateTime = newsList.get(0).getDateTime();
-
- try {
- if (dateFormat.parse(dateTime).before(new Date())) {
-
- Reservation gameScore = new Reservation();
- gameScore.setObjectId(newsList.get(0).getObjectId());
- gameScore.delete(ReservationActivity.this);
-
- } else {
- btn_login.setEnabled(false);
- btn_login.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime)));
- }
- } catch (ParseException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- btn_login.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
-
- DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(ReservationActivity.this,
- dateFormat.format(new Date()));
- dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() {
-
- @Override
- public void onDateTimeChane(final String dateTime) {
- // TODO Auto-generated method stub
-
- Reservation reservation = new Reservation();
- reservation.setRoomId(roomId);
- reservation.setRoomName(roomName);
- reservation.setUserId(User.userId);
- reservation.setDateTime(dateTime);
-
- reservation.save(ReservationActivity.this, new SaveListener() {
-
- @Override
- public void onSuccess() {
- // TODO Auto-generated method stub
- toast("预定成功");
- btn_login.setEnabled(false);
- btn_login.setText("已经预定 " + dateTime);
-
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO Auto-generated method stub
- toast("预定失败");
-
- }
- });
- }
- });
-
- }
- });
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopActivity.java
deleted file mode 100644
index 6270cf9..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopActivity.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GridAdapter;
-import com.stone.ui.MyGridView;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 商品主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class ShopActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "ShopActivity" ;
-
- private MyGridView gvSchoolClass; //学习小菜
- private MyGridView gvFoodClass; //吃饭小菜
- private MyGridView gvGiftClass; //购物小菜
- private MyGridView gvOutClass; //疯狂小菜
-
- //private ImageView imgLoc;
- //private ImageView imgSearch;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop);
-
- initView();
- }
-
- /**
- * 初始化组件并适配数据
- */
- public void initView() {
- gvFoodClass = (MyGridView) findViewById(R.id.gv_food_class);
- gvGiftClass = (MyGridView) findViewById(R.id.gv_gift_class);
- gvOutClass = (MyGridView) findViewById(R.id.gv_out_class);
- gvSchoolClass = (MyGridView) findViewById(R.id.gv_school_class);
-
- gvFoodClass.setAdapter(new GridAdapter(this, 0));
- gvFoodClass.setOnItemClickListener(this);
-
- gvGiftClass.setAdapter(new GridAdapter(this, 1));
- gvGiftClass.setOnItemClickListener(this);
-
- gvOutClass.setAdapter(new GridAdapter(this, 2));
- gvOutClass.setOnItemClickListener(this);
-
- gvSchoolClass.setAdapter(new GridAdapter(this, 3));
- gvSchoolClass.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Log.i("GridView点击了: ", "position"+position);
- //toast("点击了: " + position);
- switch (parent.getId()) {
-
- //点击 学习小菜 中的子项(1代表第一个GridView, (position+1)代表GridView中第几个元素)
- case R.id.gv_school_class:
- //教学类的做特别处理
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, ClassroomActivity.class);
- startActivity(toBXTActivity);
- } else {
- toShopAllActivity( GridAdapter.mSchoolTexts[position], "1"+(position+1) );
- }
-
- break;
- //点击 吃饭小菜 中的子项
- case R.id.gv_food_class:
- toShopAllActivity( GridAdapter.mFoodTexts[position], "2"+(position+1) );
- break;
- //点击 购物小菜 中的子项
- case R.id.gv_gift_class:
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, BXTActivity.class);
- startActivity(toBXTActivity);
- } else {
- toShopAllActivity( GridAdapter.mGiftTexts[position], "3"+(position+1) );
- }
- break;
- //点击 疯狂小菜 中的子项
- case R.id.gv_out_class:
- toShopAllActivity( GridAdapter.mOutTexts[position], "4"+(position+1) );
- break;
- default:
- break;
- }
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
- /**
- *
- * @param title 父分类标题
- * @param type
- */
- private void toShopAllActivity(String title, String type) {
- Intent toShopAll = new Intent(ShopActivity.this, ShopAllActivity.class);
- toShopAll.putExtra("title", title);
- //当前点击的项的父分类
- toShopAll.putExtra("type", type);
- startActivity(toShopAll);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopAllActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopAllActivity.java
deleted file mode 100644
index 9dc775b..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopAllActivity.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.stone.shop.view;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.ShopListAdapter;
-import com.stone.shop.model.Shop;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 某一分类下的所有店铺页面
- * @author Stone
- * @date 2014-4-26
- */
-public class ShopAllActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "ShopAllActivity" ;
-
- private TextView tvTitle;
- private ListView lvShopAllList;
- private ShopListAdapter shopListAdapter;
-
- //记录从ShopActivity中传过来的当前点击项的类型
- private String type;
- private List shopList = new ArrayList();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_all);
-
- //得到从上级Activity中传入的Type数据
- type = getIntent().getStringExtra("type");
-
- //获取商店数据
- getShopsDate();
-
- initView();
-
- }
-
- public void initView() {
- //设置标题
- tvTitle = (TextView) findViewById(R.id.tv_title);
- tvTitle.setText(getIntent().getStringExtra("title"));
-
- lvShopAllList = (ListView) findViewById(R.id.lv_shop_all);
- shopListAdapter = new ShopListAdapter(this, (ArrayList) shopList, type);
- lvShopAllList.setAdapter(shopListAdapter);
- lvShopAllList.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- //toast("点击了: " + position);
- //将当前点击的Shop对象传递给下一个Activity
- Intent toShopItem = new Intent(ShopAllActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shopList.get(position) );
- bundle.putString("shopID", shopList.get(position).getObjectId()); //商铺的ID需要单独传递,否则获取到的是null
- Log.i(TAG, ">>发出>>" + "shopID: "+shopList.get(position).getObjectId()+" shopName: "+shopList.get(position).getName());
- toShopItem.putExtras(bundle);
- startActivity(toShopItem);
- }
-
- /**
- * 加载当前分类的所有店铺到ListView中
- */
- private void getShopsDate() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- Shop shop = new Shop();
- shop.setType(type);
- query.addWhereEqualTo("type", shop.getType()); // 查询当前类型的所有店铺
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- //toast("查询成功. 共计" + object.size());
- if(object.size()==0)
- toast("还没开张, 耐心等待吧");
- shopList = object;
- // 通知Adapter数据更新
- shopListAdapter.refresh((ArrayList) shopList);
- shopListAdapter.notifyDataSetChanged();
-
- }
-
- @Override
- public void onError(int arg0, String msg) {
- toast("查询失败:"+msg);
- }
-
- });
- }
-
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopItemActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopItemActivity.java
deleted file mode 100644
index 2aaa72e..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/ShopItemActivity.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.PagerTitleStrip;
-import android.support.v4.view.ViewPager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobQuery.CachePolicy;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GoodsListAdapter;
-import com.stone.shop.adapter.ViewPagerAdapter;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Shop;
-import com.stone.ui.ViewPagerCompat;
-
-public class ShopItemActivity extends Activity implements OnClickListener, OnItemClickListener{
-
- private static final String TAG = "ShopItemActivity";
-
- // ViewPager页
- 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的标题
-
- // 店铺商品列表
- private ListView lvGoodsList;
- private GoodsListAdapter goodsListAdapter;
- private Button btnBuyGood;
-
- // 店铺简介页中的控件
- private TextView tvShopName; // 店铺名
- private TextView tvShopInfo; // 店铺简介
- private TextView tvShopSale; // 店铺促销信息
- private TextView tvShopLoc; // 店铺地理位置
- private TextView tvShopPhone; // 店铺电话
- private Button btnCommit;
- private EditText etCommit;
- private LinearLayout llCommitParent; // 评论父线性布局
- private LinearLayout llCommitSon; // 评论子线性布局
- private ImageView imgCall; // 拨打电话
-
- // UI测试数据
- private static List goodsList;
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good selectGood;
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_item);
-
- // 获取到从ShopAllActivity中传递过来的Shop对象
- shop = (Shop) getIntent().getSerializableExtra("shop");
- shopID = getIntent().getStringExtra("shopID");
- Log.i(TAG, "<<收到<<" + "shopID: " + shop.getObjectId() + " shopName: "
- + shop.getName());
- Log.i(TAG,
- "<<收到<<" + "shopID: " + shopID + " shopName: " + shop.getName());
-
- // 初始化商品页面以及适配数据
- initGoodsDate();
- initView();
-
-
- }
-
- public void initView() {
-
- viewPager = (ViewPagerCompat) findViewById(R.id.viewpager);
- pagerTabStrip = (PagerTabStrip) findViewById(R.id.pagertab);
- pagerTabStrip.setTabIndicatorColor(Color.argb(255, 255, 127, 39));
- pagerTabStrip.setDrawFullUnderline(false);
- pagerTabStrip.setTextSpacing(50);
- pagerTabStrip.setTextColor(Color.argb(255, 255, 127, 39));
-
- view1 = LayoutInflater.from(this)
- .inflate(R.layout.viewpager_menu, null);
- view2 = LayoutInflater.from(this).inflate(R.layout.viewpager_shopinfo,
- null);
-
- initContentView();
-
- viewList = new ArrayList();// 将要分页显示的View装入数组中
- viewList.add(view1);
- viewList.add(view2);
-
- titleList = new ArrayList();// 每个页面的Title数据
- titleList.add("商品");
- titleList.add("店铺简介");
- shopViewPagerAdapter = new ViewPagerAdapter(viewList, titleList);
-
- viewPager.setAdapter(shopViewPagerAdapter);
- viewPager.setCurrentItem(0);
-
- }
-
- /**
- * 获取某一商店的所有商品
- *
- * @date 2014-5-1
- * @autor Stone
- */
- public void initGoodsDate() {
- goodsList = new ArrayList();
- goodsListAdapter = new GoodsListAdapter(this, goodsList);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("shopID", shopID);
- query.setCachePolicy(CachePolicy.CACHE_ELSE_NETWORK); //
- // 先从缓存取数据,如果没有,再从网络取。
- query.setLimit(15); // 限制最多15个结果
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List goods) {
- // toast("查询商品成功, 共" + goods.size());
- if (goods.size() == 0) {
- toast("该店还没有添加商品");
- }
- goodsList = goods;
- goodsListAdapter.refresh(goodsList);
- goodsListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- public void initContentView() {
- // 商品列表页
- lvGoodsList = (ListView) view1.findViewById(R.id.lv_goods_list);
- lvGoodsList.setAdapter(goodsListAdapter);
- lvGoodsList.setOnItemClickListener(this);
-
- // 店铺简介页
- tvShopName = (TextView) view2.findViewById(R.id.tv_shop_title);
- tvShopInfo = (TextView) view2.findViewById(R.id.tv_shop_introduce);
- tvShopSale = (TextView) view2.findViewById(R.id.tv_shop_promotion);
- tvShopLoc = (TextView) view2.findViewById(R.id.tv_shop_location);
- tvShopPhone = (TextView) view2.findViewById(R.id.tv_shop_phone);
- tvShopName.setText(shop.getName()); // 设置店铺名
- tvShopInfo.setText(shop.getInfo()); // 设置店铺简介
- tvShopSale.setText(shop.getSale()); // 设置店铺公告
- tvShopLoc.setText("位置:" + "二食堂二楼"); // 设置店铺位置
- tvShopPhone.setText("电话:" + shop.getPhone()); // 设置店铺联系电话
-
- btnCommit = (Button) view2.findViewById(R.id.btn_commit);
- btnCommit.setOnClickListener(this);
-
- // 获取到评论的布局
- etCommit = (EditText) view2.findViewById(R.id.et_commit);
- llCommitParent = (LinearLayout) view2
- .findViewById(R.id.ll_commit_parent_view);
- llCommitSon = (LinearLayout) findViewById(R.id.ll_commit_son_view);
-
- imgCall = (ImageView) view2.findViewById(R.id.img_call);
- imgCall.setOnClickListener(this);
-
- }
-
- /**
- * 添加一条评论
- *
- * @param user
- * @param content
- */
- public void insertCommit(String user, String content) {
- View view = LayoutInflater.from(this).inflate(R.layout.commit, null);
- TextView tvUser = (TextView) view.findViewById(R.id.tv_commit_user);
- TextView tvContent = (TextView) view
- .findViewById(R.id.tv_commit_content);
- tvUser.setText(user);
- tvContent.setText(content);
- llCommitParent.addView(view);
- tvUser = null;
- 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) {
- switch (v.getId()) {
- case R.id.btn_commit:
- if (etCommit.getText().toString().equals("")) {
- toast("亲,先写一句吧");
- } else {
- SimpleDateFormat formatter = new SimpleDateFormat(
- "yyyy年MM月dd日 HH:mm:ss ");
- Date curDate = new Date(System.currentTimeMillis());// 获取当前时间
- String time = formatter.format(curDate);
- String content = etCommit.getText().toString() + " [ " + time
- + " ] ";
- insertCommit("admin" + ":", content);
- etCommit.setText("");
- }
- break;
-
- case R.id.img_call:
- toast("店主没有留下电话");
- break;
-
- default:
- break;
- }
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- switch (viewPager.getCurrentItem()) {
- case 0:
- toast("选择的商品名称: " + goodsList.get(position).getName());
- selectGood = goodsList.get(position);
- 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);
- //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;
- default:
- break;
- }
-
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/SplashActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/SplashActivity.java
deleted file mode 100644
index 5292f3d..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/SplashActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationSet;
-import android.view.animation.RotateAnimation;
-import android.view.animation.ScaleAnimation;
-import android.widget.RelativeLayout;
-
-public class SplashActivity extends Activity {
- private RelativeLayout rlSplash;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- initView();
- initAnimation();
- }
-
- private void initView() {
- setContentView(R.layout.activity_splash);
- rlSplash = (RelativeLayout) findViewById(R.id.rl_splash);
- }
-
- private void initAnimation() {
- AnimationSet set = new AnimationSet(false);
- RotateAnimation rtAnimation = new RotateAnimation(0, 360,
- Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF,
- 0.5f);
- rtAnimation.setDuration(2000);
- rtAnimation.setFillAfter(true);
-
- ScaleAnimation scAnimation = new ScaleAnimation(0, 1, 0, 1,
- Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF,
- 0.5f);
- scAnimation.setDuration(2000);
- scAnimation.setFillAfter(true);
-
- AlphaAnimation alAnimation = new AlphaAnimation(0, 1);
- alAnimation.setDuration(2000);
- alAnimation.setFillAfter(true);
-
- set.addAnimation(rtAnimation);
- set.addAnimation(scAnimation);
- set.addAnimation(alAnimation);
-
- set.setAnimationListener(new AnimationListener() {
-
- @Override
- public void onAnimationStart(Animation arg0) {
-
- }
-
- @Override
- public void onAnimationRepeat(Animation arg0) {
-
- }
-
- @Override
- public void onAnimationEnd(Animation arg0) {
- startActivity(new Intent(SplashActivity.this,
- LoginActivity.class));
- finish();
- }
- });
-
- rlSplash.startAnimation(set);
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/UserInfoActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/UserInfoActivity.java
deleted file mode 100644
index 738b792..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/UserInfoActivity.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * @date 2014-5-19
- * @author Stone
- */
-public class UserInfoActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_userinfo);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/WsqActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/WsqActivity.java
deleted file mode 100644
index 0b1947e..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/WsqActivity.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.stone.shop.view;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Toast;
-
-import com.stone.shop.R;
-
-/**
- * 购物车主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class WsqActivity extends Activity {
-
- private static final String TAG = "CarActivity";
-
- private static final String URL_WSQ = "http://wx.wsq.qq.com/231782938";
- private WebView wsqWebView;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_car);
-
- wsqWebView = (WebView) findViewById(R.id.wv_wsq);
-
- // -----------------------------------------------------------------
-
- wsqWebView.getSettings().setJavaScriptEnabled(true); // 设置使用够执行JS脚本
- //wsqWebView.getSettings().setBuiltInZoomControls(true); // 设置使支持缩放
- wsqWebView.getSettings().setDefaultFontSize(12);
- wsqWebView.setWebChromeClient(new WebChromeClient());
- wsqWebView.setWebViewClient(new WebViewClient() {
- @Override
- public boolean shouldOverrideUrlLoading(WebView view,
- String url) {
- view.loadUrl(url);// 使用当前WebView处理跳转
- return true;// true表示此事件在此处被处理,不需要再广播
- }
-
- @Override
- // 转向错误时的处理
- public void onReceivedError(WebView view, int errorCode,
- String description, String failingUrl) {
- Toast.makeText(WsqActivity.this,
- "Oh no! " + description, Toast.LENGTH_SHORT)
- .show();
- }
- });
- wsqWebView.loadUrl(URL_WSQ);
- // ------------------------------------------------
-
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldAboutActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldAboutActivity.java
deleted file mode 100644
index 64cd483..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldAboutActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.stone.shop.view.old;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * 关于软件
- * @author Stone
- */
-public class OldAboutActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_about);
- }
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldMineActivity.java b/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldMineActivity.java
deleted file mode 100644
index a8886c8..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/shop/view/old/OldMineActivity.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.stone.shop.view.old;
-
-import java.util.List;
-
-import javax.security.auth.PrivateCredentialPermission;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.shop.view.AboutActivity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 个人中心主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class OldMineActivity extends Activity implements OnClickListener{
-
- private static final String TAG = "OldMineActivity" ;
-
- private Button btnAbout;
- private Button btnContact;
- private Button btnJoin;
-
- private TextView tvUserName; //当前用户的用户名
- private TextView tvSchool; //学校
- private TextView tvCademy; //学院
- private TextView tvDorPart; //所在区 西区
- private TextView tvDorNum; //宿舍楼号 19栋
-
- private TextView tvMe; //我
- private TextView tvXiaoCai; //小菜
- private TextView tvBowl; //饭碗
- private User user = new User();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_old);
-
- BmobUser user = BmobUser.getCurrentUser(this);
- Log.i(TAG, "BmobUser.userName = " + user.getUsername());
- getCurUser(user.getUsername());
-
- initView();
- }
-
- public void initView() {
-
- tvUserName = (TextView) findViewById(R.id.tv_username);
- tvSchool = (TextView) findViewById(R.id.tv_school);
- tvCademy = (TextView) findViewById(R.id.tv_cademy);
- tvDorPart = (TextView) findViewById(R.id.tv_dorPart);
- tvDorNum = (TextView) findViewById(R.id.tv_dorNum);
-
- btnAbout = (Button) findViewById(R.id.btn_about);
- btnContact = (Button) findViewById(R.id.btn_contact);
- btnJoin = (Button) findViewById(R.id.btn_share);
-
- tvUserName = (TextView) findViewById(R.id.tv_username);
- tvMe = (TextView) findViewById(R.id.tv_me);
- tvXiaoCai = (TextView) findViewById(R.id.tv_xiaocai);
- tvBowl = (TextView) findViewById(R.id.tv_bowl);
-
- btnAbout.setOnClickListener(this);
- btnContact.setOnClickListener(this);
- btnJoin.setOnClickListener(this);
-
- tvMe.setOnClickListener(this);
- tvXiaoCai.setOnClickListener(this);
- tvBowl.setOnClickListener(this);
- }
-
- //获得当前用户User类型
- public void getCurUser(String username) {
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("username", username);
- query.findObjects(this, new FindListener() {
- @Override
- public void onSuccess(List object) {
- if(object.size()==1)
- user = object.get(0);
- else
- user = null;
- loadData();
- //toast("查询到:" + object.size());
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取信息失败");
- }
- });
- }
-
- //加载查询到的用户数据
- public void loadData() {
- //toast("加载数据中...");
- tvUserName.setText(user.getUsername());
- tvSchool.setText(user.getSchool());
- tvCademy.setText(user.getCademy());
- tvDorPart.setText(user.getDorPart());
- tvDorNum.setText(user.getDorNum());
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_share:
- Intent toShare = new Intent(Intent.ACTION_SEND);
- toShare.setType("text/plain");
- toShare.putExtra(Intent.EXTRA_SUBJECT, "分享");
- toShare.putExtra(Intent.EXTRA_TEXT, "在这里" +"\n" + "针对NUDT三号狱的在这里测试版上线了,赶紧下载体验吧"
- + "http://xiaocai.bmob.cn");
- startActivity(Intent.createChooser(toShare, "分享到"));
- break;
- case R.id.tv_me:
- startAnim(R.id.tv_me);
- break;
- case R.id.tv_xiaocai:
- startAnim(R.id.tv_xiaocai);
- break;
- case R.id.tv_bowl:
- startAnim(R.id.tv_bowl);
- break;
- default:
- Intent toAbout = new Intent(OldMineActivity.this, AboutActivity.class);
- startActivity(toAbout);
- break;
- }
- }
-
- //点击文字动画
- private void startAnim(int id){
- Animation scale = AnimationUtils.loadAnimation(this, R.anim.shake);
- if(id == R.id.tv_me)
- tvMe.startAnimation(scale);
- else if(id == R.id.tv_xiaocai)
- tvXiaoCai.startAnimation(scale);
- else if(id == R.id.tv_bowl)
- tvBowl.startAnimation(scale);
- else { }
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/AutoScrollViewPager.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/AutoScrollViewPager.java
deleted file mode 100644
index 0d542cd..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/AutoScrollViewPager.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package com.stone.ui;
-
-import java.lang.reflect.Field;
-
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.animation.Interpolator;
-
-/**
- * Auto Scroll View Pager
- *
- * Basic Setting and Usage
- *
{@link #startAutoScroll()} start auto scroll, or {@link #startAutoScroll(int)} start auto scroll delayed
- *
{@link #stopAutoScroll()} stop auto scroll
- *
{@link #setInterval(long)} set auto scroll time in milliseconds, default is {@link #DEFAULT_INTERVAL}
- *
- *
- * Advanced Settings and Usage
- *
{@link #setDirection(int)} set auto scroll direction
- *
{@link #setCycle(boolean)} set whether automatic cycle when auto scroll reaching the last or first item, default
- * is true
- *
{@link #setSlideBorderMode(int)} set how to process when sliding at the last or first item
- *
{@link #setStopScrollWhenTouch(boolean)} set whether stop auto scroll when touching, default is true
- *
- *
- * @author Trinea 2013-12-30
- */
-public class AutoScrollViewPager extends ViewPager {
- public static final int DEFAULT_INTERVAL = 1500;
-
- public static final int LEFT = 0;
- public static final int RIGHT = 1;
-
- /** do nothing when sliding at the last or first item **/
- public static final int SLIDE_BORDER_MODE_NONE = 0;
- /** cycle when sliding at the last or first item **/
- public static final int SLIDE_BORDER_MODE_CYCLE = 1;
- /** deliver event to parent when sliding at the last or first item **/
- public static final int SLIDE_BORDER_MODE_TO_PARENT = 2;
-
- /** auto scroll time in milliseconds, default is {@link #DEFAULT_INTERVAL} **/
- private long interval = DEFAULT_INTERVAL;
- /** auto scroll direction, default is {@link #RIGHT} **/
- private int direction = RIGHT;
- /** whether automatic cycle when auto scroll reaching the last or first item, default is true **/
- private boolean isCycle = true;
- /** whether stop auto scroll when touching, default is true **/
- private boolean stopScrollWhenTouch = true;
- /** how to process when sliding at the last or first item, default is {@link #SLIDE_BORDER_MODE_NONE} **/
- private int slideBorderMode = SLIDE_BORDER_MODE_NONE;
- /** whether animating when auto scroll at the last or first item **/
- private boolean isBorderAnimation = true;
-
- private Handler handler;
- private boolean isAutoScroll = false;
- private boolean isStopByTouch = false;
- private float touchX = 0f, downX = 0f;
- private CustomDurationScroller scroller = null;
-
- public static final int SCROLL_WHAT = 0;
-
- public AutoScrollViewPager(Context paramContext){
- super(paramContext);
- init();
- }
-
- public AutoScrollViewPager(Context paramContext, AttributeSet paramAttributeSet){
- super(paramContext, paramAttributeSet);
- init();
- }
-
- private void init() {
- handler = new MyHandler();
- setViewPagerScroller();
- }
-
- /**
- * start auto scroll, first scroll delay time is {@link #getInterval()}
- */
- public void startAutoScroll() {
- isAutoScroll = true;
- sendScrollMessage(interval);
- }
-
- /**
- * start auto scroll
- *
- * @param delayTimeInMills first scroll delay time
- */
- public void startAutoScroll(int delayTimeInMills) {
- isAutoScroll = true;
- sendScrollMessage(delayTimeInMills);
- }
-
- /**
- * stop auto scroll
- */
- public void stopAutoScroll() {
- isAutoScroll = false;
- handler.removeMessages(SCROLL_WHAT);
- }
-
- /**
- * set the factor by which the duration of sliding animation will change
- */
- public void setScrollDurationFactor(double scrollFactor) {
- scroller.setScrollDurationFactor(scrollFactor);
- }
-
- private void sendScrollMessage(long delayTimeInMills) {
- /** remove messages before, keeps one message is running at most **/
- handler.removeMessages(SCROLL_WHAT);
- handler.sendEmptyMessageDelayed(SCROLL_WHAT, delayTimeInMills);
- }
-
- /**
- * set ViewPager scroller to change animation duration when sliding
- */
- private void setViewPagerScroller() {
- try {
- Field scrollerField = ViewPager.class.getDeclaredField("mScroller");
- scrollerField.setAccessible(true);
- Field interpolatorField = ViewPager.class.getDeclaredField("sInterpolator");
- interpolatorField.setAccessible(true);
-
- scroller = new CustomDurationScroller(getContext(), (Interpolator)interpolatorField.get(null));
- scrollerField.set(this, scroller);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * scroll only once
- */
- public void scrollOnce() {
- PagerAdapter adapter = getAdapter();
- int currentItem = getCurrentItem();
- int totalCount;
- if (adapter == null || (totalCount = adapter.getCount()) <= 1) {
- return;
- }
-
- int nextItem = (direction == LEFT) ? --currentItem : ++currentItem;
- if (nextItem < 0) {
- if (isCycle) {
- setCurrentItem(totalCount - 1, isBorderAnimation);
- }
- } else if (nextItem == totalCount) {
- if (isCycle) {
- setCurrentItem(0, isBorderAnimation);
- }
- } else {
- setCurrentItem(nextItem, true);
- }
- }
-
- /**
- *
- * if stopScrollWhenTouch is true
- *
if event is down, stop auto scroll.
- *
if event is up, start auto scroll again.
- *
- */
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- if (stopScrollWhenTouch) {
- if (ev.getAction() == MotionEvent.ACTION_DOWN && isAutoScroll) {
- isStopByTouch = true;
- stopAutoScroll();
- } else if (ev.getAction() == MotionEvent.ACTION_UP && isStopByTouch) {
- startAutoScroll();
- }
- }
-
- if (slideBorderMode == SLIDE_BORDER_MODE_TO_PARENT || slideBorderMode == SLIDE_BORDER_MODE_CYCLE) {
- touchX = ev.getX();
- if (ev.getAction() == MotionEvent.ACTION_DOWN) {
- downX = touchX;
- }
- int currentItem = getCurrentItem();
- PagerAdapter adapter = getAdapter();
- int pageCount = adapter == null ? 0 : adapter.getCount();
- /**
- * current index is first one and slide to right or current index is last one and slide to left.
- * if slide border mode is to parent, then requestDisallowInterceptTouchEvent false.
- * else scroll to last one when current item is first one, scroll to first one when current item is last
- * one.
- */
- if ((currentItem == 0 && downX <= touchX) || (currentItem == pageCount - 1 && downX >= touchX)) {
- if (slideBorderMode == SLIDE_BORDER_MODE_TO_PARENT) {
- getParent().requestDisallowInterceptTouchEvent(false);
- } else {
- if (pageCount > 1) {
- setCurrentItem(pageCount - currentItem - 1, isBorderAnimation);
- }
- getParent().requestDisallowInterceptTouchEvent(true);
- }
- return super.onTouchEvent(ev);
- }
- }
- getParent().requestDisallowInterceptTouchEvent(true);
- return super.onTouchEvent(ev);
- }
-
- private class MyHandler extends Handler {
-
- @Override
- public void handleMessage(Message msg) {
- super.handleMessage(msg);
-
- switch (msg.what) {
- case SCROLL_WHAT:
- scrollOnce();
- sendScrollMessage(interval);
- default:
- break;
- }
- }
- }
-
- /**
- * get auto scroll time in milliseconds, default is {@link #DEFAULT_INTERVAL}
- *
- * @return the interval
- */
- public long getInterval() {
- return interval;
- }
-
- /**
- * set auto scroll time in milliseconds, default is {@link #DEFAULT_INTERVAL}
- *
- * @param interval the interval to set
- */
- public void setInterval(long interval) {
- this.interval = interval;
- }
-
- /**
- * get auto scroll direction
- *
- * @return {@link #LEFT} or {@link #RIGHT}, default is {@link #RIGHT}
- */
- public int getDirection() {
- return (direction == LEFT) ? LEFT : RIGHT;
- }
-
- /**
- * set auto scroll direction
- *
- * @param direction {@link #LEFT} or {@link #RIGHT}, default is {@link #RIGHT}
- */
- public void setDirection(int direction) {
- this.direction = direction;
- }
-
- /**
- * whether automatic cycle when auto scroll reaching the last or first item, default is true
- *
- * @return the isCycle
- */
- public boolean isCycle() {
- return isCycle;
- }
-
- /**
- * set whether automatic cycle when auto scroll reaching the last or first item, default is true
- *
- * @param isCycle the isCycle to set
- */
- public void setCycle(boolean isCycle) {
- this.isCycle = isCycle;
- }
-
- /**
- * whether stop auto scroll when touching, default is true
- *
- * @return the stopScrollWhenTouch
- */
- public boolean isStopScrollWhenTouch() {
- return stopScrollWhenTouch;
- }
-
- /**
- * set whether stop auto scroll when touching, default is true
- *
- * @param stopScrollWhenTouch
- */
- public void setStopScrollWhenTouch(boolean stopScrollWhenTouch) {
- this.stopScrollWhenTouch = stopScrollWhenTouch;
- }
-
- /**
- * get how to process when sliding at the last or first item
- *
- * @return the slideBorderMode {@link #SLIDE_BORDER_MODE_NONE}, {@link #SLIDE_BORDER_MODE_TO_PARENT},
- * {@link #SLIDE_BORDER_MODE_CYCLE}, default is {@link #SLIDE_BORDER_MODE_NONE}
- */
- public int getSlideBorderMode() {
- return slideBorderMode;
- }
-
- /**
- * set how to process when sliding at the last or first item
- *
- * @param slideBorderMode {@link #SLIDE_BORDER_MODE_NONE}, {@link #SLIDE_BORDER_MODE_TO_PARENT},
- * {@link #SLIDE_BORDER_MODE_CYCLE}, default is {@link #SLIDE_BORDER_MODE_NONE}
- */
- public void setSlideBorderMode(int slideBorderMode) {
- this.slideBorderMode = slideBorderMode;
- }
-
- /**
- * whether animating when auto scroll at the last or first item, default is true
- *
- * @return
- */
- public boolean isBorderAnimation() {
- return isBorderAnimation;
- }
-
- /**
- * set whether animating when auto scroll at the last or first item, default is true
- *
- * @param isBorderAnimation
- */
- public void setBorderAnimation(boolean isBorderAnimation) {
- this.isBorderAnimation = isBorderAnimation;
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/CustomDurationScroller.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/CustomDurationScroller.java
deleted file mode 100644
index 6155603..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/CustomDurationScroller.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.view.animation.Interpolator;
-import android.widget.Scroller;
-
-
-/**
- * CustomDurationScroller
- *
- * @author Trinea 2014-3-2
- */
-public class CustomDurationScroller extends Scroller {
- private double scrollFactor = 2;
-
- public CustomDurationScroller(Context context){
- super(context);
- }
-
- public CustomDurationScroller(Context context, Interpolator interpolator){
- super(context, interpolator);
- }
-
- /**
- * not exist in android 2.3
- *
- * @param context
- * @param interpolator
- * @param flywheel
- */
- // @SuppressLint("NewApi")
- // public CustomDurationScroller(Context context, Interpolator interpolator, boolean flywheel){
- // super(context, interpolator, flywheel);
- // }
-
- /**
- * Set the factor by which the duration will change
- */
- public void setScrollDurationFactor(double scrollFactor) {
- this.scrollFactor = scrollFactor;
- }
-
- @Override
- public void startScroll(int startX, int startY, int dx, int dy, int duration) {
- super.startScroll(startX, startY, dx, dy, (int)(duration * scrollFactor));
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/DateTimePickDialogUtil.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/DateTimePickDialogUtil.java
deleted file mode 100644
index 6ba2bfe..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/DateTimePickDialogUtil.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package com.stone.ui;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.widget.DatePicker;
-import android.widget.DatePicker.OnDateChangedListener;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TimePicker;
-import android.widget.TimePicker.OnTimeChangedListener;
-
-/**
- * 日期时间选择控件 使用方法: private EditText inputDate;//需要设置的日期时间文本编辑框 private String
- * initDateTime="2012年9月3日 14:44",//初始日期时间值 在点击事件中使用:
- * inputDate.setOnClickListener(new OnClickListener() {
- *
- * @Override public void onClick(View v) { DateTimePickDialogUtil
- * dateTimePicKDialog=new
- * DateTimePickDialogUtil(SinvestigateActivity.this,initDateTime);
- * dateTimePicKDialog.dateTimePicKDialog(inputDate);
- *
- * } });
- *
- * @author
- */
-public class DateTimePickDialogUtil implements OnDateChangedListener, OnTimeChangedListener {
- private DatePicker datePicker;
- private TimePicker timePicker;
- private AlertDialog ad;
- private String dateTime;
- private String initDateTime;
- private Activity activity;
- private DateTimeListener dateTimeListener;
-
- /**
- * 日期时间弹出选择框构造函数
- *
- * @param activity
- * :调用的父activity
- * @param initDateTime
- * 初始日期时间值,作为弹出窗口的标题和日期时间初始值
- */
- public DateTimePickDialogUtil(Activity activity, String initDateTime) {
- this.activity = activity;
- this.initDateTime = initDateTime;
-
- }
-
- public void init(DatePicker datePicker, TimePicker timePicker) {
- Calendar calendar = Calendar.getInstance();
- if (!(null == initDateTime || "".equals(initDateTime))) {
- calendar = this.getCalendarByInintData(initDateTime);
- } else {
- initDateTime = calendar.get(Calendar.YEAR) + "年" + calendar.get(Calendar.MONTH) + "月"
- + calendar.get(Calendar.DAY_OF_MONTH) + "日 " + calendar.get(Calendar.HOUR_OF_DAY) + ":"
- + calendar.get(Calendar.MINUTE);
- }
-
- datePicker.init(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH),
- this);
- timePicker.setCurrentHour(calendar.get(Calendar.HOUR_OF_DAY));
- timePicker.setCurrentMinute(calendar.get(Calendar.MINUTE));
- }
-
- /**
- * 弹出日期时间选择框方法
- *
- * @param inputDate
- * :为需要设置的日期时间文本编辑框
- * @return
- */
- public AlertDialog dateTimePicKDialog(final DateTimeListener dateTimeListener) {
- LinearLayout dateTimeLayout = (LinearLayout) activity.getLayoutInflater().inflate(R.layout.common_datetime,
- null);
- datePicker = (DatePicker) dateTimeLayout.findViewById(R.id.datepicker);
- timePicker = (TimePicker) dateTimeLayout.findViewById(R.id.timepicker);
- init(datePicker, timePicker);
- timePicker.setIs24HourView(true);
- timePicker.setOnTimeChangedListener(this);
-
- ad = new AlertDialog.Builder(activity).setTitle(initDateTime).setView(dateTimeLayout)
- .setPositiveButton("设置", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
- if (dateTimeListener != null) {
- dateTimeListener.onDateTimeChane(dateTime);
- }
- }
- }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
- }
- }).show();
-
- onDateChanged(null, 0, 0, 0);
- return ad;
- }
-
- public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
- onDateChanged(null, 0, 0, 0);
- }
-
- public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
- // 获得日历实例
- Calendar calendar = Calendar.getInstance();
-
- calendar.set(datePicker.getYear(), datePicker.getMonth(), datePicker.getDayOfMonth(),
- timePicker.getCurrentHour(), timePicker.getCurrentMinute());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- dateTime = sdf.format(calendar.getTime());
- ad.setTitle(dateTime);
- }
-
- /**
- * 实现将初始日期时间2012年07月02日 16:45 拆分成年 月 日 时 分 秒,并赋值给calendar
- *
- * @param initDateTime
- * 初始日期时间值 字符串型
- * @return Calendar
- */
- private Calendar getCalendarByInintData(String initDateTime) {
- Calendar calendar = Calendar.getInstance();
-
- // 将初始日期时间2012年07月02日 16:45 拆分成年 月 日 时 分 秒
- String date = spliteString(initDateTime, "日", "index", "front"); // 日期
- String time = spliteString(initDateTime, "日", "index", "back"); // 时间
-
- String yearStr = spliteString(date, "年", "index", "front"); // 年份
- String monthAndDay = spliteString(date, "年", "index", "back"); // 月日
-
- String monthStr = spliteString(monthAndDay, "月", "index", "front"); // 月
- String dayStr = spliteString(monthAndDay, "月", "index", "back"); // 日
-
- String hourStr = spliteString(time, ":", "index", "front"); // 时
- String minuteStr = spliteString(time, ":", "index", "back"); // 分
-
- int currentYear = Integer.valueOf(yearStr.trim()).intValue();
- int currentMonth = Integer.valueOf(monthStr.trim()).intValue() - 1;
- int currentDay = Integer.valueOf(dayStr.trim()).intValue();
- int currentHour = Integer.valueOf(hourStr.trim()).intValue();
- int currentMinute = Integer.valueOf(minuteStr.trim()).intValue();
-
- calendar.set(currentYear, currentMonth, currentDay, currentHour, currentMinute);
- return calendar;
- }
-
- /**
- * 截取子串
- *
- * @param srcStr
- * 源串
- * @param pattern
- * 匹配模式
- * @param indexOrLast
- * @param frontOrBack
- * @return
- */
- public static String spliteString(String srcStr, String pattern, String indexOrLast, String frontOrBack) {
- String result = "";
- int loc = -1;
- if (indexOrLast.equalsIgnoreCase("index")) {
- loc = srcStr.indexOf(pattern); // 取得字符串第一次出现的位置
- } else {
- loc = srcStr.lastIndexOf(pattern); // 最后一个匹配串的位置
- }
- if (frontOrBack.equalsIgnoreCase("front")) {
- if (loc != -1)
- result = srcStr.substring(0, loc); // 截取子串
- } else {
- if (loc != -1)
- result = srcStr.substring(loc + 1, srcStr.length()); // 截取子串
- }
- return result;
- }
-
- public interface DateTimeListener {
-
- void onDateTimeChane(String dateTime);
-
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/DialogOrder.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/DialogOrder.java
deleted file mode 100644
index efbd9a3..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/DialogOrder.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.stone.ui;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TimePicker;
-
-import com.stone.shop.R;
-
-/**
- * 对话框订单
- * @date 2014-5-11
- * @author Stone
- */
-public class DialogOrder extends Dialog implements OnClickListener{
-
- private Context context;
- private Button btnDlgOk;
- private TimePicker tpDlgTime;
- private OrderDialogListener listener;
-
- public interface OrderDialogListener{
- public void onClick(View view);
- }
-
- public DialogOrder(Context context) {
- super(context);
- this.context = context;
- }
-
- public DialogOrder(Context context, int theme){
- super(context, theme);
- this.context = context;
- }
-
- public DialogOrder(Context context, int theme, DialogOrder.OrderDialogListener orderDialogListener){
- super(context, theme);
- this.context = context;
- this.listener = orderDialogListener;
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- this.setContentView(R.layout.dlg_order_settime);
- initView();
- }
-
- private void initView() {
- tpDlgTime = (TimePicker) findViewById(R.id.tp_dlg_time);
- tpDlgTime.setIs24HourView(true);
- btnDlgOk = (Button) findViewById(R.id.btn_dlg_ok);
- btnDlgOk.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- listener.onClick(v);
- }
-
- public String getTime() {
- return tpDlgTime.getCurrentHour() + " : " + tpDlgTime.getCurrentMinute();
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/ListScrollView.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/ListScrollView.java
deleted file mode 100644
index a04aaf7..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/ListScrollView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.ScrollView;
-
-public class ListScrollView extends ScrollView {
-
- private ListView listView;
-
- public ListScrollView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public ListScrollView(Context context) {
- super(context);
- }
-
- /**
- * 覆写onInterceptTouchEvent方法,点击操作发生在ListView的区域的时候,
- * 返回false让ScrollView的onTouchEvent接收不到MotionEvent,而是把Event传到下一级的控件中
- */
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- // TODO Auto-generated method stub
- if (listView != null && checkArea(listView, ev)) {
- return false;
- }
- return super.onInterceptTouchEvent(ev);
- }
-
- /**
- * 测试view是否在点击范围内
- * @param locate
- * @param v
- * @return
- */
- private boolean checkArea(View v, MotionEvent event){
- float x = event.getRawX();
- float y = event.getRawY();
- int[] locate = new int[2];
- v.getLocationOnScreen(locate);
- int l = locate[0];
- int r = l + v.getWidth();
- int t = locate[1];
- int b = t + v.getHeight();
- if (l < x && x < r && t < y && y < b) {
- return true;
- }
- return false;
- }
-
- public ListView getListView() {
- return listView;
- }
-
- public void setListView(ListView listView) {
- this.listView = listView;
- }
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/MyGridView.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/MyGridView.java
deleted file mode 100644
index dbbbf38..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/MyGridView.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.GridView;
-
-/**
- * 商品详情页--商品分类网格视图
- * @author Stone
- */
-public class MyGridView extends GridView {
-
- public MyGridView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public MyGridView(Context context) {
- super(context);
- }
-
- public MyGridView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- @Override
- public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
- MeasureSpec.AT_MOST);
- super.onMeasure(widthMeasureSpec, expandSpec);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/ui/ViewPagerCompat.java b/代码/Shop 1.2最终修改版/src/com/stone/ui/ViewPagerCompat.java
deleted file mode 100644
index 72f36a8..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/ui/ViewPagerCompat.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-/**
- * 商铺详情页--ViewPager的加强类,主要是为了解决滑动冲突的问题。不然的话,
- * 在ViewPager内部加入ListView等可滑动控件,两者之间会产生干扰。
- * @author Stone
- * {@link} http://blog.csdn.net/singwhatiwanna/article/details/17201587
- */
-public class ViewPagerCompat extends ViewPager {
- // mViewTouchMode表示ViewPager是否全权控制滑动事件,默认为false,即不控制
- private boolean mViewTouchMode = false;
-
- public ViewPagerCompat(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public void setViewTouchMode(boolean b) {
- if (b && !isFakeDragging()) {
- // 全权控制滑动事件
- beginFakeDrag();
- } else if (!b && isFakeDragging()) {
- // 终止控制滑动事件
- endFakeDrag();
- }
- mViewTouchMode = b;
- }
-
- /**
- * 在mViewTouchMode为true的时候,ViewPager不拦截点击事件,点击事件将由子View处理
- */
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event) {
- if (mViewTouchMode) {
- return false;
- }
- return super.onInterceptTouchEvent(event);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- try {
- return super.onTouchEvent(ev);
- } catch (Exception e) {
- return false;
- }
- }
-
- /**
- * 在mViewTouchMode为true或者滑动方向不是左右的时候,ViewPager将放弃控制点击事件,
- * 这样做有利于在ViewPager中加入ListView等可以滑动的控件,否则两者之间的滑动将会有冲突
- */
- @Override
- public boolean arrowScroll(int direction) {
- if (mViewTouchMode)
- return false;
- if (direction != FOCUS_LEFT && direction != FOCUS_RIGHT)
- return false;
- return super.arrowScroll(direction);
- }
-
-}
diff --git a/代码/Shop 1.2最终修改版/src/com/stone/util/Util.java b/代码/Shop 1.2最终修改版/src/com/stone/util/Util.java
deleted file mode 100644
index 653e1f9..0000000
--- a/代码/Shop 1.2最终修改版/src/com/stone/util/Util.java
+++ /dev/null
@@ -1,756 +0,0 @@
-package com.stone.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Bitmap.CompressFormat;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
-import junit.framework.Assert;
-
-/**
- * 工具类
- *
- * @date 2014-5-9
- * @author Stone
- */
-public class Util {
-
- /**
- * 判断电话号码是否有效
- *
- * @param phoneNumber
- * @return true 有效 / false 无效
- */
- public static boolean isPhoneNumberValid(String phoneNumber) {
-
- boolean isValid = false;
-
- String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
- CharSequence inputStr = phoneNumber;
-
- Pattern pattern = Pattern.compile(expression);
- Matcher matcher = pattern.matcher(inputStr);
-
- if (matcher.matches()) {
- isValid = true;
- }
- return isValid;
- }
-
- // 判断网络是否连接
- public static boolean isNetworkConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mNetworkInfo = mConnectivityManager
- .getActiveNetworkInfo();
- if (mNetworkInfo != null) {
- return mNetworkInfo.isAvailable();
- }
- }
- return false;
- }
-
-private static final String TAG = "SDK_Sample.Util";
-
- private static Dialog mProgressDialog;
- private static Toast mToast;
-
- /* Convert byte[] to hex string.这里我们可以将byte转换成int,然后利用Integer.toHexString(int)来转换成16进制字符串。
- * @param src byte[] data
- * @return hex string
- */
- public static String bytesToHexString(byte[] src){
- StringBuilder stringBuilder = new StringBuilder("");
- if (src == null || src.length <= 0) {
- return null;
- }
- for (int i = 0; i < src.length; i++) {
- int v = src[i] & 0xFF;
- String hv = Integer.toHexString(v);
- if (hv.length() < 2) {
- stringBuilder.append(0);
- }
- stringBuilder.append(hv);
- }
- return stringBuilder.toString();
- }
- /**
- * Convert hex string to byte[]
- * @param hexString the hex string
- * @return byte[]
- */
- public static byte[] hexStringToBytes(String hexString) {
- if (hexString == null || hexString.equals("")) {
- return null;
- }
- hexString = hexString.toUpperCase();
- int length = hexString.length() / 2;
- char[] hexChars = hexString.toCharArray();
- byte[] d = new byte[length];
- for (int i = 0; i < length; i++) {
- int pos = i * 2;
- d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
- }
- return d;
- }
- /**
- * Convert char to byte
- * @param c char
- * @return byte
- */
- private static byte charToByte(char c) {
- return (byte) "0123456789ABCDEF".indexOf(c);
- }
-
- /*
- * 16进制数字字符集
- */
- private static String hexString="0123456789ABCDEF";
- /*
- * 将字符串编码成16进制数字,适用于所有字符(包括中文)
- */
- public static String toHexString(String str)
- {
-//根据默认编码获取字节数组
- byte[] bytes = null;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- if (bytes == null) return null;
- StringBuilder sb=new StringBuilder(bytes.length*2);
-//将字节数组中每个字节拆解成2位16进制整数
- for(int i=0;i>4));
- sb.append(hexString.charAt((bytes[i]&0x0f)>>0));
- }
- return sb.toString();
- }
-
- //转换十六进制编码为字符串
- public static String hexToString(String s)
- {
- if("0x".equals(s.substring(0, 2)))
- {
- s =s.substring(2);
- }
- byte[] baKeyword = new byte[s.length()/2];
- for(int i = 0; i < baKeyword.length; i++)
- {
- try
- {
- baKeyword[i] = (byte)(0xff & Integer.parseInt(s.substring(i*2, i*2+2),16));
- }
- catch(Exception e)
- {
- e.printStackTrace();
- }
- }
-
- try
- {
- s = new String(baKeyword, "utf-8");//UTF-16le:Not
- }
- catch (Exception e1)
- {
- e1.printStackTrace();
- }
- return s;
- }
-
- public static byte[] bmpToByteArray(final Bitmap bmp, final boolean needRecycle) {
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- bmp.compress(CompressFormat.PNG, 100, output);
- if (needRecycle) {
- bmp.recycle();
- }
-
- byte[] result = output.toByteArray();
- try {
- output.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return result;
- }
-
- public static byte[] getHtmlByteArray(final String url) {
- URL htmlUrl = null;
- InputStream inStream = null;
- try {
- htmlUrl = new URL(url);
- URLConnection connection = htmlUrl.openConnection();
- HttpURLConnection httpConnection = (HttpURLConnection)connection;
- int responseCode = httpConnection.getResponseCode();
- if(responseCode == HttpURLConnection.HTTP_OK){
- inStream = httpConnection.getInputStream();
- }
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- byte[] data = inputStreamToByte(inStream);
-
- return data;
- }
-
- public static byte[] inputStreamToByte(InputStream is) {
- try{
- ByteArrayOutputStream bytestream = new ByteArrayOutputStream();
- int ch;
- while ((ch = is.read()) != -1) {
- bytestream.write(ch);
- }
- byte imgdata[] = bytestream.toByteArray();
- bytestream.close();
- return imgdata;
- }catch(Exception e){
- e.printStackTrace();
- }
-
- return null;
- }
-
- public static byte[] readFromFile(String fileName, int offset, int len) {
- if (fileName == null) {
- return null;
- }
-
- File file = new File(fileName);
- if (!file.exists()) {
- Log.i(TAG, "readFromFile: file not found");
- return null;
- }
-
- if (len == -1) {
- len = (int) file.length();
- }
-
- Log.d(TAG, "readFromFile : offset = " + offset + " len = " + len + " offset + len = " + (offset + len));
-
- if(offset <0){
- Log.e(TAG, "readFromFile invalid offset:" + offset);
- return null;
- }
- if(len <=0 ){
- Log.e(TAG, "readFromFile invalid len:" + len);
- return null;
- }
- if(offset + len > (int) file.length()){
- Log.e(TAG, "readFromFile invalid file len:" + file.length());
- return null;
- }
-
- byte[] b = null;
- try {
- RandomAccessFile in = new RandomAccessFile(fileName, "r");
- b = new byte[len];
- in.seek(offset);
- in.readFully(b);
- in.close();
-
- } catch (Exception e) {
- Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
- e.printStackTrace();
- }
- return b;
- }
-
- public static int computeSampleSize(BitmapFactory.Options options,
-
- int minSideLength, int maxNumOfPixels) {
-
- int initialSize = computeInitialSampleSize(options, minSideLength,
-
- maxNumOfPixels);
-
- int roundedSize;
-
- if (initialSize <= 8) {
-
- roundedSize = 1;
-
- while (roundedSize < initialSize) {
-
- roundedSize <<= 1;
-
- }
-
- } else {
-
- roundedSize = (initialSize + 7) / 8 * 8;
-
- }
-
- return roundedSize;
- }
-
- private static int computeInitialSampleSize(BitmapFactory.Options options,
-
- int minSideLength, int maxNumOfPixels) {
-
- double w = options.outWidth;
-
- double h = options.outHeight;
-
- int lowerBound = (maxNumOfPixels == -1) ? 1 :
-
- (int) Math.ceil(Math.sqrt(w * h / maxNumOfPixels));
-
- int upperBound = (minSideLength == -1) ? 128 :
-
- (int) Math.min(Math.floor(w / minSideLength),
-
- Math.floor(h / minSideLength));
-
- if (upperBound < lowerBound) {
-
- // return the larger one when there is no overlapping zone.
-
- return lowerBound;
-
- }
-
- if ((maxNumOfPixels == -1) &&
-
- (minSideLength == -1)) {
-
- return 1;
-
- } else if (minSideLength == -1) {
-
- return lowerBound;
-
- } else {
-
- return upperBound;
-
- }
- }
-
- /**
- * 以最省内存的方式读取图片
- */
- public static Bitmap readBitmap(final String path){
- try{
- FileInputStream stream = new FileInputStream(new File(path+"test.jpg"));
- BitmapFactory.Options opts = new BitmapFactory.Options();
- opts.inSampleSize = 8;
- opts.inPurgeable=true;
- opts.inInputShareable=true;
- Bitmap bitmap = BitmapFactory.decodeStream(stream , null, opts);
- return bitmap;
- } catch (OutOfMemoryError e) {
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- private static final int MAX_DECODE_PICTURE_SIZE = 1920 * 1440;
- public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
- Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
-
- BitmapFactory.Options options = new BitmapFactory.Options();
-
- try {
- options.inJustDecodeBounds = true;
- Bitmap tmp = BitmapFactory.decodeFile(path, options);
- if (tmp != null) {
- tmp.recycle();
- tmp = null;
- }
-
- Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
- final double beY = options.outHeight * 1.0 / height;
- final double beX = options.outWidth * 1.0 / width;
- Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
- options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
- if (options.inSampleSize <= 1) {
- options.inSampleSize = 1;
- }
-
- // NOTE: out of memory error
- while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
- options.inSampleSize++;
- }
-
- int newHeight = height;
- int newWidth = width;
- if (crop) {
- if (beY > beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- } else {
- if (beY < beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- }
-
- options.inJustDecodeBounds = false;
-
- Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
- Bitmap bm = BitmapFactory.decodeFile(path, options);
- if (bm == null) {
- Log.e(TAG, "bitmap decode failed");
- return null;
- }
-
- Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
- final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
- if (scale != null) {
- bm.recycle();
- bm = scale;
- }
-
- if (crop) {
- final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
- if (cropped == null) {
- return bm;
- }
-
- bm.recycle();
- bm = cropped;
- Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
- }
- return bm;
-
- } catch (final OutOfMemoryError e) {
- Log.e(TAG, "decode bitmap failed: " + e.getMessage());
- options = null;
- }
-
- return null;
- }
-
- public static final void showResultDialog(Context context, String msg,
- String title) {
- if(msg == null) return;
- String rmsg = msg.replace(",", "\n");
- Log.d("Util", rmsg);
- new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
- .setNegativeButton("知道了", null).create().show();
- }
-
- public static final void showProgressDialog(Context context, String title,
- String message) {
- dismissDialog();
- if (TextUtils.isEmpty(title)) {
- title = "请稍候";
- }
- if (TextUtils.isEmpty(message)) {
- message = "正在加载...";
- }
- mProgressDialog = ProgressDialog.show(context, title, message);
- }
-
- public static AlertDialog showConfirmCancelDialog(Context context,
- String title, String message,
- DialogInterface.OnClickListener posListener) {
- AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
- .setPositiveButton("确认", posListener)
- .setNegativeButton("取消", null).create();
- dlg.setCanceledOnTouchOutside(false);
- dlg.show();
- return dlg;
- }
-
- public static final void dismissDialog() {
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- mProgressDialog = null;
- }
- }
-
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message, String logLevel) {
- if ("w".equals(logLevel)) {
- Log.w("sdkDemo", message);
- } else if ("e".equals(logLevel)) {
- Log.e("sdkDemo", message);
- } else {
- Log.d("sdkDemo", message);
- }
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- // TODO Auto-generated method stub
- if (mToast != null) {
- mToast.cancel();
- mToast = null;
- }
- mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
- mToast.show();
- }
- });
- }
-
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message) {
- toastMessage(activity, message, null);
- }
-
- /**
- * 根据一个网络连接(String)获取bitmap图像
- *
- * @param imageUri
- * @return
- * @throws MalformedURLException
- */
- public static Bitmap getbitmap(String imageUri) {
- Log.v(TAG, "getbitmap:" + imageUri);
- // 显示网络上的图片
- Bitmap bitmap = null;
- try {
- URL myFileUrl = new URL(imageUri);
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setDoInput(true);
- conn.connect();
- InputStream is = conn.getInputStream();
- bitmap = BitmapFactory.decodeStream(is);
- is.close();
-
- Log.v(TAG, "image download finished." + imageUri);
- } catch (OutOfMemoryError e) {
- e.printStackTrace();
- bitmap = null;
- } catch (IOException e) {
- e.printStackTrace();
- Log.v(TAG, "getbitmap bmp fail---");
- bitmap = null;
- }
- return bitmap;
- }
-
- public static void release() {
- mProgressDialog = null;
- mToast = null;
- }
-
- // =========
- // =通过URI获取本地图片的path
- // =兼容android 5.0
- // ==========
-
- public static String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
- public static int Build_VERSION_KITKAT = 19;
- public static String getPath(final Context context, final Uri uri) {
-
- final boolean isKitKat = Build.VERSION.SDK_INT >= 19;
-
- // DocumentProvider
- if (isKitKat && isDocumentUri(context, uri)) {
- // ExternalStorageProvider
- if (isExternalStorageDocument(uri)) {
- final String docId = getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- if ("primary".equalsIgnoreCase(type)) {
- return Environment.getExternalStorageDirectory() + "/" + split[1];
- }
-
- }
- // DownloadsProvider
- else if (isDownloadsDocument(uri)) {
-
- final String id = getDocumentId(uri);
- final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
- Long.valueOf(id));
-
- return getDataColumn(context, contentUri, null, null);
- }
- // MediaProvider
- else if (isMediaDocument(uri)) {
- final String docId = getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- } else if ("video".equals(type)) {
- contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
- } else if ("audio".equals(type)) {
- contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
- }
-
- final String selection = "_id=?";
- final String[] selectionArgs = new String[] { split[1] };
-
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
- // MediaStore (and general)
- else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
- // Return the remote address
- if (isGooglePhotosUri(uri))
- return uri.getLastPathSegment();
-
- return getDataColumn(context, uri, null, null);
- }
- // File
- else if ("file".equalsIgnoreCase(uri.getScheme())) {
- return uri.getPath();
- }
-
- return null;
- }
-
- private static final String PATH_DOCUMENT = "document";
-
- /**
- * Test if the given URI represents a {@link Document} backed by a
- * {@link DocumentsProvider}.
- */
- private static boolean isDocumentUri(Context context, Uri uri) {
- final List paths = uri.getPathSegments();
- if (paths.size() < 2) {
- return false;
- }
- if (!PATH_DOCUMENT.equals(paths.get(0))) {
- return false;
- }
-
- return true;
- }
-
- private static String getDocumentId(Uri documentUri) {
- final List paths = documentUri.getPathSegments();
- if (paths.size() < 2) {
- throw new IllegalArgumentException("Not a document: " + documentUri);
- }
- if (!PATH_DOCUMENT.equals(paths.get(0))) {
- throw new IllegalArgumentException("Not a document: " + documentUri);
- }
- return paths.get(1);
- }
-
- /**
- * Get the value of the data column for this Uri. This is useful for
- * MediaStore Uris, and other file-based ContentProviders.
- *
- * @param context
- * The context.
- * @param uri
- * The Uri to query.
- * @param selection
- * (Optional) Filter used in the query.
- * @param selectionArgs
- * (Optional) Selection arguments used in the query.
- * [url=home.php?mod=space&uid=7300]@return[/url] The value of
- * the _data column, which is typically a file path.
- */
- public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
- Cursor cursor = null;
- final String column = "_data";
- final String[] projection = { column };
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
- if (cursor != null && cursor.moveToFirst()) {
- final int index = cursor.getColumnIndexOrThrow(column);
- return cursor.getString(index);
- }
- } finally {
- if (cursor != null)
- cursor.close();
- }
- return null;
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is ExternalStorageProvider.
- */
- public static boolean isExternalStorageDocument(Uri uri) {
- return "com.android.externalstorage.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is DownloadsProvider.
- */
- public static boolean isDownloadsDocument(Uri uri) {
- return "com.android.providers.downloads.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is MediaProvider.
- */
- public static boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is Google Photos.
- */
- public static boolean isGooglePhotosUri(Uri uri) {
- return "com.google.android.apps.photos.content".equals(uri.getAuthority());
- }
-}
diff --git a/代码/Shop 1.2最终版/.DS_Store b/代码/Shop 1.2最终版/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
Binary files a/代码/Shop 1.2最终版/.DS_Store and /dev/null differ
diff --git a/代码/Shop 1.2最终版/.classpath b/代码/Shop 1.2最终版/.classpath
deleted file mode 100644
index 0461652..0000000
--- a/代码/Shop 1.2最终版/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/.project b/代码/Shop 1.2最终版/.project
deleted file mode 100644
index b261c40..0000000
--- a/代码/Shop 1.2最终版/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Shop
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/代码/Shop 1.2最终版/.settings/org.eclipse.core.resources.prefs b/代码/Shop 1.2最终版/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/代码/Shop 1.2最终版/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/代码/Shop 1.2最终版/.settings/org.eclipse.jdt.core.prefs b/代码/Shop 1.2最终版/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ef8a789..0000000
--- a/代码/Shop 1.2最终版/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/代码/Shop 1.2最终版/AndroidManifest.xml b/代码/Shop 1.2最终版/AndroidManifest.xml
deleted file mode 100644
index c328205..0000000
--- a/代码/Shop 1.2最终版/AndroidManifest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/bin/AndroidManifest.xml b/代码/Shop 1.2最终版/bin/AndroidManifest.xml
deleted file mode 100644
index c328205..0000000
--- a/代码/Shop 1.2最终版/bin/AndroidManifest.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/bin/Shop.apk b/代码/Shop 1.2最终版/bin/Shop.apk
deleted file mode 100644
index f103f41..0000000
Binary files a/代码/Shop 1.2最终版/bin/Shop.apk and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes.dex b/代码/Shop 1.2最终版/bin/classes.dex
deleted file mode 100644
index c4032be..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes.dex and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/date/MessageDef.class b/代码/Shop 1.2最终版/bin/classes/com/stone/date/MessageDef.class
deleted file mode 100644
index 22f75d6..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/date/MessageDef.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/date/TypeDef.class b/代码/Shop 1.2最终版/bin/classes/com/stone/date/TypeDef.class
deleted file mode 100644
index 2ad309c..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/date/TypeDef.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/BuildConfig.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/BuildConfig.class
deleted file mode 100644
index 1387198..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/BuildConfig.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$anim.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$anim.class
deleted file mode 100644
index 302d8ec..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$anim.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$attr.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$attr.class
deleted file mode 100644
index b1c0a95..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$attr.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$dimen.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$dimen.class
deleted file mode 100644
index 9aebad5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$dimen.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$drawable.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$drawable.class
deleted file mode 100644
index 634a181..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$drawable.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$id.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$id.class
deleted file mode 100644
index 1cecd0d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$id.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$layout.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$layout.class
deleted file mode 100644
index 64a5014..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$layout.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$menu.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$menu.class
deleted file mode 100644
index e0468ab..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$menu.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$string.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$string.class
deleted file mode 100644
index 519e48b..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$string.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$style.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$style.class
deleted file mode 100644
index 5cb4430..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R$style.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R.class
deleted file mode 100644
index 0a31b19..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/R.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
deleted file mode 100644
index f7b5e64..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
deleted file mode 100644
index e1ff9fa..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
deleted file mode 100644
index de38d75..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
deleted file mode 100644
index 429811b..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class
deleted file mode 100644
index e3bc779..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
deleted file mode 100644
index 981e341..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GridAdapter.class
deleted file mode 100644
index 034b5d2..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/GridAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
deleted file mode 100644
index 2f908a5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListAdapter.class
deleted file mode 100644
index c19e6be..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListHolder.class
deleted file mode 100644
index 73eb151..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineListHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
deleted file mode 100644
index beccc78..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
deleted file mode 100644
index ab8cdff..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsHolder.class
deleted file mode 100644
index 2e0aca3..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
deleted file mode 100644
index d8390ad..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
deleted file mode 100644
index 2202ce8..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
deleted file mode 100644
index 1b6dc47..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SComHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SComHolder.class
deleted file mode 100644
index 1d74fb9..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SComHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
deleted file mode 100644
index b60293d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopHolder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopHolder.class
deleted file mode 100644
index 32685bc..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopHolder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
deleted file mode 100644
index a77c4c5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
deleted file mode 100644
index 99fa505..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/BXTNews.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/BXTNews.class
deleted file mode 100644
index d6e8093..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/BXTNews.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Classroom.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Classroom.class
deleted file mode 100644
index 964077d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Classroom.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/FeedBack.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/FeedBack.class
deleted file mode 100644
index 2e29dc3..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/FeedBack.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Good.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Good.class
deleted file mode 100644
index 64769d9..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Good.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/LuckyUser.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/LuckyUser.class
deleted file mode 100644
index 15990c3..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/LuckyUser.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/News.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/News.class
deleted file mode 100644
index d206387..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/News.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Order.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Order.class
deleted file mode 100644
index 021c4be..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Order.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Reservation.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Reservation.class
deleted file mode 100644
index 1db5f15..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Reservation.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/SComment.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/SComment.class
deleted file mode 100644
index be7ff20..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/SComment.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Shop.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Shop.class
deleted file mode 100644
index 469f145..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/Shop.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/User.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/User.class
deleted file mode 100644
index 79a6879..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/model/User.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AboutActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AboutActivity.class
deleted file mode 100644
index a5ddd38..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AboutActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$1.class
deleted file mode 100644
index 7183b3f..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$2.class
deleted file mode 100644
index 34ab0ff..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity.class
deleted file mode 100644
index bebea1a..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/AwardActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity$1.class
deleted file mode 100644
index 8f8b7f7..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity.class
deleted file mode 100644
index 5b5459e..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTNewsActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTNewsActivity.class
deleted file mode 100644
index d0e1b18..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BXTNewsActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BaseActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BaseActivity.class
deleted file mode 100644
index 66f070d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/BaseActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
deleted file mode 100644
index d092ad3..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity.class
deleted file mode 100644
index c733605..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ClassroomActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
deleted file mode 100644
index 7e8f5ff..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity.class
deleted file mode 100644
index 16450ef..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/FeedBackActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity$1.class
deleted file mode 100644
index 787be71..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity.class
deleted file mode 100644
index aeb6739..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/HomeActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$1.class
deleted file mode 100644
index 6be525c..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$2.class
deleted file mode 100644
index 7e52794..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$3.class
deleted file mode 100644
index 2b5c29e..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$3.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
deleted file mode 100644
index 72a769b..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4.class
deleted file mode 100644
index b6566b4..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$4.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
deleted file mode 100644
index f4ee115..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity.class
deleted file mode 100644
index c3c0dc9..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/LoginActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$1.class
deleted file mode 100644
index 32158be..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$2.class
deleted file mode 100644
index 784b166..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity.class
deleted file mode 100644
index 23c47fe..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
deleted file mode 100644
index edd28ab..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
deleted file mode 100644
index d1cefb5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity.class
deleted file mode 100644
index 64d39b1..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
deleted file mode 100644
index 7a78ecb..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
deleted file mode 100644
index 6d853e0..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
deleted file mode 100644
index 6d2dcf0..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
deleted file mode 100644
index 492c4e8..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineSoftActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineSoftActivity.class
deleted file mode 100644
index 97a5707..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/MineSoftActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/NewsActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/NewsActivity.class
deleted file mode 100644
index 602d437..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/NewsActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$1.class
deleted file mode 100644
index 0415ea2..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$2.class
deleted file mode 100644
index c0cbaae..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity.class
deleted file mode 100644
index 2d8de31..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
deleted file mode 100644
index 5c74559..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
deleted file mode 100644
index 4df351b..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity.class
deleted file mode 100644
index 5b76eac..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/OrderInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity$1.class
deleted file mode 100644
index f60e7ec..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity.class
deleted file mode 100644
index 7b364d9..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/RegisterActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$1.class
deleted file mode 100644
index 7d3096f..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
deleted file mode 100644
index c222292..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
deleted file mode 100644
index 110a457..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2.class
deleted file mode 100644
index 627f891..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity.class
deleted file mode 100644
index 47673f2..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ReservationActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopActivity.class
deleted file mode 100644
index b7f261d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
deleted file mode 100644
index 61fac18..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity.class
deleted file mode 100644
index 2e6bbab..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopAllActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
deleted file mode 100644
index c27431f..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity.class
deleted file mode 100644
index 3659034..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/ShopItemActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity$1.class
deleted file mode 100644
index da6b059..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity.class
deleted file mode 100644
index c88c786..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/SplashActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/UserInfoActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/UserInfoActivity.class
deleted file mode 100644
index 7e44ad4..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/UserInfoActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity$1.class
deleted file mode 100644
index 56d7d00..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity.class
deleted file mode 100644
index fec7d74..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/WsqActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
deleted file mode 100644
index 53167c8..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
deleted file mode 100644
index 7483558..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity.class b/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity.class
deleted file mode 100644
index 00554a5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/shop/view/old/OldMineActivity.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
deleted file mode 100644
index 75e985d..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager.class
deleted file mode 100644
index 3c31662..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/AutoScrollViewPager.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/CustomDurationScroller.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/CustomDurationScroller.class
deleted file mode 100644
index cb8dd98..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/CustomDurationScroller.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
deleted file mode 100644
index dd4d7e1..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
deleted file mode 100644
index ecdb945..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
deleted file mode 100644
index ecd71fa..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
deleted file mode 100644
index ce86724..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
deleted file mode 100644
index dbb56fc..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder.class
deleted file mode 100644
index 037b060..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/DialogOrder.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ListScrollView.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ListScrollView.class
deleted file mode 100644
index a1467e5..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ListScrollView.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/MyGridView.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/MyGridView.class
deleted file mode 100644
index 7aaf8ed..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/MyGridView.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ViewPagerCompat.class b/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ViewPagerCompat.class
deleted file mode 100644
index ddc619a..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/ui/ViewPagerCompat.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util$1.class b/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util$1.class
deleted file mode 100644
index db560d7..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util$1.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util.class b/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util.class
deleted file mode 100644
index 3c5a93c..0000000
Binary files a/代码/Shop 1.2最终版/bin/classes/com/stone/util/Util.class and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/dexedLibs/android-support-v4-58a0c83f8cf0e45d7b49734a753afdfc.jar b/代码/Shop 1.2最终版/bin/dexedLibs/android-support-v4-58a0c83f8cf0e45d7b49734a753afdfc.jar
deleted file mode 100644
index 6c5c223..0000000
Binary files a/代码/Shop 1.2最终版/bin/dexedLibs/android-support-v4-58a0c83f8cf0e45d7b49734a753afdfc.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/dexedLibs/bmobPush_0.1beta-31d912916e14cf5ca903d2db22edd8f6.jar b/代码/Shop 1.2最终版/bin/dexedLibs/bmobPush_0.1beta-31d912916e14cf5ca903d2db22edd8f6.jar
deleted file mode 100644
index f3ae1cc..0000000
Binary files a/代码/Shop 1.2最终版/bin/dexedLibs/bmobPush_0.1beta-31d912916e14cf5ca903d2db22edd8f6.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/dexedLibs/bmob_v3.1.0beta-9c30c538a29d0bc11bed9bbb0e6a0acd.jar b/代码/Shop 1.2最终版/bin/dexedLibs/bmob_v3.1.0beta-9c30c538a29d0bc11bed9bbb0e6a0acd.jar
deleted file mode 100644
index e504023..0000000
Binary files a/代码/Shop 1.2最终版/bin/dexedLibs/bmob_v3.1.0beta-9c30c538a29d0bc11bed9bbb0e6a0acd.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/dexedLibs/mta-sdk-1.6.2-943a7feebfd46a893b0d0a1972e6c46b.jar b/代码/Shop 1.2最终版/bin/dexedLibs/mta-sdk-1.6.2-943a7feebfd46a893b0d0a1972e6c46b.jar
deleted file mode 100644
index 8bc9d75..0000000
Binary files a/代码/Shop 1.2最终版/bin/dexedLibs/mta-sdk-1.6.2-943a7feebfd46a893b0d0a1972e6c46b.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/dexedLibs/open_sdk_r5756-452eabac50740581dc71444d85ad54b7.jar b/代码/Shop 1.2最终版/bin/dexedLibs/open_sdk_r5756-452eabac50740581dc71444d85ad54b7.jar
deleted file mode 100644
index 6ac093d..0000000
Binary files a/代码/Shop 1.2最终版/bin/dexedLibs/open_sdk_r5756-452eabac50740581dc71444d85ad54b7.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/jarlist.cache b/代码/Shop 1.2最终版/bin/jarlist.cache
deleted file mode 100644
index 0565465..0000000
--- a/代码/Shop 1.2最终版/bin/jarlist.cache
+++ /dev/null
@@ -1,3 +0,0 @@
-# cache for current jar dependency. DO NOT EDIT.
-# format is
-# Encoding is UTF-8
diff --git a/代码/Shop 1.2最终版/bin/proguard.txt b/代码/Shop 1.2最终版/bin/proguard.txt
deleted file mode 100644
index eafe13e..0000000
--- a/代码/Shop 1.2最终版/bin/proguard.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-# view res/layout/activity_shop_item.xml #generated:12
--keep class android.support.v4.view.PagerTabStrip { (...); }
-
-# view AndroidManifest.xml #generated:145
--keep class com.stone.shop.view.AboutActivity { (...); }
-
-# view AndroidManifest.xml #generated:109
--keep class com.stone.shop.view.AwardActivity { (...); }
-
-# view AndroidManifest.xml #generated:151
--keep class com.stone.shop.view.BXTActivity { (...); }
-
-# view AndroidManifest.xml #generated:155
--keep class com.stone.shop.view.BXTNewsActivity { (...); }
-
-# view AndroidManifest.xml #generated:65
--keep class com.stone.shop.view.BaseActivity { (...); }
-
-# view AndroidManifest.xml #generated:73
--keep class com.stone.shop.view.ClassroomActivity { (...); }
-
-# view AndroidManifest.xml #generated:133
--keep class com.stone.shop.view.FeedBackActivity { (...); }
-
-# view AndroidManifest.xml #generated:101
--keep class com.stone.shop.view.HomeActivity { (...); }
-
-# view AndroidManifest.xml #generated:69
--keep class com.stone.shop.view.LoginActivity { (...); }
-
-# view AndroidManifest.xml #generated:113
--keep class com.stone.shop.view.MineActivity { (...); }
-
-# view AndroidManifest.xml #generated:121
--keep class com.stone.shop.view.MineInfoActivity { (...); }
-
-# view AndroidManifest.xml #generated:125
--keep class com.stone.shop.view.MineInfoEditActivity { (...); }
-
-# view AndroidManifest.xml #generated:129
--keep class com.stone.shop.view.MineSoftActivity { (...); }
-
-# view AndroidManifest.xml #generated:141
--keep class com.stone.shop.view.NewsActivity { (...); }
-
-# view AndroidManifest.xml #generated:93
--keep class com.stone.shop.view.OrderActivity { (...); }
-
-# view AndroidManifest.xml #generated:97
--keep class com.stone.shop.view.OrderInfoActivity { (...); }
-
-# view AndroidManifest.xml #generated:77
--keep class com.stone.shop.view.RegisterActivity { (...); }
-
-# view AndroidManifest.xml #generated:117
--keep class com.stone.shop.view.ReservationActivity { (...); }
-
-# view AndroidManifest.xml #generated:81
--keep class com.stone.shop.view.ShopActivity { (...); }
-
-# view AndroidManifest.xml #generated:85
--keep class com.stone.shop.view.ShopAllActivity { (...); }
-
-# view AndroidManifest.xml #generated:89
--keep class com.stone.shop.view.ShopItemActivity { (...); }
-
-# view AndroidManifest.xml #generated:56
--keep class com.stone.shop.view.SplashActivity { (...); }
-
-# view AndroidManifest.xml #generated:105
--keep class com.stone.shop.view.WsqActivity { (...); }
-
-# view AndroidManifest.xml #generated:137
--keep class com.stone.shop.view.old.OldMineActivity { (...); }
-
-# view res/layout/activity_home.xml #generated:85
--keep class com.stone.ui.AutoScrollViewPager { (...); }
-
-# view res/layout/activity_home.xml #generated:12
--keep class com.stone.ui.ListScrollView { (...); }
-
-# view res/layout/activity_shop.xml #generated:128
-# view res/layout/activity_shop.xml #generated:160
-# view res/layout/activity_shop.xml #generated:47
-# view res/layout/activity_shop.xml #generated:88
--keep class com.stone.ui.MyGridView { (...); }
-
-# view res/layout/activity_shop_item.xml #generated:6
--keep class com.stone.ui.ViewPagerCompat { (...); }
-
-# view AndroidManifest.xml #generated:173
--keep class com.tencent.connect.common.AssistActivity { (...); }
-
-# view AndroidManifest.xml #generated:159
--keep class com.tencent.tauth.AuthActivity { (...); }
-
-# onClick res/layout/header_mine_info.xml #generated:8
--keepclassmembers class * { *** clickBack(...); }
-
-# onClick res/layout/header_mine_info_edit.xml #generated:8
--keepclassmembers class * { *** clickCancel(...); }
-
-# onClick res/layout/header_mine_info.xml #generated:32
--keepclassmembers class * { *** clickEdit(...); }
-
-# onClick res/layout/header_feedback.xml #generated:8
--keepclassmembers class * { *** clickFeedBack(...); }
-
-# onClick res/layout/header_mine_info_edit.xml #generated:32
--keepclassmembers class * { *** clickSave(...); }
-
-# onClick res/layout/header_soft.xml #generated:8
--keepclassmembers class * { *** clickSoftBack(...); }
-
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_normal.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_normal.png
deleted file mode 100644
index a908656..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_normal.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_pressed.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_pressed.png
deleted file mode 100644
index 7acb87a..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/btn_green_pressed.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected.png
deleted file mode 100644
index 54b74dc..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected_press.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected_press.png
deleted file mode 100644
index 6d5756a..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_selected_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect.png
deleted file mode 100644
index 9185ada..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect_press.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect_press.png
deleted file mode 100644
index 0bf72e9..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/checkbox_unselect_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_1.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_1.png
deleted file mode 100644
index f6b9de2..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_2.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_2.png
deleted file mode 100644
index cdc5f24..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_3.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_3.png
deleted file mode 100644
index ead23a9..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_5.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_5.png
deleted file mode 100644
index 64a8847..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_5.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_6.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_6.png
deleted file mode 100644
index 7ec915c..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_6.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_7.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_7.png
deleted file mode 100644
index 1df46b0..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_7.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_8.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_8.png
deleted file mode 100644
index 8bc6b23..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_8.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_breakfast.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_breakfast.png
deleted file mode 100644
index 1bb8b03..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_breakfast.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_car.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_car.png
deleted file mode 100644
index 83d6810..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_car.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_date.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_date.png
deleted file mode 100644
index 9df2a0e..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_date.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hbut.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hbut.png
deleted file mode 100644
index 775cc41..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hbut.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hide.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hide.png
deleted file mode 100644
index ca30710..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_loc.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_loc.png
deleted file mode 100644
index 4590b69..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_loc.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png
deleted file mode 100644
index c4c33b1..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_find_holo_light.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_find_holo_light.png
deleted file mode 100644
index e8a9f98..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_find_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_info_details.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_info_details.png
deleted file mode 100644
index 057d063..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_info_details.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_myplaces.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_myplaces.png
deleted file mode 100644
index 3f4bbe9..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_myplaces.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_notifications.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_notifications.png
deleted file mode 100644
index 6fdf21f..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_notifications.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_share.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_share.png
deleted file mode 100644
index 62c4002..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_menu_share.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_mine.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_mine.png
deleted file mode 100644
index a1727ef..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_mine.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator.png
deleted file mode 100644
index ddd68c8..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator_focused.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator_focused.png
deleted file mode 100644
index a9a52dc..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_page_indicator_focused.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone.png
deleted file mode 100644
index 435ae6b..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone2.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone2.png
deleted file mode 100644
index 57ab828..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone3.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone3.png
deleted file mode 100644
index 6ce6629..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_phone3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_sale.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_sale.png
deleted file mode 100644
index 7a0e775..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_sale.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_search.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_search.png
deleted file mode 100644
index 8ff6204..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_search.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shelf_category_divider.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shelf_category_divider.png
deleted file mode 100644
index 836688a..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shelf_category_divider.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shop.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shop.png
deleted file mode 100644
index b51d593..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_shop.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_no.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_no.png
deleted file mode 100644
index 37797b9..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_no.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_yes.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_yes.png
deleted file mode 100644
index 3b3aa73..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/ic_star_yes.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button.png
deleted file mode 100644
index 756a4ce..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button_select.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button_select.png
deleted file mode 100644
index 5e946a4..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/login_button_select.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/res/crunch/drawable/qq.png b/代码/Shop 1.2最终版/bin/res/crunch/drawable/qq.png
deleted file mode 100644
index 8510143..0000000
Binary files a/代码/Shop 1.2最终版/bin/res/crunch/drawable/qq.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/bin/resources.ap_ b/代码/Shop 1.2最终版/bin/resources.ap_
deleted file mode 100644
index 8f43423..0000000
Binary files a/代码/Shop 1.2最终版/bin/resources.ap_ and /dev/null differ
diff --git a/代码/Shop 1.2最终版/gen/com/stone/shop/BuildConfig.java b/代码/Shop 1.2最终版/gen/com/stone/shop/BuildConfig.java
deleted file mode 100644
index f1eddbc..0000000
--- a/代码/Shop 1.2最终版/gen/com/stone/shop/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package com.stone.shop;
-
-public final class BuildConfig {
- public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/gen/com/stone/shop/R.java b/代码/Shop 1.2最终版/gen/com/stone/shop/R.java
deleted file mode 100644
index f7fdb05..0000000
--- a/代码/Shop 1.2最终版/gen/com/stone/shop/R.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package com.stone.shop;
-
-public final class R {
- public static final class anim {
- public static final int cycle_7=0x7f040000;
- public static final int scale=0x7f040001;
- public static final int shake=0x7f040002;
- }
- public static final class attr {
- }
- public static final class dimen {
- /** Default screen margins, per the Android Design guidelines.
-
- Customize dimensions originally defined in res/values/dimens.xml (such as
- screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-
- */
- public static final int activity_horizontal_margin=0x7f050000;
- public static final int activity_vertical_margin=0x7f050001;
- }
- public static final class drawable {
- public static final int abs__tab_selected_focused_holo=0x7f020000;
- 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_81=0x7f020017;
- public static final int ic_82=0x7f020018;
- public static final int ic_app=0x7f020019;
- public static final int ic_app1=0x7f02001a;
- public static final int ic_banner1=0x7f02001b;
- public static final int ic_banner_hide=0x7f02001c;
- public static final int ic_banner_image_default1=0x7f02001d;
- public static final int ic_banner_image_default11=0x7f02001e;
- public static final int ic_banner_image_default2=0x7f02001f;
- public static final int ic_banner_image_default22=0x7f020020;
- public static final int ic_banner_image_default3=0x7f020021;
- public static final int ic_banner_image_default4=0x7f020022;
- public static final int ic_banner_image_default55=0x7f020023;
- public static final int ic_banner_image_default77=0x7f020024;
- public static final int ic_breakfast=0x7f020025;
- public static final int ic_car=0x7f020026;
- public static final int ic_date=0x7f020027;
- public static final int ic_hbut=0x7f020028;
- public static final int ic_hide=0x7f020029;
- public static final int ic_launcher=0x7f02002a;
- public static final int ic_loc=0x7f02002b;
- public static final int ic_menu_copy_holo_light=0x7f02002c;
- public static final int ic_menu_find_holo_light=0x7f02002d;
- public static final int ic_menu_info_details=0x7f02002e;
- public static final int ic_menu_myplaces=0x7f02002f;
- public static final int ic_menu_notifications=0x7f020030;
- public static final int ic_menu_share=0x7f020031;
- public static final int ic_mine=0x7f020032;
- public static final int ic_page_indicator=0x7f020033;
- public static final int ic_page_indicator_focused=0x7f020034;
- public static final int ic_phone=0x7f020035;
- public static final int ic_phone2=0x7f020036;
- public static final int ic_phone3=0x7f020037;
- public static final int ic_sale=0x7f020038;
- public static final int ic_search=0x7f020039;
- public static final int ic_shelf_category_divider=0x7f02003a;
- public static final int ic_shop=0x7f02003b;
- public static final int ic_shop_info_bg=0x7f02003c;
- public static final int ic_shop_info_bg2=0x7f02003d;
- public static final int ic_shop_info_bg22=0x7f02003e;
- public static final int ic_star_no=0x7f02003f;
- public static final int ic_star_yes=0x7f020040;
- public static final int login_button=0x7f020041;
- public static final int login_button_select=0x7f020042;
- public static final int qq=0x7f020043;
- public static final int shap_circle=0x7f020044;
- public static final int shap_divider=0x7f020045;
- public static final int shape_color_frame=0x7f020046;
- public static final int shape_grid_item=0x7f020047;
- public static final int shape_left_radius_color_square=0x7f020048;
- public static final int shape_radius=0x7f020049;
- public static final int shape_radius_color_square=0x7f02004a;
- public static final int shape_radius_square=0x7f02004b;
- public static final int splash=0x7f02004c;
- public static final int star_img1=0x7f02004d;
- public static final int star_img2=0x7f02004e;
- public static final int star_img3=0x7f02004f;
- public static final int star_img4=0x7f020050;
- public static final int star_img5=0x7f020051;
- public static final int tab_bg_selector=0x7f020052;
- public static final int welcome_background=0x7f020053;
- }
- 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 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 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_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 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 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_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_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 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_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 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 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_loc=0x7f090009;
- public static final int tv_bxt_news_point=0x7f09000c;
- public static final int tv_bxt_news_speaker=0x7f090007;
- public static final int tv_bxt_news_speaker_info=0x7f09000d;
- 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_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_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 view_pager=0x7f090017;
- public static final int viewpager=0x7f090062;
- public static final int wv_wsq=0x7f09000e;
- }
- public static final class layout {
- public static final int activity_about=0x7f030000;
- public static final int activity_award=0x7f030001;
- public static final int activity_base=0x7f030002;
- public static final int activity_bxt=0x7f030003;
- public static final int activity_bxt_news=0x7f030004;
- public static final int activity_car=0x7f030005;
- public static final int activity_classroom=0x7f030006;
- public static final int activity_feedback=0x7f030007;
- public static final int activity_home=0x7f030008;
- public static final int activity_login=0x7f030009;
- public static final int activity_mine=0x7f03000a;
- public static final int activity_mine_info=0x7f03000b;
- public static final int activity_mine_info_edit=0x7f03000c;
- public static final int activity_mine_old=0x7f03000d;
- public static final int activity_news=0x7f03000e;
- public static final int activity_order=0x7f03000f;
- public static final int activity_order_info=0x7f030010;
- public static final int activity_reg=0x7f030011;
- public static final int activity_shop=0x7f030012;
- public static final int activity_shop_all=0x7f030013;
- public static final int activity_shop_item=0x7f030014;
- public static final int activity_soft=0x7f030015;
- public static final int activity_splash=0x7f030016;
- public static final int activity_test=0x7f030017;
- public static final int activity_userinfo=0x7f030018;
- public static final int bxt_list_item=0x7f030019;
- public static final int commit=0x7f03001a;
- public static final int common_datetime=0x7f03001b;
- public static final int dlg_order_settime=0x7f03001c;
- public static final int goods_list_item=0x7f03001d;
- public static final int gv_item_classroom=0x7f03001e;
- public static final int header_award=0x7f03001f;
- public static final int header_bxt=0x7f030020;
- public static final int header_bxt_news=0x7f030021;
- public static final int header_feedback=0x7f030022;
- public static final int header_home=0x7f030023;
- public static final int header_mine=0x7f030024;
- public static final int header_mine_info=0x7f030025;
- public static final int header_mine_info_edit=0x7f030026;
- public static final int header_news=0x7f030027;
- public static final int header_order=0x7f030028;
- public static final int header_order_info=0x7f030029;
- public static final int header_shop=0x7f03002a;
- public static final int header_shop_all=0x7f03002b;
- public static final int header_soft=0x7f03002c;
- public static final int layout_reservation=0x7f03002d;
- public static final int mine_list_item=0x7f03002e;
- public static final int mine_soft_list_item=0x7f03002f;
- public static final int news_list_item=0x7f030030;
- public static final int order_info_list_item=0x7f030031;
- public static final int popmenu=0x7f030032;
- public static final int scom_list_item=0x7f030033;
- public static final int shop_all_list_item=0x7f030034;
- public static final int shop_grid_item=0x7f030035;
- public static final int tab_widget_item=0x7f030036;
- public static final int viewpager_menu=0x7f030037;
- public static final int viewpager_shopinfo=0x7f030038;
- }
- public static final class menu {
- public static final int main=0x7f080000;
- public static final int popup=0x7f080001;
- }
- public static final class string {
- public static final int action_settings=0x7f060001;
- public static final int app_name=0x7f060000;
- public static final int hello_world=0x7f060002;
- }
- public static final class style {
- /**
- Base application theme for API 11+. This theme completely replaces
- AppBaseTheme from res/values/styles.xml on API 11+ devices.
-
- API 11 theme customizations can go here.
-
- Base application theme for API 14+. This theme completely replaces
- AppBaseTheme from BOTH res/values/styles.xml and
- res/values-v11/styles.xml on API 14+ devices.
-
- API 14 theme customizations can go here.
- */
- public static final int AppBaseTheme=0x7f070000;
- public static final int AppNoTitleBarTheme=0x7f070003;
- public static final int AppTheme=0x7f070001;
- /** 自定义对话框的样式
- */
- public static final int MyDialog=0x7f070004;
- public static final int NoTitleBarTheme=0x7f070002;
- /** 自定义RatingBar样式
- */
- public static final int custom_ratingbar_style=0x7f070005;
- }
-}
diff --git a/代码/Shop 1.2最终版/ic_launcher-web.png b/代码/Shop 1.2最终版/ic_launcher-web.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/ic_launcher-web.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/libs/android-support-v4.jar b/代码/Shop 1.2最终版/libs/android-support-v4.jar
deleted file mode 100644
index 9056828..0000000
Binary files a/代码/Shop 1.2最终版/libs/android-support-v4.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/libs/bmobPush_0.1beta.jar b/代码/Shop 1.2最终版/libs/bmobPush_0.1beta.jar
deleted file mode 100644
index 1d64f33..0000000
Binary files a/代码/Shop 1.2最终版/libs/bmobPush_0.1beta.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/libs/bmob_v3.1.0beta.jar b/代码/Shop 1.2最终版/libs/bmob_v3.1.0beta.jar
deleted file mode 100644
index 1882b21..0000000
Binary files a/代码/Shop 1.2最终版/libs/bmob_v3.1.0beta.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/libs/mta-sdk-1.6.2.jar b/代码/Shop 1.2最终版/libs/mta-sdk-1.6.2.jar
deleted file mode 100644
index 49b7787..0000000
Binary files a/代码/Shop 1.2最终版/libs/mta-sdk-1.6.2.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/libs/open_sdk_r5756.jar b/代码/Shop 1.2最终版/libs/open_sdk_r5756.jar
deleted file mode 100644
index 72daab6..0000000
Binary files a/代码/Shop 1.2最终版/libs/open_sdk_r5756.jar and /dev/null differ
diff --git a/代码/Shop 1.2最终版/lint.xml b/代码/Shop 1.2最终版/lint.xml
deleted file mode 100644
index 9d72abb..0000000
--- a/代码/Shop 1.2最终版/lint.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/proguard-project.txt b/代码/Shop 1.2最终版/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/代码/Shop 1.2最终版/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/代码/Shop 1.2最终版/project.properties b/代码/Shop 1.2最终版/project.properties
deleted file mode 100644
index 5c5f4c7..0000000
--- a/代码/Shop 1.2最终版/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-20
-proguard.config=proguard.cfg
diff --git a/代码/Shop 1.2最终版/res/anim/cycle_7.xml b/代码/Shop 1.2最终版/res/anim/cycle_7.xml
deleted file mode 100644
index 57932a8..0000000
--- a/代码/Shop 1.2最终版/res/anim/cycle_7.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
diff --git a/代码/Shop 1.2最终版/res/anim/scale.xml b/代码/Shop 1.2最终版/res/anim/scale.xml
deleted file mode 100644
index 77cdc91..0000000
--- a/代码/Shop 1.2最终版/res/anim/scale.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/anim/shake.xml b/代码/Shop 1.2最终版/res/anim/shake.xml
deleted file mode 100644
index 4352ab2..0000000
--- a/代码/Shop 1.2最终版/res/anim/shake.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/drawable-hdpi/ic_launcher.png b/代码/Shop 1.2最终版/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable-mdpi/ic_launcher.png b/代码/Shop 1.2最终版/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable-xhdpi/ic_launcher.png b/代码/Shop 1.2最终版/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable-xxhdpi/ic_launcher.png b/代码/Shop 1.2最终版/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_focused_holo.9.png b/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_focused_holo.9.png
deleted file mode 100644
index 140ebfd..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_focused_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_holo.9.png b/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_holo.9.png
deleted file mode 100644
index a94f098..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_pressed_holo.9.png b/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_pressed_holo.9.png
deleted file mode 100644
index 25ec789..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/abs__tab_selected_pressed_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/abs__tab_unselected_pressed_holo.9.png b/代码/Shop 1.2最终版/res/drawable/abs__tab_unselected_pressed_holo.9.png
deleted file mode 100644
index 3e7f9e4..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/abs__tab_unselected_pressed_holo.9.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/bg1.jpg b/代码/Shop 1.2最终版/res/drawable/bg1.jpg
deleted file mode 100644
index cbb06e0..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/bg1.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/bg3.jpg b/代码/Shop 1.2最终版/res/drawable/bg3.jpg
deleted file mode 100644
index 69333a7..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/bg3.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/btn_green_normal.png b/代码/Shop 1.2最终版/res/drawable/btn_green_normal.png
deleted file mode 100644
index 3297518..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/btn_green_normal.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/btn_green_pressed.png b/代码/Shop 1.2最终版/res/drawable/btn_green_pressed.png
deleted file mode 100644
index a2c1e43..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/btn_green_pressed.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/checkbox_bg1.xml b/代码/Shop 1.2最终版/res/drawable/checkbox_bg1.xml
deleted file mode 100644
index 24e98f1..0000000
--- a/代码/Shop 1.2最终版/res/drawable/checkbox_bg1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/checkbox_selected.png b/代码/Shop 1.2最终版/res/drawable/checkbox_selected.png
deleted file mode 100644
index 54b74dc..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/checkbox_selected.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/checkbox_selected_press.png b/代码/Shop 1.2最终版/res/drawable/checkbox_selected_press.png
deleted file mode 100644
index 6d5756a..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/checkbox_selected_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/checkbox_unselect.png b/代码/Shop 1.2最终版/res/drawable/checkbox_unselect.png
deleted file mode 100644
index 9185ada..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/checkbox_unselect.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/checkbox_unselect_press.png b/代码/Shop 1.2最终版/res/drawable/checkbox_unselect_press.png
deleted file mode 100644
index 0bf72e9..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/checkbox_unselect_press.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/custom_ratingbar.xml b/代码/Shop 1.2最终版/res/drawable/custom_ratingbar.xml
deleted file mode 100644
index ab2cf58..0000000
--- a/代码/Shop 1.2最终版/res/drawable/custom_ratingbar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_1.png b/代码/Shop 1.2最终版/res/drawable/ic_1.png
deleted file mode 100644
index 9ccc4da..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_2.png b/代码/Shop 1.2最终版/res/drawable/ic_2.png
deleted file mode 100644
index bc9f9ff..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_3.png b/代码/Shop 1.2最终版/res/drawable/ic_3.png
deleted file mode 100644
index 1192560..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_41.png b/代码/Shop 1.2最终版/res/drawable/ic_41.png
deleted file mode 100644
index 2809275..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_41.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_42.png b/代码/Shop 1.2最终版/res/drawable/ic_42.png
deleted file mode 100644
index c4c3fe5..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_42.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_5.png b/代码/Shop 1.2最终版/res/drawable/ic_5.png
deleted file mode 100644
index 32e9ab3..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_5.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_6.png b/代码/Shop 1.2最终版/res/drawable/ic_6.png
deleted file mode 100644
index 4172b94..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_6.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_7.png b/代码/Shop 1.2最终版/res/drawable/ic_7.png
deleted file mode 100644
index ccfabb4..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_7.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_8.png b/代码/Shop 1.2最终版/res/drawable/ic_8.png
deleted file mode 100644
index 609d322..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_8.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_81.png b/代码/Shop 1.2最终版/res/drawable/ic_81.png
deleted file mode 100644
index 3e74d95..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_81.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_82.png b/代码/Shop 1.2最终版/res/drawable/ic_82.png
deleted file mode 100644
index 5c7d3d3..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_82.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_app.png b/代码/Shop 1.2最终版/res/drawable/ic_app.png
deleted file mode 100644
index cb4a403..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_app.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_app1.png b/代码/Shop 1.2最终版/res/drawable/ic_app1.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_app1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner1.png b/代码/Shop 1.2最终版/res/drawable/ic_banner1.png
deleted file mode 100644
index e53f92f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_hide.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_hide.png
deleted file mode 100644
index cb4a403..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default1.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default1.png
deleted file mode 100644
index 5f4b680..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default1.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default11.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default11.png
deleted file mode 100644
index 48b457e..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default11.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default2.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default2.png
deleted file mode 100644
index 51cdab6..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default22.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default22.png
deleted file mode 100644
index 90c6304..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default22.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default3.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default3.png
deleted file mode 100644
index 9c265c7..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default4.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default4.png
deleted file mode 100644
index a2a3229..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default4.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default55.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default55.png
deleted file mode 100644
index 4ce9b4f..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default55.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default77.png b/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default77.png
deleted file mode 100644
index 49bda9c..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_banner_image_default77.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_breakfast.png b/代码/Shop 1.2最终版/res/drawable/ic_breakfast.png
deleted file mode 100644
index 82a0eae..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_breakfast.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_car.png b/代码/Shop 1.2最终版/res/drawable/ic_car.png
deleted file mode 100644
index f6e6b53..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_car.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_date.png b/代码/Shop 1.2最终版/res/drawable/ic_date.png
deleted file mode 100644
index 1ce7f73..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_date.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_hbut.png b/代码/Shop 1.2最终版/res/drawable/ic_hbut.png
deleted file mode 100644
index dfc211b..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_hbut.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_hide.png b/代码/Shop 1.2最终版/res/drawable/ic_hide.png
deleted file mode 100644
index f6b6fb9..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_hide.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_loc.png b/代码/Shop 1.2最终版/res/drawable/ic_loc.png
deleted file mode 100644
index 080c76a..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_loc.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_copy_holo_light.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_copy_holo_light.png
deleted file mode 100644
index 0dd8865..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_copy_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_find_holo_light.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_find_holo_light.png
deleted file mode 100644
index efee6df..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_find_holo_light.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_info_details.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_info_details.png
deleted file mode 100644
index 6a7a1e9..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_info_details.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_myplaces.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_myplaces.png
deleted file mode 100644
index ade7532..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_myplaces.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_notifications.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_notifications.png
deleted file mode 100644
index ded4323..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_notifications.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_menu_share.png b/代码/Shop 1.2最终版/res/drawable/ic_menu_share.png
deleted file mode 100644
index 2837615..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_menu_share.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_mine.png b/代码/Shop 1.2最终版/res/drawable/ic_mine.png
deleted file mode 100644
index 08e701b..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_mine.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_page_indicator.png b/代码/Shop 1.2最终版/res/drawable/ic_page_indicator.png
deleted file mode 100644
index 6204a24..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_page_indicator.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_page_indicator_focused.png b/代码/Shop 1.2最终版/res/drawable/ic_page_indicator_focused.png
deleted file mode 100644
index f75c2e1..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_page_indicator_focused.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_phone.png b/代码/Shop 1.2最终版/res/drawable/ic_phone.png
deleted file mode 100644
index 91d3d2b..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_phone.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_phone2.png b/代码/Shop 1.2最终版/res/drawable/ic_phone2.png
deleted file mode 100644
index 19c6769..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_phone2.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_phone3.png b/代码/Shop 1.2最终版/res/drawable/ic_phone3.png
deleted file mode 100644
index c3c55dc..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_phone3.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_sale.png b/代码/Shop 1.2最终版/res/drawable/ic_sale.png
deleted file mode 100644
index 1c4518e..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_sale.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_search.png b/代码/Shop 1.2最终版/res/drawable/ic_search.png
deleted file mode 100644
index 9f6df03..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_search.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_shelf_category_divider.png b/代码/Shop 1.2最终版/res/drawable/ic_shelf_category_divider.png
deleted file mode 100644
index 836688a..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_shelf_category_divider.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_shop.png b/代码/Shop 1.2最终版/res/drawable/ic_shop.png
deleted file mode 100644
index 129e2c2..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_shop.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg.jpg b/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg.jpg
deleted file mode 100644
index 2d84e7c..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg2.jpg b/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg2.jpg
deleted file mode 100644
index 566f0e1..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg2.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg22.jpg b/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg22.jpg
deleted file mode 100644
index 9ec3fd3..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_shop_info_bg22.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_star_no.png b/代码/Shop 1.2最终版/res/drawable/ic_star_no.png
deleted file mode 100644
index 303c979..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_star_no.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/ic_star_yes.png b/代码/Shop 1.2最终版/res/drawable/ic_star_yes.png
deleted file mode 100644
index add85d5..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/ic_star_yes.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/login_button.png b/代码/Shop 1.2最终版/res/drawable/login_button.png
deleted file mode 100644
index 756a4ce..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/login_button.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/login_button_select.png b/代码/Shop 1.2最终版/res/drawable/login_button_select.png
deleted file mode 100644
index 5e946a4..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/login_button_select.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/qq.png b/代码/Shop 1.2最终版/res/drawable/qq.png
deleted file mode 100644
index c65c220..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/qq.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/shap_circle.xml b/代码/Shop 1.2最终版/res/drawable/shap_circle.xml
deleted file mode 100644
index 5da73a6..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shap_circle.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shap_divider.xml b/代码/Shop 1.2最终版/res/drawable/shap_divider.xml
deleted file mode 100644
index 01c2205..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shap_divider.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_color_frame.xml b/代码/Shop 1.2最终版/res/drawable/shape_color_frame.xml
deleted file mode 100644
index 43ddd6e..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_color_frame.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_grid_item.xml b/代码/Shop 1.2最终版/res/drawable/shape_grid_item.xml
deleted file mode 100644
index 2f9482e..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_grid_item.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_left_radius_color_square.xml b/代码/Shop 1.2最终版/res/drawable/shape_left_radius_color_square.xml
deleted file mode 100644
index 7c6d37b..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_left_radius_color_square.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_radius.xml b/代码/Shop 1.2最终版/res/drawable/shape_radius.xml
deleted file mode 100644
index ac0596b..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_radius.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_radius_color_square.xml b/代码/Shop 1.2最终版/res/drawable/shape_radius_color_square.xml
deleted file mode 100644
index 6693a5e..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_radius_color_square.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/shape_radius_square.xml b/代码/Shop 1.2最终版/res/drawable/shape_radius_square.xml
deleted file mode 100644
index 041ac07..0000000
--- a/代码/Shop 1.2最终版/res/drawable/shape_radius_square.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/splash.png b/代码/Shop 1.2最终版/res/drawable/splash.png
deleted file mode 100644
index e9755b2..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/splash.png and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/star_img1.jpg b/代码/Shop 1.2最终版/res/drawable/star_img1.jpg
deleted file mode 100644
index e0692fb..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/star_img1.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/star_img2.jpg b/代码/Shop 1.2最终版/res/drawable/star_img2.jpg
deleted file mode 100644
index 391c24d..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/star_img2.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/star_img3.jpg b/代码/Shop 1.2最终版/res/drawable/star_img3.jpg
deleted file mode 100644
index db58906..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/star_img3.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/star_img4.jpg b/代码/Shop 1.2最终版/res/drawable/star_img4.jpg
deleted file mode 100644
index eb52ecd..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/star_img4.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/star_img5.jpg b/代码/Shop 1.2最终版/res/drawable/star_img5.jpg
deleted file mode 100644
index 8b48b57..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/star_img5.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/drawable/tab_bg_selector.xml b/代码/Shop 1.2最终版/res/drawable/tab_bg_selector.xml
deleted file mode 100644
index 8efcdbf..0000000
--- a/代码/Shop 1.2最终版/res/drawable/tab_bg_selector.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/drawable/welcome_background.jpg b/代码/Shop 1.2最终版/res/drawable/welcome_background.jpg
deleted file mode 100644
index e9755b2..0000000
Binary files a/代码/Shop 1.2最终版/res/drawable/welcome_background.jpg and /dev/null differ
diff --git a/代码/Shop 1.2最终版/res/layout/activity_about.xml b/代码/Shop 1.2最终版/res/layout/activity_about.xml
deleted file mode 100644
index 43e2ee5..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_about.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_award.xml b/代码/Shop 1.2最终版/res/layout/activity_award.xml
deleted file mode 100644
index d7c8743..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_award.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_base.xml b/代码/Shop 1.2最终版/res/layout/activity_base.xml
deleted file mode 100644
index 3fe3662..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_base.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_bxt.xml b/代码/Shop 1.2最终版/res/layout/activity_bxt.xml
deleted file mode 100644
index dc32da0..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_bxt.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_bxt_news.xml b/代码/Shop 1.2最终版/res/layout/activity_bxt_news.xml
deleted file mode 100644
index 56290df..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_bxt_news.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_car.xml b/代码/Shop 1.2最终版/res/layout/activity_car.xml
deleted file mode 100644
index 9ec7023..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_car.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/activity_classroom.xml b/代码/Shop 1.2最终版/res/layout/activity_classroom.xml
deleted file mode 100644
index c6c244d..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_classroom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_feedback.xml b/代码/Shop 1.2最终版/res/layout/activity_feedback.xml
deleted file mode 100644
index cb08bab..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_feedback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/activity_home.xml b/代码/Shop 1.2最终版/res/layout/activity_home.xml
deleted file mode 100644
index 87b9ba7..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_home.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_login.xml b/代码/Shop 1.2最终版/res/layout/activity_login.xml
deleted file mode 100644
index 89eac74..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_login.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_mine.xml b/代码/Shop 1.2最终版/res/layout/activity_mine.xml
deleted file mode 100644
index a1ac1d6..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_mine.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_mine_info.xml b/代码/Shop 1.2最终版/res/layout/activity_mine_info.xml
deleted file mode 100644
index 7a44f76..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_mine_info.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_mine_info_edit.xml b/代码/Shop 1.2最终版/res/layout/activity_mine_info_edit.xml
deleted file mode 100644
index e7fa0b8..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_mine_info_edit.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_mine_old.xml b/代码/Shop 1.2最终版/res/layout/activity_mine_old.xml
deleted file mode 100644
index a4d3ca6..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_mine_old.xml
+++ /dev/null
@@ -1,335 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_news.xml b/代码/Shop 1.2最终版/res/layout/activity_news.xml
deleted file mode 100644
index ae1fd9c..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_news.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_order.xml b/代码/Shop 1.2最终版/res/layout/activity_order.xml
deleted file mode 100644
index 458b689..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_order.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_order_info.xml b/代码/Shop 1.2最终版/res/layout/activity_order_info.xml
deleted file mode 100644
index 2617a2e..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_order_info.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/activity_reg.xml b/代码/Shop 1.2最终版/res/layout/activity_reg.xml
deleted file mode 100644
index 3654ab2..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_reg.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/activity_shop.xml b/代码/Shop 1.2最终版/res/layout/activity_shop.xml
deleted file mode 100644
index 05efaf5..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_shop.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_shop_all.xml b/代码/Shop 1.2最终版/res/layout/activity_shop_all.xml
deleted file mode 100644
index 363ab03..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_shop_all.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_shop_item.xml b/代码/Shop 1.2最终版/res/layout/activity_shop_item.xml
deleted file mode 100644
index aca5ee3..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_shop_item.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_soft.xml b/代码/Shop 1.2最终版/res/layout/activity_soft.xml
deleted file mode 100644
index 292f1f1..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_soft.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_splash.xml b/代码/Shop 1.2最终版/res/layout/activity_splash.xml
deleted file mode 100644
index b675293..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_splash.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/activity_test.xml b/代码/Shop 1.2最终版/res/layout/activity_test.xml
deleted file mode 100644
index d7e28cf..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_test.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/activity_userinfo.xml b/代码/Shop 1.2最终版/res/layout/activity_userinfo.xml
deleted file mode 100644
index 0ae99aa..0000000
--- a/代码/Shop 1.2最终版/res/layout/activity_userinfo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/bxt_list_item.xml b/代码/Shop 1.2最终版/res/layout/bxt_list_item.xml
deleted file mode 100644
index d361af5..0000000
--- a/代码/Shop 1.2最终版/res/layout/bxt_list_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/commit.xml b/代码/Shop 1.2最终版/res/layout/commit.xml
deleted file mode 100644
index 5367094..0000000
--- a/代码/Shop 1.2最终版/res/layout/commit.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/common_datetime.xml b/代码/Shop 1.2最终版/res/layout/common_datetime.xml
deleted file mode 100644
index 07c3415..0000000
--- a/代码/Shop 1.2最终版/res/layout/common_datetime.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/dlg_order_settime.xml b/代码/Shop 1.2最终版/res/layout/dlg_order_settime.xml
deleted file mode 100644
index 974cfd6..0000000
--- a/代码/Shop 1.2最终版/res/layout/dlg_order_settime.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/goods_list_item.xml b/代码/Shop 1.2最终版/res/layout/goods_list_item.xml
deleted file mode 100644
index 5a0fb97..0000000
--- a/代码/Shop 1.2最终版/res/layout/goods_list_item.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/gv_item_classroom.xml b/代码/Shop 1.2最终版/res/layout/gv_item_classroom.xml
deleted file mode 100644
index 4c8cc0e..0000000
--- a/代码/Shop 1.2最终版/res/layout/gv_item_classroom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_award.xml b/代码/Shop 1.2最终版/res/layout/header_award.xml
deleted file mode 100644
index 370dcf8..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_award.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_bxt.xml b/代码/Shop 1.2最终版/res/layout/header_bxt.xml
deleted file mode 100644
index e679c11..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_bxt.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_bxt_news.xml b/代码/Shop 1.2最终版/res/layout/header_bxt_news.xml
deleted file mode 100644
index 72032ab..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_bxt_news.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_feedback.xml b/代码/Shop 1.2最终版/res/layout/header_feedback.xml
deleted file mode 100644
index 3b9ac1d..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_feedback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_home.xml b/代码/Shop 1.2最终版/res/layout/header_home.xml
deleted file mode 100644
index 10e970c..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_home.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_mine.xml b/代码/Shop 1.2最终版/res/layout/header_mine.xml
deleted file mode 100644
index 05ee9e5..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_mine.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_mine_info.xml b/代码/Shop 1.2最终版/res/layout/header_mine_info.xml
deleted file mode 100644
index 818280d..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_mine_info.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_mine_info_edit.xml b/代码/Shop 1.2最终版/res/layout/header_mine_info_edit.xml
deleted file mode 100644
index a48689f..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_mine_info_edit.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_news.xml b/代码/Shop 1.2最终版/res/layout/header_news.xml
deleted file mode 100644
index 9372403..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_news.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_order.xml b/代码/Shop 1.2最终版/res/layout/header_order.xml
deleted file mode 100644
index 3a1becb..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_order.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_order_info.xml b/代码/Shop 1.2最终版/res/layout/header_order_info.xml
deleted file mode 100644
index 664a304..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_order_info.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_shop.xml b/代码/Shop 1.2最终版/res/layout/header_shop.xml
deleted file mode 100644
index 7f67816..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_shop.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/header_shop_all.xml b/代码/Shop 1.2最终版/res/layout/header_shop_all.xml
deleted file mode 100644
index a893d03..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_shop_all.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/header_soft.xml b/代码/Shop 1.2最终版/res/layout/header_soft.xml
deleted file mode 100644
index a7530c7..0000000
--- a/代码/Shop 1.2最终版/res/layout/header_soft.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/layout_reservation.xml b/代码/Shop 1.2最终版/res/layout/layout_reservation.xml
deleted file mode 100644
index 30ebbd0..0000000
--- a/代码/Shop 1.2最终版/res/layout/layout_reservation.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/mine_list_item.xml b/代码/Shop 1.2最终版/res/layout/mine_list_item.xml
deleted file mode 100644
index b98c2d4..0000000
--- a/代码/Shop 1.2最终版/res/layout/mine_list_item.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/mine_soft_list_item.xml b/代码/Shop 1.2最终版/res/layout/mine_soft_list_item.xml
deleted file mode 100644
index b403c2a..0000000
--- a/代码/Shop 1.2最终版/res/layout/mine_soft_list_item.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/news_list_item.xml b/代码/Shop 1.2最终版/res/layout/news_list_item.xml
deleted file mode 100644
index 169372f..0000000
--- a/代码/Shop 1.2最终版/res/layout/news_list_item.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/order_info_list_item.xml b/代码/Shop 1.2最终版/res/layout/order_info_list_item.xml
deleted file mode 100644
index e46624a..0000000
--- a/代码/Shop 1.2最终版/res/layout/order_info_list_item.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/popmenu.xml b/代码/Shop 1.2最终版/res/layout/popmenu.xml
deleted file mode 100644
index 435138e..0000000
--- a/代码/Shop 1.2最终版/res/layout/popmenu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/scom_list_item.xml b/代码/Shop 1.2最终版/res/layout/scom_list_item.xml
deleted file mode 100644
index 5367094..0000000
--- a/代码/Shop 1.2最终版/res/layout/scom_list_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/shop_all_list_item.xml b/代码/Shop 1.2最终版/res/layout/shop_all_list_item.xml
deleted file mode 100644
index aa1c0c1..0000000
--- a/代码/Shop 1.2最终版/res/layout/shop_all_list_item.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/shop_grid_item.xml b/代码/Shop 1.2最终版/res/layout/shop_grid_item.xml
deleted file mode 100644
index 97252d3..0000000
--- a/代码/Shop 1.2最终版/res/layout/shop_grid_item.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/tab_widget_item.xml b/代码/Shop 1.2最终版/res/layout/tab_widget_item.xml
deleted file mode 100644
index 6c54957..0000000
--- a/代码/Shop 1.2最终版/res/layout/tab_widget_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/layout/viewpager_menu.xml b/代码/Shop 1.2最终版/res/layout/viewpager_menu.xml
deleted file mode 100644
index c9e0fe8..0000000
--- a/代码/Shop 1.2最终版/res/layout/viewpager_menu.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/layout/viewpager_shopinfo.xml b/代码/Shop 1.2最终版/res/layout/viewpager_shopinfo.xml
deleted file mode 100644
index 5696e20..0000000
--- a/代码/Shop 1.2最终版/res/layout/viewpager_shopinfo.xml
+++ /dev/null
@@ -1,292 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/res/menu/main.xml b/代码/Shop 1.2最终版/res/menu/main.xml
deleted file mode 100644
index c002028..0000000
--- a/代码/Shop 1.2最终版/res/menu/main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/代码/Shop 1.2最终版/res/menu/popup.xml b/代码/Shop 1.2最终版/res/menu/popup.xml
deleted file mode 100644
index c75aecd..0000000
--- a/代码/Shop 1.2最终版/res/menu/popup.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
diff --git a/代码/Shop 1.2最终版/res/values-sw600dp/dimens.xml b/代码/Shop 1.2最终版/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 44f01db..0000000
--- a/代码/Shop 1.2最终版/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/values-sw720dp-land/dimens.xml b/代码/Shop 1.2最终版/res/values-sw720dp-land/dimens.xml
deleted file mode 100644
index 61e3fa8..0000000
--- a/代码/Shop 1.2最终版/res/values-sw720dp-land/dimens.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 128dp
-
-
diff --git a/代码/Shop 1.2最终版/res/values-v11/styles.xml b/代码/Shop 1.2最终版/res/values-v11/styles.xml
deleted file mode 100644
index 3c02242..0000000
--- a/代码/Shop 1.2最终版/res/values-v11/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/values-v14/styles.xml b/代码/Shop 1.2最终版/res/values-v14/styles.xml
deleted file mode 100644
index a91fd03..0000000
--- a/代码/Shop 1.2最终版/res/values-v14/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/代码/Shop 1.2最终版/res/values/dimens.xml b/代码/Shop 1.2最终版/res/values/dimens.xml
deleted file mode 100644
index 55c1e59..0000000
--- a/代码/Shop 1.2最终版/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- 16dp
- 16dp
-
-
diff --git a/代码/Shop 1.2最终版/res/values/strings.xml b/代码/Shop 1.2最终版/res/values/strings.xml
deleted file mode 100644
index ebd7dfb..0000000
--- a/代码/Shop 1.2最终版/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- 在这里
- Settings
- Hello world!
-
-
-
diff --git a/代码/Shop 1.2最终版/res/values/styles.xml b/代码/Shop 1.2最终版/res/values/styles.xml
deleted file mode 100644
index 5a0bc8b..0000000
--- a/代码/Shop 1.2最终版/res/values/styles.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/代码/Shop 1.2最终版/src/com/stone/date/MessageDef.java b/代码/Shop 1.2最终版/src/com/stone/date/MessageDef.java
deleted file mode 100644
index 1128511..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/date/MessageDef.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.date;
-
-
-public class MessageDef {
-
- //查询用户订单成功完成
- public static final int MINE_FINISH_LOAD_DATA = 401;
-
- //查询用户成功完成
- public static final int MINE_INFO_FINISH_FIND_USER = 402;
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/date/TypeDef.java b/代码/Shop 1.2最终版/src/com/stone/date/TypeDef.java
deleted file mode 100644
index 8770ae5..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/date/TypeDef.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stone.date;
-
-/**
- * 类型分类汇总
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class TypeDef {
-
- //父分类
- public static final String[] typeDadList = { "学习", "点餐", "校园服务", "娱乐" };
-
- //子分类--学习小菜
- public static final String[] typeSonList1 = { "教室", "图书馆" };
-
- //子分类--吃饭小菜
- public static final String[] typeSonList2 = { "一食堂", "二食堂" };
-
- //子分类--购物小菜
- public static final String[] typeSonList3 = {"博学堂", "打印", "理发", "宾馆", "自行车", "生日蛋糕", "宿舍超市"};
-
- //子分类--疯狂小菜
- public static final String[] typeSonList4 = { "兼职", "景点门票", "租车", "旅游",
- "聚餐", "宾馆", "KTV" };
-
- public static final String[] chDayOfWeek = {"天","一","二","三","四","五","六"};
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTListAdapter.java
deleted file mode 100644
index df02860..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTListAdapter.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.Iterator;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
-import com.stone.shop.model.Good;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座列表适配器
- *
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTListAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public BXTListAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- Log.i("BXTNewsAdapter", "Adapter刷新数据");
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- BXTNewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.bxt_list_item, null);
- newsHolder = new BXTNewsHolder();
- newsHolder.tvBXTNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_bxt_news_item_title);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (BXTNewsHolder) convertView.getTag();
- }
- newsHolder.tvBXTNewsTitle.setText(mNewsList.get(position).getTitle());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTNewsHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTNewsHolder.java
deleted file mode 100644
index 976395b..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/BXTNewsHolder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class BXTNewsHolder {
-
- public TextView tvBXTNewsTitle; //博学堂讲座标题
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ClassroomAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ClassroomAdapter.java
deleted file mode 100644
index 7deb441..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ClassroomAdapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Classroom;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ClassroomAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public ClassroomAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder viewHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.gv_item_classroom, null);
- viewHolder = new ViewHolder();
- viewHolder.tv_chooseText = (TextView) convertView.findViewById(R.id.tv_chooseText);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- viewHolder.tv_chooseText.setText(mNewsList.get(position).getName());
- return convertView;
- }
-
- class ViewHolder {
-
- public TextView tv_chooseText; // 博学堂讲座标题
-
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsHolder.java
deleted file mode 100644
index 0a4e852..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsHolder.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * 商品视图
- * @date 2014-4-26
- * @author Stone
- */
-public class GoodsHolder {
-
- public TextView tvName; //商品名称
- public TextView tvPrice; //商品单价
- public TextView btnBuyGood; //购买按钮
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsListAdapter.java
deleted file mode 100644
index 0befe9a..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GoodsListAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-
-public class GoodsListAdapter extends BaseAdapter {
-
- private Context mContext;
- private List mGoodsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public GoodsListAdapter(Context context, List goodsList) {
- mContext = context;
- mGoodsList = goodsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mGoodsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mGoodsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mGoodsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- GoodsHolder goodHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.goods_list_item, null);
- goodHolder = new GoodsHolder();
- goodHolder.tvName = (TextView) convertView
- .findViewById(R.id.tv_good_name);
- goodHolder.tvPrice = (TextView) convertView
- .findViewById(R.id.tv_good_price);
- goodHolder.btnBuyGood = (TextView) convertView
- .findViewById(R.id.btn_buy_good);
- convertView.setTag(goodHolder);
- } else {
- goodHolder = (GoodsHolder) convertView.getTag();
- }
- goodHolder.tvName.setText(mGoodsList.get(position).getName());
- goodHolder.tvPrice.setText("¥"+mGoodsList.get(position).getPrice());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GridAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GridAdapter.java
deleted file mode 100644
index b5e7430..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/GridAdapter.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.R.integer;
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-
-/**
- * 生活-- 网格布局(ImageView+TextView)适配器
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class GridAdapter extends BaseAdapter {
-
- private Context mContext;
- private int mIndex = 0; // 代表当前需要适配页面中第几个GridView
-
- //学习小菜
- public static String[] mSchoolTexts = TypeDef.typeSonList1;
- private int[] mSchoolImages = { R.drawable.ic_81, R.drawable.ic_82 };
-
- //吃饭小菜
- public static String[] mFoodTexts = TypeDef.typeSonList2;
- private int[] mFoodImages = { R.drawable.ic_41, R.drawable.ic_42};
-
- //购物小菜
- public static String[] mGiftTexts = TypeDef.typeSonList3;
- private int[] mGiftImages = { R.drawable.ic_7, R.drawable.ic_7,
- R.drawable.ic_7, R.drawable.ic_7, R.drawable.ic_7,
- R.drawable.ic_7, R.drawable.ic_7};
-
- //疯狂小菜
- public static String[] mOutTexts = TypeDef.typeSonList4;
- private int[] mOutImages = { R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3 };
-
- public GridAdapter(Context context, int index) {
- mContext = context;
- mIndex = index;
- }
-
- @Override
- public int getCount() {
- int count = 0;
- switch (mIndex) {
- case 0:
- count = mFoodImages.length;
- break;
- case 1:
- count = mGiftImages.length;
- break;
- case 2:
- count = mOutImages.length;
- break;
- case 3:
- count = mSchoolImages.length;
- break;
- default:
- break;
- }
- return count;
- }
-
- @Override
- public Object getItem(int position) {
- return null;
- }
-
- @Override
- public long getItemId(int position) {
- return 0;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- View view = View.inflate(mContext, R.layout.shop_grid_item, null);
- // RelativeLayout rl = (RelativeLayout)
- // view.findViewById(R.id.relaGrid);
-
- ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage);
- TextView text = (TextView) view.findViewById(R.id.tv_chooseText);
- switch (mIndex) {
- case 0:
- image.setImageResource(mFoodImages[position]);
- text.setText(mFoodTexts[position]);
- break;
- case 1:
- image.setImageResource(mGiftImages[position]);
- text.setText(mGiftTexts[position]);
- break;
- case 2:
- image.setImageResource(mOutImages[position]);
- text.setText(mOutTexts[position]);
- break;
- case 3:
- image.setImageResource(mSchoolImages[position]);
- text.setText(mSchoolTexts[position]);
- break;
- default:
- break;
- }
-
- return view;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ImagePagerAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ImagePagerAdapter.java
deleted file mode 100644
index c73ef5a..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ImagePagerAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-
-/**
- * 首页--图片轮播AutoScrollViewPager适配器
- * @author Stone
- */
-public class ImagePagerAdapter extends PagerAdapter {
-
- private List mImgViews;
-
- public ImagePagerAdapter(Context context, List imgViews) {
- this.mImgViews = imgViews;
- }
-
- @Override
- public int getCount() {
- if(mImgViews != null){
- return mImgViews.size();
- }
- return 0;
- }
-
- @Override
- public Object instantiateItem(View arg0, int arg1) {
- ((ViewPager) arg0).addView(mImgViews.get(arg1));
- return mImgViews.get(arg1);
- }
-
- @Override
- public void destroyItem(View arg0, int arg1, Object arg2) {
- ((ViewPager) arg0).removeView(mImgViews.get(arg1));
- }
-
- @Override
- public boolean isViewFromObject(View arg0, Object arg1) {
- return arg0 == arg1;
- }
-
- @Override
- public void restoreState(Parcelable arg0, ClassLoader arg1) {
-
- }
-
- @Override
- public Parcelable saveState() {
- return null;
- }
-
- @Override
- public void startUpdate(View arg0) {
-
- }
-
- @Override
- public void finishUpdate(View arg0) {
-
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListAdapter.java
deleted file mode 100644
index 29a2f69..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListAdapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineListAdapter extends BaseAdapter {
-
- private Context mContext;
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private int[] mItemImgIds; // 项目列表Icon
- private LayoutInflater mInflater = null;
-
- public MineListAdapter(Context context, String[] names, String[] contents, int[] imgIds) {
- mContext = context;
- mItemNames = names;
- mItemContents = contents;
- mItemImgIds = imgIds;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_list_item, null);
- holder = new MineListHolder();
- holder.imgItem = (ImageView) convertView.findViewById(R.id.img_item);
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.imgItem.setBackgroundResource(mItemImgIds[position]);
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListHolder.java
deleted file mode 100644
index eb315fe..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineListHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class MineListHolder {
-
- public ImageView imgItem; //项目Icon
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftAdapter.java
deleted file mode 100644
index 9dae107..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftAdapter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineSoftAdapter extends BaseAdapter {
-
- private Context mContext;
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private LayoutInflater mInflater = null;
-
- public MineSoftAdapter(Context context, String[] names, String[] contents) {
- mContext = context;
- mItemNames = names;
- mItemContents = contents;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_soft_list_item, null);
- holder = new MineListHolder();
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftHolder.java
deleted file mode 100644
index d3ed1ac..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/MineSoftHolder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class MineSoftHolder {
-
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsHolder.java
deleted file mode 100644
index b49850d..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsHolder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class NewsHolder {
-
- public TextView tvNewsType; //新闻分类
- public TextView tvNewsTitle; //新闻标题
- public TextView tvNewsDate; //新闻时间
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsListAdapter.java
deleted file mode 100644
index 92264ca..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/NewsListAdapter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.News;
-
-import android.R.integer;
-import android.content.Context;
-import android.graphics.pdf.PdfDocument.Page;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 新闻列表适配器
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class NewsListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mNewsList = null; // 所选分类下的所有店铺列表
-
- public NewsListAdapter(Context context, List newsList) {
- mContext = context;
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(ArrayList list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- NewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.news_list_item, null);
- newsHolder = new NewsHolder();
- newsHolder.tvNewsType = (TextView) convertView
- .findViewById(R.id.tv_news_type);
- newsHolder.tvNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_news_title);
- newsHolder.tvNewsDate = (TextView) convertView
- .findViewById(R.id.tv_news_date);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (NewsHolder) convertView.getTag();
- }
- //拆分字符串,只取年月日
- String[] ss = new String[2];
- ss = mNewsList.get(position).getCreatedAt().split(" ");
- newsHolder.tvNewsType.setText(mNewsList.get(position).getType()); //新闻类型
- newsHolder.tvNewsTitle.setText(mNewsList.get(position).getTitle()); //新闻标题
- newsHolder.tvNewsDate.setText(ss[0]); //新闻发布日期
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoHolder.java
deleted file mode 100644
index 7b94ec6..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class OrderInfoHolder {
-
- public TextView tvOrderInfoGoodName;
- public TextView tvOrderInfoShopName;
- public TextView tvOrderInfoPrice;
- public TextView tvOrderInfoState;
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoListAdapter.java
deleted file mode 100644
index 35c9294..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/OrderInfoListAdapter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.GetListener;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Order;
-import com.stone.shop.model.Shop;
-import com.stone.shop.view.OrderInfoActivity;
-
-/**
- * 适配器--适配订单列表中的数据
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mOrderList = null; // 所选分类下的所有店铺列表
- private String mType; // 商店的分类
-
- public OrderInfoListAdapter(Context context, List orderList) {
- mContext = context;
- mOrderList = orderList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mOrderList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mOrderList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- public void refresh(List list) {
- mOrderList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- OrderInfoHolder orderInfoHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.order_info_list_item, null);
- orderInfoHolder = new OrderInfoHolder();
- orderInfoHolder.tvOrderInfoGoodName = (TextView) convertView
- .findViewById(R.id.tv_order_info_good_name);
- orderInfoHolder.tvOrderInfoShopName = (TextView) convertView
- .findViewById(R.id.tv_order_info_shop_name);
- orderInfoHolder.tvOrderInfoPrice = (TextView) convertView
- .findViewById(R.id.tv_order_info_price);
- orderInfoHolder.tvOrderInfoState = (TextView) convertView
- .findViewById(R.id.tv_order_info_state);
- convertView.setTag(orderInfoHolder);
- } else {
- orderInfoHolder = (OrderInfoHolder) convertView.getTag();
- }
- orderInfoHolder.tvOrderInfoGoodName.setText(mOrderList.get(position).getGoodName());
- orderInfoHolder.tvOrderInfoShopName.setText(mOrderList.get(position).getShopName());
- orderInfoHolder.tvOrderInfoPrice.setText("¥" + mOrderList.get(position).getPrice());
- orderInfoHolder.tvOrderInfoState.setText(mOrderList.get(position).getState());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SComHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SComHolder.java
deleted file mode 100644
index 5bf60e8..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SComHolder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class SComHolder {
-
- public TextView tvComUser;
- public TextView tvComContent;
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SCommentAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SCommentAdapter.java
deleted file mode 100644
index 98cf470..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/SCommentAdapter.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.SComment;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 店铺评论列表适配器
- * @date 2014-5-3
- * @author Stone
- */
-public class SCommentAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private List mSComList = null; // 所选分类下的所有店铺列表
-
- public SCommentAdapter(Context context, List list) {
- mContext = context;
- mSComList = list;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mSComList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mSComList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- SComHolder scomHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.scom_list_item, null);
- scomHolder = new SComHolder();
- scomHolder.tvComUser = (TextView) convertView
- .findViewById(R.id.tv_commit_user);
- scomHolder.tvComContent = (TextView) convertView
- .findViewById(R.id.tv_commit_content);
- convertView.setTag(scomHolder);
- } else {
- scomHolder = (SComHolder) convertView.getTag();
- }
- scomHolder.tvComUser.setText(mSComList.get(position).getUserName());
- scomHolder.tvComContent.setText(mSComList.get(position).getContent());
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopHolder.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopHolder.java
deleted file mode 100644
index f0c3de3..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopHolder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-/**
- * 商店视图
- * @date 2014-4-29
- * @author Stone
- */
-public class ShopHolder {
-
- public TextView tvShopName;
- public TextView tvShopType;
- public TextView tvShopLoc;
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopListAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopListAdapter.java
deleted file mode 100644
index 539a17f..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ShopListAdapter.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.model.Shop;
-
-/**
- * 适配器--适配某一分类下的店铺列表数据
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class ShopListAdapter extends BaseAdapter {
-
- private Context mContext;
- private LayoutInflater mInflater = null;
- private ArrayList mShopList = null; // 所选分类下的所有店铺列表
- private String mType; // 商店的分类
-
- public ShopListAdapter(Context context, ArrayList shopList,
- String type) {
- mContext = context;
- mShopList = shopList;
- mType = type;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mShopList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mShopList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(ArrayList list) {
- mShopList = list;
- //将数字的类型编号转换为文字
- exchangeType(mType);
- notifyDataSetChanged();
- }
-
- /**
- * 根据当前的type类型, 转换成相应的文字
- * @date 2014-4-29
- * @param typeString
- */
- private void exchangeType(String typeString) {
-
- int type = Integer.parseInt(typeString);
- int fatherType = type / 10; //父类型编号
- int sonType = type % 10; //子类型编号
-
- Iterator iterator = mShopList.iterator();
- while (iterator.hasNext()) {
- switch (fatherType) {
- case 1:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList1[sonType-1]);
- break;
- case 2:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList2[sonType-1]);
- break;
- case 3:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList3[sonType-1]);
- break;
- case 4:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList4[sonType-1]);
- break;
- default:
- break;
- }
-
- }
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ShopHolder shopHodler;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.shop_all_list_item, null);
- shopHodler = new ShopHolder();
- shopHodler.tvShopName = (TextView) convertView
- .findViewById(R.id.tv_shop_name);
- shopHodler.tvShopType = (TextView) convertView
- .findViewById(R.id.tv_shop_type);
- shopHodler.tvShopLoc = (TextView) convertView
- .findViewById(R.id.tv_shop_loc);
- convertView.setTag(shopHodler);
- } else {
- shopHodler = (ShopHolder) convertView.getTag();
- }
- shopHodler.tvShopName.setText(mShopList.get(position).getName());
- // 商店的类型需要单独处理
- shopHodler.tvShopType.setText(mShopList.get(position).getType());
- shopHodler.tvShopLoc.setText("二食堂");
- return convertView;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ViewPagerAdapter.java b/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ViewPagerAdapter.java
deleted file mode 100644
index 38dedc2..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/adapter/ViewPagerAdapter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.view.ShopItemActivity;
-import com.stone.ui.ViewPagerCompat;
-
-import android.support.v4.view.PagerAdapter;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-
-/**
- * 商铺详情页--ViewPagerCompat适配器
- * @author Stone
- */
-public class ViewPagerAdapter extends PagerAdapter {
-
- private List mListViews;
- private List mTitleList;
-
- public ViewPagerAdapter(List mListViews, List mTitleList) {
- this.mListViews = mListViews;
- this.mTitleList = mTitleList;
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- container.removeView(mListViews.get(position));//删除页卡
- }
-
- @Override
- public CharSequence getPageTitle(int position) {
-
- return mTitleList.get(position);//直接用适配器来完成标题的显示,所以从上面可以看到,我们没有使用PagerTitleStrip。当然你可以使用。
- }
-
-
- @Override
- public Object instantiateItem(ViewGroup container, int position) { //这个方法用来实例化页卡
- container.addView(mListViews.get(position), 0);//添加页卡
- return mListViews.get(position);
- }
-
- @Override
- public int getCount() {
- return mListViews.size();//返回页卡的数量
- }
-
- @Override
- public boolean isViewFromObject(View arg0, Object arg1) {
- return arg0==arg1;//官方提示这样写
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/BXTNews.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/BXTNews.java
deleted file mode 100644
index fb8f926..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/BXTNews.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/Classroom.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/Classroom.java
deleted file mode 100644
index 85c64eb..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/Classroom.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Classroom extends BmobObject {
-
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "ClassRoom [name=" + name + "]";
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/FeedBack.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/FeedBack.java
deleted file mode 100644
index 9461f41..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/FeedBack.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 用户反馈信息
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBack extends BmobObject {
-
- private String username;
- private String phone;
- private String email;
- private String content;
-
- public String getUsername() {
- return username;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/Good.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/Good.java
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/Good.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/LuckyUser.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/LuckyUser.java
deleted file mode 100644
index 4600723..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/LuckyUser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 中奖用户
- * @date 2014-5-28
- * @author Stone
- */
-public class LuckyUser extends BmobObject {
-
- private String username;
- private String award;
-
- public String getUsername() {
- return username;
- }
- public String getAward() {
- return award;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public void setAward(String award) {
- this.award = award;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/News.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/News.java
deleted file mode 100644
index b169779..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/News.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/Order.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/Order.java
deleted file mode 100644
index 4879ef3..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/Order.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 订单实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Order extends BmobObject {
-
- private String userName;
- private String goodID; // 商品ID
- private String goodName;
- private String shopID; // 商店ID
- private String shopName;
- private String count; // 数量
- private String price; // 价格
- private String time; // 取餐时间
- private String phone; // 联系电话
- private String state = "未取餐"; // 订单状态(已取, 未取)
- private String tips; // 附加信息
-
- public String getGoodID() {
- return goodID;
- }
- public String getGoodName() {
- return goodName;
- }
- public String getUserName() {
- return userName;
- }
- public String getShopID() {
- return shopID;
- }
- public String getShopName() {
- return shopName;
- }
- public String getCount() {
- return count;
- }
- public String getPrice() {
- return price;
- }
- public String getTime() {
- return time;
- }
- public String getPhone() {
- return phone;
- }
- public String getState() {
- return state;
- }
- public String getTips() {
- return tips;
- }
- public void setGoodID(String goodID) {
- this.goodID = goodID;
- }
- public void setGoodName(String goodName) {
- this.goodName = goodName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
- public void setCount(String count) {
- this.count = count;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setPrice(String price) {
- this.price = price;
- }
- public void setPhone(String phone) {
- this.phone = phone;
- }
- public void setState(String state) {
- this.state = state;
- }
- public void setTips(String tips) {
- this.tips = tips;
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/Reservation.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/Reservation.java
deleted file mode 100644
index d1fafaa..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/Reservation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Reservation extends BmobObject {
-
- private String roomId;
- private String roomName;
- private String userId;
- private String dateTime;
-
- public String getRoomId() {
- return roomId;
- }
-
- public void setRoomId(String roomId) {
- this.roomId = roomId;
- }
-
- public String getRoomName() {
- return roomName;
- }
-
- public void setRoomName(String roomName) {
- this.roomName = roomName;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getDateTime() {
- return dateTime;
- }
-
- public void setDateTime(String dateTime) {
- this.dateTime = dateTime;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/SComment.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/SComment.java
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/SComment.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/Shop.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/Shop.java
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/Shop.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/model/User.java b/代码/Shop 1.2最终版/src/com/stone/shop/model/User.java
deleted file mode 100644
index 33baeff..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/model/User.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/AboutActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/AboutActivity.java
deleted file mode 100644
index 1e5944c..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/AboutActivity.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-/**
- * 关于软件
- * @author Stone
- */
-public class AboutActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_about);
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/AwardActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/AwardActivity.java
deleted file mode 100644
index 54cd361..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/AwardActivity.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.LuckyUser;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 每日一抽页面
- * @date 2014-5-18
- * @author Stone
- */
-public class AwardActivity extends Activity {
-
- private EditText etAwardNew;
- private EditText etAwardOld;
-
- private String awardNew;
- private String awardOld;
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 0:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_award);
-
- initData();
- }
-
- private void initView() {
- etAwardNew = (EditText) findViewById(R.id.et_award_new);
- etAwardOld = (EditText) findViewById(R.id.et_award_old);
-
- etAwardNew.setText(awardNew);
- etAwardOld.setText(awardOld);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.order("-updateAt");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List list) {
- awardNew = list.get(0).getUsername()+" " +list.get(0).getAward();
- awardOld = list.get(1).getUsername()+" " +list.get(1).getAward();
- Message msg = new Message();
- msg.what = 0;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取中奖名单失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTActivity.java
deleted file mode 100644
index b2fcb93..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTActivity.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.BXTListAdapter;
-import com.stone.shop.model.BXTNews;
-import com.stone.shop.model.Classroom;
-import com.stone.shop.model.BXTNews;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.renderscript.Element;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-/**
- * 教学类-博学堂界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "BXTActivity";
-
- private ListView lvBXTNews;
- private BXTListAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (ListView) findViewById(R.id.lv_bxt_news);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new BXTListAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- //toast("查询商品成功, 共" + newsList.size());
- if(newsList.size()==0)
- toast("亲, 暂时还木有讲座哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toBXTNewsActivity = new Intent(BXTActivity.this, BXTNewsActivity.class);
- toBXTNewsActivity.putExtra("title", mBXTNewsList.get(position).getTitle());
- toBXTNewsActivity.putExtra("topic", mBXTNewsList.get(position).getTopic());
- toBXTNewsActivity.putExtra("speaker", mBXTNewsList.get(position).getSpeaker());
- toBXTNewsActivity.putExtra("time", mBXTNewsList.get(position).getTime());
- toBXTNewsActivity.putExtra("location", mBXTNewsList.get(position).getLocation());
- toBXTNewsActivity.putExtra("holder1", mBXTNewsList.get(position).getHolder1());
- toBXTNewsActivity.putExtra("holder2", mBXTNewsList.get(position).getHolder2());
- toBXTNewsActivity.putExtra("points", mBXTNewsList.get(position).getPoints());
- toBXTNewsActivity.putExtra("speakerinfo", mBXTNewsList.get(position).getSpeakerinfo());
- startActivity(toBXTNewsActivity);
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTNewsActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTNewsActivity.java
deleted file mode 100644
index a39c090..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/BXTNewsActivity.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座详情界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNewsActivity extends Activity {
-
- private static final String TAG = "BXTNewsActivity";
-
- private BXTNews news;
- private TextView tvBXTNewsTitle;
- private TextView tvBXTNewsTopic;
- private TextView tvBXTNewsSpeaker;
- private TextView tvBXTNewsTime;
- private TextView tvBXTNewsLoc;
- private TextView tvBXTNewsHolder1;
- private TextView tvBXTNewsHolder2;
- private TextView tvBXTNewsPoints;
- private TextView tvBXTNewsSpeakerInfo;
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt_news);
-
- initView();
- }
-
- private void initView() {
-
- tvBXTNewsTitle = (TextView) findViewById(R.id.tv_bxt_news_title);
- tvBXTNewsTopic = (TextView) findViewById(R.id.tv_bxt_news_topic);
- tvBXTNewsSpeaker = (TextView) findViewById(R.id.tv_bxt_news_speaker);
- tvBXTNewsTime = (TextView) findViewById(R.id.tv_bxt_news_time);
- tvBXTNewsLoc = (TextView) findViewById(R.id.tv_bxt_news_loc);
- tvBXTNewsHolder1 = (TextView) findViewById(R.id.tv_bxt_news_holder1);
- tvBXTNewsHolder2 = (TextView) findViewById(R.id.tv_bxt_news_holder2);
- tvBXTNewsPoints = (TextView) findViewById(R.id.tv_bxt_news_point);
- tvBXTNewsSpeakerInfo = (TextView) findViewById(R.id.tv_bxt_news_speaker_info);
-
- tvBXTNewsTitle.setText(getIntent().getStringExtra("title"));
- tvBXTNewsTopic.setText(getIntent().getStringExtra("topic"));
- tvBXTNewsSpeaker.setText(getIntent().getStringExtra("speaker"));
- tvBXTNewsTime.setText(getIntent().getStringExtra("time"));
- tvBXTNewsLoc.setText(getIntent().getStringExtra("location"));
- tvBXTNewsHolder1.setText(getIntent().getStringExtra("holder1"));
- tvBXTNewsHolder2.setText(getIntent().getStringExtra("holder2"));
- tvBXTNewsPoints.setText(getIntent().getStringExtra("points"));
- tvBXTNewsSpeakerInfo.setText(getIntent().getStringExtra("speakerinfo"));
-
- }
-
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/BaseActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/BaseActivity.java
deleted file mode 100644
index c5e45b2..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/BaseActivity.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.stone.shop.view;
-
-import cn.bmob.v3.Bmob;
-
-import com.stone.shop.R;
-import com.stone.shop.view.old.OldMineActivity;
-
-import android.os.Bundle;
-import android.app.TabActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.Space;
-import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 应用主界面
- * @date 2014-4-24
- * @author Stone
- */
-@SuppressWarnings("deprecation")
-public class BaseActivity extends TabActivity {
-
- private static final String TAG = "BaseActivity";
-
- private TabHost tabHost;
- private LayoutInflater layoutInflater;
-
-
- String[] mTitle = new String[] { "周边", "每日一抽", "我的"};
- int[] mIcon = new int[] { R.drawable.ic_shop, R.drawable.ic_sale,
- R.drawable.ic_car, R.drawable.ic_mine };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_base);
-
- initTabView();
-
-
- }
-
- public View getTabItemView(int i) {
- // TODO Auto-generated method stub
- View view = layoutInflater.inflate(R.layout.tab_widget_item, null);
- ImageView imageView = (ImageView) view.findViewById(R.id.imageview);
- imageView.setImageResource(mIcon[i]);
- TextView textView = (TextView) view.findViewById(R.id.textview);
- textView.setText(mTitle[i]);
- return view;
- }
-
- public void initTabView() {
-
- /**
- * tabHost.newTabSpec("artist")创建一个标签项,其中artist为它的标签标识符,相当于jsp页面标签的name属性
- * setIndicator("艺术标签",resources.getDrawable(R.drawable.ic_tab))设置标签显示文本以及标签上的图标(该图标并不是一个图片,而是一个xml文件哦)
- * setContent(intent)为当前标签指定一个意图
- * tabHost.addTab(spec); 将标签项添加到标签中
- */
-
- tabHost = getTabHost();
- layoutInflater = LayoutInflater.from(this);
- TabHost.TabSpec spec;
-
- Intent intent1 = new Intent(this, ShopActivity.class);
- spec = tabHost.newTabSpec(mTitle[0]).setIndicator( getTabItemView(0) ).setContent(intent1);
- tabHost.addTab(spec);
-
- Intent intent2 = new Intent(this, AwardActivity.class);
- spec = tabHost.newTabSpec(mTitle[1]).setIndicator( getTabItemView(1) ).setContent(intent2);
- tabHost.addTab(spec);
-
- Intent intent3 = new Intent(this, MineActivity.class);
- spec = tabHost.newTabSpec(mTitle[2]).setIndicator( getTabItemView(2) ).setContent(intent3);
- tabHost.addTab(spec);
-
- /*
- Intent intent3 = new Intent(this, WsqActivity.class);
- spec = tabHost.newTabSpec(mTitle[2]).setIndicator( getTabItemView(2) ).setContent(intent3);
- tabHost.addTab(spec);
-
- Intent intent4 = new Intent(this, OldMineActivity.class);
- spec = tabHost.newTabSpec(mTitle[3]).setIndicator( getTabItemView(3) ).setContent(intent4);
- tabHost.addTab(spec); */
-
- tabHost.setCurrentTab(0);
- }
-
- @Override
- public void onBackPressed() {
- Toast.makeText(this, "确定要退出在这里么?", Toast.LENGTH_LONG).show();
- //super.onBackPressed();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/ClassroomActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/ClassroomActivity.java
deleted file mode 100644
index 7707d63..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/ClassroomActivity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.BXTListAdapter;
-import com.stone.shop.adapter.ClassroomAdapter;
-import com.stone.shop.model.Classroom;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class ClassroomActivity extends Activity implements OnItemClickListener {
-
- private static final String TAG = "BXTActivity";
-
- private GridView lvBXTNews;
- private ClassroomAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_classroom);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (GridView) findViewById(R.id.gv_classroom);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new ClassroomAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室");
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- // toast("查询商品成功, 共" + newsList.size());
- if (newsList.size() == 0)
- toast("亲, 暂时还木有教室哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- Intent intent = new Intent(ClassroomActivity.this, ReservationActivity.class);
- Classroom classroom = mBXTNewsList.get(position);
- intent.putExtra("roomId", classroom.getObjectId());
- intent.putExtra("roomName", classroom.getName());
- startActivity(intent);
-
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/FeedBackActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/FeedBackActivity.java
deleted file mode 100644
index ac8cc27..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/FeedBackActivity.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.stone.shop.view;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.FeedBack;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-/**
- * 意见反馈界面
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBackActivity extends Activity implements OnClickListener{
-
- private static final String TAG = "FeedBackActivity";
-
- private EditText etContent;
- private Button btnSubmit;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_feedback);
-
- initView();
- }
-
- private void initView() {
- etContent = (EditText) findViewById(R.id.et_feedback_content);
- btnSubmit = (Button) findViewById(R.id.btn_feedback_submit);
- btnSubmit.setOnClickListener(this);
- }
-
- /**
- * 提交用户的反馈信息
- */
- private void submit() {
- String content = etContent.getText().toString();
- if(content.equals("")) {
- toast("亲,请先写点东西吧");
- } else {
- BmobUser user = BmobUser.getCurrentUser(this);
- FeedBack fb = new FeedBack();
- fb.setUsername(user.getUsername());
- fb.setEmail(user.getEmail());
- fb.setContent(content);
- fb.insertObject(this, new InsertListener() {
-
- @Override
- public void onSuccess() {
- toast("提交成功, 在这里会尽快回复");
- back();
- }
-
- @Override
- public void onFailure(String arg0) {
- toast("提交失败");
- }
- });
-
- }
-
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_feedback_submit:
- submit();
- break;
-
- default:
- break;
- }
- }
-
- private void back() {
- finish();
- }
-
- public void clickFeedBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/HomeActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/HomeActivity.java
deleted file mode 100644
index ef4e9c5..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/HomeActivity.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.opengl.Visibility;
-import android.os.Bundle;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ImageView.ScaleType;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import cn.bmob.v3.Bmob;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.GetServerTimeListener;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.ImagePagerAdapter;
-import com.stone.shop.adapter.NewsListAdapter;
-import com.stone.shop.model.News;
-import com.stone.shop.model.Shop;
-import com.stone.ui.AutoScrollViewPager;
-import com.stone.ui.ListScrollView;
-
-/**
- * 主界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class HomeActivity extends Activity implements OnClickListener,
- OnItemClickListener {
-
- private static final String TAG = "HomeActivity";
-
- private ListScrollView listScrollView;
-
- // 校历
- private TextView tvWeek; // 周次和星期
- private TextView tvDay; // 年月日
-
- // 图片轮播
- private FrameLayout flImageAds;
- private AutoScrollViewPager viewPager;
- private List mImgViews;
- private ImageButton btnHideAds;
- private int[] mImgResId = { R.drawable.ic_banner1, R.drawable.ic_banner1,
- R.drawable.ic_banner1, R.drawable.ic_banner1 };
-
- // 校园新闻
- private ListView lvNewsList;
- private List newsList = new ArrayList();
- private NewsListAdapter newsListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_home);
-
- // 解决ScrollView和ListView之间的冲突
- listScrollView = (ListScrollView) findViewById(R.id.listScrollView);
- lvNewsList = (ListView) findViewById(R.id.lv_news);
- listScrollView.setListView(lvNewsList);
-
- flImageAds = (FrameLayout) findViewById(R.id.fl_image_ads);
- viewPager = (AutoScrollViewPager) findViewById(R.id.view_pager);
- btnHideAds = (ImageButton) findViewById(R.id.btn_hide_ads);
-
- mImgViews = new ArrayList();
- for (int i = 0; i < mImgResId.length; i++) {
- ImageView imageView = new ImageView(this);
- imageView.setImageResource(mImgResId[i]);
- imageView.setScaleType(ScaleType.CENTER_CROP);
- mImgViews.add(imageView);
- }
-
- btnHideAds.setOnClickListener(this);
-
- viewPager.setAdapter(new ImagePagerAdapter(this, mImgViews));
- viewPager.setInterval(3000); // 设置自动滚动的间隔时间,单位为毫秒
- viewPager.setDirection(AutoScrollViewPager.RIGHT); // 设置自动滚动的方向,默认向右
- viewPager.setCycle(true); // 是否自动循环轮播,默认为true
- viewPager.setScrollDurationFactor(3); // 设置ViewPager滑动动画间隔时间的倍率,达到减慢动画或改变动画速度的效果
- viewPager.setStopScrollWhenTouch(true); // 当手指碰到ViewPager时是否停止自动滚动,默认为true
- viewPager.setBorderAnimation(true); // 设置循环滚动时滑动到从边缘滚动到下一个是否需要动画,默认为true
- viewPager
- .setSlideBorderMode(AutoScrollViewPager.SLIDE_BORDER_MODE_NONE);// 滑动到第一个或最后一个Item的处理方式,支持没有任何操作、轮播以及传递到父View三种模式
-
- viewPager.startAutoScroll();
-
- // 校历
- tvWeek = (TextView) findViewById(R.id.tv_week);
- tvDay = (TextView) findViewById(R.id.tv_day);
- setTime();
-
- // 新闻
- newsListAdapter = new NewsListAdapter(this, newsList);
- lvNewsList.setAdapter(newsListAdapter);
- lvNewsList.setOnItemClickListener(this);
-
- getNewsData();
- }
-
- /**
- * 设置校历中日期的时间
- */
- public void setTime() {
- Calendar calendar = Calendar.getInstance();
- String year = calendar.get(Calendar.YEAR)+"";
- String month = calendar.get(Calendar.MONTH)+1+"";
- String day = calendar.get(Calendar.DAY_OF_MONTH)+"";
- String week = calendar.get(Calendar.WEEK_OF_YEAR)-9+"";
- String dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK)+"";
- String chDayOfWeek = TypeDef.chDayOfWeek[Integer.parseInt(dayOfWeek)-1];
- toast(year+"-"+month+"-"+day+" "+" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvWeek.setText(" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvDay.setText(year+" 年 "+month+" 月 "+day+" 日");
- }
-
- /**
- * 初始化新闻列表数据
- * @date 2014-5-3
- * @author Stone
- */
- public void getNewsData() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- newsList = object;
- // 通知Adapter数据更新
- newsListAdapter.refresh((ArrayList) newsList);
- newsListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("对不起, 获取数据失败了");
- }
- });
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- // start auto scroll when onResume
- viewPager.startAutoScroll();
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_hide_ads:
- flImageAds.setVisibility(View.GONE);
- break;
-
- default:
- break;
- }
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toNewsDetail = new Intent(HomeActivity.this, NewsActivity.class);
- toNewsDetail.putExtra("NewsTitle", newsList.get(position).getTitle());
- toNewsDetail.putExtra("NewsAuthor", newsList.get(position).getAuthor());
- toNewsDetail.putExtra("NewsTime", newsList.get(position).getCreatedAt());
- toNewsDetail.putExtra("NewsContent", newsList.get(position).getContent());
- startActivity(toNewsDetail);
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT);
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/LoginActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/LoginActivity.java
deleted file mode 100644
index 8d76303..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/LoginActivity.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.stone.shop.view;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.Bmob;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-import com.tencent.connect.UserInfo;
-import com.tencent.connect.auth.QQAuth;
-import com.tencent.connect.common.Constants;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
-import com.tencent.tauth.UiError;
-
-/**
- * 登陆界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class LoginActivity extends Activity implements OnClickListener {
-
- private static final String TAG = "LoginActicity";
-
- private Button btnLogin;
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
-
- private String username;
- private String password;
-
- private static final String APP_ID = "222222";
- private UserInfo mInfo;
- private TextView mUserInfo;
- private ImageView mUserLogo;
- private ImageView mNewLoginButton;
- private TextView backInfo;
-
- // QQ登陆
- private static Tencent mTencent;
- // private QQAuth mQQAuth;
-
- Handler mHandler = new Handler() {
-
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == 0) {
- JSONObject response = (JSONObject) msg.obj;
- if (response.has("nickname")) {
- try {
- mUserInfo.setVisibility(android.view.View.VISIBLE);
- mUserInfo.setText(response.getString("nickname"));
- } catch (JSONException e) {
- e.printStackTrace();
- }
- }
-
- } else if (msg.what == 1) {
- Bitmap bitmap = (Bitmap) msg.obj;
- mUserLogo.setImageBitmap(bitmap);
- mUserLogo.setVisibility(android.view.View.VISIBLE);
- }
- }
-
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // 初始化 Bmob SDK
- // 使用时请将第二个参数Application ID替换成你在Bmob服务器端创建的Application ID
- Bmob.initialize(this, "252a2c58d0dc9a78a5411501c62ce0de");
- setContentView(R.layout.activity_login);
-
- // QQ登陆, 获取实例
- // mQQAuth = QQAuth.createInstance(APP_ID,
- // this.getApplicationContext());
- mTencent = Tencent.createInstance(APP_ID, this.getApplicationContext());
-
- btnLogin = (Button) findViewById(R.id.btn_login);
- btnReg = (Button) findViewById(R.id.btn_register);
-
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
-
- btnLogin.setOnClickListener(this);
- btnReg.setOnClickListener(this);
-
- findViewById(R.id.btn_qq).setOnClickListener(this);
-
- mUserInfo = (TextView) findViewById(R.id.user_nickname);
- mUserLogo = (ImageView) findViewById(R.id.user_logo);
- mNewLoginButton = (ImageView) findViewById(R.id.new_login_btn);
- mNewLoginButton.setOnClickListener(this);
- backInfo = (TextView) findViewById(R.id.user_callback);
-
- getUserInfo();
-
- }
-
- private void getUserInfo() {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- etUsername.setText(sp.getString("username", null));
- etPassword.setText(sp.getString("password", null));
- }
-
- // 保存用户的登陆记录
- private void saveUserInfo(String username, String password) {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- Editor editor = sp.edit();
- editor.putString("username", username);
- editor.putString("password", password);
- editor.commit();
- }
-
- public void onClickLogin() {
- if (!mTencent.isSessionValid()) {
- mTencent.login(this, "all", loginListener);
- Log.d("SDKQQAgentPref", "FirstLaunch_SDK:" + SystemClock.elapsedRealtime());
- } else {
-
- mTencent.logout(this);
- updateUserInfo();
- }
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- // 登陆
- case R.id.btn_login:
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
-
- if (!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if (username.equals("") || password.equals("")) {
- toast("请输入账号和密码");
- break;
- } else {
- final User bu2 = new User();
- bu2.setUsername(username);
- bu2.setPassword(password);
- bu2.login(this, new InsertListener() {
- @Override
- public void onSuccess() {
- toast("欢迎进入 在这里 服务系统");
- // 保存用户信息
- saveUserInfo(username, password);
- // 跳转到主页
- User.userId = bu2.getObjectId();
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();
-
- }
-
- @Override
- public void onFailure(String msg) {
- toast("用户名或密码错误");
- }
- });
- }
- break;
-
- case R.id.btn_register:
- Intent toReg = new Intent(LoginActivity.this, RegisterActivity.class);
- startActivity(toReg);
- break;
- case R.id.btn_qq:
-
- onClickLogin();
-
- break;
-
- default:
- break;
-
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- IUiListener loginListener = new BaseUiListener() {
- @Override
- protected void doComplete(JSONObject values) {
- Log.d("SDKQQAgentPref", "AuthorSwitch_SDK:" + SystemClock.elapsedRealtime());
- initOpenidAndToken(values);
- updateUserInfo();
- }
- };
-
- private class BaseUiListener implements IUiListener {
-
- @Override
- public void onComplete(Object response) {
- if (null == response) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
- JSONObject jsonResponse = (JSONObject) response;
- if (null != jsonResponse && jsonResponse.length() == 0) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
-// Util.showResultDialog(LoginActivity.this, response.toString(), "登录成功");
- doComplete((JSONObject) response);
- try {
- User.userId = jsonResponse.getString("openid");
- } catch (JSONException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();
- }
-
- protected void doComplete(JSONObject values) {
-
- }
-
- @Override
- public void onError(UiError e) {
- Util.toastMessage(LoginActivity.this, "onError: " + e.errorDetail);
- Util.dismissDialog();
- }
-
- @Override
- public void onCancel() {
- Util.toastMessage(LoginActivity.this, "onCancel: ");
- Util.dismissDialog();
- }
- }
-
- private void updateUserInfo() {
- if (mTencent != null && mTencent.isSessionValid()) {
- IUiListener listener = new IUiListener() {
-
- @Override
- public void onError(UiError e) {
-
- }
-
- @Override
- public void onComplete(final Object response) {
- Message msg = new Message();
- msg.obj = response;
- msg.what = 0;
- mHandler.sendMessage(msg);
- new Thread() {
-
- @Override
- public void run() {
- JSONObject json = (JSONObject) response;
- if (json.has("figureurl")) {
- Bitmap bitmap = null;
- try {
- bitmap = Util.getbitmap(json.getString("figureurl_qq_2"));
- } catch (JSONException e) {
-
- }
- Message msg = new Message();
- msg.obj = bitmap;
- msg.what = 1;
- mHandler.sendMessage(msg);
- }
- }
-
- }.start();
- }
-
- @Override
- public void onCancel() {
-
- }
- };
- mInfo = new UserInfo(this, mTencent.getQQToken());
- mInfo.getUserInfo(listener);
-
- } else {
- mUserInfo.setText("");
- mUserInfo.setVisibility(android.view.View.GONE);
- mUserLogo.setVisibility(android.view.View.GONE);
- }
- }
-
- public static void initOpenidAndToken(JSONObject jsonObject) {
- try {
- String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN);
- String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN);
- String openId = jsonObject.getString(Constants.PARAM_OPEN_ID);
- if (!TextUtils.isEmpty(token) && !TextUtils.isEmpty(expires) && !TextUtils.isEmpty(openId)) {
- mTencent.setAccessToken(token, expires);
- mTencent.setOpenId(openId);
- }
- } catch (Exception e) {
- }
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- Log.d(TAG, "-->onActivityResult " + requestCode + " resultCode=" + resultCode);
- if (requestCode == Constants.REQUEST_LOGIN ||
- requestCode == Constants.REQUEST_APPBAR) {
- Tencent.onActivityResultData(requestCode,resultCode,data,loginListener);
- }
-
- super.onActivityResult(requestCode, resultCode, data);
- }
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/MineActivity.java
deleted file mode 100644
index b5af889..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineActivity.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package com.stone.shop.view;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.CountListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 个人中心主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class MineActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "MineActivity" ;
-
- private String[] userItemNames = {"stonekity"} ;
- private String[] userItemContents = {""} ;
- private String[] orderItemNames = {"当前订单", "历史订单"};
- private String[] orderItemContents = {"*", ""};
- private String[] aboutItemNames = {"通知中心", "软件相关", "推荐给朋友", "退出账号"};
- private String[] aboutItemContents = {"", "", "", ""};
-
- private int[] userImgIds = {R.drawable.ic_menu_myplaces};
- private int[] orderImgIds = {R.drawable.ic_menu_find_holo_light, R.drawable.ic_menu_copy_holo_light};
- private int[] aboutImgIds = {R.drawable.ic_menu_notifications, R.drawable.ic_menu_info_details, R.drawable.ic_menu_share, R.drawable.ic_star_yes};
-
- private ListView lvMineUser;
- private ListView lvMineOrder;
- private ListView lvMineAbout;
- private MineListAdapter userListAdapter;
- private MineListAdapter orderListAdapter;
- private MineListAdapter aboutListAdapter;
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_FINISH_LOAD_DATA:
- //toast("Handler 收到数据加载完成的消息");
- orderListAdapter.notifyDataSetChanged();
- break;
- default:
- break;
- }
- }
-};
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine);
-
- initData("已取餐");
- initData("未取餐");
- initView();
- }
-
- private void initView() {
-
- lvMineUser = (ListView) findViewById(R.id.lv_mine_user);
- lvMineOrder = (ListView) findViewById(R.id.lv_mine_order);
- lvMineAbout = (ListView) findViewById(R.id.lv_mine_about);
-
- userListAdapter = new MineListAdapter(this, userItemNames, userItemContents, userImgIds);
- orderListAdapter = new MineListAdapter(this, orderItemNames, orderItemContents, orderImgIds);
- aboutListAdapter = new MineListAdapter(this, aboutItemNames, aboutItemContents, aboutImgIds);
-
- lvMineUser.setAdapter(userListAdapter);
- lvMineOrder.setAdapter(orderListAdapter);
- lvMineAbout.setAdapter(aboutListAdapter);
-
- lvMineUser.setOnItemClickListener(this);
- lvMineOrder.setOnItemClickListener(this);
- lvMineAbout.setOnItemClickListener(this);
-
- }
-
- //初始化列表菜单中数据
- public void initData(final String type) {
- //获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
- userItemNames[0] = user.getUsername();
-
- //获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- query.addWhereEqualTo("state", type);
- query.count(this, Order.class, new CountListener() {
-
- @Override
- public void onSuccess(int count) {
- if(type.equals("未取餐")) {
- orderItemContents[0] ="( " +count+ " )";
- }
- if(type.equals("已取餐")) {
- orderItemContents[1] ="( " +count+ " )";
- }
- Message msg = new Message();
- msg.what = MessageDef.MINE_FINISH_LOAD_DATA;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
-
- //个人资料
- if(parent.getId() == R.id.lv_mine_user) {
- switch (position) {
- case 0: //资料卡
- //toast("点击个人资料");
- Intent toMineInfo = new Intent(MineActivity.this, MineInfoActivity.class);
- startActivity(toMineInfo);
- break;
-
- default:
- break;
- }
- }
-
- //小菜订单
- if(parent.getId() == R.id.lv_mine_order) {
- //toast("点击了订单区域");
- Intent toOrderInfo;
- switch (position) {
- case 0:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "now");
- startActivity(toOrderInfo);
- break;
- case 1:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "old");
- startActivity(toOrderInfo);
- break;
- default:
- break;
- }
- }
-
- //其他
- if(parent.getId() == R.id.lv_mine_about) {
-
- switch (position) {
- case 1: //软件相关
- Intent toMineSoft = new Intent(MineActivity.this, MineSoftActivity.class);
- startActivity(toMineSoft);
- break;
- case 2: //推荐给朋友
- Intent toShare = new Intent(Intent.ACTION_SEND);
- toShare.setType("text/plain");
- toShare.putExtra(Intent.EXTRA_SUBJECT, "分享");
- toShare.putExtra(Intent.EXTRA_TEXT, "在这里-抢鲜版" +"\n" + "针对三号院的“在这里”上线了,赶紧下载体验吧"
- + "http://xiaocai.bmob.cn");
- startActivity(Intent.createChooser(toShare, "分享到"));
- break;
- case 3: //退出当期账号
- BmobUser.logOut(this);
- Intent toLogin = new Intent(MineActivity.this, LoginActivity.class);
- startActivity(toLogin);
- finish();
- break;
-
- default:
- //toast("点击了通知区域");
- break;
- }
-
- }
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoActivity.java
deleted file mode 100644
index d5ce189..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoActivity.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 个人资料卡
- * @date 2014-5-21
- * @author Stone
- */
-public class MineInfoActivity extends Activity {
-
- private TextView tvUsername;
- private TextView tvSchool;
- private TextView tvCademy;
- private TextView tvDorPart;
- private TextView tvDorNum;
- private TextView tvPhone;
- private TextView tvQQ;
-
- private User curUser = new User();
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_INFO_FINISH_FIND_USER:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info);
-
- getCurUser();
- }
-
- private void initView() {
- tvUsername = (TextView) findViewById(R.id.tv_mineinfo_username);
- tvSchool = (TextView) findViewById(R.id.tv_mineinfo_school);
- tvCademy = (TextView) findViewById(R.id.tv_mineinfo_cademy);
- tvDorPart = (TextView) findViewById(R.id.tv_mineinfo_dorpart);
- tvDorNum = (TextView) findViewById(R.id.tv_mineinfo_dornum);
- tvPhone = (TextView) findViewById(R.id.tv_mineinfo_phone);
- tvQQ = (TextView) findViewById(R.id.tv_mineinfo_qq);
-
- tvUsername.setText(curUser.getUsername());
- tvSchool.setText(curUser.getSchool());
- tvCademy.setText(curUser.getCademy());
- tvDorPart.setText(curUser.getDorPart());
- tvDorNum.setText(curUser.getDorNum());
- tvPhone.setText(curUser.getPhone());
- tvQQ.setText(curUser.getQQ());
-
- }
-
- private void getCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("亲, 获取当前用户失败");
- }
- });
-
- }
-
- public void clickEdit(View v) {
- Intent toEditMineInfo = new Intent(MineInfoActivity.this, MineInfoEditActivity.class);
-// Bundle bundle = new Bundle();
-// bundle.putString("username", curUser.getUsername());
-// bundle.putString("school", curUser.getSchool());
-// bundle.putString("cademy", curUser.getCademy());
-// bundle.putString("dorpart", curUser.getDorPart());
-// bundle.putString("dornum", curUser.getDorNum());
-// bundle.putString("phone", curUser.getPhone());
-// bundle.putString("qq", curUser.getQQ());
-// toEditMineInfo.putExtras(bundle);
- startActivity(toEditMineInfo);
- }
-
- public void clickBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoEditActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoEditActivity.java
deleted file mode 100644
index 39902ea..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineInfoEditActivity.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.UpdateListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 修改个人资料卡
- * @date 2014-5-28
- * @author Stone
- */
-public class MineInfoEditActivity extends Activity {
-
- private EditText etUsername;
- private EditText etSchool;
- private EditText etCademy;
- private EditText etDorPart;
- private EditText etDorNum;
- private EditText etPhone;
- private EditText etQQ;
-
- private User curUser;
- private Bundle bundle;
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_INFO_FINISH_FIND_USER:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info_edit);
-
- setCurUser();
- }
-
- private void initView() {
- etUsername = (EditText) findViewById(R.id.et_mineinfo_username);
- etSchool = (EditText) findViewById(R.id.et_mineinfo_school);
- etCademy = (EditText) findViewById(R.id.et_mineinfo_cademy);
- etDorPart = (EditText) findViewById(R.id.et_mineinfo_dorpart);
- etDorNum = (EditText) findViewById(R.id.et_mineinfo_dornum);
- etPhone = (EditText) findViewById(R.id.et_mineinfo_phone);
- etQQ = (EditText) findViewById(R.id.et_mineinfo_qq);
-
- etUsername.setText(curUser.getUsername());
- etSchool.setText(curUser.getSchool());
- etCademy.setText(curUser.getCademy());
- etDorPart.setText(curUser.getDorPart());
- etDorNum.setText(curUser.getDorNum());
- etPhone.setText(curUser.getPhone());
- etQQ.setText(curUser.getQQ());
- }
-
- private void setCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- //toast("查询到用户 " + object.size());
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取当前用户失败");
- }
- });
-
- }
-
- private void saveUserInfo() {
- if(curUser == null) {
- toast("curUser为空");
- } else {
- toast("当前用户为 " + curUser.getUsername());
- }
- Log.i("当前用户的ID: ", curUser.getObjectId());
- curUser.setUsername(etUsername.getText().toString());
- curUser.setSchool(etSchool.getText().toString());
- curUser.setCademy(etCademy.getText().toString());
- curUser.setDorPart(etDorPart.getText().toString());
- curUser.setDorNum(etDorNum.getText().toString());
- curUser.setPhone(etPhone.getText().toString());
- curUser.setQQ(etQQ.getText().toString());
- curUser.update(this, curUser.getObjectId(), new UpdateListener() {
-
- @Override
- public void onSuccess() {
- toast("更新成功");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("更新失败");
- }
- });
- }
-
- public void clickSave(View v) {
- saveUserInfo();
- finish();
- }
-
- public void clickCancel(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineSoftActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/MineSoftActivity.java
deleted file mode 100644
index c1960fd..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/MineSoftActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.adapter.MineSoftAdapter;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 软件相关
- * @date 2014-5-21
- * @author Stone
- */
-public class MineSoftActivity extends Activity implements OnItemClickListener{
-
-
- private String[] softItemNames = {"意见反馈", "检查更新", "使用协议", "关于我们"};
- private String[] softItemContents = {"", "", "", ""};
- private ListView lvMineSoft;
-
- private MineSoftAdapter softListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_soft);
-
- initView();
- }
-
- private void initView() {
- lvMineSoft = (ListView) findViewById(R.id.lv_mine_soft);
- softListAdapter = new MineSoftAdapter(this, softItemNames, softItemContents);
- lvMineSoft.setAdapter(softListAdapter);
- lvMineSoft.setOnItemClickListener(this);
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- switch (position) {
- case 0:
- Intent toFeedBack = new Intent(MineSoftActivity.this, FeedBackActivity.class);
- startActivity(toFeedBack);
- break;
- case 1:
- toast("已经是最新版本");
- break;
- case 2:
- break;
- case 3:
- Intent toAboutSoft = new Intent(MineSoftActivity.this, AboutActivity.class);
- startActivity(toAboutSoft);
- break;
-
- default:
- break;
- }
-
- }
-
- public void clickSoftBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/NewsActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/NewsActivity.java
deleted file mode 100644
index 2014960..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/NewsActivity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 新闻内容显示界面
- * @date 2014-5-8
- * @author Stone
- */
-public class NewsActivity extends Activity {
-
- private static String TAG = "NewsActivity";
-
- private TextView tvNewsTitle;
- private TextView tvNewsAuthor;
- private TextView tvNewsTime;
- private TextView tvNewsContent;
-
- private String newsTitle;
- private String newsAuthor;
- private String newsTime;
- private String newsContent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_news);
-
- getIntentData();
- initView();
- }
-
- //获取Intent中传入的新闻数据
- private void getIntentData() {
- newsTitle = getIntent().getStringExtra("NewsTitle");
- newsAuthor = getIntent().getStringExtra("NewsAuthor");
- newsTime = getIntent().getStringExtra("NewsTime");
- newsContent = getIntent().getStringExtra("NewsContent");
-
- newsTitle = splitString(newsTitle); //拆分字符串, 将新闻标题设置为 "】" 后面的内容
- }
-
- private String splitString(String str) {
- String[] strs = null;
- if(str.equals("")){
- return "";
- } else if ( !(str.contains("【") || str.contains("】")) ) {
- return str;
- }
- strs = str.split("】");
- return strs[1];
- }
-
- private void initView() {
- tvNewsTitle = (TextView) findViewById(R.id.tv_news_title);
- tvNewsAuthor = (TextView) findViewById(R.id.tv_news_author);
- tvNewsTime = (TextView) findViewById(R.id.tv_news_time);
- tvNewsContent = (TextView) findViewById(R.id.tv_news_content);
-
- tvNewsTitle.setText(newsTitle);
- tvNewsAuthor.setText("作者: "+newsAuthor);
- tvNewsTime.setText("发布日期 : "+newsTime);
- tvNewsContent.setText(newsContent);
- }
-
-
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderActivity.java
deleted file mode 100644
index 07cde0c..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderActivity.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.Calendar;
-
-import android.app.Activity;
-import android.app.TimePickerDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TimePicker;
-import android.widget.Toast;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.InsertListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Order;
-import com.stone.shop.model.Shop;
-import com.stone.ui.DialogOrder;
-import com.stone.util.Util;
-
-/**
- * 应用主界面
- * @date 2014-5-13
- * @author Stone
- */
-public class OrderActivity extends Activity implements OnClickListener{
-
- private TextView tvOrderShop; // 店名
- private TextView tvOrderGood; // 菜名
- private TextView tvOrderCount; // 数量
- private TextView tvOrderTime; // 取餐时间
- private TimePicker tpOrderTime; // 时间选择控件
- private EditText etOrderPhone; // 联系电话
- private EditText etOrderWords; // 附加留言
- private Button btnOrderCountMore; // 增加数量
- private Button btnOrderCountLess; // 减少数量
-
- private Button btnOrderSetTime; // 设置时间
- private Button btnDlgOk; // 设置时间完成
- private Button btnOrderSubmit; // 提交订单
-
-// private DialogOrder dlgSetOrderTime;
-// private View dlgOrderView;
- private int mHour;
- private int mMinute;
- private String time = "12 : 30";
- private TimePickerDialog dlgSetOrderTime;
- private TimePickerDialog.OnTimeSetListener mTimeSetListener =
- new TimePickerDialog.OnTimeSetListener() {
-
- public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
- mHour = hourOfDay;
- mMinute = minute;
- updateDisplay();
- }
- };
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good good; //当前选择的商品
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order);
-
- shop = (Shop) getIntent().getSerializableExtra("shop");
- good = (Good) getIntent().getSerializableExtra("good");
- shopID = getIntent().getStringExtra("shopID");
-
- initView();
- //initDlgView();
- }
-
- private void initView() {
-
- tvOrderShop = (TextView) findViewById(R.id.tv_order_shop);
- tvOrderGood = (TextView) findViewById(R.id.tv_order_good);
- tvOrderCount = (TextView) findViewById(R.id.tv_order_count);
- tvOrderTime = (TextView) findViewById(R.id.tv_order_time);
- tvOrderShop.setText(shop.getName());
- tvOrderGood.setText(good.getName());
-
-
- etOrderPhone = (EditText) findViewById(R.id.et_order_phone);
- etOrderWords = (EditText) findViewById(R.id.et_order_words);
-
- btnOrderCountMore = (Button) findViewById(R.id.btn_order_count_more);
- btnOrderCountLess = (Button) findViewById(R.id.btn_order_count_less);
- btnOrderSetTime = (Button) findViewById(R.id.btn_set_time);
- btnOrderSubmit = (Button) findViewById(R.id.btn_order_submit);
- btnOrderCountMore.setOnClickListener(this);
- btnOrderCountLess.setOnClickListener(this);
- btnOrderSetTime.setOnClickListener(this);
- btnOrderSubmit.setOnClickListener(this);
-
- }
-
-// private void initDlgView() {
-// LayoutInflater inflater = LayoutInflater.from(this);
-// dlgOrderView = inflater.inflate(R.layout.dlg_order_settime, null);
-// tpOrderTime = (TimePicker) dlgOrderView.findViewById(R.id.tp_dlg_time);
-// tpOrderTime.setIs24HourView(true);
-// btnDlgOk = (Button) dlgOrderView.findViewById(R.id.btn_dlg_ok);
-// btnDlgOk.setOnClickListener(this);
-// }
-
- @Override
- public void onClick(View v) {
- int count = 1;
- switch (v.getId()) {
- case R.id.btn_order_count_more:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 4) {
- toast("每份订单数量不能超过 4");
- } else {
- tvOrderCount.setText( (count+1)+"");
- }
- break;
- case R.id.btn_order_count_less:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 1) {
- toast("每份订单数量至少为 1 ");
- } else {
- tvOrderCount.setText( (count-1)+"");
- }
- break;
- case R.id.btn_set_time:
-// dlgSetOrderTime = new DialogOrder(this, R.style.MyDialog);
-// dlgSetOrderTime.show();
- final Calendar c = Calendar.getInstance();
- mHour = c.get(Calendar.HOUR_OF_DAY);
- mMinute = c.get(Calendar.MINUTE);
- dlgSetOrderTime = new TimePickerDialog(this, mTimeSetListener, mHour, mMinute, true);
- dlgSetOrderTime.show();
- break;
- case R.id.btn_dlg_ok:
- time = tpOrderTime.getCurrentHour()+ " : " + tpOrderTime.getCurrentMinute();
- dlgSetOrderTime.dismiss();
- case R.id.btn_order_submit:
- //toast("小菜订单提交成功");
- postOrder();
- finish();
- //back();
- break;
- default:
- break;
- }
-
- }
-
- /**
- * 提交订单数据
- */
- private void postOrder() {
- String count = tvOrderCount.getText().toString();
- String phone = etOrderPhone.getText().toString();
- String words = etOrderWords.getText().toString();
- float price = Integer.parseInt(count)* Float.parseFloat(good.getPrice());
- if( !Util.isPhoneNumberValid(phone) ) {
- toast("请输入正确的联系电话, 方便取餐");
- } else {
- Order order = new Order();
- BmobUser user = BmobUser.getCurrentUser(this);
- order.setUserName(user.getUsername());
- order.setGoodID(good.getObjectId());
- order.setGoodName(good.getName());
- order.setShopID(shop.getObjectId());
- order.setShopName(shop.getName());
- order.setCount(count);
- order.setTime(time);
- order.setPrice(price+"");
- order.setPhone(phone);
- order.setTips(words);
- order.insertObject(this, new InsertListener() {
-
- @Override
- public void onSuccess() {
- toast("订单提交成功");
- }
-
- @Override
- public void onFailure(String arg0) {
- toast("订单提交失败");
- }
- });
-
- }
- }
-
- private void updateDisplay() {
- time = mHour + " : " + mMinute;
- tvOrderTime.setText(time);
- }
-
- private void back() {
- Intent back = new Intent(OrderActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shop );
- bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null
- back.putExtras(bundle);
- startActivity(back);
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderInfoActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderInfoActivity.java
deleted file mode 100644
index e3c3d26..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/OrderInfoActivity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.OrderInfoListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 订单详情页面
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoActivity extends Activity implements OnItemLongClickListener{
-
- private static final String TAG = "OrderInfoActivity";
-
- private ListView lvOrderInfo;
- private OrderInfoListAdapter orderInfoListAdapter;
- private List orderList = new ArrayList();
-
- private String type = ""; // now-当前订单 old-历史订单
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order_info);
-
- type = getIntent().getStringExtra("type");
-
- initData();
- initView();
- }
-
- private void initView() {
- lvOrderInfo = (ListView) findViewById(R.id.lv_order_info);
- orderInfoListAdapter = new OrderInfoListAdapter(this, orderList);
- lvOrderInfo.setAdapter(orderInfoListAdapter);
- lvOrderInfo.setOnItemLongClickListener(this);
- }
-
- // 初始化列表菜单中数据
- public void initData() {
- // 获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
-
- // 获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- if(type.equals("now")) {
- query.addWhereEqualTo("state", "未取餐");
- } else if(type.equals("old")) {
- query.addWhereEqualTo("state", "已取餐");
- } else {
- // do nothing
- }
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- if (object.size() == 0)
- toast("您还没有订单");
- orderList = object;
- // 通知Adapter数据更新
- orderInfoListAdapter.refresh(orderList);
- orderInfoListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- //订单长按响应事件
- @Override
- public boolean onItemLongClick(AdapterView> parent, View view,
- int position, long id) {
- PopupMenu popup = new PopupMenu(this, lvOrderInfo);
- popup.getMenuInflater().inflate(R.menu.popup, popup.getMenu());
-
- popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Toast.makeText(OrderInfoActivity.this, "Clicked popup menu item " + item.getTitle(),
- Toast.LENGTH_SHORT).show();
- return true;
- }
- });
-
- popup.show();
- return false;
- };
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/RegisterActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/RegisterActivity.java
deleted file mode 100644
index a19d0db..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/RegisterActivity.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-import cn.bmob.v3.listener.InsertListener;
-
-/**
- * 注册界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class RegisterActivity extends Activity implements OnClickListener {
-
- private static final String TAG = "RegisterActivity";
-
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
- private EditText etComfirmPsd;
- private EditText etPhone;
-
- private String username = null;
- private String password = null;
- private String comfirmPsd = null;
- private String phone = null;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_reg);
-
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
- etComfirmPsd = (EditText) findViewById(R.id.et_comfirm_psd);
- etPhone = (EditText) findViewById(R.id.et_phone);
-
- btnReg = (Button) findViewById(R.id.btn_reg_now);
- btnReg.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_reg_now:
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
- comfirmPsd = etComfirmPsd.getText().toString();
- phone = etPhone.getText().toString();
- if(!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if (username.equals("") || password.equals("")
- || comfirmPsd.equals("") || phone.equals("")) {
- toast("不填完整不能拿到身份证, ~~~~(>_<)~~~~ ");
- } else if (!comfirmPsd.equals(password)) {
- toast("两次密码输入不一致");
- } else if(!Util.isPhoneNumberValid(phone)) {
- toast("请输入正确的手机号码");
- }else {
- // 开始提交注册信息
- User bu = new User();
- bu.setUsername(username);
- bu.setPassword(password);
- bu.setPhone(phone);
- bu.signUp(this, new InsertListener() {
- @Override
- public void onSuccess() {
- toast("拿到身份证了,快登陆吧");
- Intent backLogin = new Intent(RegisterActivity.this,
- LoginActivity.class);
- startActivity(backLogin);
- RegisterActivity.this.finish();
- }
-
- @Override
- public void onFailure(String msg) {
- toast("该名字已被人使用,换个名字吧.");
- }
- });
- }
- break;
-
- default:
- break;
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/ReservationActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/ReservationActivity.java
deleted file mode 100644
index f98d619..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/ReservationActivity.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Reservation;
-import com.stone.shop.model.User;
-import com.stone.ui.DateTimePickDialogUtil;
-import com.stone.ui.DateTimePickDialogUtil.DateTimeListener;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.SaveListener;
-
-public class ReservationActivity extends Activity {
-
- private Button btn_login;
- private SimpleDateFormat dateFormat;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layout_reservation);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室预定");
-
- final String roomId = getIntent().getStringExtra("roomId");
- final String roomName = getIntent().getStringExtra("roomName");
-
- TextView tv_room = (TextView) findViewById(R.id.tv_room);
- tv_room.setText("教室:" + roomName);
-
- btn_login = (Button) findViewById(R.id.btn_login);
-
- dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- // 查找Person表里面id为6b6c11c537的数据
- BmobQuery bmobQuery = new BmobQuery();
- bmobQuery.addWhereEqualTo("userId", User.userId);
- bmobQuery.addWhereEqualTo("roomId", roomId);
- bmobQuery.findObjects(ReservationActivity.this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- // toast("查询商品成功, 共" + newsList.size());
- if (newsList.size() != 0) {
-
- String dateTime = newsList.get(0).getDateTime();
-
- btn_login.setEnabled(false);
- btn_login.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime)));
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- btn_login.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
-
- DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(ReservationActivity.this,
- dateFormat.format(new Date(System.currentTimeMillis() )));
- dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() {
-
- @Override
- public void onDateTimeChane(final String dateTime) {
- // TODO Auto-generated method stub
-
- Reservation reservation = new Reservation();
- reservation.setRoomId(roomId);
- reservation.setRoomName(roomName);
- reservation.setUserId(User.userId);
- reservation.setDateTime(dateTime);
-
- reservation.save(ReservationActivity.this, new SaveListener() {
-
- @Override
- public void onSuccess() {
- // TODO Auto-generated method stub
- toast("预定成功");
- btn_login.setEnabled(false);
- btn_login.setText("已经预定 "+ dateTime);
-
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO Auto-generated method stub
- toast("预定失败");
-
- }
- });
- }
- });
-
- }
- });
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopActivity.java
deleted file mode 100644
index 6270cf9..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopActivity.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GridAdapter;
-import com.stone.ui.MyGridView;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 商品主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class ShopActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "ShopActivity" ;
-
- private MyGridView gvSchoolClass; //学习小菜
- private MyGridView gvFoodClass; //吃饭小菜
- private MyGridView gvGiftClass; //购物小菜
- private MyGridView gvOutClass; //疯狂小菜
-
- //private ImageView imgLoc;
- //private ImageView imgSearch;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop);
-
- initView();
- }
-
- /**
- * 初始化组件并适配数据
- */
- public void initView() {
- gvFoodClass = (MyGridView) findViewById(R.id.gv_food_class);
- gvGiftClass = (MyGridView) findViewById(R.id.gv_gift_class);
- gvOutClass = (MyGridView) findViewById(R.id.gv_out_class);
- gvSchoolClass = (MyGridView) findViewById(R.id.gv_school_class);
-
- gvFoodClass.setAdapter(new GridAdapter(this, 0));
- gvFoodClass.setOnItemClickListener(this);
-
- gvGiftClass.setAdapter(new GridAdapter(this, 1));
- gvGiftClass.setOnItemClickListener(this);
-
- gvOutClass.setAdapter(new GridAdapter(this, 2));
- gvOutClass.setOnItemClickListener(this);
-
- gvSchoolClass.setAdapter(new GridAdapter(this, 3));
- gvSchoolClass.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Log.i("GridView点击了: ", "position"+position);
- //toast("点击了: " + position);
- switch (parent.getId()) {
-
- //点击 学习小菜 中的子项(1代表第一个GridView, (position+1)代表GridView中第几个元素)
- case R.id.gv_school_class:
- //教学类的做特别处理
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, ClassroomActivity.class);
- startActivity(toBXTActivity);
- } else {
- toShopAllActivity( GridAdapter.mSchoolTexts[position], "1"+(position+1) );
- }
-
- break;
- //点击 吃饭小菜 中的子项
- case R.id.gv_food_class:
- toShopAllActivity( GridAdapter.mFoodTexts[position], "2"+(position+1) );
- break;
- //点击 购物小菜 中的子项
- case R.id.gv_gift_class:
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, BXTActivity.class);
- startActivity(toBXTActivity);
- } else {
- toShopAllActivity( GridAdapter.mGiftTexts[position], "3"+(position+1) );
- }
- break;
- //点击 疯狂小菜 中的子项
- case R.id.gv_out_class:
- toShopAllActivity( GridAdapter.mOutTexts[position], "4"+(position+1) );
- break;
- default:
- break;
- }
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
- /**
- *
- * @param title 父分类标题
- * @param type
- */
- private void toShopAllActivity(String title, String type) {
- Intent toShopAll = new Intent(ShopActivity.this, ShopAllActivity.class);
- toShopAll.putExtra("title", title);
- //当前点击的项的父分类
- toShopAll.putExtra("type", type);
- startActivity(toShopAll);
- }
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopAllActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopAllActivity.java
deleted file mode 100644
index 9dc775b..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopAllActivity.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.stone.shop.view;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.ShopListAdapter;
-import com.stone.shop.model.Shop;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 某一分类下的所有店铺页面
- * @author Stone
- * @date 2014-4-26
- */
-public class ShopAllActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "ShopAllActivity" ;
-
- private TextView tvTitle;
- private ListView lvShopAllList;
- private ShopListAdapter shopListAdapter;
-
- //记录从ShopActivity中传过来的当前点击项的类型
- private String type;
- private List shopList = new ArrayList();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_all);
-
- //得到从上级Activity中传入的Type数据
- type = getIntent().getStringExtra("type");
-
- //获取商店数据
- getShopsDate();
-
- initView();
-
- }
-
- public void initView() {
- //设置标题
- tvTitle = (TextView) findViewById(R.id.tv_title);
- tvTitle.setText(getIntent().getStringExtra("title"));
-
- lvShopAllList = (ListView) findViewById(R.id.lv_shop_all);
- shopListAdapter = new ShopListAdapter(this, (ArrayList) shopList, type);
- lvShopAllList.setAdapter(shopListAdapter);
- lvShopAllList.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- //toast("点击了: " + position);
- //将当前点击的Shop对象传递给下一个Activity
- Intent toShopItem = new Intent(ShopAllActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shopList.get(position) );
- bundle.putString("shopID", shopList.get(position).getObjectId()); //商铺的ID需要单独传递,否则获取到的是null
- Log.i(TAG, ">>发出>>" + "shopID: "+shopList.get(position).getObjectId()+" shopName: "+shopList.get(position).getName());
- toShopItem.putExtras(bundle);
- startActivity(toShopItem);
- }
-
- /**
- * 加载当前分类的所有店铺到ListView中
- */
- private void getShopsDate() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- Shop shop = new Shop();
- shop.setType(type);
- query.addWhereEqualTo("type", shop.getType()); // 查询当前类型的所有店铺
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- //toast("查询成功. 共计" + object.size());
- if(object.size()==0)
- toast("还没开张, 耐心等待吧");
- shopList = object;
- // 通知Adapter数据更新
- shopListAdapter.refresh((ArrayList) shopList);
- shopListAdapter.notifyDataSetChanged();
-
- }
-
- @Override
- public void onError(int arg0, String msg) {
- toast("查询失败:"+msg);
- }
-
- });
- }
-
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- };
-
-}
diff --git a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopItemActivity.java b/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopItemActivity.java
deleted file mode 100644
index 2aaa72e..0000000
--- a/代码/Shop 1.2最终版/src/com/stone/shop/view/ShopItemActivity.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.PagerTitleStrip;
-import android.support.v4.view.ViewPager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobQuery.CachePolicy;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GoodsListAdapter;
-import com.stone.shop.adapter.ViewPagerAdapter;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Shop;
-import com.stone.ui.ViewPagerCompat;
-
-public class ShopItemActivity extends Activity implements OnClickListener, OnItemClickListener{
-
- private static final String TAG = "ShopItemActivity";
-
- // ViewPager页
- 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的标题
-
- // 店铺商品列表
- private ListView lvGoodsList;
- private GoodsListAdapter goodsListAdapter;
- private Button btnBuyGood;
-
- // 店铺简介页中的控件
- private TextView tvShopName; // 店铺名
- private TextView tvShopInfo; // 店铺简介
- private TextView tvShopSale; // 店铺促销信息
- private TextView tvShopLoc; // 店铺地理位置
- private TextView tvShopPhone; // 店铺电话
- private Button btnCommit;
- private EditText etCommit;
- private LinearLayout llCommitParent; // 评论父线性布局
- private LinearLayout llCommitSon; // 评论子线性布局
- private ImageView imgCall; // 拨打电话
-
- // UI测试数据
- private static List goodsList;
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good selectGood;
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_item);
-
- // 获取到从ShopAllActivity中传递过来的Shop对象
- shop = (Shop) getIntent().getSerializableExtra("shop");
- shopID = getIntent().getStringExtra("shopID");
- Log.i(TAG, "<<收到<<" + "shopID: " + shop.getObjectId() + " shopName: "
- + shop.getName());
- Log.i(TAG,
- "<<收到<<" + "shopID: " + shopID + " shopName: " + shop.getName());
-
- // 初始化商品页面以及适配数据
- initGoodsDate();
- initView();
-
-
- }
-
- public void initView() {
-
- viewPager = (ViewPagerCompat) findViewById(R.id.viewpager);
- pagerTabStrip = (PagerTabStrip) findViewById(R.id.pagertab);
- pagerTabStrip.setTabIndicatorColor(Color.argb(255, 255, 127, 39));
- pagerTabStrip.setDrawFullUnderline(false);
- pagerTabStrip.setTextSpacing(50);
- pagerTabStrip.setTextColor(Color.argb(255, 255, 127, 39));
-
- view1 = LayoutInflater.from(this)
- .inflate(R.layout.viewpager_menu, null);
- view2 = LayoutInflater.from(this).inflate(R.layout.viewpager_shopinfo,
- null);
-
- initContentView();
-
- viewList = new ArrayList();// 将要分页显示的View装入数组中
- viewList.add(view1);
- viewList.add(view2);
-
- titleList = new ArrayList();// 每个页面的Title数据
- titleList.add("商品");
- titleList.add("店铺简介");
- shopViewPagerAdapter = new ViewPagerAdapter(viewList, titleList);
-
- viewPager.setAdapter(shopViewPagerAdapter);
- viewPager.setCurrentItem(0);
-
- }
-
- /**
- * 获取某一商店的所有商品
- *
- * @date 2014-5-1
- * @autor Stone
- */
- public void initGoodsDate() {
- goodsList = new ArrayList();
- goodsListAdapter = new GoodsListAdapter(this, goodsList);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("shopID", shopID);
- query.setCachePolicy(CachePolicy.CACHE_ELSE_NETWORK); //
- // 先从缓存取数据,如果没有,再从网络取。
- query.setLimit(15); // 限制最多15个结果
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List