diff --git a/logo/1471916225_687675.png b/logo/1471916225_687675.png
new file mode 100644
index 0000000..f3b4640
Binary files /dev/null and b/logo/1471916225_687675.png differ
diff --git a/logo/logo.png b/logo/logo.png
new file mode 100644
index 0000000..d0b2b33
Binary files /dev/null and b/logo/logo.png differ
diff --git a/代码/在这里2.0/bin/classes.dex b/代码/在这里2.0/bin/classes.dex
new file mode 100644
index 0000000..7fbe2ab
Binary files /dev/null and b/代码/在这里2.0/bin/classes.dex differ
diff --git a/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class
new file mode 100644
index 0000000..660ba91
Binary files /dev/null and b/代码/在这里2.0/bin/classes/com/stone/shop/view/ShopItemActivity.class differ
diff --git a/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar b/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar
new file mode 100644
index 0000000..9b41944
Binary files /dev/null and b/代码/在这里2.0/bin/dexedLibs/android-support-v4-86e3b724485f562038a4407f62ddc43f.jar differ
diff --git a/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar b/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar
new file mode 100644
index 0000000..38491a2
Binary files /dev/null and b/代码/在这里2.0/bin/dexedLibs/bmobPush_0.1beta-01d17812d80c1131bb6ed888e6d3d9e4.jar differ
diff --git a/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar b/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar
new file mode 100644
index 0000000..d0203e6
Binary files /dev/null and b/代码/在这里2.0/bin/dexedLibs/bmob_v3.1.0beta-173c13ea83514cb156e5ff9c8a5d68b1.jar differ
diff --git a/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar b/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar
new file mode 100644
index 0000000..60a5143
Binary files /dev/null and b/代码/在这里2.0/bin/dexedLibs/mta-sdk-1.6.2-510dd94975ba57f712913ab1972491a1.jar differ
diff --git a/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar b/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar
new file mode 100644
index 0000000..0d0d72d
Binary files /dev/null and b/代码/在这里2.0/bin/dexedLibs/open_sdk_r5756-9a2de497930a69d8d056ed81ce90a373.jar differ
diff --git a/代码/在这里2.0/bin/jarlist.cache b/代码/在这里2.0/bin/jarlist.cache
new file mode 100644
index 0000000..0565465
--- /dev/null
+++ b/代码/在这里2.0/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/back_blue.png b/代码/在这里2.0/bin/res/crunch/drawable/back_blue.png
new file mode 100644
index 0000000..7bb76c8
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/back_blue.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_app.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_app.png
new file mode 100644
index 0000000..133c34c
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_app.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_app2.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_app2.png
new file mode 100644
index 0000000..95da9dc
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_app2.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png
new file mode 100644
index 0000000..b68aff8
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_car1.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png
new file mode 100644
index 0000000..e731aba
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_sale1.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png
new file mode 100644
index 0000000..2294af5
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_search.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png b/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png
new file mode 100644
index 0000000..7870d41
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/ic_shop1.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/qq1.png b/代码/在这里2.0/bin/res/crunch/drawable/qq1.png
new file mode 100644
index 0000000..cabecb3
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/qq1.png differ
diff --git a/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png b/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png
new file mode 100644
index 0000000..123848f
Binary files /dev/null and b/代码/在这里2.0/bin/res/crunch/drawable/sgbf.png differ
diff --git a/代码/在这里2.0/bin/resources.ap_ b/代码/在这里2.0/bin/resources.ap_
new file mode 100644
index 0000000..b476fff
Binary files /dev/null and b/代码/在这里2.0/bin/resources.ap_ differ
diff --git a/代码/在这里2.0/res/drawable/back_blue.png b/代码/在这里2.0/res/drawable/back_blue.png
new file mode 100644
index 0000000..b1af3cb
Binary files /dev/null and b/代码/在这里2.0/res/drawable/back_blue.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_81.png b/代码/在这里2.0/res/drawable/ic_81.png
new file mode 100644
index 0000000..3e74d95
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_81.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_82.png b/代码/在这里2.0/res/drawable/ic_82.png
new file mode 100644
index 0000000..5c7d3d3
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_82.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_app2.png b/代码/在这里2.0/res/drawable/ic_app2.png
new file mode 100644
index 0000000..a15dcb3
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_app2.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_car1.png b/代码/在这里2.0/res/drawable/ic_car1.png
new file mode 100644
index 0000000..fb2348d
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_car1.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_sale1.png b/代码/在这里2.0/res/drawable/ic_sale1.png
new file mode 100644
index 0000000..c250abf
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_sale1.png differ
diff --git a/代码/在这里2.0/res/drawable/ic_shop1.png b/代码/在这里2.0/res/drawable/ic_shop1.png
new file mode 100644
index 0000000..1ef3cff
Binary files /dev/null and b/代码/在这里2.0/res/drawable/ic_shop1.png differ
diff --git a/代码/在这里2.0/res/drawable/qq1.png b/代码/在这里2.0/res/drawable/qq1.png
new file mode 100644
index 0000000..2d06463
Binary files /dev/null and b/代码/在这里2.0/res/drawable/qq1.png differ
diff --git a/代码/在这里2.0/res/drawable/sgbf.png b/代码/在这里2.0/res/drawable/sgbf.png
new file mode 100644
index 0000000..9caf9d9
Binary files /dev/null and b/代码/在这里2.0/res/drawable/sgbf.png differ
diff --git a/代码/在这里2.0/res/layout/activity_award.xml b/代码/在这里2.0/res/layout/activity_award.xml
new file mode 100644
index 0000000..a5b8cb3
--- /dev/null
+++ b/代码/在这里2.0/res/layout/activity_award.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <include layout="@layout/header_award" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="今日中奖名单"
+            android:textColor="#FF0000"
+            android:textSize="16sp"
+            android:typeface="monospace" />
+
+        <View
+            android:layout_width="100dp"
+            android:layout_height="1.5dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="5dp"
+            android:background="#FF0000" />
+
+        <EditText
+            android:id="@+id/et_award_new"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:hint=""
+            android:lines="1" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="50dp"
+            android:gravity="center"
+            android:text="昨日中奖名单"
+            android:textColor="#FF0000"
+            android:textSize="16sp"
+            android:typeface="monospace" />
+
+        <View
+            android:layout_width="100dp"
+            android:layout_height="1.5dp"
+            android:layout_gravity="center"
+            android:layout_marginBottom="5dp"
+            android:background="#FF0000" />
+
+        <EditText
+            android:id="@+id/et_award_old"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:enabled="false"
+            android:hint=""
+            android:lines="1" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class b/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class
deleted file mode 100644
index 22f75d6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class b/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class
deleted file mode 100644
index 78e9dd7..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class b/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class
deleted file mode 100644
index 1387198..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class
deleted file mode 100644
index 302d8ec..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class
deleted file mode 100644
index b1c0a95..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class
deleted file mode 100644
index a7855d8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class
deleted file mode 100644
index 40366a7..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class
deleted file mode 100644
index d046964..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class
deleted file mode 100644
index c8124ab..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class
deleted file mode 100644
index 29a2d76..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class
deleted file mode 100644
index c16d59e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class
deleted file mode 100644
index bfe38ed..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class b/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class
deleted file mode 100644
index eabe9b3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R.class b/代码/在这里3.0/bin/classes/com/stone/shop/R.class
deleted file mode 100644
index 3fd6d56..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/R.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class
deleted file mode 100644
index 1cafd98..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
deleted file mode 100644
index a66066c..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class
deleted file mode 100644
index cf5f465..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
deleted file mode 100644
index cd39a4c..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
deleted file mode 100644
index e84bdcb..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
deleted file mode 100644
index 78f9658..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
deleted file mode 100644
index ec10ebb..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
deleted file mode 100644
index e10b4fc..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
deleted file mode 100644
index e1ff9fa..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class
deleted file mode 100644
index 29a5087..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
deleted file mode 100644
index f269e16..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
deleted file mode 100644
index 519fb97..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
deleted file mode 100644
index 98125e5..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class
deleted file mode 100644
index 34e8ce1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class
deleted file mode 100644
index e3bc779..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
deleted file mode 100644
index bac6ae6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class
deleted file mode 100644
index d51bdb3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
deleted file mode 100644
index 2f908a5..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
deleted file mode 100644
index 86beded..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
deleted file mode 100644
index c072602..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class
deleted file mode 100644
index 07cfae2..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class
deleted file mode 100644
index 73eb151..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
deleted file mode 100644
index 98a1a16..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
deleted file mode 100644
index ab8cdff..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class
deleted file mode 100644
index 2e0aca3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
deleted file mode 100644
index cde5f5e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
deleted file mode 100644
index 2202ce8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
deleted file mode 100644
index 7582ca3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class
deleted file mode 100644
index 1d74fb9..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
deleted file mode 100644
index 6278967..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class
deleted file mode 100644
index 32685bc..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
deleted file mode 100644
index 4a267ea..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
deleted file mode 100644
index 44c6d1b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
deleted file mode 100644
index 99fa505..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class
deleted file mode 100644
index 86cdc99..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class
deleted file mode 100644
index 13f14cf..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class
deleted file mode 100644
index 6a2f679..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class
deleted file mode 100644
index 122ae6a..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class
deleted file mode 100644
index de39937..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class
deleted file mode 100644
index 2e29dc3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class
deleted file mode 100644
index 86d57b1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class
deleted file mode 100644
index 52e7815..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class
deleted file mode 100644
index c8b07ce..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class
deleted file mode 100644
index 15990c3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class
deleted file mode 100644
index 9ea95b1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class
deleted file mode 100644
index 021c4be..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class
deleted file mode 100644
index 1db5f15..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class
deleted file mode 100644
index 9e86c65..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class
deleted file mode 100644
index ece843d..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class b/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class
deleted file mode 100644
index c140d66..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class
deleted file mode 100644
index a5ddd38..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class
deleted file mode 100644
index 5aaf2ac..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class
deleted file mode 100644
index 243feb0..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class
deleted file mode 100644
index 5a75215..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class
deleted file mode 100644
index eba9fb9..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class
deleted file mode 100644
index fa5b32f..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class
deleted file mode 100644
index 496c8ec..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class
deleted file mode 100644
index 64079bd..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class
deleted file mode 100644
index e36ab8b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
deleted file mode 100644
index a07cd1e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class
deleted file mode 100644
index e4f0f4c..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class
deleted file mode 100644
index 590cba9..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class
deleted file mode 100644
index cac2455..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class
deleted file mode 100644
index 78736c3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class
deleted file mode 100644
index b686d6a..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class
deleted file mode 100644
index e71b2a3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class
deleted file mode 100644
index 0f87f42..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class
deleted file mode 100644
index d9eacac..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class
deleted file mode 100644
index 904f663..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class
deleted file mode 100644
index 20b01bd..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class
deleted file mode 100644
index 37721d9..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
deleted file mode 100644
index 2e468d6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class
deleted file mode 100644
index cee70b1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class
deleted file mode 100644
index 47b49c2..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class
deleted file mode 100644
index 800d44e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class
deleted file mode 100644
index 6b0f013..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
deleted file mode 100644
index db96747..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class
deleted file mode 100644
index 4aa38a9..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class
deleted file mode 100644
index 04055fb..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class
deleted file mode 100644
index 65dc203..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class
deleted file mode 100644
index d84375b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
deleted file mode 100644
index fc7edb2..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class
deleted file mode 100644
index 3c9ec6d..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class
deleted file mode 100644
index fa27442..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
deleted file mode 100644
index efb8011..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
deleted file mode 100644
index 6f3ad50..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class
deleted file mode 100644
index 13c7193..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class
deleted file mode 100644
index 96e72cd..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class
deleted file mode 100644
index 56c6554..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
deleted file mode 100644
index fc09b74..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class
deleted file mode 100644
index 902985e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
deleted file mode 100644
index fb2d2d6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class
deleted file mode 100644
index 6b0a35a..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MainActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MainActivity.class
deleted file mode 100644
index cad8982..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MainActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class
deleted file mode 100644
index 858af0f..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class
deleted file mode 100644
index 6bd99a6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class
deleted file mode 100644
index c6a424b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
deleted file mode 100644
index edd28ab..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
deleted file mode 100644
index 2705443..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class
deleted file mode 100644
index 099c0c4..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
deleted file mode 100644
index e9769ec..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
deleted file mode 100644
index 39b4d0a..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
deleted file mode 100644
index ae38e77..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
deleted file mode 100644
index 538e72b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineSoftActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineSoftActivity.class
deleted file mode 100644
index c12133c..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineSoftActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class
deleted file mode 100644
index ef553b3..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
deleted file mode 100644
index 09c6d31..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class
deleted file mode 100644
index bef67fc..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class
deleted file mode 100644
index 0ab4111..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class
deleted file mode 100644
index a73fffc..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class
deleted file mode 100644
index af1465b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
deleted file mode 100644
index 7b359b8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
deleted file mode 100644
index 1920a25..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class
deleted file mode 100644
index 32bb86f..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class
deleted file mode 100644
index 1db7471..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class
deleted file mode 100644
index 48820bd..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class
deleted file mode 100644
index 74a2f31..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
deleted file mode 100644
index 91a52a6..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
deleted file mode 100644
index c8072eb..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class
deleted file mode 100644
index a9ce27b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class
deleted file mode 100644
index c48f331..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class
deleted file mode 100644
index 90d1f67..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
deleted file mode 100644
index 6d201df..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class
deleted file mode 100644
index 566cf96..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
deleted file mode 100644
index e2b7e8f..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class
deleted file mode 100644
index 451a694..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity$1.class
deleted file mode 100644
index 8a23c90..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity.class
deleted file mode 100644
index bb477a8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/UserInfoActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/UserInfoActivity.class
deleted file mode 100644
index 2e1050f..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/UserInfoActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class
deleted file mode 100644
index 1dfe8aa..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class
deleted file mode 100644
index f1d0e71..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldAboutActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
deleted file mode 100644
index 53167c8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldAboutActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
deleted file mode 100644
index 7804c8b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class
deleted file mode 100644
index 28ef2a5..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class b/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
deleted file mode 100644
index 1e096e1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class b/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class
deleted file mode 100644
index 09e1cd1..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class b/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class
deleted file mode 100644
index 04ced10..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
deleted file mode 100644
index 2650c7e..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
deleted file mode 100644
index 82c0e7b..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
deleted file mode 100644
index ecd71fa..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
deleted file mode 100644
index a729aad..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class b/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
deleted file mode 100644
index dbb56fc..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder.class b/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder.class
deleted file mode 100644
index 2f46bde..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/ListScrollView.class b/代码/在这里3.0/bin/classes/com/stone/ui/ListScrollView.class
deleted file mode 100644
index a1467e5..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/ListScrollView.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/MyGridView.class b/代码/在这里3.0/bin/classes/com/stone/ui/MyGridView.class
deleted file mode 100644
index 7aaf8ed..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/MyGridView.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class b/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class
deleted file mode 100644
index 1540878..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/ActivityUtil.class b/代码/在这里3.0/bin/classes/com/stone/util/ActivityUtil.class
deleted file mode 100644
index 470a667..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/util/ActivityUtil.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/ToastFactory.class b/代码/在这里3.0/bin/classes/com/stone/util/ToastFactory.class
deleted file mode 100644
index 8b29df8..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/util/ToastFactory.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/Util$1.class b/代码/在这里3.0/bin/classes/com/stone/util/Util$1.class
deleted file mode 100644
index e1c38f2..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/util/Util$1.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/Util.class b/代码/在这里3.0/bin/classes/com/stone/util/Util.class
deleted file mode 100644
index 0b125ae..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/util/Util.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/proguard.txt b/代码/在这里3.0/bin/proguard.txt
index 711d8c4..ee9dd4f 100644
--- a/代码/在这里3.0/bin/proguard.txt
+++ b/代码/在这里3.0/bin/proguard.txt
@@ -1,4 +1,4 @@
-# view res/layout/activity_shop_item.xml #generated:12
+# view res/layout/activity_shop_item.xml #generated:14
 -keep class android.support.v4.view.PagerTabStrip { <init>(...); }
 
 # view AndroidManifest.xml #generated:153
