Compare commits

...

132 Commits

Author SHA1 Message Date
kaka727 c80b029798 删除无关信息 2016-09-03 18:39:54 +08:00
kaka727 a5092213c9 终极修改后的修改 2016-09-03 18:21:04 +08:00
kaka727 008cd86fb4 2016.9.3
终极完善
2016-09-03 17:16:24 +08:00
TISSOT 15df154c60 xujiaming 2016-9-2
修正SonarQube
2016-09-02 09:27:21 +08:00
kaka727 474147a462 修改部分冗余文件 2016-09-01 21:41:51 +08:00
kaka727 7384182b7d 2016.9.1
修改代码中问题
2016-09-01 21:30:07 +08:00
qinjiaming_branch fb918b7612 整理文档和模型。 2016-08-31 15:10:12 +08:00
qinjiaming_branch e094eb5b3c 最终版代码。 2016-08-31 12:15:08 +08:00
qinjiaming_branch 485f4ffc51 规范修改 2016-08-30 11:42:11 +08:00
qinjiaming_branch 86db9f0073 1 2016-08-30 11:27:42 +08:00
qinjiaming_branch 3ab9b202dd Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-30 11:18:49 +08:00
qinjiaming_branch a4637f2ca3 merge 2016-08-30 11:18:26 +08:00
王尚文 370fda4e2a Merge branch 'zhaozaichun' into 'master'
旧版本合并

嘎嘎

See merge request !13
2016-08-30 10:57:52 +08:00
zzc ffbcf267f5 Merge branch 'zhaozaichun' of https://git.trustie.net/kaka727/shangwen666 into zhaozaichun 2016-08-30 10:53:48 +08:00
zzc 2a689cf645 文档 2016-08-30 10:53:23 +08:00
zzc f505442c33 回退到旧版本 2016-08-30 10:50:31 +08:00
qinjiaming_branch fee6c38a85 merge 2016-08-30 10:44:15 +08:00
qinjiaming_branch b5c3b0020f Merge branch 'zhaozaichun' 2016-08-30 10:21:21 +08:00
qinjiaming_branch 84cbcb0be2 提交文档 2016-08-30 10:09:17 +08:00
qinjiaming_branch 4f844a90d8 合并赵再春前的提交 2016-08-30 10:06:13 +08:00
zzc bf6a90a591 移回分支 2016-08-30 09:52:36 +08:00
zzc e85abefd10 删除本地 2016-08-30 09:51:35 +08:00
qinjiaming_branch 406ede7f36 Merge remote-tracking branch 'remotes/origin/qinjiaming_branch' 2016-08-30 09:47:07 +08:00
zzc b0810e1896 修改 2016-08-30 09:44:11 +08:00
TISSOT 3524c22401 xujiaming 2016-8-30
新闻界面最终版修改,LastPull
2016-08-30 09:43:22 +08:00
qinjiaming_branch 9befe9ae76 1111 2016-08-30 09:36:44 +08:00
qinjiaming_branch 5a7f4c3881 合并赵再春分支。 2016-08-30 09:19:34 +08:00
qinjiaming_branch 424ec44904 报错。 2016-08-30 09:02:07 +08:00
qinjiaming_branch d898f42da5 改动模型。 2016-08-30 08:42:50 +08:00
qinjiaming_branch e929b22f5e 更新了UML图。 2016-08-30 08:36:54 +08:00
qinjiaming_branch 9605b5b810 上传覃佳明的顺序图。 2016-08-30 08:21:46 +08:00
qinjiaming_branch 5afa9af69a 修改了顺序图 2016-08-30 08:18:41 +08:00
qinjiaming_branch 84c742190f Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-30 08:11:07 +08:00
qinjiaming_branch 6112020442 修改代码。 2016-08-30 08:01:30 +08:00
zzc 9dbc66b9f5 部署图补充 2016-08-29 11:47:40 +08:00
zzc 403edef0e9 界面类图和顺序图补充 2016-08-29 11:13:53 +08:00
kaka727 e621789e14 修改 2016-08-29 11:13:07 +08:00
kaka727 45d19e4178 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-29 11:05:33 +08:00
kaka727 5714e0383b 文档和模型中的子系统顺序图 2016-08-29 11:00:05 +08:00
qinjiaming_branch dd0e5ca252 合并赵再春。 2016-08-29 10:53:35 +08:00
zzc 672b18ea3a 删除2.0版本 2016-08-29 10:51:07 +08:00
zzc 31106ecba2 修改 2016-08-29 10:29:16 +08:00
qinjiaming_branch 417b9a334b 修改。 2016-08-29 10:16:07 +08:00
qinjiaming_branch 06546057a3 删除了错误版本。 2016-08-29 10:15:15 +08:00
qinjiaming_branch 0aeeb50eb2 Merge branch 'qinjiaming_branch' 2016-08-29 10:12:07 +08:00
qinjiaming_branch 5f20e564e7 修改。 2016-08-29 10:08:03 +08:00
qinjiaming_branch 09cf04ed7d Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-29 10:06:39 +08:00
qinjiaming_branch b02d1cf5ef 修改。 2016-08-29 10:05:57 +08:00
王尚文 a1a4b7fa4f Merge branch 'zhaozaichun' into 'master'
界面修改

