新增撤回、恢复、回收站、字数统计、设置便签标题功能 #16

Merged

pu9e8mzyq merged 9 commits from sujiazheng_branch into master

pu9e8mzyq commented

Collaborator

新增撤回、恢复、回收站、字数统计、设置便签标题功能

pu9e8mzyq self-assigned this

pu9e8mzyq added 17 commits

65dbc8d66b 文件

1854859206 新增报告

115c145dd8 新增报告

cdfd4d15b0 Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom

ed0f90e7fc 修改报告

338a954a78 修改报告

0c26eef26b Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom

ad709c254a 修改报告

ff4998cc1b 修改报告

2560354549 修改报告

6f36e1b62a 新增撤回、恢复、回收站、字数统计、设置便签标题功能

02ab732cda 新增功能

d0d240a58e Merge branch 'sujiazheng_branch' of https://bdgit.educoder.net/plyf8vez7/fcytom

# Conflicts:
#	doc/小米便签开源代码的泛读报告_粟嘉政.docx

577cb73c51 添加新功能

03b4449326 修改代码

8b89d6fef7 修改代码

983c0768e6 修改

pu9e8mzyq added 1 commit

1ad5fad977 Merge branch 'master' of https://bdgit.educoder.net/plyf8vez7/fcytom into sujiazheng_branch

# Conflicts:
#	src/Notes-master/app/src/main/java/net/micode/notes/MainActivity.java
#	src/Notes-master/app/src/main/java/net/micode/notes/command/Command.java
#	src/Notes-master/app/src/main/java/net/micode/notes/command/TextChangeCommand.java
#	src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
#	src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
#	src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
#	src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
#	src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
#	src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
#	src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
#	src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
#	src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
#	src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
#	src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
#	src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
#	src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
#	src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
#	src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java

pu9e8mzyq merged commit 586745bb1a into master 3 months ago

pu9e8mzyq referenced this issue from a commit

Merge pull request '新增撤回、恢复、回收站、字数统计、设置便签标题功能' (#16) from sujiazheng_branch into master

The pull request has been merged as 586745bb1a.

No reviewers

No Label

No Milestone

No project

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: plyf8vez7/fcytom#16