diff --git a/代码/在这里3.0/project.properties b/代码/在这里3.0/project.properties
index 17bdc51..b0ee040 100644
--- a/代码/在这里3.0/project.properties
+++ b/代码/在这里3.0/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-18
+target=android-19
 proguard.config=proguard.cfg
diff --git a/代码/在这里3.0/res/drawable/ic_app.png b/代码/在这里3.0/res/drawable/ic_app.png
index cb4a403..f46e766 100644
Binary files a/代码/在这里3.0/res/drawable/ic_app.png and b/代码/在这里3.0/res/drawable/ic_app.png differ
diff --git a/代码/在这里3.0/res/drawable/ic_search.png b/代码/在这里3.0/res/drawable/ic_search.png
index 9f6df03..34e757f 100644
Binary files a/代码/在这里3.0/res/drawable/ic_search.png and b/代码/在这里3.0/res/drawable/ic_search.png differ
diff --git a/代码/在这里3.0/res/layout/activity_base.xml b/代码/在这里3.0/res/layout/activity_base.xml
index 3fe3662..fa7a321 100644
--- a/代码/在这里3.0/res/layout/activity_base.xml
+++ b/代码/在这里3.0/res/layout/activity_base.xml
@@ -23,7 +23,7 @@
             android:id="@android:id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#ccDEDEDE"
