2016.7.7

代码/.metadata/.log

@@ -10945,3 +10945,6 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+
+!ENTRY org.eclipse.ui 2 2 2016-07-05 11:04:16.067
+!MESSAGE Invalid property category path: ValidationPropertiesPage (bundle: org.eclipse.wst.xml.ui, propertyPage: org.eclipse.wst.xml.ui.propertyPage.project.validation)

代码/.metadata/.plugins/org.eclipse.cdt.core/.log

@@ -35,3 +35,4 @@
 *** SESSION 7月 04, 2016 17:58:21.26 --------------------------------------------
 *** SESSION 7月 05, 2016 00:44:57.89 --------------------------------------------
 *** SESSION 7月 05, 2016 08:14:55.77 --------------------------------------------
+*** SESSION 7月 05, 2016 10:21:37.73 --------------------------------------------

代码/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs

@@ -1,6 +1,7 @@
 com.android.ide.eclipse.adt.fixLegacyEditors=1
 com.android.ide.eclipse.adt.previews=custom
 com.android.ide.eclipse.adt.sdk=D\:\\\u5B66\u4E60\\\u5927\u4E09\u4E0B\\adt-bundle-windows-x86_64-20140702\\sdk
+com.android.ide.eclipse.adt.xmlEditor=true
 design.palette.flyout.dockLocation=4
 design.palette.flyout.state=1
 eclipse.preferences.version=1

代码/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

@@ -66,7 +66,7 @@
           <tags>persp.showIn:org.eclipse.team.ui.GenericHistoryView</tags>
           <tags>persp.showIn:org.eclipse.ui.views.ResourceNavigator</tags>
           <tags>persp.showIn:org.eclipse.ui.navigator.ProjectExplorer</tags>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_QeC2kxo6Eeax29SYYg3z8g" selectedElement="_QeC2lBo6Eeax29SYYg3z8g" horizontal="true">
+          <children xsi:type="basic:PartSashContainer" xmi:id="_QeC2kxo6Eeax29SYYg3z8g" selectedElement="_QeC2nho6Eeax29SYYg3z8g" horizontal="true">
             <children xsi:type="basic:PartSashContainer" xmi:id="_QeC2lBo6Eeax29SYYg3z8g" containerData="2500" selectedElement="_QeC2lRo6Eeax29SYYg3z8g">
               <children xsi:type="basic:PartStack" xmi:id="_QeC2lRo6Eeax29SYYg3z8g" elementId="left" containerData="6000" selectedElement="_QeC2lho6Eeax29SYYg3z8g">
                 <tags>newtablook</tags>
@@ -129,17 +129,41 @@
       <tags>categoryTag:Help</tags>
     </sharedElements>
     <sharedElements xsi:type="advanced:Area" xmi:id="_Qc_tsBo6Eeax29SYYg3z8g" elementId="org.eclipse.ui.editorss" selectedElement="_Qc_tsRo6Eeax29SYYg3z8g">
-      <children xsi:type="basic:PartStack" xmi:id="_Qc_tsRo6Eeax29SYYg3z8g" elementId="org.eclipse.e4.primaryDataStack">
+      <children xsi:type="basic:PartStack" xmi:id="_Qc_tsRo6Eeax29SYYg3z8g" elementId="org.eclipse.e4.primaryDataStack" selectedElement="_JLNF8EJZEeaGY6yZUjGHAg">
         <tags>newtablook</tags>
         <tags>org.eclipse.e4.primaryDataStack</tags>
         <tags>EditorStack</tags>
