diff --git a/代码/.metadata/.log b/代码/.metadata/.log index fddc1c7..8cdfa63 100644 --- a/代码/.metadata/.log +++ b/代码/.metadata/.log @@ -10853,3 +10853,95 @@ This warning can be switched off on the Team > Git > Confirmations and Warnings !ENTRY org.eclipse.ui 2 2 2016-07-05 08:17:01.429 !MESSAGE Invalid property category path: ValidationPropertiesPage (bundle: org.eclipse.wst.xml.ui, propertyPage: org.eclipse.wst.xml.ui.propertyPage.project.validation) +!SESSION 2016-07-05 10:21:25.706 ----------------------------------------------- +eclipse.buildId=M20130204-1200 +java.version=1.8.0_66 +java.vendor=Oracle Corporation +BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=zh_CN +Framework arguments: -product com.android.ide.eclipse.adt.package.adtproduct +Command-line arguments: -os win32 -ws win32 -arch x86_64 -product com.android.ide.eclipse.adt.package.adtproduct + +!ENTRY org.eclipse.core.resources 4 4 2016-07-05 10:22:14.573 +!MESSAGE Exception occurred while saving project preferences: /Shop/.settings/org.eclipse.jdt.core.prefs. +!STACK 1 +org.eclipse.core.internal.resources.ResourceException: A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + at org.eclipse.core.internal.resources.Folder.assertCreateRequirements(Folder.java:47) + at org.eclipse.core.internal.resources.Folder.create(Folder.java:95) + at org.eclipse.core.internal.resources.ProjectPreferences$1.run(ProjectPreferences.java:566) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.core.internal.resources.ProjectPreferences.save(ProjectPreferences.java:590) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalFlush(EclipsePreferences.java:465) + at org.eclipse.core.internal.resources.ProjectPreferences.flush(ProjectPreferences.java:350) + at org.eclipse.jdt.internal.core.JavaProject.setOption(JavaProject.java:2953) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.checkAndFixCompilerCompliance(ProjectHelper.java:513) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProjectClasspathEntries(ProjectHelper.java:422) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProject(ProjectHelper.java:296) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createEclipseProject(NewProjectCreator.java:837) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createProjectAsync(NewProjectCreator.java:660) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.access$0(NewProjectCreator.java:590) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator$3.execute(NewProjectCreator.java:400) + at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118) + at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121) +!SUBENTRY 1 org.eclipse.core.resources 4 272 2016-07-05 10:22:14.596 +!MESSAGE A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + +!ENTRY org.eclipse.core.resources 4 4 2016-07-05 10:22:14.918 +!MESSAGE Exception occurred while saving project preferences: /Shop/.settings/org.eclipse.jdt.core.prefs. +!STACK 1 +org.eclipse.core.internal.resources.ResourceException: A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + at org.eclipse.core.internal.resources.Folder.assertCreateRequirements(Folder.java:47) + at org.eclipse.core.internal.resources.Folder.create(Folder.java:95) + at org.eclipse.core.internal.resources.ProjectPreferences$1.run(ProjectPreferences.java:566) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.core.internal.resources.ProjectPreferences.save(ProjectPreferences.java:590) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalFlush(EclipsePreferences.java:465) + at org.eclipse.core.internal.resources.ProjectPreferences.flush(ProjectPreferences.java:350) + at org.eclipse.jdt.internal.core.JavaProject.setOption(JavaProject.java:2953) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.checkAndFixCompilerCompliance(ProjectHelper.java:515) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProjectClasspathEntries(ProjectHelper.java:422) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProject(ProjectHelper.java:296) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createEclipseProject(NewProjectCreator.java:837) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createProjectAsync(NewProjectCreator.java:660) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.access$0(NewProjectCreator.java:590) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator$3.execute(NewProjectCreator.java:400) + at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118) + at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121) +!SUBENTRY 1 org.eclipse.core.resources 4 272 2016-07-05 10:22:14.918 +!MESSAGE A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + +!ENTRY org.eclipse.core.resources 4 4 2016-07-05 10:22:14.920 +!MESSAGE Exception occurred while saving project preferences: /Shop/.settings/org.eclipse.jdt.core.prefs. +!STACK 1 +org.eclipse.core.internal.resources.ResourceException: A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + at org.eclipse.core.internal.resources.Folder.assertCreateRequirements(Folder.java:47) + at org.eclipse.core.internal.resources.Folder.create(Folder.java:95) + at org.eclipse.core.internal.resources.ProjectPreferences$1.run(ProjectPreferences.java:566) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.core.internal.resources.ProjectPreferences.save(ProjectPreferences.java:590) + at org.eclipse.core.internal.preferences.EclipsePreferences.internalFlush(EclipsePreferences.java:465) + at org.eclipse.core.internal.resources.ProjectPreferences.flush(ProjectPreferences.java:350) + at org.eclipse.jdt.internal.core.JavaProject.setOption(JavaProject.java:2953) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.checkAndFixCompilerCompliance(ProjectHelper.java:517) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProjectClasspathEntries(ProjectHelper.java:422) + at com.android.ide.eclipse.adt.internal.project.ProjectHelper.fixProject(ProjectHelper.java:296) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createEclipseProject(NewProjectCreator.java:837) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.createProjectAsync(NewProjectCreator.java:660) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator.access$0(NewProjectCreator.java:590) + at com.android.ide.eclipse.adt.internal.wizards.newproject.NewProjectCreator$3.execute(NewProjectCreator.java:400) + at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106) + at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344) + at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118) + at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121) +!SUBENTRY 1 org.eclipse.core.resources 4 272 2016-07-05 10:22:14.921 +!MESSAGE A resource already exists on disk 'C:\Users\kaka727\Desktop\Group4Project\代码\Shop\.settings'. + +!ENTRY org.eclipse.egit.ui 2 0 2016-07-05 10:22:15.189 +!MESSAGE Warning: The environment variable HOME is not set. The following directory will be used to store the Git +user global configuration and to define the default location to store repositories: 'C:\Users\kaka727'. If this is +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. diff --git a/代码/.metadata/.plugins/org.eclipse.cdt.core/.log b/代码/.metadata/.plugins/org.eclipse.cdt.core/.log index 7c35989..0d3d65f 100644 --- a/代码/.metadata/.plugins/org.eclipse.cdt.core/.log +++ b/代码/.metadata/.plugins/org.eclipse.cdt.core/.log @@ -34,3 +34,4 @@ *** SESSION 7月 04, 2016 15:52:02.68 -------------------------------------------- *** SESSION 7月 04, 2016 17:58:21.26 -------------------------------------------- *** SESSION 7月 05, 2016 00:44:57.89 -------------------------------------------- +*** SESSION 7月 05, 2016 08:14:55.77 -------------------------------------------- diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.history/b6/a00fed5acf4100161923c4b8d3c0f74b b/代码/.metadata/.plugins/org.eclipse.core.resources/.history/b6/a00fed5acf4100161923c4b8d3c0f74b deleted file mode 100644 index 9cc78c8..0000000 --- a/代码/.metadata/.plugins/org.eclipse.core.resources/.history/b6/a00fed5acf4100161923c4b8d3c0f74b +++ /dev/null @@ -1,114 +0,0 @@ -package com.stone.shop.adapter; - -import android.R.integer; -import android.content.Context; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import com.stone.date.TypeDef; -import com.stone.shop.R; - -/** - * 生活-- 网格布局(ImageView+TextView)适配器 - * - * @date 2014-4-24 - * @author Stone - */ -public class GridAdapter extends BaseAdapter { - - private Context mContext; - private int mIndex = 0; // 代表当前需要适配页面中第几个GridView - - //学习小菜 - public static String[] mSchoolTexts = TypeDef.typeSonList1; - private int[] mSchoolImages = { R.drawable.ic_8, R.drawable.ic_8 }; - - //吃饭小菜 - public static String[] mFoodTexts = TypeDef.typeSonList2; - private int[] mFoodImages = { R.drawable.ic_41, R.drawable.ic_42}; - - //购物小菜 - public static String[] mGiftTexts = TypeDef.typeSonList3; - private int[] mGiftImages = { R.drawable.ic_7, R.drawable.ic_7, - R.drawable.ic_7, R.drawable.ic_7, R.drawable.ic_7, - R.drawable.ic_7, R.drawable.ic_7}; - - //疯狂小菜 - public static String[] mOutTexts = TypeDef.typeSonList4; - private int[] mOutImages = { R.drawable.ic_3, R.drawable.ic_3, - R.drawable.ic_3, R.drawable.ic_3, R.drawable.ic_3, - R.drawable.ic_3, R.drawable.ic_3 }; - - public GridAdapter(Context context, int index) { - mContext = context; - mIndex = index; - } - - @Override - public int getCount() { - int count = 0; - switch (mIndex) { - case 0: - count = mFoodImages.length; - break; - case 1: - count = mGiftImages.length; - break; - case 2: - count = mOutImages.length; - break; - case 3: - count = mSchoolImages.length; - break; - default: - break; - } - return count; - } - - @Override - public Object getItem(int position) { - return null; - } - - @Override - public long getItemId(int position) { - return 0; - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - View view = View.inflate(mContext, R.layout.shop_grid_item, null); - // RelativeLayout rl = (RelativeLayout) - // view.findViewById(R.id.relaGrid); - - ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage); - TextView text = (TextView) view.findViewById(R.id.tv_chooseText); - switch (mIndex) { - case 0: - image.setImageResource(mFoodImages[position]); - text.setText(mFoodTexts[position]); - break; - case 1: - image.setImageResource(mGiftImages[position]); - text.setText(mGiftTexts[position]); - break; - case 2: - image.setImageResource(mOutImages[position]); - text.setText(mOutTexts[position]); - break; - case 3: - image.setImageResource(mSchoolImages[position]); - text.setText(mSchoolTexts[position]); - break; - default: - break; - } - - return view; - } - -} diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.history/c2/701f0a90d94100161923c4b8d3c0f74b b/代码/.metadata/.plugins/org.eclipse.core.resources/.history/c2/701f0a90d94100161923c4b8d3c0f74b deleted file mode 100644 index 2276646..0000000 --- a/代码/.metadata/.plugins/org.eclipse.core.resources/.history/c2/701f0a90d94100161923c4b8d3c0f74b +++ /dev/null @@ -1,123 +0,0 @@ -package com.stone.shop.view; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -import com.stone.shop.R; -import com.stone.shop.model.Reservation; -import com.stone.shop.model.User; -import com.stone.ui.DateTimePickDialogUtil; -import com.stone.ui.DateTimePickDialogUtil.DateTimeListener; - -import android.app.Activity; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.TextView; -import android.widget.Toast; -import cn.bmob.v3.BmobQuery; -import cn.bmob.v3.listener.FindListener; -import cn.bmob.v3.listener.SaveListener; - -public class ReservationActivity extends Activity { - - private Button btn_login; - private SimpleDateFormat dateFormat; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.layout_reservation); - - TextView tv_title = (TextView) findViewById(R.id.tv_title); - tv_title.setText("教室预定"); - - final String roomId = getIntent().getStringExtra("roomId"); - final String roomName = getIntent().getStringExtra("roomName"); - - TextView tv_room = (TextView) findViewById(R.id.tv_room); - tv_room.setText("教室：" + roomName); - - btn_login = (Button) findViewById(R.id.btn_login); - - dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm"); - - // 查找Person表里面id为6b6c11c537的数据 - BmobQuery bmobQuery = new BmobQuery(); - bmobQuery.addWhereEqualTo("userId", User.userId); - bmobQuery.addWhereEqualTo("roomId", roomId); - bmobQuery.findObjects(ReservationActivity.this, new FindListener() { - - @Override - public void onSuccess(List newsList) { - // toast("查询商品成功, 共" + newsList.size()); - if (newsList.size() != 0) { - - String dateTime = newsList.get(0).getDateTime(); - - btn_login.setEnabled(false); - btn_login.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime))); - - } - - } - - @Override - public void onError(int arg0, String arg1) { - toast("查询失败"); - } - }); - - btn_login.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - // TODO Auto-generated method stub - - DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(ReservationActivity.this, - dateFormat.format(new Date(System.currentTimeMillis() + 3600 * 1000 * 2))); - dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() { - - @Override - public void onDateTimeChane(final String dateTime) { - // TODO Auto-generated method stub - - Reservation reservation = new Reservation(); - reservation.setRoomId(roomId); - reservation.setRoomName(roomName); - reservation.setUserId(User.userId); - reservation.setDateTime(dateTime); - - reservation.save(ReservationActivity.this, new SaveListener() { - - @Override - public void onSuccess() { - // TODO Auto-generated method stub - toast("预定成功"); - btn_login.setEnabled(false); - btn_login.setText("已经预定 "+ dateTime); - - } - - @Override - public void onFailure(int arg0, String arg1) { - // TODO Auto-generated method stub - toast("预定失败"); - - } - }); - } - }); - - } - }); - - } - - private void toast(String toast) { - Toast.makeText(this, toast, Toast.LENGTH_SHORT).show(); - } -} diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/11/properties.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/11/properties.index index 69e71d1..15ca475 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/11/properties.index and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/11/properties.index differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/62/properties.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/62/properties.index index c9508ea..ac2dbe3 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/62/properties.index and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/62/properties.index differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/d6/properties.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/d6/properties.index index 69610fd..1abba86 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/d6/properties.index and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/a0/d6/properties.index differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/a5/history.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/a5/history.index deleted file mode 100644 index 249836a..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/a5/history.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/b1/history.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/b1/history.index deleted file mode 100644 index 817b6d6..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/e4/81/65/f6/b1/history.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/properties.index b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/properties.index index 1753f1f..7bfd244 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/properties.index and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.indexes/properties.index differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.location b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.location deleted file mode 100644 index e399f03..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.location and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers deleted file mode 100644 index a7eab4d..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers.snap b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers.snap index 91d6c54..f70511e 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers.snap and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.markers.snap differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.syncinfo.snap b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.syncinfo.snap index 91d6c54..3ab7083 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.syncinfo.snap and b/代码/.metadata/.plugins/org.eclipse.core.resources/.projects/Shop/.syncinfo.snap differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap b/代码/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap index 91d6c54..3ab7083 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap and b/代码/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.root/36.tree b/代码/.metadata/.plugins/org.eclipse.core.resources/.root/36.tree deleted file mode 100644 index 8436256..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.root/36.tree and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/代码/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources index 3a91319..34d61a7 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and b/代码/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources differ diff --git a/代码/.metadata/.plugins/org.eclipse.core.resources/.snap b/代码/.metadata/.plugins/org.eclipse.core.resources/.snap index 47c1dba..c2e92eb 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.core.resources/.snap and b/代码/.metadata/.plugins/org.eclipse.core.resources/.snap differ diff --git a/代码/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/代码/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 832148f..95e5aed 100644 --- a/代码/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/代码/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -66,7 +66,7 @@ persp.showIn:org.eclipse.team.ui.GenericHistoryView persp.showIn:org.eclipse.ui.views.ResourceNavigator persp.showIn:org.eclipse.ui.navigator.ProjectExplorer - + newtablook @@ -85,7 +85,7 @@ - + newtablook org.eclipse.e4.secondaryDataStack @@ -129,29 +129,17 @@ categoryTag:Help - + newtablook org.eclipse.e4.primaryDataStack EditorStack - - - Editor - org.eclipse.jdt.ui.CompilationUnitEditor - removeOnHide - activeOnClose - - - - Editor - org.eclipse.jdt.ui.CompilationUnitEditor - removeOnHide - View categoryTag:Java + activeOnClose ViewMenu menuContribution:menu @@ -283,18 +271,18 @@ Draggable - - - - - - - - - - - - + + + + + + + + + + + + toolbarSeparator @@ -302,53 +290,53 @@ Draggable - - - - - - + + + + + + Draggable - - - + + + Draggable - - + + Draggable - - + + Draggable - - + + Draggable - - - - + + + + Draggable - - - - + + + + Draggable - - - + + + toolbarSeparator @@ -356,15 +344,15 @@ Draggable - - - - - - - - - + + + + + + + + + toolbarSeparator @@ -376,8 +364,8 @@ Draggable - - + + stretch diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/1721429585.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/1721429585.index deleted file mode 100644 index a8e9aab..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/1721429585.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/2771060146.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/2771060146.index deleted file mode 100644 index ed1d6b2..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/2771060146.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/3690134431.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/3690134431.index deleted file mode 100644 index 23e89f3..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/3690134431.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/383641943.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/383641943.index index 933a3ed..6b35c06 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/383641943.index and b/代码/.metadata/.plugins/org.eclipse.jdt.core/383641943.index differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/4274425093.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/4274425093.index deleted file mode 100644 index 6203c44..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/4274425093.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/73220715.index b/代码/.metadata/.plugins/org.eclipse.jdt.core/73220715.index deleted file mode 100644 index ace1f75..0000000 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/73220715.index and /dev/null differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps b/代码/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps index 980dcae..c1f560c 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps and b/代码/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/代码/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache index a904678..593f470 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and b/代码/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/代码/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index 5c6203d..3210ad1 100644 --- a/代码/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/代码/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -1,8 +1,8 @@ INDEX VERSION 1.126+C:\Users\kaka727\Desktop\Group4Project\\.metadata\.plugins\org.eclipse.jdt.core -1583082874.index -3690134431.index -73220715.index 383641943.index -4274425093.index -1721429585.index -2771060146.index +1583082874.index +2086117408.index +3572018792.index +3417759826.index +1022550500.index +235409274.index diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/代码/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat index a2732c1..859fbd4 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and b/代码/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png index a95f608..a6abcd8 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png and b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png index 9abe3c5..2856a9f 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png and b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png differ diff --git a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png index 2856a9f..abd76cf 100644 Binary files a/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png and b/代码/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png differ diff --git a/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.history b/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.history index 3ad1f2a..abac164 100644 --- a/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.history +++ b/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.history @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.index b/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.index index a91da0f..c7278a4 100644 --- a/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.index +++ b/代码/.metadata/.plugins/org.eclipse.ltk.core.refactoring/.refactorings/.workspace/2016/7/28/refactorings.index @@ -2,3 +2,4 @@ 1467618778472 Delete resource 'Shop' 1467618782832 Delete resource 'SplashActivity' 1467626348947 Delete resource 'Shop' +1467682684573 Delete resource 'Shop' diff --git a/代码/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/代码/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml index 6725113..ccb2223 100644 --- a/代码/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ b/代码/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -2,7 +2,7 @@
- + diff --git a/文档/第二次迭代PPT.pptx b/文档/第二次迭代PPT.pptx index a48268e..487dd4a 100644 Binary files a/文档/第二次迭代PPT.pptx and b/文档/第二次迭代PPT.pptx differ