+            android:background="#FF0000"
             android:layout_gravity="bottom" >
         </TabWidget>
     </TabHost>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/activity_bxt_news.xml b/代码/在这里3.0/res/layout/activity_bxt_news.xml
index 56290df..f34c7f5 100644
--- a/代码/在这里3.0/res/layout/activity_bxt_news.xml
+++ b/代码/在这里3.0/res/layout/activity_bxt_news.xml
@@ -26,7 +26,7 @@
                 android:gravity="center"
                 android:padding="10dp"
                 android:text="第417期“相约博学堂”之人文讲座预告"
-                android:textColor="#2F4F4F"
+                android:textColor="#FF0000"
                 android:textSize="16sp"
                 android:textStyle="bold" />
 
@@ -38,7 +38,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="讲座主题"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -57,7 +57,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="主讲人"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -76,7 +76,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="讲座时间"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -95,7 +95,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="讲座地点"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -114,7 +114,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="主办单位"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -133,7 +133,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="承办单位"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -152,7 +152,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="主讲内容提要"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
@@ -172,7 +172,7 @@
                 android:layout_marginBottom="5dp"
                 android:layout_marginTop="10dp"
                 android:text="主讲人简介"
-                android:textColor="#FF8C00"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
 
             <TextView
diff --git a/代码/在这里3.0/res/layout/activity_feedback.xml b/代码/在这里3.0/res/layout/activity_feedback.xml
index cb08bab..05eddf7 100644
--- a/代码/在这里3.0/res/layout/activity_feedback.xml
+++ b/代码/在这里3.0/res/layout/activity_feedback.xml
@@ -22,7 +22,7 @@
         android:layout_width="100dp"
         android:layout_height="40dp"
         android:layout_margin="5dp"
-        android:background="#FF8833"
+        android:background="#FF0000"
         android:layout_gravity="right"
         android:text="提交"
         android:textColor="#FFFFFF"/>
diff --git a/代码/在这里3.0/res/layout/activity_home.xml b/代码/在这里3.0/res/layout/activity_home.xml
index 87b9ba7..8645050 100644
--- a/代码/在这里3.0/res/layout/activity_home.xml
+++ b/代码/在这里3.0/res/layout/activity_home.xml
@@ -26,7 +26,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
                 android:layout_margin="5dp"
-                android:background="@drawable/shape_radius_square"
+                android:background="#FAF0E6"
                 android:padding="5dp" >
 
                 <ImageView
@@ -34,7 +34,7 @@
                     android:layout_width="100dp"
                     android:layout_height="100dp"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/shape_radius_color_square" />
+                    android:background="#F5DEB3" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -50,7 +50,7 @@
                         android:gravity="center_horizontal"
                         android:padding="5dp"
                         android:text="校历 "
-                        android:textColor="#2F4F4F"
+                        android:textColor="#FF0000"
                         android:textSize="18sp" />
 
                     <TextView
@@ -110,7 +110,7 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginTop="20dp"
                     android:text="校园动态"
-                    android:textColor="#2F4F4F"
+                    android:textColor="#FF0000"
                     android:textSize="18sp" />
 
                 <!-- 新闻列表 -->
diff --git a/代码/在这里3.0/res/layout/activity_login.xml b/代码/在这里3.0/res/layout/activity_login.xml
index 89eac74..b3028f9 100644
--- a/代码/在这里3.0/res/layout/activity_login.xml
+++ b/代码/在这里3.0/res/layout/activity_login.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/back_blue"
     android:gravity="center"
     android:padding="20dp" >
 
@@ -20,7 +21,7 @@
             android:layout_marginBottom="10dp"
             android:contentDescription="欢迎登陆"
             android:src="@drawable/ic_app" />
