Merge branch 'master' of https://bdgit.educoder.net/pz4kybsvg/mi_maintenance

更新
Merge pull request '更新' (#12 ) from dingzijian_branch into master
168 changed files with 0 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1 @@
 # 小米便签项目维护
-
--- a/doc/实践资源-开源软件维护方案及成果模板.docx
+++ b/doc/实践资源-开源软件维护方案及成果模板.docx
--- a/doc/小米便签开源软件维护.pptx
+++ b/doc/小米便签开源软件维护.pptx
--- a/doc/开源软件维护方案及成果.docx
+++ b/doc/开源软件维护方案及成果.docx
--- a/src/Notes-master/java/net/micode/.scannerwork/.sonar_lock
+++ b/src/Notes-master/java/net/micode/.scannerwork/.sonar_lock
--- a/src/Notes-master/app/src/main/AndroidManifest.xml
+++ b/src/Notes-master/app/src/main/AndroidManifest.xml
--- a/src/Notes-master/app/src/main/java/net/micode/.scannerwork/.sonar_lock
+++ b/src/Notes-master/app/src/main/java/net/micode/.scannerwork/.sonar_lock
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/FZYTK.TTF
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/FZYTK.TTF
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STLITI.TTF
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STLITI.TTF
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STXINGKA.TTF
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STXINGKA.TTF
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STXINWEI.TTF
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STXINWEI.TTF
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STZHONGS.TTF
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/STZHONGS.TTF
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simfang.ttf
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simfang.ttf
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simhei.ttf
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simhei.ttf
--- a/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simkai.ttf
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/assets/font/simkai.ttf
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/Note.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/model/WorkingNote.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/BackupUtils.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/DataUtils.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/tool/ResourceParser.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteEditText.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NoteItemData.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesListItem.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/UCropPictureActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/UCropPictureActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/ui/WelcomeActivity.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/ui/WelcomeActivity.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
--- a/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
+++ b/src/Notes-master/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
--- a/src/Notes-master/app/src/main/res/color/primary_text_dark.xml
+++ b/src/Notes-master/app/src/main/res/color/primary_text_dark.xml
--- a/src/Notes-master/app/src/main/res/color/secondary_text_dark.xml
+++ b/src/Notes-master/app/src/main/res/color/secondary_text_dark.xml
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/call_record.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/clock.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/clock.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/delete.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/delete.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_blue.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_green.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_red.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_green.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_red.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_white.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_white.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/edit_yellow.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/font_large.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/font_normal.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/font_small.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/font_super.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/icon_app.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_background.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_down.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_single.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_blue_up.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_folder.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_down.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_middle.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_single.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_green_up.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_down.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_middle.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_single.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_red_up.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_down.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_middle.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_single.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_white_up.9.png
--- a/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
+++ b/src/Notes-master/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dingzijian	436492524d	Merge branch 'master' of https://bdgit.educoder.net/pz4kybsvg/mi_maintenance	3 years ago
Dingzijian	3c9ea38321	更新	3 years ago
pz4kybsvg	f73669b67f	Merge pull request '更新' (#12 ) from dingzijian_branch into master	3 years ago
Dingzijian	97b44d4c18	更新	3 years ago
Dingzijian	1b70eaf491	1	3 years ago
Dingzijian	e3a505ffb9	1	3 years ago
Dingzijian	5415bb363b	Merge branch 'master' into dingzijian_branch	3 years ago
pz4kybsvg	0b1576ba66	Update README.md	3 years ago
Dingzijian	60b8253be9	更新	3 years ago
Dingzijian	02dad9d08f	更新	3 years ago
Dingzijian	737e8b0a97	更新	3 years ago
Dingzijian	8f5e3848fe	更新	3 years ago
p95lsv6nx	84b05ec823	Update README.md	3 years ago
p95lsv6nx	e606a7f396	Merge pull request '更新到master' (#11 ) from develop into master	3 years ago
pz4kybsvg	db7681cc0f	Update README.md	3 years ago
pz4kybsvg	9162659535	Update README.md	3 years ago
pz4kybsvg	67da182a49	Merge pull request '合并显示字数、修改字体的功能到master' (#9 ) from develop into master	3 years ago
pz4kybsvg	2278fa1499	Merge pull request '个性化背景，朗读，欢迎界面' (#6 ) from develop into master	3 years ago