+        <children xsi:type="basic:Part" xmi:id="_XEZ8UEJXEeaGY6yZUjGHAg" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="LoginActivity.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="Shop/src/com/stone/shop/view/LoginActivity.java" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/Shop/src/com/stone/shop/view/LoginActivity.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;2239&quot; selectionTopPixel=&quot;3600&quot;/>&#xD;&#xA;&lt;/editor>"/>
+          <tags>Editor</tags>
+          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+          <tags>removeOnHide</tags>
+        </children>
+        <children xsi:type="basic:Part" xmi:id="_zejMQEJYEeaGY6yZUjGHAg" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="ClassroomActivity.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="Shop/src/com/stone/shop/view/ClassroomActivity.java" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/Shop/src/com/stone/shop/view/ClassroomActivity.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;1882&quot; selectionTopPixel=&quot;490&quot;/>&#xD;&#xA;&lt;/editor>"/>
+          <tags>Editor</tags>
+          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+          <tags>removeOnHide</tags>
+        </children>
+        <children xsi:type="basic:Part" xmi:id="_1WKOIEJYEeaGY6yZUjGHAg" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="activity_classroom.xml" iconURI="platform:/plugin/com.android.ide.eclipse.adt/icons/android_file.png" tooltip="Shop/res/layout/activity_classroom.xml" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;com.android.ide.eclipse.editors.CommonXmlEditor&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/Shop/res/layout/activity_classroom.xml&quot;/>&#xD;&#xA;&lt;/editor>"/>
+          <tags>Editor</tags>
+          <tags>com.android.ide.eclipse.editors.CommonXmlEditor</tags>
+          <tags>removeOnHide</tags>
+        </children>
+        <children xsi:type="basic:Part" xmi:id="_JLNF8EJZEeaGY6yZUjGHAg" elementId="org.eclipse.e4.ui.compatibility.editor" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityEditor" label="ReservationActivity.java" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/jcu_obj.gif" tooltip="Shop/src/com/stone/shop/view/ReservationActivity.java" closeable="true">
+          <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;editor id=&quot;org.eclipse.jdt.ui.CompilationUnitEditor&quot;>&#xD;&#xA;&lt;input factoryID=&quot;org.eclipse.ui.part.FileEditorInputFactory&quot; path=&quot;/Shop/src/com/stone/shop/view/ReservationActivity.java&quot;/>&#xD;&#xA;&lt;editorState selectionHorizontalPixel=&quot;0&quot; selectionLength=&quot;0&quot; selectionOffset=&quot;2798&quot; selectionTopPixel=&quot;735&quot;/>&#xD;&#xA;&lt;/editor>"/>
+          <tags>Editor</tags>
+          <tags>org.eclipse.jdt.ui.CompilationUnitEditor</tags>
+          <tags>removeOnHide</tags>
+          <tags>activeOnClose</tags>
+        </children>
       </children>
     </sharedElements>
     <sharedElements xsi:type="basic:Part" xmi:id="_QdeO0ho6Eeax29SYYg3z8g" elementId="org.eclipse.jdt.ui.PackageExplorer" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Package Explorer" iconURI="platform:/plugin/org.eclipse.jdt.ui/icons/full/eview16/package.gif" tooltip="Workspace" closeable="true">
       <persistedState key="memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;view group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;>&#xD;&#xA;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;>&#xD;&#xA;&lt;xmlDefinedFilters>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/>&#xD;&#xA;&lt;/xmlDefinedFilters>&#xD;&#xA;&lt;/customFilters>&#xD;&#xA;&lt;/view>"/>
       <tags>View</tags>
       <tags>categoryTag:Java</tags>
-      <tags>activeOnClose</tags>
       <menus xmi:id="_Qf20cBo6Eeax29SYYg3z8g" elementId="org.eclipse.jdt.ui.PackageExplorer">
         <tags>ViewMenu</tags>
         <tags>menuContribution:menu</tags>
@@ -271,18 +295,18 @@
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQHvUBo6Eeax29SYYg3z8g" elementId="org.eclipse.ui.workbench.file">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecdNIEJFEea0dfB4lUMs_w" elementId="new.group"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz21IEJXEeaGY6yZUjGHAg" elementId="new.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecdNIUJFEea0dfB4lUMs_w" elementId="newWizardDropDown"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz21IUJXEeaGY6yZUjGHAg" elementId="newWizardDropDown"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecd0MEJFEea0dfB4lUMs_w" elementId="new.ext" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz3cMEJXEeaGY6yZUjGHAg" elementId="new.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecd0MUJFEea0dfB4lUMs_w" elementId="save.group" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz3cMUJXEeaGY6yZUjGHAg" elementId="save.group" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecd0MkJFEea0dfB4lUMs_w" elementId="save"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz4DQEJXEeaGY6yZUjGHAg" elementId="save"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecd0M0JFEea0dfB4lUMs_w" elementId="saveAll"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz4DQUJXEeaGY6yZUjGHAg" elementId="saveAll"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecebQEJFEea0dfB4lUMs_w" elementId="save.ext" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz4qUEJXEeaGY6yZUjGHAg" elementId="save.ext" visible="false"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_ecfCUEJFEea0dfB4lUMs_w" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.gif" tooltip="Print" enabled="false" command="_Pzs5IBo6Eeax29SYYg3z8g"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_Lz5RYEJXEeaGY6yZUjGHAg" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/print_edit.gif" tooltip="Print" command="_Pzs5IBo6Eeax29SYYg3z8g"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_eclwAEJFEea0dfB4lUMs_w" elementId="print.ext" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz9i0EJXEeaGY6yZUjGHAg" elementId="print.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_eclwAUJFEea0dfB4lUMs_w" elementId="build.group"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz9i0UJXEeaGY6yZUjGHAg" elementId="build.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_eclwAkJFEea0dfB4lUMs_w" elementId="build.ext" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-J4EJXEeaGY6yZUjGHAg" elementId="build.ext" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecmXEEJFEea0dfB4lUMs_w" elementId="additions"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-J4UJXEeaGY6yZUjGHAg" elementId="additions"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQHvURo6Eeax29SYYg3z8g" elementId="additions" toBeRendered="false">
         <tags>toolbarSeparator</tags>
@@ -296,47 +320,53 @@
         <children xsi:type="menu:OpaqueToolItem" xmi:id="_fpIbokJFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"/>
         <children xsi:type="menu:OpaqueToolItem" xmi:id="_fpIbo0JFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"/>
         <children xsi:type="menu:OpaqueToolItem" xmi:id="_fpJCsEJFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_XjtugEJXEeaGY6yZUjGHAg" elementId="Presentation"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_XjwKwEJXEeaGY6yZUjGHAg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleBreadcrumb"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_XjxY4EJXEeaGY6yZUjGHAg" elementId="org.eclipse.jdt.ui.edit.text.java.toggleMarkOccurrences"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_XjzOEEJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.toggleBlockSelectionMode"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Xj1DQEJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.toggleShowWhitespaceCharacters"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Xj2RYEJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_Qu1EkBo6Eeax29SYYg3z8g" elementId="adt.actionSet.avdManager">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egOS0EJFEea0dfB4lUMs_w" elementId="android_project"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2nOMEJXEeaGY6yZUjGHAg" elementId="android_project"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egO54EJFEea0dfB4lUMs_w" elementId="com.android.ide.eclipse.adt.ui.sdkmanager"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2nOMUJXEeaGY6yZUjGHAg" elementId="com.android.ide.eclipse.adt.ui.sdkmanager"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egPg8EJFEea0dfB4lUMs_w" elementId="com.android.ide.eclipse.adt.ui.avdmanager"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2nOMkJXEeaGY6yZUjGHAg" elementId="com.android.ide.eclipse.adt.ui.avdmanager"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_NbyKABo7Eeaw54lm6FXYtQ" elementId="org.eclipse.debug.ui.breakpointActionSet">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egPg8UJFEea0dfB4lUMs_w" elementId="breakpointGroup"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2n1QEJXEeaGY6yZUjGHAg" elementId="breakpointGroup"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egPg8kJFEea0dfB4lUMs_w" elementId="org.eclipse.debug.ui.actions.SkipAllBreakpoints"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2n1QUJXEeaGY6yZUjGHAg" elementId="org.eclipse.debug.ui.actions.SkipAllBreakpoints"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_Qvfy8Bo6Eeax29SYYg3z8g" elementId="adt.actionSet.lint">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egQIAEJFEea0dfB4lUMs_w" elementId="android_project"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2n1QkJXEeaGY6yZUjGHAg" elementId="android_project"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egQIAUJFEea0dfB4lUMs_w" elementId="com.android.ide.eclipse.adt.ui.lintrunner"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2n1Q0JXEeaGY6yZUjGHAg" elementId="com.android.ide.eclipse.adt.ui.lintrunner"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QvTlsBo6Eeax29SYYg3z8g" elementId="adt.actionSet.wizards">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egQIAkJFEea0dfB4lUMs_w" elementId="android_project"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2n1REJXEeaGY6yZUjGHAg" elementId="android_project"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egRWIEJFEea0dfB4lUMs_w" elementId="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2ocUEJXEeaGY6yZUjGHAg" elementId="com.android.ide.eclipse.adt.wizards.actions.NewXmlFileAction"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_Qtr1EBo6Eeax29SYYg3z8g" elementId="org.eclipse.debug.ui.launchActionSet">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egRWIUJFEea0dfB4lUMs_w" elementId="debug"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2ocUUJXEeaGY6yZUjGHAg" elementId="debug"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egRWIkJFEea0dfB4lUMs_w" elementId="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2ocUkJXEeaGY6yZUjGHAg" elementId="org.eclipse.debug.internal.ui.actions.DebugDropDownAction"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egRWI0JFEea0dfB4lUMs_w" elementId="org.eclipse.debug.internal.ui.actions.RunDropDownAction"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2ocU0JXEeaGY6yZUjGHAg" elementId="org.eclipse.debug.internal.ui.actions.RunDropDownAction"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9MEJFEea0dfB4lUMs_w" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pDYEJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.externaltools.ExternalToolMenuDelegateToolbar"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_Quu98Bo6Eeax29SYYg3z8g" elementId="org.eclipse.jdt.ui.JavaElementCreationActionSet">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9MUJFEea0dfB4lUMs_w" elementId="JavaWizards"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pDYUJXEeaGY6yZUjGHAg" elementId="JavaWizards"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9MkJFEea0dfB4lUMs_w" elementId="org.eclipse.jdt.ui.actions.OpenProjectWizard"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pDYkJXEeaGY6yZUjGHAg" elementId="org.eclipse.jdt.ui.actions.OpenProjectWizard"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9M0JFEea0dfB4lUMs_w" elementId="org.eclipse.jdt.ui.actions.OpenPackageWizard"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pDY0JXEeaGY6yZUjGHAg" elementId="org.eclipse.jdt.ui.actions.OpenPackageWizard"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9NEJFEea0dfB4lUMs_w" elementId="org.eclipse.jdt.ui.actions.NewTypeDropDown"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pDZEJXEeaGY6yZUjGHAg" elementId="org.eclipse.jdt.ui.actions.NewTypeDropDown"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QuEPkBo6Eeax29SYYg3z8g" elementId="org.eclipse.search.searchActionSet">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9NUJFEea0dfB4lUMs_w" elementId="Search"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqcEJXEeaGY6yZUjGHAg" elementId="Search"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egR9NkJFEea0dfB4lUMs_w" elementId="openType"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqcUJXEeaGY6yZUjGHAg" elementId="openType"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egSkQEJFEea0dfB4lUMs_w" elementId="org.eclipse.search.OpenSearchDialogPage"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqckJXEeaGY6yZUjGHAg" elementId="org.eclipse.search.OpenSearchDialogPage"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQHvUxo6Eeax29SYYg3z8g" elementId="group.nav" toBeRendered="false">
         <tags>toolbarSeparator</tags>