-
+        
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -28,39 +29,34 @@
             android:layout_centerHorizontal="true"
             android:gravity="center"
             android:text="在  这  里"
-            android:textSize="14sp"
+            android:textSize="18sp"
+            android:textColor="#FFFAFA"
             android:typeface="monospace" />
+
+
     </RelativeLayout>
 
-    <LinearLayout
+   <LinearLayout
         android:id="@+id/ll_row1"
         android:layout_width="match_parent"
         android:layout_height="40dp"
         android:layout_below="@id/rl_welcome"
         android:orientation="horizontal" >
 
-        <TextView
-            android:id="@+id/tv_username"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:gravity="center"
-            android:text="账号"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp" />
+       <EditText
+           android:id="@+id/et_password"
+           android:layout_width="match_parent"
+           android:layout_height="40dp"
+           android:layout_weight="1"
+           android:background="#F0F8FF"
+           android:ems="10"
+           android:hint="密码"
+           android:inputType="textPassword"
+           android:lines="2"
+           android:paddingLeft="12.0dp"
+           android:textSize="18sp"
+           android:typeface="monospace" />
 
-        <EditText
-            android:id="@+id/et_username"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_weight="1"
-            android:background="#ccDEDEDE"
-            android:inputType="text"
-            android:lines="2"
-            android:paddingLeft="12.0dp"
-            android:textSize="14sp"
-            android:typeface="monospace" />
     </LinearLayout>
 
     <LinearLayout
@@ -71,28 +67,15 @@
         android:layout_marginTop="20dp"
         android:orientation="horizontal" >
 
-        <TextView
-            android:id="@+id/tv_password"
+        <Button
+            android:id="@+id/btn_login"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:gravity="center"
-            android:text="密码"
-            android:textColor="#FFFFFF"
-            android:textSize="16sp" />
+            android:layout_height="45dp"
+            android:background="#FFFFFF"
+            android:text="登录"
+            android:textColor="#20B2AA"
+            android:textSize="24.0sp" />
 
-        <EditText
-            android:id="@+id/et_password"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:layout_weight="1"
-            android:background="#ccDEDEDE"
-            android:inputType="textPassword"
-            android:lines="2"
-            android:paddingLeft="12.0dp"
-            android:textSize="14sp"
-            android:typeface="monospace" />
     </LinearLayout>
 
     <LinearLayout
@@ -102,15 +85,6 @@
         android:layout_below="@id/ll_row2"
         android:layout_marginTop="30dp"
         android:orientation="horizontal" >
-
-        <Button
-            android:id="@+id/btn_login"
-            android:layout_width="match_parent"
-            android:layout_height="45dp"
-            android:background="@drawable/shape_radius_color_square"
-            android:text="登录"
-            android:textColor="#FFFFFF"
-            android:textSize="18sp" />
     </LinearLayout>
 
     <RelativeLayout
@@ -127,11 +101,11 @@
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:background="#d3d3d3"
+            android:background="#FFFFFF"
             android:paddingLeft="8.0dip"
             android:paddingRight="8.0dip"
             android:text="找回账号"
-            android:textColor="#B0C4DE"
+            android:textColor="#20B2AA"
             android:textSize="12.0sp" />
 
         <Button
@@ -140,24 +114,22 @@
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="#d3d3d3"
+            android:background="#FFFFFF"
             android:gravity="left|center"
             android:paddingLeft="8.0dip"
             android:paddingRight="8.0dip"
             android:text="    注  册    "
-            android:textColor="#B0C4DE"
+            android:textColor="#20B2AA"
             android:textSize="12.0sp" />
 
         <Button
             android:id="@+id/btn_qq"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:background="#d3d3d3"
-            android:paddingRight="8.0dip"
-            android:text="QQ登录"
-            android:textColor="#ffffff"
-            android:textSize="12.0sp" />
+            android:layout_width="32.5dip"
+            android:layout_height="42.5dip"
+            android:layout_centerHorizontal="true"
+            android:background="@drawable/qq1"
+            android:paddingRight="8.0dip" />
+
     </RelativeLayout>
 
     <LinearLayout
@@ -191,4 +163,24 @@
             android:text="返回消息" />
     </LinearLayout>
 
+    <EditText
+        android:id="@+id/et_username"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_above="@+id/ll_row2"
+        android:layout_alignLeft="@+id/rl_welcome"
+        android:layout_marginBottom="66dp"
+        android:layout_weight="1"
+        android:background="#F0F8FF"
+        android:ems="10"
+        android:hint="账号"
+        android:inputType="text"
+        android:lines="2"
+        android:paddingLeft="12.0dp"
+        android:textSize="18sp"
+        android:typeface="monospace" >
+
+        <requestFocus />
+    </EditText>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/activity_mine.xml b/代码/在这里3.0/res/layout/activity_mine.xml
index a1ac1d6..1ae96b1 100644
--- a/代码/在这里3.0/res/layout/activity_mine.xml
+++ b/代码/在这里3.0/res/layout/activity_mine.xml
@@ -32,12 +32,12 @@
             android:layout_marginTop="15dp"
             android:layout_marginBottom="2dp"
             android:text="在这里订单"
-            android:textColor="#FF8833"/>
+            android:textColor="#FF0000"/>
         
         <View 
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="#FFFF8833"/>
+            android:background="#FF0000"/>
         
         <ListView
             android:id="@+id/lv_mine_order"
@@ -56,12 +56,12 @@
             android:layout_marginTop="15dp"
             android:layout_marginBottom="2dp"
             android:text="其他"
-            android:textColor="#FF8833"/>
+            android:textColor="#FF0000"/>
         
         <View 
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="#FFFF8833"/>
+            android:background="#FF0000"/>
         
         <ListView
             android:id="@+id/lv_mine_about"
diff --git a/代码/在这里3.0/res/layout/activity_mine_info.xml b/代码/在这里3.0/res/layout/activity_mine_info.xml
index 7a44f76..95cdac4 100644
--- a/代码/在这里3.0/res/layout/activity_mine_info.xml
+++ b/代码/在这里3.0/res/layout/activity_mine_info.xml
@@ -47,12 +47,12 @@
                 android:layout_marginBottom="2dp"
                 android:layout_marginTop="15dp"
                 android:text="资料"
-                android:textColor="#FF8833" />
+                android:textColor="#FF0000" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#FFFF8833" />
+                android:background="#FF0000" />
         </LinearLayout>
 
         <RelativeLayout
@@ -160,12 +160,12 @@
                 android:layout_marginBottom="2dp"
                 android:layout_marginTop="15dp"
                 android:text="联系方式"
-                android:textColor="#FF8833" />
+                android:textColor="#FF0000" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#FFFF8833" />
+                android:background="#FF0000" />
         </LinearLayout>
 
         <RelativeLayout
diff --git a/代码/在这里3.0/res/layout/activity_mine_info_edit.xml b/代码/在这里3.0/res/layout/activity_mine_info_edit.xml
index e7fa0b8..738be64 100644
--- a/代码/在这里3.0/res/layout/activity_mine_info_edit.xml
+++ b/代码/在这里3.0/res/layout/activity_mine_info_edit.xml
@@ -47,12 +47,12 @@
                 android:layout_marginBottom="2dp"
                 android:layout_marginTop="15dp"
                 android:text="资料"
