 YZLSJR
|
6c8cd7eaee
|
修改后的代码
|
2 months ago |
|
YZLSJR
|
7a7a0e9a32
|
Merge branch 'master' of https://bdgit.educoder.net/p82mi6jb7/test_01 into yzl_branch
# Conflicts:
# src/.gitignore
# src/.idea/.gitignore
# src/.idea/MarsCodeWorkspaceAppSettings.xml
# src/.idea/misc.xml
# src/app/src/main/AndroidManifest.xml
# src/app/src/main/java/net/micode/notes/data/Contact.java
# src/app/src/main/java/net/micode/notes/data/Notes.java
# src/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
# src/app/src/main/java/net/micode/notes/data/NotesProvider.java
# src/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
# src/app/src/main/java/net/micode/notes/gtask/data/Node.java
# src/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
# src/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
# src/app/src/main/java/net/micode/notes/gtask/data/Task.java
# src/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
# src/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java
# src/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java
# src/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
# src/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java
# src/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java
# src/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java
# src/app/src/main/java/net/micode/notes/model/Note.java
# src/app/src/main/java/net/micode/notes/model/WorkingNote.java
# src/app/src/main/java/net/micode/notes/tool/BackupUtils.java
# src/app/src/main/java/net/micode/notes/tool/DataUtils.java
# src/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
# src/app/src/main/java/net/micode/notes/tool/ResourceParser.java
# src/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
# src/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
# src/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java
# src/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
# src/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
# src/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
# src/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
# src/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
# src/app/src/main/java/net/micode/notes/ui/NoteEditText.java
# src/app/src/main/java/net/micode/notes/ui/NoteItemData.java
# src/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
# src/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java
# src/app/src/main/java/net/micode/notes/ui/NotesListItem.java
# src/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
# src/app/src/main/res/color/primary_text_dark.xml
# src/app/src/main/res/color/secondary_text_dark.xml
# src/app/src/main/res/drawable-hdpi/bg_btn_set_color.png
# src/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png
# src/app/src/main/res/drawable-hdpi/call_record.png
# src/app/src/main/res/drawable-hdpi/clock.png
# src/app/src/main/res/drawable-hdpi/delete.png
# src/app/src/main/res/drawable-hdpi/dropdown_icon.9.png
# src/app/src/main/res/drawable-hdpi/edit_blue.9.png
# src/app/src/main/res/drawable-hdpi/edit_green.9.png
# src/app/src/main/res/drawable-hdpi/edit_red.9.png
# src/app/src/main/res/drawable-hdpi/edit_title_blue.9.png
# src/app/src/main/res/drawable-hdpi/edit_title_green.9.png
# src/app/src/main/res/drawable-hdpi/edit_title_red.9.png
# src/app/src/main/res/drawable-hdpi/edit_title_white.9.png
# src/app/src/main/res/drawable-hdpi/edit_title_yellow.9.png
# src/app/src/main/res/drawable-hdpi/edit_white.9.png
# src/app/src/main/res/drawable-hdpi/edit_yellow.9.png
# src/app/src/main/res/drawable-hdpi/font_large.png
# src/app/src/main/res/drawable-hdpi/font_normal.png
# src/app/src/main/res/drawable-hdpi/font_size_selector_bg.9.png
# src/app/src/main/res/drawable-hdpi/font_small.png
# src/app/src/main/res/drawable-hdpi/font_super.png
# src/app/src/main/res/drawable-hdpi/icon_app.png
# src/app/src/main/res/drawable-hdpi/list_background.png
# src/app/src/main/res/drawable-hdpi/list_blue_down.9.png
# src/app/src/main/res/drawable-hdpi/list_blue_middle.9.png
# src/app/src/main/res/drawable-hdpi/list_blue_single.9.png
# src/app/src/main/res/drawable-hdpi/list_blue_up.9.png
# src/app/src/main/res/drawable-hdpi/list_folder.9.png
# src/app/src/main/res/drawable-hdpi/list_footer_bg.9.png
# src/app/src/main/res/drawable-hdpi/list_green_down.9.png
# src/app/src/main/res/drawable-hdpi/list_green_middle.9.png
# src/app/src/main/res/drawable-hdpi/list_green_single.9.png
# src/app/src/main/res/drawable-hdpi/list_green_up.9.png
# src/app/src/main/res/drawable-hdpi/list_red_down.9.png
# src/app/src/main/res/drawable-hdpi/list_red_middle.9.png
# src/app/src/main/res/drawable-hdpi/list_red_single.9.png
# src/app/src/main/res/drawable-hdpi/list_red_up.9.png
# src/app/src/main/res/drawable-hdpi/list_white_down.9.png
# src/app/src/main/res/drawable-hdpi/list_white_middle.9.png
# src/app/src/main/res/drawable-hdpi/list_white_single.9.png
# src/app/src/main/res/drawable-hdpi/list_white_up.9.png
# src/app/src/main/res/drawable-hdpi/list_yellow_down.9.png
# src/app/src/main/res/drawable-hdpi/list_yellow_middle.9.png
# src/app/src/main/res/drawable-hdpi/list_yellow_single.9.png
# src/app/src/main/res/drawable-hdpi/list_yellow_up.9.png
# src/app/src/main/res/drawable-hdpi/menu_delete.png
# src/app/src/main/res/drawable-hdpi/menu_move.png
# src/app/src/main/res/drawable-hdpi/new_note_normal.png
# src/app/src/main/res/drawable-hdpi/new_note_pressed.png
# src/app/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png
# src/app/src/main/res/drawable-hdpi/notification.png
# src/app/src/main/res/drawable-hdpi/search_result.png
# src/app/src/main/res/drawable-hdpi/selected.png
# src/app/src/main/res/drawable-hdpi/title_alert.png
# src/app/src/main/res/drawable-hdpi/title_bar_bg.9.png
# src/app/src/main/res/drawable-hdpi/widget_2x_blue.png
# src/app/src/main/res/drawable-hdpi/widget_2x_green.png
# src/app/src/main/res/drawable-hdpi/widget_2x_red.png
# src/app/src/main/res/drawable-hdpi/widget_2x_white.png
# src/app/src/main/res/drawable-hdpi/widget_2x_yellow.png
# src/app/src/main/res/drawable-hdpi/widget_4x_blue.png
# src/app/src/main/res/drawable-hdpi/widget_4x_green.png
# src/app/src/main/res/drawable-hdpi/widget_4x_red.png
# src/app/src/main/res/drawable-hdpi/widget_4x_white.png
# src/app/src/main/res/drawable-hdpi/widget_4x_yellow.png
# src/app/src/main/res/drawable/new_note.xml
# src/app/src/main/res/layout/account_dialog_title.xml
# src/app/src/main/res/layout/add_account_text.xml
# src/app/src/main/res/layout/datetime_picker.xml
# src/app/src/main/res/layout/dialog_edit_text.xml
# src/app/src/main/res/layout/folder_list_item.xml
# src/app/src/main/res/layout/note_edit.xml
# src/app/src/main/res/layout/note_edit_list_item.xml
# src/app/src/main/res/layout/note_item.xml
# src/app/src/main/res/layout/note_list.xml
# src/app/src/main/res/layout/note_list_dropdown_menu.xml
# src/app/src/main/res/layout/note_list_footer.xml
# src/app/src/main/res/layout/settings_header.xml
# src/app/src/main/res/layout/widget_2x.xml
# src/app/src/main/res/layout/widget_4x.xml
# src/app/src/main/res/menu/call_note_edit.xml
# src/app/src/main/res/menu/call_record_folder.xml
# src/app/src/main/res/menu/note_edit.xml
# src/app/src/main/res/menu/note_list.xml
# src/app/src/main/res/menu/note_list_dropdown.xml
# src/app/src/main/res/menu/note_list_options.xml
# src/app/src/main/res/menu/sub_folder.xml
# src/app/src/main/res/raw-zh-rCN/introduction
# src/app/src/main/res/raw/introduction
# src/app/src/main/res/values-zh-rCN/arrays.xml
# src/app/src/main/res/values-zh-rCN/strings.xml
# src/app/src/main/res/values-zh-rTW/arrays.xml
# src/app/src/main/res/values-zh-rTW/strings.xml
# src/app/src/main/res/values/arrays.xml
# src/app/src/main/res/values/colors.xml
# src/app/src/main/res/values/dimens.xml
# src/app/src/main/res/values/strings.xml
# src/app/src/main/res/values/styles.xml
# src/app/src/main/res/xml/preferences.xml
# src/app/src/main/res/xml/searchable.xml
# src/app/src/main/res/xml/widget_2x_info.xml
# src/app/src/main/res/xml/widget_4x_info.xml
|
2 months ago |
|
YZLSJR
|
1a37a03f59
|
test
|
2 months ago |
 p82mi6jb7
