xujiaming 2016-8-22

Shop代码更新，增加“学校通知”功能；整合覃佳明同学
   图书馆代码，修正部分冲突；增加图书馆，学校通知，
   商店，商品的部分云端数据

Shop/.classpath

@@ -3,6 +3,7 @@
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>

Shop/AndroidManifest.xml

@@ -74,6 +74,10 @@
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.RegisterActivity"
             android:label="@string/app_name" >
@@ -118,6 +122,10 @@
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.MineInfoActivity"
             android:label="@string/app_name" >

Shop/bin/AndroidManifest.xml

@@ -74,6 +74,10 @@
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.RegisterActivity"
             android:label="@string/app_name" >
@@ -118,6 +122,10 @@
             android:name="com.stone.shop.view.ReservationActivity"
             android:label="@string/app_name" >
         </activity>
+        <activity
+            android:name="com.stone.shop.view.LibraryReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
         <activity
             android:name="com.stone.shop.view.MineInfoActivity"
             android:label="@string/app_name" >