-                android:textColor="#FF8833" />
+                android:textColor="#FF0000" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#FFFF8833" />
+                android:background="#FF0000" />
         </LinearLayout>
 
         <RelativeLayout
@@ -160,12 +160,12 @@
                 android:layout_marginBottom="2dp"
                 android:layout_marginTop="15dp"
                 android:text="联系方式"
-                android:textColor="#FF8833" />
+                android:textColor="#FF0000" />
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:background="#FFFF8833" />
+                android:background="#FF0000" />
         </LinearLayout>
 
         <RelativeLayout
diff --git a/代码/在这里3.0/res/layout/activity_mine_old.xml b/代码/在这里3.0/res/layout/activity_mine_old.xml
index a4d3ca6..1ec9536 100644
--- a/代码/在这里3.0/res/layout/activity_mine_old.xml
+++ b/代码/在这里3.0/res/layout/activity_mine_old.xml
@@ -112,7 +112,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:background="@drawable/shape_left_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="学校"
@@ -140,7 +140,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:background="@drawable/shape_left_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="学院"
@@ -168,7 +168,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:background="@drawable/shape_left_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="所在区"
@@ -196,7 +196,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
-                        android:background="@drawable/shape_left_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="宿舍楼号"
@@ -255,7 +255,7 @@
                     <Button
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="在这里订单"
@@ -266,7 +266,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="历史订单"
@@ -277,7 +277,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="我的钱包"
@@ -297,7 +297,7 @@
                         android:id="@+id/btn_about"
                         android:layout_width="120dp"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="关于在这里"
@@ -309,7 +309,7 @@
                         android:layout_width="120dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="联系我们"
@@ -321,7 +321,7 @@
                         android:layout_width="120dp"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:background="@drawable/shape_radius_color_square"
+                        android:background="#FF0000"
                         android:gravity="center"
                         android:padding="10dp"
                         android:text="分享在这里"
diff --git a/代码/在这里3.0/res/layout/activity_news.xml b/代码/在这里3.0/res/layout/activity_news.xml
index ae1fd9c..65c935b 100644
--- a/代码/在这里3.0/res/layout/activity_news.xml
+++ b/代码/在这里3.0/res/layout/activity_news.xml
@@ -35,7 +35,7 @@
                     android:paddingTop="3dp"
                     android:paddingBottom="3dp"
                     android:text="作者: 小菜"
-                    android:textColor="#FF8C00"
+                    android:textColor="#FF0000"
                     android:textSize="12sp" />
             
             <TextView
@@ -47,7 +47,7 @@
                     android:paddingTop="3dp"
                     android:paddingBottom="3dp"
                     android:text="发布日期 : 2014-5-3"
-                    android:textColor="#FF8C00"
+                    android:textColor="#FF0000"
                     android:textSize="12sp" />
             
             <TextView
diff --git a/代码/在这里3.0/res/layout/activity_order.xml b/代码/在这里3.0/res/layout/activity_order.xml
index 458b689..1d8f29b 100644
--- a/代码/在这里3.0/res/layout/activity_order.xml
+++ b/代码/在这里3.0/res/layout/activity_order.xml
@@ -79,7 +79,7 @@
                     android:id="@+id/btn_order_count_less"
                     android:layout_width="30dp"
                     android:layout_height="30dp"
-                    android:background="#FF8833"
+                    android:background="#FF0000"
                     android:text="-"
                     android:textColor="#FFFFFF"
                     android:textSize="24sp" />
@@ -97,7 +97,7 @@
                     android:layout_width="30dp"
                     android:layout_height="30dp"
                     android:layout_marginLeft="30dp"
-                    android:background="#FF8833"
+                    android:background="#FF0000"
                     android:text="+"
                     android:textColor="#FFFFFF"
                     android:textSize="22sp" />
@@ -132,7 +132,7 @@
                 android:layout_height="30dp"
                 android:padding="3dp"
                 android:layout_alignParentRight="true"
-                android:background="#FF8833"
+                android:background="#FF0000"
                 android:textColor="#FFFFFF"
                 android:textSize="16sp"
                 android:text="设置时间"/>
@@ -210,7 +210,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
-        android:background="#FF8833"
+        android:background="#FF0000"
         android:text="提交订单"
         android:textColor="#FFFFFF"
         android:textSize="16sp" />
diff --git a/代码/在这里3.0/res/layout/activity_reg.xml b/代码/在这里3.0/res/layout/activity_reg.xml
index 3654ab2..783becd 100644
--- a/代码/在这里3.0/res/layout/activity_reg.xml
+++ b/代码/在这里3.0/res/layout/activity_reg.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" 
+    android:background="@drawable/back_blue"
     android:padding="20dp"
     android:gravity="center" >
     
@@ -13,34 +14,28 @@
         android:gravity="center_horizontal"
         android:typeface="monospace"
         android:text="在这里|全部在这里！"
-        android:textSize="14sp" />
+        android:textSize="18sp"
+        android:textColor="#FFFFFF" />
     
-    <LinearLayout
+   <LinearLayout
         android:id="@+id/ll_row1" 
         android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="40dp" 
         android:layout_below="@id/tv_reg_title">
         
-        <TextView 
-            android:id="@+id/tv_username"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:textSize="16sp"
-            android:text="账户名"/>
+       
         
         <EditText 
             android:id="@+id/et_username"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="1"
+            android:hint="账号"
             android:inputType="text"
-            android:background="#d3d3d3"
+            android:background="#FFFFFF"
             android:paddingLeft="12.0dp"
-            android:textSize="14sp" />
+            android:textSize="18sp" />
         
     </LinearLayout>
     
@@ -52,25 +47,18 @@
         android:layout_marginTop="20dp"
         android:layout_below="@id/ll_row1">
         
-        <TextView 
-            android:id="@+id/tv_password"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:textSize="16sp"
-            android:text="密码 "/>
+        
         
         <EditText 
             android:id="@+id/et_password"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="1"
+            android:hint="密码"
             android:inputType="textPassword"
-            android:background="#d3d3d3" 
+            android:background="#FFFFFF" 
             android:paddingLeft="12.0dp"
-            android:textSize="14sp" />
+            android:textSize="18sp" />
         
     </LinearLayout>
     
@@ -82,25 +70,18 @@
         android:layout_marginTop="20dp"
         android:layout_below="@id/ll_row2">
         
-        <TextView 
-            android:id="@+id/tv_comfirm_psd"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:textSize="16sp"
-            android:text="确认密码"/>
+       
         
         <EditText 
             android:id="@+id/et_comfirm_psd"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="1"
+            android:hint="确认密码"
             android:inputType="textPassword"
-            android:background="#d3d3d3"
+            android:background="#FFFFFF"
             android:paddingLeft="12.0dp"
-            android:textSize="14sp" />
+            android:textSize="18sp" />
         
     </LinearLayout>
     
@@ -112,25 +93,18 @@
         android:layout_marginTop="20dp"
         android:layout_below="@id/ll_row3">
         