|
542f346b93
|
Merge pull request '最终文档' (#13) from develop into master
|
2 months ago |
|
kongshan
|
f60d49e4c3
|
update doc
|
2 months ago |
|
p82mi6jb7
|
1025866b06
|
Merge pull request 'update_doc' (#12) from develop into master
|
2 months ago |
|
kongshan
|
b565822c9c
|
update_doc
|
2 months ago |
|
p82mi6jb7
|
1e58b9a370
|
Merge pull request 'update_doc' (#11) from develop into master
|
2 months ago |
|
kongshan
|
4627da6c7a
|
doc/开源代码质量分析报告.docx
|
2 months ago |
|
p82mi6jb7
|
9d864547a8
|
Merge pull request 'update_readme' (#10) from develop into master
|
3 months ago |
|
kongshan
|
8514bb33bf
|
update_readme
|
3 months ago |
|
p82mi6jb7
|
cb605d089c
|
Merge pull request 'update_readme' (#9) from develop into master
|
3 months ago |
|
kongshan
|
9216976282
|
update_readme
|
3 months ago |
|
p82mi6jb7
|
1323cb9a1d
|
Merge pull request 'doc_update' (#8) from develop into master
|
3 months ago |
|
kongshan
|
b45603e1cc
|
doc_update
|
3 months ago |
|
p82mi6jb7
|
ca4930334d
|
Merge pull request 'update_1' (#7) from develop into master
|
3 months ago |
|
kongshan
|
bbbeb61687
|
update_1
|
3 months ago |
|
p82mi6jb7
|
c79ed54905
|
Merge pull request 'update' (#5) from develop into master
|
3 months ago |
|
kongshan
|
f02004d5be
|
log
|
3 months ago |
|
kongshan
|
c568fd497f
|
finally
|
3 months ago |
|
p82mi6jb7
|
afbbed5380
|
Merge pull request 'success coding' (#3) from develop into master
|
4 months ago |
|
kongshan
|
dfcbc43d69
|
success
|
4 months ago |
|
p82mi6jb7
|
f65cedf1e8
|
Merge pull request 'update' (#2) from develop into master
|
4 months ago |
|
YZLSJR
|
202d729271
|
调试好的小米便签代码
|
4 months ago |
|
kongshan
|
3aeaedd922
|
第一次项目修改，尝试运行小米便签源码
|
4 months ago |
|
kongshan
|
93605ccbc6
|
add doc
|
4 months ago |
|
kongshan
|
30bb6cabd7
|
重构目录
|
4 months ago |
|
kongshan
|
fa0cb428e5
|
创建目录
|
4 months ago |
|
kongshan
|
8a63e6b5e0
|
test project
|
4 months ago |
|
kongshan
|
53e044d2a6
|
test 1
|
4 months ago |
|
kongshan
|
4e4b25fcf5
|
push src
|
5 months ago |
|
kongshan
|
c943c66b30
|
first test
|
5 months ago |
|
p82mi6jb7
|
f57995d651
|
Initial commit
|
5 months ago |
