Merge remote-tracking branch 'remotes/origin/xujiaming_branch' into develop

# Conflicts:
#	readme.txt

readme.txt

@@ -0,0 +1,5 @@
+我的电脑里没有Microsoft project，打不开.mpp文件，因此就用excel表做了任务分工，望老师见谅。还有我8月17日进行了代码的编写，昨天也已经上传了，今天也进行了部分代码的更改，但是变化不大。
+
+
+
+					BY 覃佳明

代码/Shop_8.18_by_qinjiaming/Shop/.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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"/>
+</classpath>

代码/Shop_8.18_by_qinjiaming/Shop/.project

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Shop</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

代码/Shop_8.18_by_qinjiaming/Shop/AndroidManifest.xml

@@ -74,7 +74,7 @@
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
         </activity>
-                <activity
+        <activity
             android:name="com.stone.shop.view.LibraryActivity"
             android:label="@string/app_name" >
         </activity>
@@ -163,30 +163,6 @@
         <activity
             android:name="com.stone.shop.view.BXTNewsActivity"
             android:label="@string/app_name" >
-        </activity> 
-        <activity
-            android:name="com.stone.shop.view.InformationActivity"
-            android:label="@string/app_name" >
-        </activity> 
-        <activity
-            android:name="com.stone.shop.view.InfoContentActivity"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="com.stone.shop.view.InfoNewsContentActivity"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MultiScreenActivity"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MultiViewGroup"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MainActivity"
-            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.tencent.tauth.AuthActivity"
@@ -207,14 +183,6 @@
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="behind"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:name="com.stone.shop.view.EditActivity"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="com.stone.shop.view.CommentActivity"
-            android:label="@string/app_name" >
-        </activity>
     </application>
 
 </manifest>

代码/Shop_8.18_by_qinjiaming/Shop/bin/AndroidManifest.xml

@@ -74,7 +74,7 @@
             android:name="com.stone.shop.view.ClassroomActivity"
             android:label="@string/app_name" >
         </activity>
-                <activity
+        <activity
             android:name="com.stone.shop.view.LibraryActivity"
             android:label="@string/app_name" >
         </activity>
@@ -163,30 +163,6 @@
         <activity
             android:name="com.stone.shop.view.BXTNewsActivity"
             android:label="@string/app_name" >
-        </activity> 
-        <activity
-            android:name="com.stone.shop.view.InformationActivity"
-            android:label="@string/app_name" >
-        </activity> 
-        <activity
-            android:name="com.stone.shop.view.InfoContentActivity"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="com.stone.shop.view.InfoNewsContentActivity"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MultiScreenActivity"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MultiViewGroup"
-            android:label="@string/app_name" >
-        </activity>
-         <activity
-            android:name="com.stone.shop.view.MainActivity"
-            android:label="@string/app_name" >
         </activity>
         <activity
             android:name="com.tencent.tauth.AuthActivity"
@@ -207,14 +183,6 @@
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="behind"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity
-            android:name="com.stone.shop.view.EditActivity"
-            android:label="@string/app_name" >
-        </activity>
-        <activity
-            android:name="com.stone.shop.view.CommentActivity"
-            android:label="@string/app_name" >
-        </activity>
     </application>
 
 </manifest>