-        <TextView 
-            android:id="@+id/tv_phone"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="2"
-            android:gravity="center"
-            android:background="@drawable/shape_left_radius_color_square"
-            android:textSize="16sp"
-            android:text="电话"/>
+        
         
         <EditText 
             android:id="@+id/et_phone"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_weight="1"
+			android:hint="电话"
             android:inputType="number"
-            android:background="#d3d3d3"
+            android:background="#FFFFFF"
             android:paddingLeft="12.0dp"
-            android:textSize="14sp" />
+            android:textSize="18sp" />
         
     </LinearLayout>
     
@@ -146,8 +120,9 @@
             android:id="@+id/btn_reg_now"
             android:layout_width="match_parent"
             android:layout_height="45dp"
-            android:background="@drawable/shape_radius_color_square"
+            android:background="#FFFFFF"
             android:text="加入在这里"
+            android:textColor="#20B2AA"
             android:textSize="18sp"  />
         
     </LinearLayout>
diff --git a/代码/在这里3.0/res/layout/activity_shop.xml b/代码/在这里3.0/res/layout/activity_shop.xml
index 05efaf5..93e7d66 100644
--- a/代码/在这里3.0/res/layout/activity_shop.xml
+++ b/代码/在这里3.0/res/layout/activity_shop.xml
@@ -33,7 +33,7 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginBottom="2dp"
                     android:text="学    习"
-                    android:textColor="#FFFF8833"
+                    android:textColor="#FF0000"
                     android:textSize="16sp"
                     android:typeface="monospace" />
                 
@@ -42,7 +42,7 @@
                     android:layout_height="1.5dp"
                     android:layout_marginLeft="5dp"
                     android:layout_marginBottom="5dp"
-                    android:background="#FFFF8833"/>
+                    android:background="#FF0000"/>
                 
                 <com.stone.ui.MyGridView
                     android:id="@+id/gv_school_class"
@@ -74,7 +74,7 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginBottom="2dp"
                     android:text="校园服务"
-                    android:textColor="#FFFF8833"
+                    android:textColor="#FF0000"
                     android:textSize="16sp"
                     android:typeface="monospace" />
                 
@@ -83,7 +83,7 @@
                     android:layout_height="1.5dp"
                     android:layout_marginLeft="5dp"
                     android:layout_marginBottom="5dp"
-                    android:background="#FFFF8833"/>
+                    android:background="#FF0000"/>
                 
                 <com.stone.ui.MyGridView
                     android:id="@+id/gv_gift_class"
@@ -114,7 +114,7 @@
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="2dp"
                     android:text="点    餐"
-                    android:textColor="#FFFF8833"
+                    android:textColor="#FF0000"
                     android:textSize="16sp"
                     android:typeface="monospace" />
                 
@@ -123,7 +123,7 @@
                     android:layout_height="1.5dp"
                     android:layout_marginLeft="5dp"
                     android:layout_marginBottom="5dp"
-                    android:background="#FFFF8833"/>
+                    android:background="#FF0000"/>
                 
                 <com.stone.ui.MyGridView
                     android:id="@+id/gv_food_class"
diff --git a/代码/在这里3.0/res/layout/activity_shop_item.xml b/代码/在这里3.0/res/layout/activity_shop_item.xml
index aca5ee3..1d979fc 100644
--- a/代码/在这里3.0/res/layout/activity_shop_item.xml
+++ b/代码/在这里3.0/res/layout/activity_shop_item.xml
@@ -8,14 +8,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center" >
-        
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/pagertab"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_gravity="top"
-            android:background="#ccDEDEDE" />
             
-    </com.stone.ui.ViewPagerCompat> 
+    </com.stone.ui.ViewPagerCompat>
+
+    <android.support.v4.view.PagerTabStrip
+        android:id="@+id/pagertab"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:background="#ccDEDEDE" >
+    </android.support.v4.view.PagerTabStrip>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/dlg_order_settime.xml b/代码/在这里3.0/res/layout/dlg_order_settime.xml
index 974cfd6..165d2ee 100644
--- a/代码/在这里3.0/res/layout/dlg_order_settime.xml
+++ b/代码/在这里3.0/res/layout/dlg_order_settime.xml
@@ -7,7 +7,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="#ccDCDCDC"
+        android:background="#FFFFFF"
         android:orientation="horizontal" >
 
         <TextView
@@ -16,7 +16,7 @@
             android:layout_centerVertical="true"
             android:padding="10dp"
             android:text="设置取餐时间"
-            android:textColor="#FF8833"
+            android:textColor="#FF0000"
             android:textSize="16sp" />
         
         <Button 
@@ -26,7 +26,7 @@
             android:layout_margin="3dp"
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
-			android:background="#FF8833"
+			android:background="#FF0000"
 			android:textColor="#FFFFFF"
             android:text="确定" />
         
@@ -36,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:layout_marginTop="2dp"
-        android:background="#FF8833"/>
+        android:background="#FF0000"/>
 
     <TimePicker
         android:id="@+id/tp_dlg_time"
diff --git a/代码/在这里3.0/res/layout/goods_list_item.xml b/代码/在这里3.0/res/layout/goods_list_item.xml
index 5a0fb97..bf17b9a 100644
--- a/代码/在这里3.0/res/layout/goods_list_item.xml
+++ b/代码/在这里3.0/res/layout/goods_list_item.xml
@@ -34,7 +34,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="￥9.0"
-                android:textColor="#FF8833"
+                android:textColor="#FF0000"
                 android:textSize="14sp" />
         </LinearLayout>
 
@@ -47,10 +47,10 @@
             android:clickable="true"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="#FF8833"
+            android:background="#FF0000"
             android:text="碗里来"
             android:textSize="12sp"
-            android:textColor="#ffffff" />
+            android:textColor="#FFFFFF" />
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_bxt.xml b/代码/在这里3.0/res/layout/header_bxt.xml
index e679c11..1aeac26 100644
--- a/代码/在这里3.0/res/layout/header_bxt.xml
+++ b/代码/在这里3.0/res/layout/header_bxt.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:gravity="center"
     android:padding="3dp" >
     
@@ -14,7 +14,7 @@
         android:layout_centerInParent="true"
         android:text="博学堂"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
    <Spinner
diff --git a/代码/在这里3.0/res/layout/header_bxt_news.xml b/代码/在这里3.0/res/layout/header_bxt_news.xml
index 72032ab..d9bc311 100644
--- a/代码/在这里3.0/res/layout/header_bxt_news.xml
+++ b/代码/在这里3.0/res/layout/header_bxt_news.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:gravity="center"
     android:padding="3dp" >
     
@@ -14,7 +14,7 @@
         android:layout_centerInParent="true"
         android:text="博学堂讲座详情"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_feedback.xml b/代码/在这里3.0/res/layout/header_feedback.xml
index 3b9ac1d..ef9e7c0 100644
--- a/代码/在这里3.0/res/layout/header_feedback.xml
+++ b/代码/在这里3.0/res/layout/header_feedback.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView
@@ -14,7 +14,7 @@
         android:clickable="true"
         android:text="返回"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -24,7 +24,7 @@
         android:layout_centerInParent="true"
         android:text="意见反馈"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_home.xml b/代码/在这里3.0/res/layout/header_home.xml