@@ -344,15 +374,15 @@
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQHvVRo6Eeax29SYYg3z8g" elementId="org.eclipse.ui.workbench.navigate">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecmXEUJFEea0dfB4lUMs_w" elementId="history.group"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-J4kJXEeaGY6yZUjGHAg" elementId="history.group"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecmXEkJFEea0dfB4lUMs_w" elementId="group.application" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-J40JXEeaGY6yZUjGHAg" elementId="group.application" visible="false"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecm-IEJFEea0dfB4lUMs_w" elementId="backardHistory"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-w8EJXEeaGY6yZUjGHAg" elementId="backardHistory"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecm-IUJFEea0dfB4lUMs_w" elementId="forwardHistory"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-w8UJXEeaGY6yZUjGHAg" elementId="forwardHistory"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecm-IkJFEea0dfB4lUMs_w" elementId="pin.group"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz-w8kJXEeaGY6yZUjGHAg" elementId="pin.group"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_ecnlMEJFEea0dfB4lUMs_w" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.gif" tooltip="Pin the current editor" enabled="false" command="_PzgsTRo6Eeax29SYYg3z8g"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_Lz_YAEJXEeaGY6yZUjGHAg" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/pin_editor.gif" tooltip="Pin the current editor" enabled="false" command="_PzgsTRo6Eeax29SYYg3z8g"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egSkQUJFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.gotoNextAnnotation"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqc0JXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.gotoNextAnnotation"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egSkQkJFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqdEJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.gotoPreviousAnnotation"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_egSkQ0JFEea0dfB4lUMs_w" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_L2pqdUJXEeaGY6yZUjGHAg" elementId="org.eclipse.ui.edit.text.gotoLastEditPosition"/>
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQHvVho6Eeax29SYYg3z8g" elementId="group.editor" toBeRendered="false">
         <tags>toolbarSeparator</tags>