嘎嘎鸭

See merge request !6
2016-08-29 09:44:28 +08:00
qinjiaming_branch 762ff22b6c 更新了顺序图。 2016-08-29 09:42:22 +08:00
qinjiaming_branch 5b7dc9e4aa 删除了旧版本。 2016-08-29 09:41:39 +08:00
qinjiaming_branch 02d87d4f4b 合并后的代码。 2016-08-29 09:38:58 +08:00
qinjiaming_branch a324c31647 合并赵再春的分支。 2016-08-29 09:35:02 +08:00
qinjiaming_branch 52ad396005 改动了顺序图 2016-08-29 09:21:19 +08:00
zzc 5e7e4fcb0f 界面修改最终版 2016-08-29 08:41:06 +08:00
qinjiaming_branch 1e89a44038 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-28 20:50:13 +08:00
qinjiaming_branch 8fb1246607 Merge branch 'qinjiaming_branch' 2016-08-28 20:48:27 +08:00
qinjiaming_branch a748034f71 基本完成“主要”级别错误的改动。 2016-08-28 20:41:57 +08:00
qinjiaming_branch dc2b814182 改正错误。 2016-08-28 20:23:37 +08:00
qinjiaming_branch 83db9fd57c Merge branch 'qinjiaming_branch' 2016-08-28 20:10:47 +08:00
qinjiaming_branch 97d6ab17e2 改正了一些“主要”级别的错误。 2016-08-28 20:04:37 +08:00
TISSOT 454a3df8b9 xujiaming 2016-8-18
修正软件设计用例图,软件体系结构包图
2016-08-28 09:04:03 +08:00
kaka727 2f23a18077 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-26 21:49:48 +08:00
kaka727 2f41ba4c20 2016.8.26 修改文档 2016-08-26 21:45:12 +08:00
qinjiaming_branch 8da8ac1d0f Merge branch 'qinjiaming_branch' 2016-08-26 19:18:38 +08:00
qinjiaming_branch 6a1f252163 改动了很多类,改动了主要错误中unused的错误。 2016-08-26 19:14:25 +08:00
qinjiaming_branch 5830d4936b 修改了很多类。 2016-08-26 11:44:18 +08:00
qinjiaming_branch 0589972ab4 严重代码修改基本完成。 2016-08-26 11:00:20 +08:00
qinjiaming_branch aed010d3c0 改动代码。上传用例图。 2016-08-26 10:33:23 +08:00
TISSOT 29526be3e2 xujiaming 2016-8-26
绘制预定教室子系统各个用例的顺序图
2016-08-26 09:25:48 +08:00
qinjiaming_branch 9b29ae5d5b unknown. 2016-08-26 09:07:15 +08:00
qinjiaming_branch e5117fec0d 顺序图。 2016-08-26 09:06:20 +08:00
qinjiaming_branch 13339e5d09 Merge branch 'qinjiaming_branch'。 2016-08-26 09:04:24 +08:00
qinjiaming_branch 5c281bbfd9 2016.8.26改动顺序图。 2016-08-26 08:53:42 +08:00
qinjiaming_branch 61ffcfcc95 2016.8.26 2016-08-26 08:51:10 +08:00
qinjiaming_branch 5c3d387422 2016.8.26修改了一些代码错误。 2016-08-26 08:05:04 +08:00
qinjiaming_branch 729adae7f3 2016.8.25测试sonarqube。 2016-08-25 16:30:33 +08:00
qinjiaming_branch f295983f47 2016.8.25整合了最新的代码。 2016-08-25 15:12:06 +08:00
zzc df5eb2f122 部分界面修改 2016-08-25 10:37:31 +08:00
kaka727 92a7ed7b96 修复bug 2016-08-25 10:34:13 +08:00
kaka727 61b06442c2 合并功能 2016-08-25 10:02:45 +08:00
TISSOT 9bd78cbb15 xujiaming 2016-8-25
修正“校园通知”显示内容,优化显示
2016-08-25 09:08:39 +08:00
kaka727 325753993a 更改模型名称 2016-08-25 08:44:53 +08:00
TISSOT 37c857aab5 xujiaming 2016-8-15
修改功能
2016-08-25 08:42:25 +08:00
kaka727 b4ac237342 更改模型 2016-08-25 08:37:56 +08:00
zzc 2ef7f3b771 对质量问题的修正 2016-08-25 08:15:38 +08:00
kaka727 b351eb4c5d 删除多余版本 2016-08-25 08:15:12 +08:00
kaka727 008a678462 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-25 08:12:18 +08:00
kaka727 e557fa13ae 2016.8.25 删除多余版本 2016-08-25 08:09:15 +08:00
kaka727 e13c8e13b2 2016.8.25 2016-08-25 08:02:17 +08:00
qinjiaming_branch b344627f71 1. 2016-08-24 15:30:04 +08:00
王尚文 94cb177e01 Merge branch 'xujiaming_branch' into 'master'
增加“学校通知”模块

