 lyy
|
88e699deea
|
1
|
1 year ago |
|
lyy
|
89f50ba0b9
|
1
|
1 year ago |
|
lyy
|
dae15d95c5
|
1
|
1 year ago |
|
lyy
|
9ffd10704d
|
1
|
1 year ago |
|
lyy
|
584bf13613
|
1
|
1 year ago |
|
lyy
|
3d3a1e832e
|
1
|
1 year ago |
|
lyy
|
b3e1f7e90e
|
1
|
1 year ago |
|
lyy
|
227828262c
|
完成
|
1 year ago |
|
lyy
|
bcc54e841a
|
Merge branch 'master' of https://bdgit.educoder.net/p82fie9y6/Notes-master
# Conflicts:
# 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/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/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/menu/note_list.xml
# src/app/src/main/res/values-zh-rCN/strings.xml
# src/app/src/main/res/values/strings.xml
|
1 year ago |
|
lyy
|
da1bcf2436
|
完成
|
1 year ago |
|
lyy
|
b9e54a336b
|
总结
|
1 year ago |
|
lyy
|
0dd138191c
|
维护文档
|
1 year ago |
|
lyy
|
90ca66e737
|
精读注释
|
1 year ago |
|
lyy
|
dfdee18119
|
Merge branch 'develop' of https://bdgit.educoder.net/p82fie9y6/Notes-master into develop
|
1 year ago |
|
lyy
|
814967bce3
|
Squashed commit of the following:
commit 85eea4ea72
Merge: e386d33 4d298a1
Author: lyy <627219260@qq.com>
Date: Sat May 4 19:26:26 2024 +0800
Merge branch 'develop' of https://bdgit.educoder.net/p82fie9y6/Notes-master into text
commit e386d33ba0
Author: lyy <627219260@qq.com>
Date: Sat May 4 19:24:25 2024 +0800
Squashed commit of the following:
commit 4d298a1d1c
Author: lyy <627219260@qq.com>
Date: Fri Apr 26 14:25:39 2024 +0800
精读
commit c8e65c4496
Author: lyy <627219260@qq.com>
Date: Sat May 4 19:11:11 2024 +0800
打开回收站
commit 9816a0b8b8
Author: lyy <627219260@qq.com>
Date: Sat May 4 15:34:56 2024 +0800
在非回收站处删除便签时，移入回收站；在回收站删除便签时，彻底删除
在主页面菜单里提供“Recycle Bin”选项，允许用户进入回收站
|
1 year ago |
|
lyy
|
85eea4ea72
|
Merge branch 'develop' of https://bdgit.educoder.net/p82fie9y6/Notes-master into text
|
1 year ago |
|
lyy
|
e386d33ba0
|
Squashed commit of the following:
commit 4d298a1d1c
Author: lyy <627219260@qq.com>
Date: Fri Apr 26 14:25:39 2024 +0800
精读
|
1 year ago |
|
lyy
|
c8e65c4496
|
打开回收站
|
1 year ago |
|
lyy
|
9816a0b8b8
|
在非回收站处删除便签时，移入回收站；在回收站删除便签时，彻底删除
在主页面菜单里提供“Recycle Bin”选项，允许用户进入回收站
|
1 year ago |
|
lyy
|
4d298a1d1c
|
精读
|
1 year ago |
|
lyy
|
29dd857eae
|
报告
|
1 year ago |
|
lyy
|
04d774fb4f
|
精读标注
|
1 year ago |
|
lyy
|
b38189d2e9
|
泛读报告
|
1 year ago |
|
lyy
|
d16d33bf60
|
精读标注
|
1 year ago |
|
lyy
|
9801f62dc6
|
精读标注
|
1 year ago |
|
lyy
|
20aa128028
|
泛读
|
1 year ago |
|
lyy
|
eb35038413
|
成功运行
|
1 year ago |
|
lyy
|
5be8755e30
|
开始
|
1 year ago |
|
lyy
|
88ea8db205
|
原软件
|
1 year ago |
|
p82fie9y6
|
6b6c6b0ccb
|
Delete '111.txt'
|
1 year ago |
|
lyy
|
5e79cc5b0e
|
111
|
1 year ago |
|
p82fie9y6
|
a3c3648a66
|
Initial commit
|
1 year ago |