index 10e970c..ac3b936 100644
--- a/代码/在这里3.0/res/layout/header_home.xml
+++ b/代码/在这里3.0/res/layout/header_home.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -13,7 +13,7 @@
         android:layout_centerInParent="true"
         android:text="NUDT"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_info.xml b/代码/在这里3.0/res/layout/header_info.xml
index 8601f9a..ffa4267 100644
--- a/代码/在这里3.0/res/layout/header_info.xml
+++ b/代码/在这里3.0/res/layout/header_info.xml
@@ -2,25 +2,17 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
-    android:gravity="center"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
-        android:id="@+id/tv_info_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="5dp"
         android:layout_centerInParent="true"
-        android:text="学校通知"
+        android:text="每日一抽"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
-   <Spinner
-       android:id="@+id/sp_bxt_header" 
-       android:layout_width="200dp"
-       android:layout_height="wrap_content"
-       android:visibility="gone"
-       />
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_info_item.xml b/代码/在这里3.0/res/layout/header_info_item.xml
index 3c33196..57f0741 100644
--- a/代码/在这里3.0/res/layout/header_info_item.xml
+++ b/代码/在这里3.0/res/layout/header_info_item.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
-    android:gravity="center"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -12,9 +11,9 @@
         android:layout_height="wrap_content"
         android:padding="5dp"
         android:layout_centerInParent="true"
-        android:text="学校通知详情"
+        android:text="我"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
-
+    
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_mine_info.xml b/代码/在这里3.0/res/layout/header_mine_info.xml
index 818280d..40ac8e7 100644
--- a/代码/在这里3.0/res/layout/header_mine_info.xml
+++ b/代码/在这里3.0/res/layout/header_mine_info.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -15,7 +15,7 @@
         android:clickable="true"
         android:text="返回"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -26,7 +26,7 @@
         android:layout_centerInParent="true"
         android:text="个人资料"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -40,7 +40,7 @@
         android:clickable="true"
         android:text="编辑"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_mine_info_edit.xml b/代码/在这里3.0/res/layout/header_mine_info_edit.xml
index a48689f..ae9dcfb 100644
--- a/代码/在这里3.0/res/layout/header_mine_info_edit.xml
+++ b/代码/在这里3.0/res/layout/header_mine_info_edit.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -15,7 +15,7 @@
         android:onClick="clickCancel"
         android:clickable="true"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -26,7 +26,7 @@
         android:layout_centerInParent="true"
         android:text="修改资料"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -40,7 +40,7 @@
         android:clickable="true"
         android:text="保存"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_news.xml b/代码/在这里3.0/res/layout/header_news.xml
index 9372403..b89d24b 100644
--- a/代码/在这里3.0/res/layout/header_news.xml
+++ b/代码/在这里3.0/res/layout/header_news.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -13,7 +13,7 @@
         android:layout_centerInParent="true"
         android:text="校内新闻"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_order.xml b/代码/在这里3.0/res/layout/header_order.xml
index 3a1becb..aa97d59 100644
--- a/代码/在这里3.0/res/layout/header_order.xml
+++ b/代码/在这里3.0/res/layout/header_order.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -13,7 +13,7 @@
         android:layout_centerInParent="true"
         android:text="订单"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_order_info.xml b/代码/在这里3.0/res/layout/header_order_info.xml
index 664a304..0b792fd 100644
--- a/代码/在这里3.0/res/layout/header_order_info.xml
+++ b/代码/在这里3.0/res/layout/header_order_info.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -13,7 +13,7 @@
         android:layout_centerInParent="true"
         android:text="当前订单"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/header_shop.xml b/代码/在这里3.0/res/layout/header_shop.xml
index ae9dba3..447a67b 100644
--- a/代码/在这里3.0/res/layout/header_shop.xml
+++ b/代码/在这里3.0/res/layout/header_shop.xml
@@ -2,20 +2,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="@drawable/actionbar_background"
+    android:background="#FF0000"
     android:padding="3dp" >
     
-    <!-- 
-    <TextView 
-        android:id="@+id/tv_school"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="5dp"
-        android:layout_centerVertical="true"
-        android:text="湖北工业大学"
-        android:textSize="12sp"
-        android:textColor="#8B4513"
-        android:typeface="monospace"/>  -->
+
     
     <TextView 
         android:id="@+id/tv_title"
@@ -25,7 +15,7 @@
         android:layout_centerInParent="true"
         android:text="在这里"
         android:textSize="20sp"
-        android:textColor="#ffffff"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
diff --git a/代码/在这里3.0/res/layout/header_shop_all.xml b/代码/在这里3.0/res/layout/header_shop_all.xml
index a893d03..c8d0f80 100644
--- a/代码/在这里3.0/res/layout/header_shop_all.xml
+++ b/代码/在这里3.0/res/layout/header_shop_all.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView 
@@ -13,7 +13,7 @@
         android:layout_centerInParent="true"
         android:text="过桥米线"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <ImageView 
diff --git a/代码/在这里3.0/res/layout/header_soft.xml b/代码/在这里3.0/res/layout/header_soft.xml
index a7530c7..0145086 100644
--- a/代码/在这里3.0/res/layout/header_soft.xml
+++ b/代码/在这里3.0/res/layout/header_soft.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="50dp"
-    android:background="#ccDEDEDE"
+    android:background="#FF0000"
     android:padding="3dp" >
     
     <TextView
@@ -14,7 +14,7 @@
         android:clickable="true"
         android:text="返回"
         android:textSize="18sp"
-        android:textColor="#6495ED"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
     <TextView 
@@ -25,7 +25,7 @@
         android:layout_centerInParent="true"
         android:text="软件相关"
         android:textSize="20sp"
-        android:textColor="#8B4513"
+        android:textColor="#FFFFFF"
         android:typeface="monospace"/>
     
 </RelativeLayout>
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/layout_reservation.xml b/代码/在这里3.0/res/layout/layout_reservation.xml
index 30ebbd0..3fe96b4 100644
--- a/代码/在这里3.0/res/layout/layout_reservation.xml
+++ b/代码/在这里3.0/res/layout/layout_reservation.xml
@@ -19,7 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="20dp"
-        android:background="@drawable/shape_radius_color_square"
+        android:background="#FF0000"
         android:text="预定教室"
         android:textColor="#FFFFFF"
         android:textSize="18sp" />
diff --git a/代码/在这里3.0/res/layout/news_list_item.xml b/代码/在这里3.0/res/layout/news_list_item.xml
index cb7778b..3f86c9c 100644
--- a/代码/在这里3.0/res/layout/news_list_item.xml
+++ b/代码/在这里3.0/res/layout/news_list_item.xml
@@ -7,7 +7,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="90dp"
+        android:layout_height="wrap_content"
         android:background="#F5F5F5"
         android:gravity="center"
         android:orientation="horizontal"
@@ -22,8 +22,8 @@
             android:gravity="center_vertical|left"
             android:layout_weight="3"
             android:text="【博学堂】"
-            android:textSize="18sp"
-            android:textColor="#FF8C00"/>
+            android:textSize="14sp"
+            android:textColor="#FF0000"/>
         
         <TextView
             android:id="@+id/tv_news_title"