整合覃佳明代码,添加“学校通知”模块

See merge request !2
2016-08-24 14:47:15 +08:00
TISSOT 448da21567 xujiaming 2016-8-24
阻断修正
2016-08-24 12:34:17 +08:00
TISSOT 1e4cccc56f xujiaming 2016-8-23
代码修正,功能完善
2016-08-24 12:21:26 +08:00
roadfar ccf6baa1ea 测试自动分析 2016-08-23 22:48:28 +08:00
kaka727 683e83a196 Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666 2016-08-23 20:09:22 +08:00
kaka727 2cf0ab1d31 2016.8.23 文档初稿 2016-08-23 20:07:16 +08:00
roadfar 6f495d250d 123 2016-08-23 11:25:03 +08:00
roadfar 66f5940bb6 123 2016-08-23 11:22:28 +08:00
zzc 85f05176a6 部分界面修改,以及软件logo设计图 2016-08-23 10:21:38 +08:00
TISSOT 772fe9298a xujiaming 2016-8-23
修改软件体系结构暴徒,需求设计用例图,代码修正
2016-08-23 09:08:17 +08:00
kaka727 7a45d2c8b2 2016.8.22 文档完善和代码 2016-08-22 21:10:57 +08:00
TISSOT 89a70fe8f8 xujiaming 2016-8-22
Shop代码更新,增加“学校通知”功能;整合覃佳明同学
   图书馆代码,修正部分冲突;增加图书馆,学校通知,
   商店,商品的部分云端数据
2016-08-22 18:34:33 +08:00
TISSOT 88bb83cd99 xujiaming 2016-8-22
增加学校通知功能,但是源代码存在问题,之后进行改正
2016-08-22 16:24:56 +08:00
TISSOT 3574b7010e xujiaming 2016-8-22
Upload SourceCode
2016-08-22 12:39:45 +08:00
zzc dca165ca45 界面修改 2016-08-22 10:51:09 +08:00
TISSOT 1b88157731 xujiaming 2016-8-22
upload SourceCode
2016-08-22 10:46:14 +08:00
kaka727 3e6634721e 2016.8.21 最新文档和代码 2016-08-21 19:35:17 +08:00
zzc c361b19458 部分界面修改 2016-08-20 19:45:48 +08:00
TISSOT 6cb4a09b77 xujiaming 2016-8-20
修改需求说明书第三章,增加需求分析设计用例图
2016-08-20 08:40:06 +08:00
kaka727 61ad6acd23 2016.8.19 修改漏洞 2016-08-19 16:39:50 +08:00
zzc f18c269ba7 软件规格说明书引言部分 2016-08-19 15:50:30 +08:00
TISSOT ee6a0a39bd xujiaming 2016-8-19
完成云端数据查询、下载、显示的测试代码,测试成功
2016-08-19 13:19:34 +08:00
zzc 9606a7e2c2 对登陆界面和注册界面进行了优化和改进 2016-08-19 11:07:35 +08:00
zzc ccb2736221 创建新的分支 2016-08-19 10:39:46 +08:00
kaka727 5a4d3694cf 2016.8.19 修复漏洞 2016-08-19 10:27:53 +08:00
kaka727 c0b7d3759a 2016.8.19 修改重复代码 2016-08-19 09:51:39 +08:00
TISSOT d30395d631 xujiaming 2016-8-19
增加验证对于多条数据查询的QueryActivity
2016-08-19 09:25:04 +08:00
kaka727 3bda382d1c 2016.8.18 代码和文档 2016-08-18 21:31:33 +08:00
kaka727 d4cef780f3 test 尚文 2016-08-18 21:26:33 +08:00
TISSOT b8ebc218ec xujiaming 2016-8-18
修改分工
2016-08-18 19:52:28 +08:00
TISSOT 025185761f xujiaming 2016-8-18
王尚文的project和许家铭的project都在文档中
2016-08-18 19:42:46 +08:00
zzc d2cebf4a30 个人任务计划表 2016-08-18 17:10:58 +08:00
TISSOT 80ac761412 xujiaming 2016-8-18
Add SourceCode to 'xujiaming_branch'
2016-08-18 11:16:48 +08:00
TISSOT 26f840a767 xujiaming 2016-8-18
test for createdata in Bmob Cloud
2016-08-18 11:06:16 +08:00
TISSOT 4b719a60f8 Merge branch 'xujiaming_branch' of https://git.trustie.net/kaka727/shangwen666 into xujiaming_branch 2016-08-18 08:26:58 +08:00
TISSOT 039fe75e15 Merge branch 'xujiaming_branch' of https://git.trustie.net/kaka727/shangwen666 into xujiaming_branch 2016-08-18 08:26:27 +08:00
TISSOT 498d42f17e Merge branch 'xujiaming_branch' of https://git.trustie.net/kaka727/shangwen666 into xujiaming_branch 2016-08-18 08:12:13 +08:00
TISSOT 48e0a1be0d 2016-8-17
SourceCode
2016-08-18 08:09:53 +08:00
TISSOT 73785c13d8 2016-8-17 2016-08-17 11:27:07 +08:00
TISSOT 51dc291daa 2016-8-17 2016-08-17 11:18:25 +08:00
TISSOT 53a5b40908 修改readme.txt 2016-03-12 10:01:57 +08:00
1143 changed files with 16182 additions and 6386 deletions

View File

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

View File

@ -1,10 +0,0 @@
<?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>

View File

@ -1,33 +0,0 @@
<?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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 963 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 531 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 435 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 922 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Some files were not shown because too many files have changed in this diff Show More