commit
912124f9b6
Binary file not shown.
@ -0,0 +1,4 @@
|
||||
胡逸飞：软件需求描述文档
|
||||
王俊龙：用例图，用例交互图
|
||||
王志成：分析类图，状态图
|
||||
谢成扬：软件需求规格说明书
|
||||
Binary file not shown.
@ -0,0 +1,29 @@
|
||||
|
||||
用例名：显示实时天气
|
||||
业务目标：在用户点击查看天气按钮后接收天气变化的信息，并且反馈给用户
|
||||
执行者：使用者
|
||||
前置条件：小米便签启动处于菜单界面
|
||||
基本交互动作：
|
||||
1.接受到使用者点击查看天气按钮，和所在的城市
|
||||
2.一切正常，将用户选择的城市以及温度反应给用户。
|
||||
扩展交互动作：
|
||||
2a.用户发出修改城市请求；
|
||||
2a1 系统按照用户需求更改城市让用户再次操作。
|
||||
呈现新城市的温度。
|
||||
|
||||
|
||||
|
||||
|
||||
用例名：登录
|
||||
业务目标：用户输入账号密码正确后，是用户进入使用界面
|
||||
执行者：用户
|
||||
前置条件：小米便签运行中
|
||||
基本交互动作：
|
||||
1.用户输入账号密码。
|
||||
2.一切正常，账号密码正确登入成功。
|
||||
扩展交互动作：
|
||||
2a.用户密码错误，提示用户密码出错，使用户重新输入。
|
||||
2a1.输入正确登入。
|
||||
2b.用户账号不存在，提醒用户账号错误，通知再次输入或者注册。
|
||||
2b1登入成功。
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,3 @@
|
||||
谢成扬：逻辑视点体系结构模型
|
||||
胡逸飞：物理视点的体系结构模型
|
||||
王志成，王志龙（共同）：软件体系结构设计文档
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@
|
||||
NoteWidgetProvider.java
|
||||
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CheckStyle-IDEA" serialisationVersion="2">
|
||||
<checkstyleVersion>10.7.0</checkstyleVersion>
|
||||
<scanScope>JavaOnly</scanScope>
|
||||
<copyLibs>true</copyLibs>
|
||||
<option name="thirdPartyClasspath" />
|
||||
<option name="activeLocationIds" />
|
||||
<option name="locations">
|
||||
<list>
|
||||
<ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
|
||||
<ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
4
|
||||
8
|
||||
File diff suppressed because one or more lines are too long
@ -1,2 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\assets"/><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\assets"/><source path="D:\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\assets"/><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\assets"/></dataSet></merger>
|
||||
>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
|
||||
>>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
|
||||
|
||||
@ -1,2 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
|
||||
>>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
|
||||
|
||||
@ -1,2 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\study\rjgc\wrok\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\13293\Desktop\Git\gitProject\src\Notes-master3\app\src\debug\shaders"/></dataSet></merger>
|
||||
>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
|
||||
>>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
|
||||
|
||||
@ -1,4 +1,14 @@
|
||||
<<<<<<< HEAD
|
||||
#Fri Apr 14 16:36:26 CST 2023
|
||||
base.0=D\:\\study\\rjgc\\wrok\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
#Fri Apr 14 16:16:28 CST 2023
|
||||
base.0=D\:\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
=======
|
||||
#Fri Apr 14 16:08:57 CST 2023
|
||||
base.0=C\:\\Users\\13293\\Desktop\\Git\\gitProject\\src\\Notes-master3\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
>>>>>>> fc6c397b4d7cb3bef819bb2f46b3aab3cc752780
|
||||
>>>>>>> 7587c7ce919847bc9b3db80c8a689a8da77c18c6
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue