代码标注大体完成 #18

Merged

m6wf5oeyl merged 62 commits from develop into master

m6wf5oeyl commented

Owner

解决合并冲突

m6wf5oeyl added 62 commits

491f955507 new file read.txt

94c917d087 file modified

b6633f2730 file modified: read.txt

b893909981 AS提交，无修改

303dc468e8 AS提交，源码无修改

3893480ec9 AS提交，源码无修改

240336e792 部分功能分析

ff77e69e93 1.1 1.3报告

e7a95c1361 删除文件

b628723d63 function

6d1f674885 删除操作测试

f58b236284 删除测试

92ce5196a8 对NoteListActivity 的注释

5b7fdd6cf8 注释

14c06ccf3e 完成了data包注释

c4f7bb4b1a 完成了gtask包注释

6d99c5c230 标注

1c8190df35 解决冲突

847a6f0e88 解决冲突

95d551e8ff gitignore

65d876a7fb 标注报告

6c5277af59 sourcecode

7fc9f68073 data

b8c8d9a2ee widget

75bb939111 注释了widget

bcef1ab74a doc

a89c975a56 doc rename

8ad5c90c5d doc update

8e88359dfe 注释了ui包大部分代码

db147ccdbd 注释了ui的代码

b5048bec90 完成了泛读报告的1.2，1.4待修改

861b14c8bb 类图

f2b974c30b doc commit

3971585a49 doc finished

247a3ff06a doc finish

0421d505d1 modified 1

0d297c98af comment

f32da82916 develop update 1

43de783585 NoteListActivity

86c88f3527 分工以及一点点新标注

b6be20a350 标注

97a2d4e828 develop结构修改

fc4a0dc70c 分工以及一点点新标注

bf2e500e48 补全了一部分注释

60412c08db 注释

0ba6792756 AS提交，无修改

8fd99ad492 gitignore1

081aff63c8 1.1 1.3报告

59b5091dd7 对NoteListActivity 的注释

656becb41d 注释

6352b3ce25 标注

cac298439a 解决冲突

db6534a751 解决冲突

5a6e1e659e gitignore

0a1310ee89 readme

2e99dcac19 code

01a22fb85f 新的master结构

eb8e4f6f28 变更分支结构

54f560f00c 标注

e01e666ae8 Merge branch 'develop' of https://bdgit.educoder.net/m6wf5oeyl/MiNotes into wushuxian_branch

# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	doc/小米便签的代码标注.docx
#	src/main/AndroidManifest.xml
#	src/main/java/net/micode/notes/data/Contact.java
#	src/main/java/net/micode/notes/data/Notes.java
#	src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
#	src/main/java/net/micode/notes/data/NotesProvider.java
#	src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
#	src/main/res/drawable-hdpi/edit_red.9.png

15541a2209 标注

55e721e57d 手动解决冲突

m6wf5oeyl merged commit 943a05872b into master 11 months ago

m6wf5oeyl referenced this issue from a commit

Merge pull request '代码标注大体完成' (#18) from develop into master

The pull request has been merged as 943a05872b.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: m6wf5oeyl/MiNotes#18