@@ -32,7 +32,7 @@
             android:layout_weight="2"
             android:text="大礼堂电影预告大礼堂电影预告"
             android:textColor="#696969"
-            android:textSize="15sp" />
+            android:textSize="13sp" />
 		
         <TextView
             android:id="@+id/tv_news_date"
@@ -41,7 +41,7 @@
             android:layout_weight="3"
             android:gravity="center"
             android:text="2014-4-28"
-            android:textSize="13sp"
+            android:textSize="10sp"
             android:typeface="monospace" />
     </LinearLayout>
 
diff --git a/代码/在这里3.0/res/layout/order_info_list_item.xml b/代码/在这里3.0/res/layout/order_info_list_item.xml
index e46624a..de3a4fc 100644
--- a/代码/在这里3.0/res/layout/order_info_list_item.xml
+++ b/代码/在这里3.0/res/layout/order_info_list_item.xml
@@ -41,7 +41,7 @@
             android:layout_alignLeft="@id/tv_good_name"
             android:layout_alignParentBottom="true"
             android:text="二食堂三楼"
-            android:textColor="#B8860B"
+            android:textColor="#FF0000"
             android:textSize="12sp" />
     </RelativeLayout>
 
@@ -49,7 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="96dp"
         android:layout_weight="5"
-        android:background="#FF8833"
+        android:background="#FF0000"
         android:orientation="vertical" >
 
         <TextView
diff --git a/代码/在这里3.0/res/layout/shop_all_list_item.xml b/代码/在这里3.0/res/layout/shop_all_list_item.xml
index aa1c0c1..22c7c9b 100644
--- a/代码/在这里3.0/res/layout/shop_all_list_item.xml
+++ b/代码/在这里3.0/res/layout/shop_all_list_item.xml
@@ -10,7 +10,7 @@
         android:id="@+id/img_shop"
         android:layout_width="96dp"
         android:layout_height="96dp"
-        android:background="#FF8833"
+        android:background="@drawable/sgbf"
         android:contentDescription="商店展示主图" />
 
     <RelativeLayout
@@ -58,10 +58,10 @@
             android:layout_alignBaseline="@id/tv_shop_name"
             android:layout_margin="2dp"
             android:layout_toRightOf="@id/tv_shop_paper"
-            android:background="#FF4500"
+            android:background="#FF0000"
             android:gravity="center"
             android:text="新"
-            android:textColor="#F8F8FF"
+            android:textColor="#FFFFFF"
             android:textSize="12sp"
             android:typeface="monospace" />
 
@@ -86,7 +86,7 @@
             android:layout_alignLeft="@id/tv_shop_name"
             android:layout_alignParentBottom="true"
             android:text="二食堂三楼"
-            android:textColor="#B8860B"
+            android:textColor="#FF0000"
             android:textSize="12sp" />
 
         <!-- 评分 #F8F8FF -->
diff --git a/代码/在这里3.0/res/layout/tab_widget_item.xml b/代码/在这里3.0/res/layout/tab_widget_item.xml
index 6c54957..15481f6 100644
--- a/代码/在这里3.0/res/layout/tab_widget_item.xml
+++ b/代码/在这里3.0/res/layout/tab_widget_item.xml
@@ -19,6 +19,6 @@
         android:layout_height="wrap_content"  
         android:layout_gravity="center_horizontal|bottom"  
         android:textSize="12sp"  
-        android:textColor="#8B4513"/>  
+        android:textColor="#FFFFFF"/>  
   
 </LinearLayout>  
\ No newline at end of file
diff --git a/代码/在这里3.0/res/layout/viewpager_shopinfo.xml b/代码/在这里3.0/res/layout/viewpager_shopinfo.xml
index 5696e20..110a4ac 100644
--- a/代码/在这里3.0/res/layout/viewpager_shopinfo.xml
+++ b/代码/在这里3.0/res/layout/viewpager_shopinfo.xml
@@ -13,7 +13,7 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="100dp"
-            android:background="#FF8833"
+            android:background="#FF0000"
             android:contentDescription="商店信息背景图"
             android:fitsSystemWindows="true" />
 
@@ -282,7 +282,7 @@
                     android:layout_height="40dp"
                     android:layout_marginLeft="5dp"
                     android:layout_weight="3"
-                    android:background="#FF8833"
+                    android:background="#FF0000"
                     android:text="评论" 
                     android:textColor="#FFFFFF"/>
             </LinearLayout>
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java
index 3fc0aed..4f1ec9d 100644
--- a/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java
+++ b/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java
@@ -22,8 +22,8 @@ public class GridAdapter extends BaseAdapter {
 	private int mIndex = 0; // 代表当前需要适配页面中第几个GridView
 
 	//学习小菜
-	public static final String[] mSchoolTexts = TypeDef.typeSonList1;
-	private int[] mSchoolImages = { R.drawable.ic_8, R.drawable.ic_8, R.drawable.ic_8 };
+	public static String[] mSchoolTexts = TypeDef.typeSonList1;
+	private int[] mSchoolImages = { R.drawable.ic_81, R.drawable.ic_82 };
 	
 	//吃饭小菜
 	public static final String[] mFoodTexts = TypeDef.typeSonList2;
@@ -31,9 +31,9 @@ public class GridAdapter extends BaseAdapter {
 
 	//购物小菜
 	public static final 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};
+	private int[] mGiftImages = { R.drawable.ic_71, R.drawable.ic_72,
+			R.drawable.ic_73, R.drawable.ic_74, R.drawable.ic_75, 
+			R.drawable.ic_76, R.drawable.ic_77};
 
 	//疯狂小菜
 	public static final String[] mOutTexts = TypeDef.typeSonList4;
@@ -82,6 +82,7 @@ public class GridAdapter extends BaseAdapter {
 	public View getView(int position, View convertView, ViewGroup parent) {
 		View view = View.inflate(mContext, R.layout.shop_grid_item, null);
 
+
 		ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage);
 		TextView text = (TextView) view.findViewById(R.id.tv_chooseText);
 		switch (mIndex) {
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java
index a88f4f9..d6fda5a 100644
--- a/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java
+++ b/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java
@@ -49,7 +49,8 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte
 	// 店铺商品列表
 	private ListView lvGoodsList;
 	private GoodsListAdapter goodsListAdapter;
-	
+
+
 	// 店铺简介页中的控件
 	private TextView tvShopName; // 店铺名
 	private TextView tvShopInfo; // 店铺简介
@@ -65,7 +66,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte
 	private static List<Good> goodsList;
 
 	// 从上级页面中传入的数据
-	private Shop shop; // 当期选择的Shop
+	private Shop shop; // 当期选择的Shop	
 	private Good selectGood;
 	private String shopID; // 当前选择的Shop的ID
 
@@ -200,6 +201,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte
 	}
 
 
+
 	@Override
 	public void onClick(View v) {
 		switch (v.getId()) {
diff --git a/文档/软件需求规格说明书_赵再春.doc b/文档/软件需求规格说明书_赵再春.doc
new file mode 100644
index 0000000..0162400
Binary files /dev/null and b/文档/软件需求规格说明书_赵再春.doc differ