@@ -364,8 +394,8 @@
       </children>
       <children xsi:type="menu:ToolBar" xmi:id="_QQN18Ro6Eeax29SYYg3z8g" elementId="org.eclipse.ui.workbench.help">
         <tags>Draggable</tags>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecozUEJFEea0dfB4lUMs_w" elementId="group.help"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz_YAUJXEeaGY6yZUjGHAg" elementId="group.help"/>
-        <children xsi:type="menu:OpaqueToolItem" xmi:id="_ecozUUJFEea0dfB4lUMs_w" elementId="group.application" visible="false"/>
+        <children xsi:type="menu:OpaqueToolItem" xmi:id="_Lz__EEJXEeaGY6yZUjGHAg" elementId="group.application" visible="false"/>
       </children>
       <children xsi:type="menu:ToolControl" xmi:id="_QTE8sBo6Eeax29SYYg3z8g" elementId="PerspectiveSpacer" contributionURI="bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.LayoutModifierToolControl">
         <tags>stretch</tags>

代码/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

@@ -2,7 +2,7 @@
 <section name="Workbench">
 	<section name="org.eclipse.ui.internal.QuickAccess">
 		<item value="526" key="dialogHeight"/>
-		<item value="1024" key="dialogWidth"/>
+		<item value="1025" key="dialogWidth"/>
 		<list key="textEntries">
 		</list>
 		<list key="orderedElements">

代码/Shop 1.2最终修改版/.classpath

@@ -0,0 +1,9 @@
+<?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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

代码/Shop 1.2最终修改版/.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 1.2最终修改版/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

代码/Shop 1.2最终修改版/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

代码/Shop 1.2最终修改版/AndroidManifest.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.stone.shop"
+    android:versionCode="2"
+    android:versionName="Beta 1.5.8" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- SDK2.1新增获取用户位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_app"
+        android:label="@string/app_name"
+        android:theme="@style/NoTitleBarTheme" >
+
+        <!-- ********************************QQ登陆配置*********************************** -->
+        <!--
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tencent101080318" />
+            </intent-filter>
+        </activity>
+        -->
+        <!-- ********************************QQ登陆配置*********************************** -->
+        <activity
+            android:name="com.stone.shop.view.SplashActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.BaseActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.LoginActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ClassroomActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.RegisterActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopAllActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopItemActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.OrderActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.OrderInfoActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.HomeActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.WsqActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.AwardActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineInfoActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineInfoEditActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineSoftActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.FeedBackActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.old.OldMineActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.NewsActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.AboutActivity"
+            android:label="@string/app_name" >
+        </activity>
+
+        <!-- 教学类 -->
+        <activity
+            android:name="com.stone.shop.view.BXTActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.BXTNewsActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="tencent222222" />
+                <!-- 100380359 100381104 222222 -->
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+    </application>
+
+</manifest>

代码/Shop 1.2最终修改版/bin/AndroidManifest.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.stone.shop"
+    android:versionCode="2"
+    android:versionName="Beta 1.5.8" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="19" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- SDK2.1新增获取用户位置信息 -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_app"
+        android:label="@string/app_name"
+        android:theme="@style/NoTitleBarTheme" >
+
+        <!-- ********************************QQ登陆配置*********************************** -->
+        <!--
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:screenOrientation="portrait"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tencent101080318" />
+            </intent-filter>
+        </activity>
+        -->
+        <!-- ********************************QQ登陆配置*********************************** -->
+        <activity
+            android:name="com.stone.shop.view.SplashActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.BaseActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.LoginActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ClassroomActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.RegisterActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopAllActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ShopItemActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.OrderActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.OrderInfoActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.HomeActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.WsqActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.AwardActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.ReservationActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineInfoActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineInfoEditActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.MineSoftActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.FeedBackActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.old.OldMineActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.NewsActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.AboutActivity"
+            android:label="@string/app_name" >
+        </activity>
+
+        <!-- 教学类 -->
+        <activity
+            android:name="com.stone.shop.view.BXTActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.stone.shop.view.BXTNewsActivity"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="com.tencent.tauth.AuthActivity"
+            android:launchMode="singleTask"
+            android:noHistory="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="tencent222222" />
+                <!-- 100380359 100381104 222222 -->
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.tencent.connect.common.AssistActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+    </application>
+
+</manifest>