p76igso9b
/
MiNotes
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit baed786b2d
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 20:32:47 2023 +0800

    Signed-off-by: liuyitao <2371837061@qq.com>
    更新

commit 21a77f4836
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 20:28:08 2023 +0800

    Signed-off-by: liuyitao <2371837061@qq.com>
    更新

commit 65872f251e
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 19:58:26 2023 +0800

    Signed-off-by: liuyitao <2371837061@qq.com>
    更新

commit 944c6e7e6b
Merge: 63094f1 2076caf
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 09:30:38 2023 +0800

    Merge branch 'liuyitao-branch' of https://bdgit.educoder.net/p76igso9b/MiNotes into liuyitao-branch

commit 63094f152e
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 09:24:37 2023 +0800

    11

commit 69b8c477cc
Author: liuyitao <2371837061@qq.com>
Date:   Wed Dec 27 08:46:16 2023 +0800

    更新

commit 22944a8591
Author: liuyitao <2371837061@qq.com>
Date:   Tue Dec 26 22:54:46 2023 +0800

    data

commit 2076caf5a7
Author: liuyitao <2371837061@qq.com>
Date:   Tue Dec 26 22:54:46 2023 +0800

    data

commit 8e3283724a
Author: liuyitao <2371837061@qq.com>
Date:   Tue Dec 26 19:15:29 2023 +0800

    data

commit 28555afe1c
Author: liuyitao <2371837061@qq.com>
Date:   Tue Dec 26 10:55:42 2023 +0800

    data

commit 1fb45b47ad
Author: liuyitao <2371837061@qq.com>
Date:   Tue Dec 26 10:06:01 2023 +0800

    aqa

commit 8912bcb569
Author: liuyitao <2371837061@qq.com>
Date:   Thu Dec 21 01:24:30 2023 +0800

    a

# Conflicts:
#	doc/实践模板-开源软件泛读.docx
#	src/Notes-master/.gradle/8.0/checksums/checksums.lock
#	src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin
#	src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin
#	src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin
#	src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock
#	src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin
#	src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock
#	src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin
#	src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master/.gradle/file-system.probe
#	src/Notes-master/.idea/deploymentTargetDropDown.xml
#	src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar
#	src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex
#	src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out
#	src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
#	src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
#	src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class
#	src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class
#	src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
#	src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex
#	src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex
#	src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
#	src/Notes-master/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
#	src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	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/local.properties
liuyitao 11 months ago
parent 7c0e313108
commit 844ffaf112
35 changed files with 992 additions and 0 deletions
Show Stats Download Patch File Download Diff File

10
src/Notes-master/.idea/deploymentTargetDropDown.xml
Unescape View File

@ -7,8 +7,12 @@
<deviceKey> <deviceKey>
<Key> <Key>
<type value="VIRTUAL_DEVICE_PATH" /> <type value="VIRTUAL_DEVICE_PATH" />
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<value value="D:\Android\Sdk\.android\.android\avd\Pixel_2_API_24XM.avd" /> <value value="D:\Android\Sdk\.android\.android\avd\Pixel_2_API_24XM.avd" />
=======
<value value="D:\Android\Sdk\.android\.android\avd\Pixel_3.avd" />
>>>>>>> liuyitao-branch
======= =======
<value value="D:\Android\Sdk\.android\.android\avd\Pixel_3.avd" /> <value value="D:\Android\Sdk\.android\.android\avd\Pixel_3.avd" />
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -16,9 +20,12 @@
</deviceKey> </deviceKey>
</Target> </Target>
</targetSelectedWithDropDown> </targetSelectedWithDropDown>
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<timeTargetWasSelectedWithDropDown value="2023-12-10T15:25:18.755958200Z" /> <timeTargetWasSelectedWithDropDown value="2023-12-10T15:25:18.755958200Z" />
======= =======
=======
>>>>>>> liuyitao-branch
<timeTargetWasSelectedWithDropDown value="2023-12-26T13:14:02.597971200Z" /> <timeTargetWasSelectedWithDropDown value="2023-12-26T13:14:02.597971200Z" />
<targetsSelectedWithDialog> <targetsSelectedWithDialog>
<Target> <Target>
@ -31,6 +38,9 @@
</deviceKey> </deviceKey>
</Target> </Target>
</targetsSelectedWithDialog> </targetsSelectedWithDialog>
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
</component> </component>
</project> </project>

6
src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Dec 21 01:11:46 CST 2023 #Thu Dec 21 01:11:46 CST 2023
net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
@ -96,6 +97,8 @@ net.micode.notes.app-main-6\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\gi
net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
======= =======
=======
>>>>>>> liuyitao-branch
#Sun Dec 10 23:29:21 CST 2023 #Sun Dec 10 23:29:21 CST 2023
net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat
net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat
@ -192,4 +195,7 @@ net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N
net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat
net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat
net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch

17
src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

6
src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Dec 21 01:11:49 CST 2023 #Thu Dec 21 01:11:49 CST 2023
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/primary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
@ -96,6 +97,8 @@ net.micode.notes.app-main-5\:/xml/searchable.xml=C\:\\Users\\lenovo\\Desktop\\gi
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
======= =======
=======
>>>>>>> liuyitao-branch
#Sun Dec 10 23:29:22 CST 2023 #Sun Dec 10 23:29:22 CST 2023
net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml
net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml
@ -192,4 +195,7 @@ net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Project1\\MiNotes\\src\\N
net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml
net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml
net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch

17
src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

4
src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties
Unescape View File

@ -1,5 +1,9 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Dec 21 01:11:50 CST 2023 #Thu Dec 21 01:11:50 CST 2023
======= =======
#Wed Dec 20 23:43:26 CST 2023 #Wed Dec 20 23:43:26 CST 2023
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
#Wed Dec 20 23:43:26 CST 2023
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
======= =======
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger> <merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTest" generated-set="androidTest$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="androidTestDebug" generated-set="androidTestDebug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems/></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\assets"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debugAndroidTest\out"/></dataSet></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\jniLibs"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\jniLibs"/></dataSet></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger> <merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="androidTest" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTest\shaders"/></dataSet><dataSet config="androidTestDebug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\androidTestDebug\shaders"/></dataSet></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\assets"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\shader_assets\debug\out"/></dataSet></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\jniLibs"/></dataSet></merger>
>>>>>>> liuyitao-branch

4
src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
Unescape View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
======= =======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger> <merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Project1\MiNotes\src\Notes-master\app\src\debug\shaders"/></dataSet></merger>
>>>>>>> liuyitao-branch

5
src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
Unescape View File

@ -1,9 +1,14 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Tue Dec 26 23:16:26 CST 2023 #Tue Dec 26 23:16:26 CST 2023
base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
======= =======
#Tue Dec 26 21:40:43 CST 2023 #Tue Dec 26 21:40:43 CST 2023
base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
#Tue Dec 26 21:40:43 CST 2023
base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> liuyitao-branch
path.0=classes.dex path.0=classes.dex
renamed.0=classes.dex renamed.0=classes.dex

5
src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
Unescape View File

@ -1,9 +1,14 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
#Thu Dec 21 01:11:55 CST 2023 #Thu Dec 21 01:11:55 CST 2023
base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex base.0=C\:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
======= =======
#Wed Dec 20 23:43:30 CST 2023 #Wed Dec 20 23:43:30 CST 2023
base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
#Wed Dec 20 23:43:30 CST 2023
base.0=D\:\\Project1\\MiNotes\\src\\Notes-master\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
>>>>>>> liuyitao-branch
path.0=classes.dex path.0=classes.dex
renamed.0=classes.dex renamed.0=classes.dex

6
src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
Unescape View File

@ -21,6 +21,7 @@
21 21
22 <uses-sdk 22 <uses-sdk
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
22-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 22-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14" 23 android:minSdkVersion="14"
23-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 23-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
@ -268,6 +269,8 @@
148 android:value=".ui.NoteEditActivity" /> 148 android:value=".ui.NoteEditActivity" />
148-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 148-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
======= =======
=======
>>>>>>> liuyitao-branch
22-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44 22-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
23 android:minSdkVersion="14" 23 android:minSdkVersion="14"
23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41 23-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
@ -514,6 +517,9 @@
147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 147-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
148 android:value=".ui.NoteEditActivity" /> 148 android:value=".ui.NoteEditActivity" />
148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 148-->D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
149 </application> 149 </application>
150 150

6
src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
Unescape View File

@ -4,6 +4,7 @@
4 4
5 <uses-sdk 5 <uses-sdk
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
5-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:5-74 5-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:5-74
6 android:minSdkVersion="14" 6 android:minSdkVersion="14"
6-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:15-41 6-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:5:15-41
@ -31,6 +32,8 @@
19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:9-60 19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:9-60
19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:23-57 19-->C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest17019964075785161646.xml:8:23-57
======= =======
=======
>>>>>>> liuyitao-branch
5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:5-74 5-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:5-74
6 android:minSdkVersion="14" 6 android:minSdkVersion="14"
6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:15-41 6-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:5:15-41
@ -57,6 +60,9 @@
19 <uses-library android:name="android.test.runner" /> 19 <uses-library android:name="android.test.runner" />
19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:9-60 19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:9-60
19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:23-57 19-->D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\tmp\manifest\androidTest\debug\tempFile1ProcessTestManifest15820545187547679684.xml:8:23-57
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
20 </application> 20 </application>
21 21

48
src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
Unescape View File

@ -1,6 +1,7 @@
{ {
"logs": [ "logs": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [ "map": [
@ -33,6 +34,8 @@
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
======= =======
=======
>>>>>>> liuyitao-branch
"outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat", "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values-zh-rCN_values-zh-rCN.arsc.flat",
"map": [ "map": [
{ {
@ -44,6 +47,9 @@
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -55,7 +61,10 @@
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
}, },
{ {
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
@ -75,6 +84,9 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "210" "endOffsets": "210"
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
] ]
@ -83,6 +95,7 @@
"outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
@ -127,11 +140,16 @@
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -144,6 +162,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
@ -154,11 +173,16 @@
"endColumns": "19,19", "endColumns": "19,19",
"endOffsets": "1065,1191" "endOffsets": "1065,1191"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
"startLines": "-1,-1", "startLines": "-1,-1",
"startColumns": "-1,-1", "startColumns": "-1,-1",
"startOffsets": "-1,-1" "startOffsets": "-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -171,6 +195,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
@ -181,6 +206,8 @@
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104" "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
@ -189,6 +216,9 @@
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -200,7 +230,10 @@
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
}, },
{ {
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
@ -231,11 +264,15 @@
"endColumns": "51,52,52,51,51", "endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734" "endOffsets": "524,577,630,682,734"
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
] ]
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat",
"map": [ "map": [
@ -249,6 +286,8 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "838" "endOffsets": "838"
======= =======
=======
>>>>>>> liuyitao-branch
"outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat", "outputFile": "C:\\Users\\刘\\.gradle\\daemon\\8.0\\net.micode.notes.app-merged_res-4:\\values_values.arsc.flat",
"map": [ "map": [
{ {
@ -356,6 +395,9 @@
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "817"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -368,6 +410,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
@ -378,6 +421,8 @@
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
@ -386,6 +431,9 @@
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {

12
src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
Unescape View File

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
"from": { "from": {
@ -33,6 +34,8 @@
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113" "endOffsets": "6827,3634,3560,3493,3419,881,930,979,6235,6293,6647,6592,1282,4001,4079,3932,3872,3806,4732,4676,4615,4190,2992,1446,1509,4276,3716,6344,3368,3135,1884,2161,2420,1935,2931,2870,2816,2612,2565,2469,2516,2660,2711,2207,3308,2764,3188,2117,2368,2320,2263,3091,2073,3035,1977,2028,3248,1392,1701,1799,1651,1749,1603,1555,1219,1167,5134,5058,5259,6189,5582,5517,5661,5772,5951,5846,5201,5447,5325,5391,4998,6035,6114,6541,6439,6393,6502,1340,4135,4551,4859,4791,4922,4491,4442,4396,4347,1046,1113"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\strings.xml",
"from": { "from": {
"startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
@ -41,6 +44,9 @@
"endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23",
"endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -52,7 +58,10 @@
"endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986"
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
}, },
{ {
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml",
@ -72,6 +81,9 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "210" "endOffsets": "210"
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
] ]

12
src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
Unescape View File

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
@ -14,6 +15,8 @@
"endColumns": "19", "endColumns": "19",
"endOffsets": "838" "endOffsets": "838"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml",
"from": { "from": {
"startLines": "18", "startLines": "18",
@ -22,6 +25,9 @@
"endLines": "21", "endLines": "21",
"endColumns": "19", "endColumns": "19",
"endOffsets": "817" "endOffsets": "817"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -34,6 +40,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
@ -44,6 +51,8 @@
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113" "endOffsets": "6803,3714,3641,3574,3500,881,930,979,6209,6267,6623,6568,1282,3974,4052,3905,3845,3778,4704,4648,4587,4163,3073,1446,1509,4248,1880,6318,3449,3216,1965,2242,2501,2016,3012,2951,2897,2693,2646,2550,2597,2741,2792,2288,3389,2845,3269,2198,2449,2401,2344,3172,2154,3116,2058,2109,3329,1392,1701,1799,1651,1749,1603,1555,1219,1167,5106,5030,5231,6161,5554,5489,5633,5744,5923,5818,5173,5419,5297,5363,4970,6007,6086,6517,6415,6369,6478,1340,4108,4523,4831,4763,4894,4463,4414,4368,4319,1046,1113"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values-zh-rTW\\strings.xml",
"from": { "from": {
"startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
@ -52,6 +61,9 @@
"endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23",
"endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65",
"endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {

24
src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
Unescape View File

@ -4,6 +4,7 @@
"outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml",
"map": [ "map": [
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\dimens.xml",
"from": { "from": {
@ -48,11 +49,16 @@
"endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89",
"endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192" "endOffsets": "8544,4061,4312,4228,4131,884,937,990,7668,7732,8130,8071,1387,4783,4892,4688,4616,4531,5729,5662,5578,5023,2100,2037,3534,1563,1624,5129,2192,4415,7788,3964,3693,2251,2561,2879,2309,3455,3383,3321,3088,3037,2933,2984,3139,3200,2615,3892,3263,3757,2513,2819,2763,2674,3643,2465,3580,2353,2414,3825,1509,1834,1942,1778,1888,1730,1673,1302,1246,6210,6125,6434,7616,6813,6738,6903,7067,7292,7147,6286,6369,6656,6515,6596,6057,7415,7519,8019,7902,7848,7977,1453,4961,5475,5880,5799,5975,5388,5328,5272,5209,1101,1192"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\strings.xml",
"from": { "from": {
"startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startLines": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1", "startColumns": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1",
"startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1" "startOffsets": "-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -65,6 +71,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
@ -75,11 +82,16 @@
"endColumns": "19,19", "endColumns": "19,19",
"endOffsets": "1065,1191" "endOffsets": "1065,1191"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\arrays.xml",
"from": { "from": {
"startLines": "-1,-1", "startLines": "-1,-1",
"startColumns": "-1,-1", "startColumns": "-1,-1",
"startOffsets": "-1,-1" "startOffsets": "-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -92,6 +104,7 @@
} }
}, },
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "source": "C:\\Users\\lenovo\\Desktop\\git1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
@ -102,6 +115,8 @@
"endColumns": "12,12,12,12,12,12,12,12,12,12,12", "endColumns": "12,12,12,12,12,12,12,12,12,12,12",
"endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104" "endOffsets": "2314,2531,2913,2696,1098,1287,1476,1685,1897,911,2104"
======= =======
=======
>>>>>>> liuyitao-branch
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\styles.xml",
"from": { "from": {
"startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1", "startLines": "-1,-1,64,-1,-1,-1,-1,-1,-1,-1,-1",
@ -110,6 +125,9 @@
"endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1", "endLines": "-1,-1,67,-1,-1,-1,-1,-1,-1,-1,-1",
"endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1", "endColumns": "-1,-1,12,-1,-1,-1,-1,-1,-1,-1,-1",
"endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1" "endOffsets": "-1,-1,2846,-1,-1,-1,-1,-1,-1,-1,-1"
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
}, },
"to": { "to": {
@ -121,7 +139,10 @@
"endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250" "endOffsets": "8323,8534,8744,8904,9087,9272,9457,9660,9866,10049,10250"
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
}, },
{ {
"source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml", "source": "D:\\Project1\\MiNotes\\src\\Notes-master\\app\\src\\main\\res\\values\\colors.xml",
@ -248,6 +269,9 @@
"endColumns": "51,52,52,51,51", "endColumns": "51,52,52,51,51",
"endOffsets": "524,577,630,682,734" "endOffsets": "524,577,630,682,734"
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
] ]

6
src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
net.micode.notes.app-pngs-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-pngs-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-resValues-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
net.micode.notes.app-packageDebugResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir net.micode.notes.app-packageDebugResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
@ -7,6 +8,8 @@ net.micode.notes.app-merged_res-4 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes
net.micode.notes.app-debug-5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\res net.micode.notes.app-debug-5 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\debug\res
net.micode.notes.app-main-6 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\res net.micode.notes.app-main-6 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\res
======= =======
=======
>>>>>>> liuyitao-branch
net.micode.notes.app-pngs-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug net.micode.notes.app-pngs-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\pngs\debug
net.micode.notes.app-resValues-1 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug net.micode.notes.app-resValues-1 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\debug
net.micode.notes.app-packageDebugResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir net.micode.notes.app-packageDebugResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
@ -14,4 +17,7 @@ net.micode.notes.app-packageDebugResources-3 D:\Project1\MiNotes\src\Notes-maste
net.micode.notes.app-merged_res-4 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug net.micode.notes.app-merged_res-4 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debug
net.micode.notes.app-debug-5 D:\Project1\MiNotes\src\Notes-master\app\src\debug\res net.micode.notes.app-debug-5 D:\Project1\MiNotes\src\Notes-master\app\src\debug\res
net.micode.notes.app-main-6 D:\Project1\MiNotes\src\Notes-master\app\src\main\res net.micode.notes.app-main-6 D:\Project1\MiNotes\src\Notes-master\app\src\main\res
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch

6
src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt
Unescape View File

@ -1,11 +1,17 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
net.micode.notes.test.app-androidTest-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug net.micode.notes.test.app-androidTest-0 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug
net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir net.micode.notes.test.app-mergeDebugAndroidTestResources-1 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir net.micode.notes.test.app-mergeDebugAndroidTestResources-2 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
net.micode.notes.test.app-merged_res-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest net.micode.notes.test.app-merged_res-3 C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
======= =======
=======
>>>>>>> liuyitao-branch
net.micode.notes.test.app-androidTest-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug net.micode.notes.test.app-androidTest-0 D:\Project1\MiNotes\src\Notes-master\app\build\generated\res\resValues\androidTest\debug
net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir net.micode.notes.test.app-mergeDebugAndroidTestResources-1 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\merged.dir
net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir net.micode.notes.test.app-mergeDebugAndroidTestResources-2 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\incremental\debugAndroidTest\mergeDebugAndroidTestResources\stripped.dir
net.micode.notes.test.app-merged_res-3 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest net.micode.notes.test.app-merged_res-3 D:\Project1\MiNotes\src\Notes-master\app\build\intermediates\merged_res\debugAndroidTest
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch

6
src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt
Unescape View File

@ -1,6 +1,7 @@
-- Merging decision tree log --- -- Merging decision tree log ---
manifest manifest
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
@ -225,6 +226,8 @@ ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\An
android:name android:name
ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 ADDED from C:\Users\lenovo\Desktop\git1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
======= =======
=======
>>>>>>> liuyitao-branch
ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12 INJECTED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:18:1-149:12
@ -448,4 +451,7 @@ ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml
ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49 ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:147:13-49
android:name android:name
ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58 ADDED from D:\Project1\MiNotes\src\Notes-master\app\src\main\AndroidManifest.xml:146:13-58
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch

12
src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java
Unescape View File

@ -25,12 +25,15 @@ import android.util.Log;
import java.util.HashMap; import java.util.HashMap;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public class Contact { public class Contact {
private static HashMap<String, String> sContactCache; private static HashMap<String, String> sContactCache;
private static final String TAG = "Contact"; private static final String TAG = "Contact";
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
*功能描述:创建联系人数据库 *功能描述:创建联系人数据库
*/ */
@ -39,12 +42,16 @@ public class Contact {//联系人
private static final String TAG = "Contact";// TAG 日志标签 private static final String TAG = "Contact";// TAG 日志标签
// 定义字符串CALLER_ID_SELECTION // 定义字符串CALLER_ID_SELECTION
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER private static final String CALLER_ID_SELECTION = "PHONE_NUMBERS_EQUAL(" + Phone.NUMBER
+ ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'" + ",?) AND " + Data.MIMETYPE + "='" + Phone.CONTENT_ITEM_TYPE + "'"
+ " AND " + Data.RAW_CONTACT_ID + " IN " + " AND " + Data.RAW_CONTACT_ID + " IN "
+ "(SELECT raw_contact_id " + "(SELECT raw_contact_id "
+ " FROM phone_lookup" + " FROM phone_lookup"
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
+ " WHERE min_match = '+')"; + " WHERE min_match = '+')";
@ -80,6 +87,8 @@ public class Contact {//联系人
} else { } else {
Log.d(TAG, "No contact matched with number:" + phoneNumber); Log.d(TAG, "No contact matched with number:" + phoneNumber);
======= =======
=======
>>>>>>> liuyitao-branch
+ " WHERE min_match = '+')";// 定义查询条件的字符串 + " WHERE min_match = '+')";// 定义查询条件的字符串
/* /*
@ -128,6 +137,9 @@ public class Contact {//联系人
// 未找到相关信息 // 未找到相关信息
} else { } else {
Log.d(TAG, "No contact matched with number:" + phoneNumber);// 记录未找到联系人信息的日志 Log.d(TAG, "No contact matched with number:" + phoneNumber);// 记录未找到联系人信息的日志
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
return null; return null;
} }

154
src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java
Unescape View File

@ -18,6 +18,7 @@ package net.micode.notes.data;
import android.net.Uri; import android.net.Uri;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
public class Notes { public class Notes {
public static final String AUTHORITY = "micode_notes"; public static final String AUTHORITY = "micode_notes";
public static final String TAG = "Notes"; public static final String TAG = "Notes";
@ -25,6 +26,8 @@ public class Notes {
public static final int TYPE_FOLDER = 1; public static final int TYPE_FOLDER = 1;
public static final int TYPE_SYSTEM = 2; public static final int TYPE_SYSTEM = 2;
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
*功能描述：用于存储便签数据，包含了一条便签的各种属性，如标题、内容、创建时间、修改时间等 *功能描述：用于存储便签数据，包含了一条便签的各种属性，如标题、内容、创建时间、修改时间等
@ -37,6 +40,9 @@ public class Notes {
public static final int TYPE_NOTE = 0;// 便签类型为普通便签 public static final int TYPE_NOTE = 0;// 便签类型为普通便签
public static final int TYPE_FOLDER = 1;// 便签类型为文件夹 public static final int TYPE_FOLDER = 1;// 便签类型为文件夹
public static final int TYPE_SYSTEM = 2;// 便签类型为系统文件夹 public static final int TYPE_SYSTEM = 2;// 便签类型为系统文件夹
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
/** /**
@ -45,6 +51,7 @@ public class Notes {
* {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder * {@link Notes#ID_TEMPARAY_FOLDER } is for notes belonging no folder
* {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records * {@link Notes#ID_CALL_RECORD_FOLDER} is to store call records
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final int ID_ROOT_FOLDER = 0; public static final int ID_ROOT_FOLDER = 0;
public static final int ID_TEMPARAY_FOLDER = -1; public static final int ID_TEMPARAY_FOLDER = -1;
@ -66,6 +73,8 @@ public class Notes {
public static final String NOTE = TextNote.CONTENT_ITEM_TYPE; public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;
public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE; public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 系统文件夹的标识符 * 系统文件夹的标识符
@ -98,14 +107,21 @@ public class Notes {
public static class DataConstants { public static class DataConstants {
public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;// 文本便签数据类型 public static final String NOTE = TextNote.CONTENT_ITEM_TYPE;// 文本便签数据类型
public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;// 电话便签数据类型 public static final String CALL_NOTE = CallNote.CONTENT_ITEM_TYPE;// 电话便签数据类型
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
/** /**
* Uri to query all notes and folders * Uri to query all notes and folders
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
=======
public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");// 查询所有便签和文件夹的标识符
>>>>>>> liuyitao-branch
======= =======
public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");// 查询所有便签和文件夹的标识符 public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");// 查询所有便签和文件夹的标识符
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -113,23 +129,33 @@ public class Notes {
/** /**
* Uri to query data * Uri to query data
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
======= =======
=======
>>>>>>> liuyitao-branch
public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");// 查询数据的标识符 public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");// 查询数据的标识符
/* /*
* 功能描述：定义NoteColumns接口数据的常量，用于创建数据库表头 * 功能描述：定义NoteColumns接口数据的常量，用于创建数据库表头
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public interface NoteColumns { public interface NoteColumns {
/** /**
* The unique ID for a row * The unique ID for a row
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String ID = "_id"; public static final String ID = "_id";
=======
public static final String ID = "_id";// 行的唯一标识符
>>>>>>> liuyitao-branch
======= =======
public static final String ID = "_id";// 行的唯一标识符 public static final String ID = "_id";// 行的唯一标识符
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -138,8 +164,12 @@ public class Notes {
* The parent's id for note or folder * The parent's id for note or folder
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String PARENT_ID = "parent_id"; public static final String PARENT_ID = "parent_id";
=======
public static final String PARENT_ID = "parent_id";// 父级的ID
>>>>>>> liuyitao-branch
======= =======
public static final String PARENT_ID = "parent_id";// 父级的ID public static final String PARENT_ID = "parent_id";// 父级的ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -148,8 +178,12 @@ public class Notes {
* Created data for note or folder * Created data for note or folder
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String CREATED_DATE = "created_date"; public static final String CREATED_DATE = "created_date";
=======
public static final String CREATED_DATE = "created_date";// 创建日期
>>>>>>> liuyitao-branch
======= =======
public static final String CREATED_DATE = "created_date";// 创建日期 public static final String CREATED_DATE = "created_date";// 创建日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -158,19 +192,27 @@ public class Notes {
* Latest modified date * Latest modified date
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String MODIFIED_DATE = "modified_date"; public static final String MODIFIED_DATE = "modified_date";
======= =======
public static final String MODIFIED_DATE = "modified_date";// 最后修改日期 public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
>>>>>>> liuyitao-branch
/** /**
* Alert date * Alert date
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String ALERTED_DATE = "alert_date"; public static final String ALERTED_DATE = "alert_date";
=======
public static final String ALERTED_DATE = "alert_date";// 提醒日期
>>>>>>> liuyitao-branch
======= =======
public static final String ALERTED_DATE = "alert_date";// 提醒日期 public static final String ALERTED_DATE = "alert_date";// 提醒日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -179,8 +221,12 @@ public class Notes {
* Folder's name or text content of note * Folder's name or text content of note
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String SNIPPET = "snippet"; public static final String SNIPPET = "snippet";
=======
public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容
>>>>>>> liuyitao-branch
======= =======
public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容 public static final String SNIPPET = "snippet";// 文件夹名称或便签的文本内容
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -189,8 +235,12 @@ public class Notes {
* Note's widget id * Note's widget id
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String WIDGET_ID = "widget_id"; public static final String WIDGET_ID = "widget_id";
=======
public static final String WIDGET_ID = "widget_id";// 便签的Widget ID
>>>>>>> liuyitao-branch
======= =======
public static final String WIDGET_ID = "widget_id";// 便签的Widget ID public static final String WIDGET_ID = "widget_id";// 便签的Widget ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -199,8 +249,12 @@ public class Notes {
* Note's widget type * Note's widget type
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String WIDGET_TYPE = "widget_type"; public static final String WIDGET_TYPE = "widget_type";
=======
public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型
>>>>>>> liuyitao-branch
======= =======
public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型 public static final String WIDGET_TYPE = "widget_type";// 便签的Widget类型
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -209,8 +263,12 @@ public class Notes {
* Note's background color's id * Note's background color's id
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String BG_COLOR_ID = "bg_color_id"; public static final String BG_COLOR_ID = "bg_color_id";
=======
public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID
>>>>>>> liuyitao-branch
======= =======
public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID public static final String BG_COLOR_ID = "bg_color_id";// 便签的背景颜色ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -220,8 +278,12 @@ public class Notes {
* note, it has at least one attachment * note, it has at least one attachment
* <P> Type: INTEGER </P> * <P> Type: INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String HAS_ATTACHMENT = "has_attachment"; public static final String HAS_ATTACHMENT = "has_attachment";
=======
public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件
>>>>>>> liuyitao-branch
======= =======
public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件 public static final String HAS_ATTACHMENT = "has_attachment";// 是否有附件
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -230,8 +292,12 @@ public class Notes {
* Folder's count of notes * Folder's count of notes
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String NOTES_COUNT = "notes_count"; public static final String NOTES_COUNT = "notes_count";
=======
public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量
>>>>>>> liuyitao-branch
======= =======
public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量 public static final String NOTES_COUNT = "notes_count";// 文件夹中的便签数量
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -240,8 +306,12 @@ public class Notes {
* The file type: folder or note * The file type: folder or note
* <P> Type: INTEGER </P> * <P> Type: INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String TYPE = "type"; public static final String TYPE = "type";
=======
public static final String TYPE = "type";// 文件类型：文件夹或便签
>>>>>>> liuyitao-branch
======= =======
public static final String TYPE = "type";// 文件类型：文件夹或便签 public static final String TYPE = "type";// 文件类型：文件夹或便签
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -250,8 +320,12 @@ public class Notes {
* The last sync id * The last sync id
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String SYNC_ID = "sync_id"; public static final String SYNC_ID = "sync_id";
=======
public static final String SYNC_ID = "sync_id";// 最后同步的ID
>>>>>>> liuyitao-branch
======= =======
public static final String SYNC_ID = "sync_id";// 最后同步的ID public static final String SYNC_ID = "sync_id";// 最后同步的ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -260,8 +334,12 @@ public class Notes {
* Sign to indicate local modified or not * Sign to indicate local modified or not
* <P> Type: INTEGER </P> * <P> Type: INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String LOCAL_MODIFIED = "local_modified"; public static final String LOCAL_MODIFIED = "local_modified";
=======
public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改
>>>>>>> liuyitao-branch
======= =======
public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改 public static final String LOCAL_MODIFIED = "local_modified";// 标识是否本地修改
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -270,8 +348,12 @@ public class Notes {
* Original parent id before moving into temporary folder * Original parent id before moving into temporary folder
* <P> Type : INTEGER </P> * <P> Type : INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String ORIGIN_PARENT_ID = "origin_parent_id"; public static final String ORIGIN_PARENT_ID = "origin_parent_id";
=======
public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID
>>>>>>> liuyitao-branch
======= =======
public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID public static final String ORIGIN_PARENT_ID = "origin_parent_id";// 移动到临时文件夹之前的原始父级ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -280,8 +362,12 @@ public class Notes {
* The gtask id * The gtask id
* <P> Type : TEXT </P> * <P> Type : TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String GTASK_ID = "gtask_id"; public static final String GTASK_ID = "gtask_id";
=======
public static final String GTASK_ID = "gtask_id";// Google任务ID
>>>>>>> liuyitao-branch
======= =======
public static final String GTASK_ID = "gtask_id";// Google任务ID public static final String GTASK_ID = "gtask_id";// Google任务ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -290,25 +376,35 @@ public class Notes {
* The version code * The version code
* <P> Type : INTEGER (long) </P> * <P> Type : INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String VERSION = "version"; public static final String VERSION = "version";
} }
======= =======
=======
>>>>>>> liuyitao-branch
public static final String VERSION = "version";// 版本号 public static final String VERSION = "version";// 版本号
} }
/* /*
* 功能描述：定义DataColumns接口数据的常量，用于创建数据库表头 * 功能描述：定义DataColumns接口数据的常量，用于创建数据库表头
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public interface DataColumns { public interface DataColumns {
/** /**
* The unique ID for a row * The unique ID for a row
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String ID = "_id"; public static final String ID = "_id";
=======
public static final String ID = "_id";// 标识符
>>>>>>> liuyitao-branch
======= =======
public static final String ID = "_id";// 标识符 public static final String ID = "_id";// 标识符
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -317,8 +413,12 @@ public class Notes {
* The MIME type of the item represented by this row. * The MIME type of the item represented by this row.
* <P> Type: Text </P> * <P> Type: Text </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String MIME_TYPE = "mime_type"; public static final String MIME_TYPE = "mime_type";
=======
public static final String MIME_TYPE = "mime_type";// 数据的MIME类型
>>>>>>> liuyitao-branch
======= =======
public static final String MIME_TYPE = "mime_type";// 数据的MIME类型 public static final String MIME_TYPE = "mime_type";// 数据的MIME类型
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -327,8 +427,12 @@ public class Notes {
* The reference id to note that this data belongs to * The reference id to note that this data belongs to
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String NOTE_ID = "note_id"; public static final String NOTE_ID = "note_id";
=======
public static final String NOTE_ID = "note_id";// 数据ID
>>>>>>> liuyitao-branch
======= =======
public static final String NOTE_ID = "note_id";// 数据ID public static final String NOTE_ID = "note_id";// 数据ID
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -337,8 +441,12 @@ public class Notes {
* Created data for note or folder * Created data for note or folder
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String CREATED_DATE = "created_date"; public static final String CREATED_DATE = "created_date";
=======
public static final String CREATED_DATE = "created_date";// 创建日期
>>>>>>> liuyitao-branch
======= =======
public static final String CREATED_DATE = "created_date";// 创建日期 public static final String CREATED_DATE = "created_date";// 创建日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -347,8 +455,12 @@ public class Notes {
* Latest modified date * Latest modified date
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String MODIFIED_DATE = "modified_date"; public static final String MODIFIED_DATE = "modified_date";
=======
public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
>>>>>>> liuyitao-branch
======= =======
public static final String MODIFIED_DATE = "modified_date";// 最后修改日期 public static final String MODIFIED_DATE = "modified_date";// 最后修改日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -357,11 +469,15 @@ public class Notes {
* Data's content * Data's content
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String CONTENT = "content"; public static final String CONTENT = "content";
======= =======
public static final String CONTENT = "content";// 内容 public static final String CONTENT = "content";// 内容
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
public static final String CONTENT = "content";// 内容
>>>>>>> liuyitao-branch
/** /**
@ -369,8 +485,12 @@ public class Notes {
* integer data type * integer data type
* <P> Type: INTEGER </P> * <P> Type: INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String DATA1 = "data1"; public static final String DATA1 = "data1";
=======
public static final String DATA1 = "data1";// 通用数据1
>>>>>>> liuyitao-branch
======= =======
public static final String DATA1 = "data1";// 通用数据1 public static final String DATA1 = "data1";// 通用数据1
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -380,8 +500,12 @@ public class Notes {
* integer data type * integer data type
* <P> Type: INTEGER </P> * <P> Type: INTEGER </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String DATA2 = "data2"; public static final String DATA2 = "data2";
=======
public static final String DATA2 = "data2";// 通用数据2
>>>>>>> liuyitao-branch
======= =======
public static final String DATA2 = "data2";// 通用数据2 public static final String DATA2 = "data2";// 通用数据2
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -391,8 +515,12 @@ public class Notes {
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String DATA3 = "data3"; public static final String DATA3 = "data3";
=======
public static final String DATA3 = "data3";// 通用数据3
>>>>>>> liuyitao-branch
======= =======
public static final String DATA3 = "data3";// 通用数据3 public static final String DATA3 = "data3";// 通用数据3
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -402,8 +530,12 @@ public class Notes {
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String DATA4 = "data4"; public static final String DATA4 = "data4";
=======
public static final String DATA4 = "data4";// 通用数据4
>>>>>>> liuyitao-branch
======= =======
public static final String DATA4 = "data4";// 通用数据4 public static final String DATA4 = "data4";// 通用数据4
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -413,23 +545,30 @@ public class Notes {
* TEXT data type * TEXT data type
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String DATA5 = "data5"; public static final String DATA5 = "data5";
} }
======= =======
=======
>>>>>>> liuyitao-branch
public static final String DATA5 = "data5";// 通用数据5 public static final String DATA5 = "data5";// 通用数据5
} }
/* /*
* 定义了文本便签的数据结构 * 定义了文本便签的数据结构
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public static final class TextNote implements DataColumns { public static final class TextNote implements DataColumns {
/** /**
* Mode to indicate the text in check list mode or not * Mode to indicate the text in check list mode or not
* <P> Type: Integer 1:check list mode 0: normal mode </P> * <P> Type: Integer 1:check list mode 0: normal mode </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String MODE = DATA1; public static final String MODE = DATA1;
@ -443,6 +582,8 @@ public class Notes {
} }
======= =======
=======
>>>>>>> liuyitao-branch
public static final String MODE = DATA1;// 模式 public static final String MODE = DATA1;// 模式
public static final int MODE_CHECK_LIST = 1;// 待办清单模式 public static final int MODE_CHECK_LIST = 1;// 待办清单模式
@ -457,14 +598,21 @@ public class Notes {
/* /*
* 定义电话便签的数据结构 * 定义电话便签的数据结构
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public static final class CallNote implements DataColumns { public static final class CallNote implements DataColumns {
/** /**
* Call date for this record * Call date for this record
* <P> Type: INTEGER (long) </P> * <P> Type: INTEGER (long) </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String CALL_DATE = DATA1; public static final String CALL_DATE = DATA1;
=======
public static final String CALL_DATE = DATA1;// 通话日期
>>>>>>> liuyitao-branch
======= =======
public static final String CALL_DATE = DATA1;// 通话日期 public static final String CALL_DATE = DATA1;// 通话日期
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -473,6 +621,7 @@ public class Notes {
* Phone number for this record * Phone number for this record
* <P> Type: TEXT </P> * <P> Type: TEXT </P>
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public static final String PHONE_NUMBER = DATA3; public static final String PHONE_NUMBER = DATA3;
@ -482,6 +631,8 @@ public class Notes {
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note"); public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");
======= =======
=======
>>>>>>> liuyitao-branch
public static final String PHONE_NUMBER = DATA3;// 电话号码 public static final String PHONE_NUMBER = DATA3;// 电话号码
public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";// 内容类型 public static final String CONTENT_TYPE = "vnd.android.cursor.dir/call_note";// 内容类型
@ -489,6 +640,9 @@ public class Notes {
public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";// 单个条目的内容类型 public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/call_note";// 单个条目的内容类型
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 查询电话便签的URI public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/call_note");// 查询电话便签的URI
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }

186
src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
Unescape View File

@ -16,6 +16,7 @@
package net.micode.notes.data; package net.micode.notes.data;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
@ -35,6 +36,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
public interface TABLE { public interface TABLE {
======= =======
=======
>>>>>>> liuyitao-branch
import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。 import android.content.ContentValues;//就是用于保存一些数据（string boolean byte double float int long short ...）信息，这些信息可以被数据库操作时使用。
import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚） import android.content.Context;//加载和访问资源。（android中主要是这两个功能，但是这里具体不清楚）
@ -59,12 +62,16 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 接口，分成note和data,用于表示数据库中两种表格 * 接口，分成note和data,用于表示数据库中两种表格
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public static final String NOTE = "note"; public static final String NOTE = "note";
public static final String DATA = "data"; public static final String DATA = "data";
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private static final String TAG = "NotesDatabaseHelper"; private static final String TAG = "NotesDatabaseHelper";
@ -107,6 +114,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
")"; ")";
======= =======
=======
>>>>>>> liuyitao-branch
private static final String TAG = "NotesDatabaseHelper";// 日志标签，用于在日志中标识数据库操作的相关信息 private static final String TAG = "NotesDatabaseHelper";// 日志标签，用于在日志中标识数据库操作的相关信息
/* /*
@ -160,6 +169,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 创建一个名为 note_id_index 的索引，在 TABLE.DATA 表格的 DataColumns.NOTE_ID 列上创建索引，以提高查询性能 * 创建一个名为 note_id_index 的索引，在 TABLE.DATA 表格的 DataColumns.NOTE_ID 列上创建索引，以提高查询性能
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String CREATE_DATA_NOTE_ID_INDEX_SQL = private static final String CREATE_DATA_NOTE_ID_INDEX_SQL =
"CREATE INDEX IF NOT EXISTS note_id_index ON " + "CREATE INDEX IF NOT EXISTS note_id_index ON " +
@ -169,12 +181,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Increase folder's note count when move note to the folder * Increase folder's note count when move note to the folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，增加相应文件夹的便签计数 * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，增加相应文件夹的便签计数
* 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = private static final String NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_update "+ "CREATE TRIGGER increase_folder_count_on_update "+
@ -189,12 +207,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Decrease folder's note count when move note from folder * Decrease folder's note count when move note from folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，减少相应文件夹的便签计数 * 在更新 TABLE.NOTE 表格的 NoteColumns.PARENT_ID 列时，减少相应文件夹的便签计数
* 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER = private static final String NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_update " + "CREATE TRIGGER decrease_folder_count_on_update " +
@ -210,12 +234,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Increase folder's note count when insert new note to the folder * Increase folder's note count when insert new note to the folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在向 TABLE.NOTE 表格插入新便签时，增加相应文件夹的便签计数 * 在向 TABLE.NOTE 表格插入新便签时，增加相应文件夹的便签计数
* 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1 * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其加1
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER = private static final String NOTE_INCREASE_FOLDER_COUNT_ON_INSERT_TRIGGER =
"CREATE TRIGGER increase_folder_count_on_insert " + "CREATE TRIGGER increase_folder_count_on_insert " +
@ -230,12 +260,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Decrease folder's note count when delete note from the folder * Decrease folder's note count when delete note from the folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在从 TABLE.NOTE 表格删除便签时，减少相应文件夹的便签计数 * 在从 TABLE.NOTE 表格删除便签时，减少相应文件夹的便签计数
* 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1 * 通过更新 TABLE.NOTE 表格中的 NoteColumns.NOTES_COUNT 列，将其减1
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER = private static final String NOTE_DECREASE_FOLDER_COUNT_ON_DELETE_TRIGGER =
"CREATE TRIGGER decrease_folder_count_on_delete " + "CREATE TRIGGER decrease_folder_count_on_delete " +
@ -251,12 +287,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Update note's content when insert data with type {@link DataConstants#NOTE} * Update note's content when insert data with type {@link DataConstants#NOTE}
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在向 TABLE.DATA 表格插入类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 * 在向 TABLE.DATA 表格插入类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
* 通过更新 TABLE.NOTE 表格中的 NoteColumns.SNIPPET 列，将其设置为新插入数据的内容 * 通过更新 TABLE.NOTE 表格中的 NoteColumns.SNIPPET 列，将其设置为新插入数据的内容
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_INSERT_TRIGGER =
"CREATE TRIGGER update_note_content_on_insert " + "CREATE TRIGGER update_note_content_on_insert " +
@ -272,12 +314,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Update note's content when data with {@link DataConstants#NOTE} type has changed * Update note's content when data with {@link DataConstants#NOTE} type has changed
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在更新类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 * 在更新类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
* 通过触发器在 TABLE.DATA 表格上创建，在数据被更新后将新的内容更新到对应的便签中 * 通过触发器在 TABLE.DATA 表格上创建，在数据被更新后将新的内容更新到对应的便签中
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_UPDATE_TRIGGER =
"CREATE TRIGGER update_note_content_on_update " + "CREATE TRIGGER update_note_content_on_update " +
@ -293,12 +341,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Update note's content when data with {@link DataConstants#NOTE} type has deleted * Update note's content when data with {@link DataConstants#NOTE} type has deleted
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在删除类型为 DataConstants.NOTE 的数据时，更新对应便签的内容 * 在删除类型为 DataConstants.NOTE 的数据时，更新对应便签的内容
* 通过触发器在 TABLE.DATA 表格上创建，在数据被删除后将对应的便签内容清空 * 通过触发器在 TABLE.DATA 表格上创建，在数据被删除后将对应的便签内容清空
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER = private static final String DATA_UPDATE_NOTE_CONTENT_ON_DELETE_TRIGGER =
"CREATE TRIGGER update_note_content_on_delete " + "CREATE TRIGGER update_note_content_on_delete " +
@ -314,12 +368,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Delete datas belong to note which has been deleted * Delete datas belong to note which has been deleted
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在删除便签时，同时删除该便签相关的数据 * 在删除便签时，同时删除该便签相关的数据
* 通过触发器在 TABLE.NOTE 表格上创建，在便签被删除后将与该便签相关的数据一并删除 * 通过触发器在 TABLE.NOTE 表格上创建，在便签被删除后将与该便签相关的数据一并删除
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER = private static final String NOTE_DELETE_DATA_ON_DELETE_TRIGGER =
"CREATE TRIGGER delete_data_on_delete " + "CREATE TRIGGER delete_data_on_delete " +
@ -333,12 +393,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Delete notes belong to folder which has been deleted * Delete notes belong to folder which has been deleted
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在删除文件夹时，同时删除该文件夹下的所有便签 * 在删除文件夹时，同时删除该文件夹下的所有便签
* 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被删除后将该文件夹下的所有便签一并删除。 * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被删除后将该文件夹下的所有便签一并删除。
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER = private static final String FOLDER_DELETE_NOTES_ON_DELETE_TRIGGER =
"CREATE TRIGGER folder_delete_notes_on_delete " + "CREATE TRIGGER folder_delete_notes_on_delete " +
@ -352,12 +418,18 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* Move notes belong to folder which has been moved to trash folder * Move notes belong to folder which has been moved to trash folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 在将文件夹移动到回收站时，同时将该文件夹下的所有便签一并移动到回收站 * 在将文件夹移动到回收站时，同时将该文件夹下的所有便签一并移动到回收站
* 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被移动到回收站后将该文件夹下的所有便签的父文件夹ID更新为回收站的ID * 通过触发器在 TABLE.NOTE 表格上创建，在文件夹被移动到回收站后将该文件夹下的所有便签的父文件夹ID更新为回收站的ID
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER = private static final String FOLDER_MOVE_NOTES_ON_TRASH_TRIGGER =
"CREATE TRIGGER folder_move_notes_on_trash " + "CREATE TRIGGER folder_move_notes_on_trash " +
@ -370,6 +442,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
" END"; " END";
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 构造函数，传入数据库的名称和版本
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 构造函数，传入数据库的名称和版本 * 构造函数，传入数据库的名称和版本
@ -379,7 +457,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
super(context, DB_NAME, null, DB_VERSION); super(context, DB_NAME, null, DB_VERSION);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
=======
/*
* 用于创建存储标签属性的表格
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 用于创建存储标签属性的表格 * 用于创建存储标签属性的表格
@ -392,14 +476,20 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
Log.d(TAG, "note table has been created"); Log.d(TAG, "note table has been created");
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private void reCreateNoteTableTriggers(SQLiteDatabase db) { private void reCreateNoteTableTriggers(SQLiteDatabase db) {
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 用于重新创建数据库中的触发器 * 用于重新创建数据库中的触发器
*/ */
private void reCreateNoteTableTriggers(SQLiteDatabase db) { private void reCreateNoteTableTriggers(SQLiteDatabase db) {
// 通过执行SQL语句DROP TRIGGER IF EXISTS来删除已存在的触发器，以确保不会重复创建 // 通过执行SQL语句DROP TRIGGER IF EXISTS来删除已存在的触发器，以确保不会重复创建
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_update");
db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update"); db.execSQL("DROP TRIGGER IF EXISTS decrease_folder_count_on_update");
@ -408,6 +498,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS increase_folder_count_on_insert");
db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete"); db.execSQL("DROP TRIGGER IF EXISTS folder_delete_notes_on_delete");
db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash"); db.execSQL("DROP TRIGGER IF EXISTS folder_move_notes_on_trash");
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER); db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);
@ -420,6 +511,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
} }
======= =======
=======
>>>>>>> liuyitao-branch
// 创建新的触发器 // 创建新的触发器
db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 增加文件夹计数的触发器 db.execSQL(NOTE_INCREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 增加文件夹计数的触发器
db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 减少文件夹计数的触发器 db.execSQL(NOTE_DECREASE_FOLDER_COUNT_ON_UPDATE_TRIGGER);// 减少文件夹计数的触发器
@ -433,6 +526,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
*用于创建系统文件夹，插入四个不同类型的文件夹记录到 NoteColumns 表中 *用于创建系统文件夹，插入四个不同类型的文件夹记录到 NoteColumns 表中
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private void createSystemFolder(SQLiteDatabase db) { private void createSystemFolder(SQLiteDatabase db) {
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@ -441,6 +537,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* call record foler for call notes * call record foler for call notes
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 创建通话记录文件夹
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 创建通话记录文件夹 * 创建通话记录文件夹
@ -454,6 +556,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* root folder which is default folder * root folder which is default folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 根目录，即默认文件夹
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 根目录，即默认文件夹 * 根目录，即默认文件夹
@ -468,6 +576,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* temporary folder which is used for moving note * temporary folder which is used for moving note
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 临时目录，用于移动笔记
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 临时目录，用于移动笔记 * 临时目录，用于移动笔记
@ -482,6 +596,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
* create trash folder * create trash folder
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 创建垃圾箱
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 创建垃圾箱 * 创建垃圾箱
@ -493,6 +613,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values); db.insert(TABLE.NOTE, null, values);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public void createDataTable(SQLiteDatabase db) { public void createDataTable(SQLiteDatabase db) {
db.execSQL(CREATE_DATA_TABLE_SQL); db.execSQL(CREATE_DATA_TABLE_SQL);
@ -502,6 +623,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
} }
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 用于创建存储标签内容的表格 * 用于创建存储标签内容的表格
*/ */
@ -515,6 +638,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 用于重新创建数据表中的触发器 * 用于重新创建数据表中的触发器
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private void reCreateDataTableTriggers(SQLiteDatabase db) { private void reCreateDataTableTriggers(SQLiteDatabase db) {
db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_content_on_insert");
@ -527,13 +653,19 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 用于获取单例的数据库帮助类对象 * 用于获取单例的数据库帮助类对象
* 解决同一时刻只能有一个线程执行. * 解决同一时刻只能有一个线程执行.
* 在写程序库代码时，有时有一个类需要被所的其它类使用 * 在写程序库代码时，有时有一个类需要被所的其它类使用
* 但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例 * 但又要求这个类只能被实例化一次，是个服务类，定义一次，其它类使用同一个这个类的实例
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
static synchronized NotesDatabaseHelper getInstance(Context context) { static synchronized NotesDatabaseHelper getInstance(Context context) {
if (mInstance == null) { if (mInstance == null) {
@ -544,6 +676,12 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
@Override @Override
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 在数据库第一次创建时被调用，用于创建所需的表格和触发器
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 在数据库第一次创建时被调用，用于创建所需的表格和触发器 * 在数据库第一次创建时被调用，用于创建所需的表格和触发器
@ -555,12 +693,15 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
} }
@Override @Override
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
boolean reCreateTriggers = false; boolean reCreateTriggers = false;
boolean skipV2 = false; boolean skipV2 = false;
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 根据旧版本和新版本之间的差异来执行相应的数据库升级操作 * 根据旧版本和新版本之间的差异来执行相应的数据库升级操作
*/ */
@ -570,6 +711,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 如果旧版本为1，则调用upgradeToV2方法 * 如果旧版本为1，则调用upgradeToV2方法
*/ */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (oldVersion == 1) { if (oldVersion == 1) {
upgradeToV2(db); upgradeToV2(db);
@ -577,7 +721,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
oldVersion++; oldVersion++;
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法 * 如果旧版本为2且未跳过V2升级，则调用upgradeToV3方法
@ -589,7 +739,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
oldVersion++; oldVersion++;
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 如果旧版本为3，则调用upgradeToV4方法
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 如果旧版本为3，则调用upgradeToV4方法 * 如果旧版本为3，则调用upgradeToV4方法
@ -600,7 +756,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
oldVersion++; oldVersion++;
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器 * 如果需要重新创建触发器，则调用reCreateNoteTableTriggers和reCreateDataTableTriggers方法重新创建触发器
@ -611,7 +773,13 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
reCreateDataTableTriggers(db); reCreateDataTableTriggers(db);
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 如果旧版本和新版本不匹配，则抛出异常
*/
>>>>>>> liuyitao-branch
======= =======
/* /*
* 如果旧版本和新版本不匹配，则抛出异常 * 如果旧版本和新版本不匹配，则抛出异常
@ -623,6 +791,7 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private void upgradeToV2(SQLiteDatabase db) { private void upgradeToV2(SQLiteDatabase db) {
db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE); db.execSQL("DROP TABLE IF EXISTS " + TABLE.NOTE);
@ -633,6 +802,8 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
private void upgradeToV3(SQLiteDatabase db) { private void upgradeToV3(SQLiteDatabase db) {
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 更新到V2版本 * 更新到V2版本
* */ * */
@ -653,16 +824,22 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 执行SQL语句DROP TRIGGER IF EXISTS来移除不再使用的触发器 * 执行SQL语句DROP TRIGGER IF EXISTS来移除不再使用的触发器
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
// drop unused triggers // drop unused triggers
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert"); db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_insert");
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete"); db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_delete");
db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update"); db.execSQL("DROP TRIGGER IF EXISTS update_note_modified_date_on_update");
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// add a column for gtask id // add a column for gtask id
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.GTASK_ID
+ " TEXT NOT NULL DEFAULT ''"); + " TEXT NOT NULL DEFAULT ''");
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 执行ALTER TABLE语句向NOTE表格中添加一个新的列GTASK_ID，该列的类型是TEXT，并设置默认值为'' * 执行ALTER TABLE语句向NOTE表格中添加一个新的列GTASK_ID，该列的类型是TEXT，并设置默认值为''
* */ * */
@ -672,6 +849,9 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
/* /*
* 通过ContentValues对象向NOTE表格中插入一条记录，该记录代表垃圾箱系统文件夹 * 通过ContentValues对象向NOTE表格中插入一条记录，该记录代表垃圾箱系统文件夹
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
// add a trash system folder // add a trash system folder
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
@ -680,17 +860,23 @@ public class NotesDatabaseHelper extends SQLiteOpenHelper {
db.insert(TABLE.NOTE, null, values); db.insert(TABLE.NOTE, null, values);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private void upgradeToV4(SQLiteDatabase db) { private void upgradeToV4(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0"); + " INTEGER NOT NULL DEFAULT 0");
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 更新到V4版本 * 更新到V4版本
* */ * */
private void upgradeToV4(SQLiteDatabase db) { private void upgradeToV4(SQLiteDatabase db) {
db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION db.execSQL("ALTER TABLE " + TABLE.NOTE + " ADD COLUMN " + NoteColumns.VERSION
+ " INTEGER NOT NULL DEFAULT 0");// 通过执行ALTER TABLE语句向NOTE表格中添加一个新的列VERSION，该列的类型是INTEGER，并设置默认值为0 + " INTEGER NOT NULL DEFAULT 0");// 通过执行ALTER TABLE语句向NOTE表格中添加一个新的列VERSION，该列的类型是INTEGER，并设置默认值为0
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }

61
src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java
Unescape View File

@ -34,6 +34,7 @@ import net.micode.notes.data.Notes.DataColumns;
import net.micode.notes.data.Notes.NoteColumns; import net.micode.notes.data.Notes.NoteColumns;
import net.micode.notes.data.NotesDatabaseHelper.TABLE; import net.micode.notes.data.NotesDatabaseHelper.TABLE;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public class NotesProvider extends ContentProvider { public class NotesProvider extends ContentProvider {
@ -45,6 +46,8 @@ public class NotesProvider extends ContentProvider {
private static final int URI_NOTE = 1; private static final int URI_NOTE = 1;
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 功能描述：用于提供对便签数据的存储和获取功能，实现了创建、读取、更新、删除操作，以便其他组件可以通过 ContentResolver 访问和管理便签数据。 * 功能描述：用于提供对便签数据的存储和获取功能，实现了创建、读取、更新、删除操作，以便其他组件可以通过 ContentResolver 访问和管理便签数据。
* */ * */
@ -56,6 +59,9 @@ public class NotesProvider extends ContentProvider {
private static final String TAG = "NotesProvider";// 标签 private static final String TAG = "NotesProvider";// 标签
private static final int URI_NOTE = 1;// Uri匹配码 private static final int URI_NOTE = 1;// Uri匹配码
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final int URI_NOTE_ITEM = 2; private static final int URI_NOTE_ITEM = 2;
private static final int URI_DATA = 3; private static final int URI_DATA = 3;
@ -65,6 +71,7 @@ public class NotesProvider extends ContentProvider {
private static final int URI_SEARCH_SUGGEST = 6; private static final int URI_SEARCH_SUGGEST = 6;
static { static {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
mMatcher = new UriMatcher(UriMatcher.NO_MATCH); mMatcher = new UriMatcher(UriMatcher.NO_MATCH);
mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE); mMatcher.addURI(Notes.AUTHORITY, "note", URI_NOTE);
@ -75,6 +82,8 @@ public class NotesProvider extends ContentProvider {
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST); mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST); mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);
======= =======
=======
>>>>>>> liuyitao-branch
mMatcher = new UriMatcher(UriMatcher.NO_MATCH);// 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码 mMatcher = new UriMatcher(UriMatcher.NO_MATCH);// 创建UriMatcher时，调用UriMatcher(UriMatcher.NO_MATCH)表示不匹配任何路径的返回码
/* /*
* 把需要匹配Uri路径全部给注册上 * 把需要匹配Uri路径全部给注册上
@ -86,6 +95,9 @@ public class NotesProvider extends ContentProvider {
mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);// 搜索的路径 mMatcher.addURI(Notes.AUTHORITY, "search", URI_SEARCH);// 搜索的路径
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);// 搜索建议的路径 mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY, URI_SEARCH_SUGGEST);// 搜索建议的路径
mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);// 带搜索关键字的搜索建议的路径 mMatcher.addURI(Notes.AUTHORITY, SearchManager.SUGGEST_URI_PATH_QUERY + "/*", URI_SEARCH_SUGGEST);// 带搜索关键字的搜索建议的路径
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
@ -94,11 +106,17 @@ public class NotesProvider extends ContentProvider {
* we will trim '\n' and white space in order to show more information. * we will trim '\n' and white space in order to show more information.
*/ */
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
======= =======
>>>>>>> liuyitao-branch
/* /*
* 查询搜索结果的投影。该投影包含了搜索结果需要的各个字段，如便签的 ID、搜索文本等 * 查询搜索结果的投影。该投影包含了搜索结果需要的各个字段，如便签的 ID、搜索文本等
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + "," private static final String NOTES_SEARCH_PROJECTION = NoteColumns.ID + ","
+ NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + "," + NoteColumns.ID + " AS " + SearchManager.SUGGEST_COLUMN_INTENT_EXTRA_DATA + ","
@ -109,6 +127,12 @@ public class NotesProvider extends ContentProvider {
+ "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA; + "'" + Notes.TextNote.CONTENT_TYPE + "' AS " + SearchManager.SUGGEST_COLUMN_INTENT_DATA;
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
* 查询语句，用于查询搜索结果
* */
>>>>>>> liuyitao-branch
======= =======
/* /*
* 查询语句，用于查询搜索结果 * 查询语句，用于查询搜索结果
@ -122,6 +146,12 @@ public class NotesProvider extends ContentProvider {
@Override @Override
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
/*
*在onCreate()中初始化Context，实例化mHelper
* */
>>>>>>> liuyitao-branch
======= =======
/* /*
*在onCreate()中初始化Context，实例化mHelper *在onCreate()中初始化Context，实例化mHelper
@ -133,6 +163,7 @@ public class NotesProvider extends ContentProvider {
} }
@Override @Override
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
String sortOrder) { String sortOrder) {
@ -158,6 +189,8 @@ public class NotesProvider extends ContentProvider {
c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs, null, null, sortOrder); + parseSelection(selection), selectionArgs, null, null, sortOrder);
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 根据传入的Uri进行数据库查询操作 * 根据传入的Uri进行数据库查询操作
* */ * */
@ -187,14 +220,21 @@ public class NotesProvider extends ContentProvider {
id = uri.getPathSegments().get(1); // 获取Uri中的ID值 id = uri.getPathSegments().get(1); // 获取Uri中的ID值
c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id c = db.query(TABLE.DATA, projection, DataColumns.ID + "=" + id
+ parseSelection(selection), selectionArgs, null, null, sortOrder);// 查询特定ID的数据详情 + parseSelection(selection), selectionArgs, null, null, sortOrder);// 查询特定ID的数据详情
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
break; break;
case URI_SEARCH: case URI_SEARCH:
case URI_SEARCH_SUGGEST: case URI_SEARCH_SUGGEST:
if (sortOrder != null || projection != null) { if (sortOrder != null || projection != null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"do not specify sortOrder, selection, selectionArgs, or projection" + "with this query"); "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");
=======
"do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");// 如果存在不合法的参数则抛出异常
>>>>>>> liuyitao-branch
======= =======
"do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");// 如果存在不合法的参数则抛出异常 "do not specify sortOrder, selection, selectionArgs, or projection" + "with this query");// 如果存在不合法的参数则抛出异常
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -203,6 +243,7 @@ public class NotesProvider extends ContentProvider {
String searchString = null; String searchString = null;
if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) { if (mMatcher.match(uri) == URI_SEARCH_SUGGEST) {
if (uri.getPathSegments().size() > 1) { if (uri.getPathSegments().size() > 1) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
searchString = uri.getPathSegments().get(1); searchString = uri.getPathSegments().get(1);
} }
@ -279,6 +320,8 @@ public class NotesProvider extends ContentProvider {
case URI_NOTE_ITEM: case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1); id = uri.getPathSegments().get(1);
======= =======
=======
>>>>>>> liuyitao-branch
searchString = uri.getPathSegments().get(1); // 获取搜索关键字 searchString = uri.getPathSegments().get(1); // 获取搜索关键字
} }
} else { } else {
@ -368,12 +411,16 @@ public class NotesProvider extends ContentProvider {
break; break;
case URI_NOTE_ITEM: case URI_NOTE_ITEM:
id = uri.getPathSegments().get(1);// 获取Uri中的ID参数 id = uri.getPathSegments().get(1);// 获取Uri中的ID参数
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
/** /**
* ID that smaller than 0 is system folder which is not allowed to * ID that smaller than 0 is system folder which is not allowed to
* trash * trash
*/ */
long noteId = Long.valueOf(id); long noteId = Long.valueOf(id);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if (noteId <= 0) { if (noteId <= 0) {
break; break;
@ -444,6 +491,8 @@ public class NotesProvider extends ContentProvider {
} }
======= =======
=======
>>>>>>> liuyitao-branch
if (noteId <= 0) {// 如果ID小于等于0，则不允许删除 if (noteId <= 0) {// 如果ID小于等于0，则不允许删除
break; break;
} }
@ -522,11 +571,15 @@ public class NotesProvider extends ContentProvider {
/* /*
* 解析查询条件selection，如果selection不为空，则在其前面加上" AND "，用于拼接SQL语句 * 解析查询条件selection，如果selection不为空，则在其前面加上" AND "，用于拼接SQL语句
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private String parseSelection(String selection) { private String parseSelection(String selection) {
return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""); return (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : "");
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private void increaseNoteVersion(long id, String selection, String[] selectionArgs) { private void increaseNoteVersion(long id, String selection, String[] selectionArgs) {
StringBuilder sql = new StringBuilder(120); StringBuilder sql = new StringBuilder(120);
@ -555,6 +608,8 @@ public class NotesProvider extends ContentProvider {
@Override @Override
======= =======
=======
>>>>>>> liuyitao-branch
/* /*
* 根据传入的id和selection参数确定要更新的记录，并将版本号加1 * 根据传入的id和selection参数确定要更新的记录，并将版本号加1
* */ * */
@ -590,13 +645,19 @@ public class NotesProvider extends ContentProvider {
* 输入参数：参数 uri 表示查询或操作的 URI * 输入参数：参数 uri 表示查询或操作的 URI
* 函数中是环境自动生成的，也可自己改写 * 函数中是环境自动生成的，也可自己改写
* */ * */
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public String getType(Uri uri) { public String getType(Uri uri) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> liuyitao-branch
======= =======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }

29
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
Unescape View File

@ -26,6 +26,7 @@ import org.json.JSONObject;
public class MetaData extends Task { public class MetaData extends Task {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 功能描述：得到类的简写名称存入字符串TAG中 * 功能描述：得到类的简写名称存入字符串TAG中
@ -52,6 +53,8 @@ public class MetaData extends Task {
* 输出错误信息 * 输出错误信息
*/ */
======= =======
=======
>>>>>>> liuyitao-branch
private final static String TAG = MetaData.class.getSimpleName(); private final static String TAG = MetaData.class.getSimpleName();
private String mRelatedGid = null; private String mRelatedGid = null;
@ -61,11 +64,15 @@ public class MetaData extends Task {
metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid); metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, "failed to put related gid"); Log.e(TAG, "failed to put related gid");
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
setNotes(metaInfo.toString()); setNotes(metaInfo.toString());
setName(GTaskStringUtils.META_NOTE_NAME); setName(GTaskStringUtils.META_NOTE_NAME);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 功能描述：获取相关联的Gid * 功能描述：获取相关联的Gid
@ -77,16 +84,22 @@ public class MetaData extends Task {
* 功能描述：判断当前数据是否为空，若为空则返回真即值得保存 * 功能描述：判断当前数据是否为空，若为空则返回真即值得保存
*/ */
======= =======
=======
>>>>>>> liuyitao-branch
public String getRelatedGid() { public String getRelatedGid() {
return mRelatedGid; return mRelatedGid;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@Override @Override
public boolean isWorthSaving() { public boolean isWorthSaving() {
return getNotes() != null; return getNotes() != null;
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 功能描述：使用远程json数据对象设置元数据内容 * 功能描述：使用远程json数据对象设置元数据内容
@ -95,6 +108,9 @@ public class MetaData extends Task {
*/ */
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@Override @Override
public void setContentByRemoteJSON(JSONObject js) { public void setContentByRemoteJSON(JSONObject js) {
@ -105,28 +121,36 @@ public class MetaData extends Task {
mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID); mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
} catch (JSONException e) { } catch (JSONException e) {
Log.w(TAG, "failed to get related gid"); Log.w(TAG, "failed to get related gid");
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 输出警告信息 * 输出警告信息
*/ */
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
mRelatedGid = null; mRelatedGid = null;
} }
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常 * 功能描述：使用本地json数据对象设置元数据内容，一般不会用到，若用到，则抛出异常
*/ */
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@Override @Override
public void setContentByLocalJSON(JSONObject js) { public void setContentByLocalJSON(JSONObject js) {
// this function should not be called // this function should not be called
throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called"); throw new IllegalAccessError("MetaData:setContentByLocalJSON should not be called");
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
@Override @Override
public JSONObject getLocalJSONFromContent() { public JSONObject getLocalJSONFromContent() {
@ -146,6 +170,8 @@ public class MetaData extends Task {
*/ */
} }
======= =======
=======
>>>>>>> liuyitao-branch
@Override @Override
public JSONObject getLocalJSONFromContent() { public JSONObject getLocalJSONFromContent() {
@ -157,5 +183,8 @@ public class MetaData extends Task {
throw new IllegalAccessError("MetaData:getSyncAction should not be called"); throw new IllegalAccessError("MetaData:getSyncAction should not be called");
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }

12
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java
Unescape View File

@ -20,6 +20,7 @@ import android.database.Cursor;
import org.json.JSONObject; import org.json.JSONObject;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/** /**
* 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量 * 应该是同步操作的基础数据类型，定义了相关指示同步操作的常量
@ -45,6 +46,8 @@ public abstract class Node {
public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误 public static final int SYNC_ACTION_ERROR = 8;// 同步出现错误
======= =======
=======
>>>>>>> liuyitao-branch
public abstract class Node { public abstract class Node {
public static final int SYNC_ACTION_NONE = 0; public static final int SYNC_ACTION_NONE = 0;
@ -63,12 +66,16 @@ public abstract class Node {
public static final int SYNC_ACTION_UPDATE_CONFLICT = 7; public static final int SYNC_ACTION_UPDATE_CONFLICT = 7;
public static final int SYNC_ACTION_ERROR = 8; public static final int SYNC_ACTION_ERROR = 8;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
private String mGid; private String mGid;
private String mName; private String mName;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private long mLastModified;//记录最后一次修改时间 private long mLastModified;//记录最后一次修改时间
@ -125,6 +132,8 @@ public abstract class Node {
return this.mDeleted; // 返回 mDeleted 的取值 return this.mDeleted; // 返回 mDeleted 的取值
} }
======= =======
=======
>>>>>>> liuyitao-branch
private long mLastModified; private long mLastModified;
private boolean mDeleted; private boolean mDeleted;
@ -180,5 +189,8 @@ public abstract class Node {
return this.mDeleted; return this.mDeleted;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }

37
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java
Unescape View File

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。 * Description：用于支持小米便签最底层的数据库相关操作，和sqlnote的关系上是子集关系，即data是note的子集（节点）。
@ -29,6 +30,9 @@ package net.micode.notes.gtask.data;
======= =======
package net.micode.notes.gtask.data; package net.micode.notes.gtask.data;
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
package net.micode.notes.gtask.data;
>>>>>>> liuyitao-branch
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentUris; import android.content.ContentUris;
@ -50,6 +54,7 @@ import org.json.JSONObject;
public class SqlData { public class SqlData {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 功能描述：得到类的简写名称存入字符串TAG中 * 功能描述：得到类的简写名称存入字符串TAG中
@ -65,15 +70,21 @@ public class SqlData {
// 集合了interface DataColumns中所有SF常量 // 集合了interface DataColumns中所有SF常量
======= =======
=======
>>>>>>> liuyitao-branch
private static final String TAG = SqlData.class.getSimpleName(); private static final String TAG = SqlData.class.getSimpleName();
private static final int INVALID_ID = -99999; private static final int INVALID_ID = -99999;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public static final String[] PROJECTION_DATA = new String[] { public static final String[] PROJECTION_DATA = new String[] {
DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1, DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
DataColumns.DATA3 DataColumns.DATA3
}; };
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 以下五个变量作为sql表中5列的编号 * 以下五个变量作为sql表中5列的编号
@ -115,6 +126,8 @@ public class SqlData {
mIsCreate = true; mIsCreate = true;
mDataId = INVALID_ID;//mDataId置初始值-99999 mDataId = INVALID_ID;//mDataId置初始值-99999
======= =======
=======
>>>>>>> liuyitao-branch
public static final int DATA_ID_COLUMN = 0; public static final int DATA_ID_COLUMN = 0;
@ -146,6 +159,9 @@ public class SqlData {
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mIsCreate = true; mIsCreate = true;
mDataId = INVALID_ID; mDataId = INVALID_ID;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
mDataMimeType = DataConstants.NOTE; mDataMimeType = DataConstants.NOTE;
mDataContent = ""; mDataContent = "";
@ -154,6 +170,7 @@ public class SqlData {
mDiffDataValues = new ContentValues(); mDiffDataValues = new ContentValues();
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
@ -263,6 +280,8 @@ public class SqlData {
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
// 如果获取ID出错则输出错误日志并抛出ActionFailureException异常 // 如果获取ID出错则输出错误日志并抛出ActionFailureException异常
======= =======
=======
>>>>>>> liuyitao-branch
public SqlData(Context context, Cursor c) { public SqlData(Context context, Cursor c) {
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();
mIsCreate = false; mIsCreate = false;
@ -337,6 +356,9 @@ public class SqlData {
try { try {
mDataId = Long.valueOf(uri.getPathSegments().get(1)); mDataId = Long.valueOf(uri.getPathSegments().get(1));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, "Get note id error :" + e.toString()); Log.e(TAG, "Get note id error :" + e.toString());
throw new ActionFailureException("create note failed"); throw new ActionFailureException("create note failed");
@ -345,6 +367,7 @@ public class SqlData {
if (mDiffDataValues.size() > 0) { if (mDiffDataValues.size() > 0) {
int result = 0; int result = 0;
if (!validateVersion) { if (!validateVersion) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果不需要验证版本，则直接通过mDataId更新mDiffDataValues到数据库中 // 如果不需要验证版本，则直接通过mDataId更新mDiffDataValues到数据库中
result = mContentResolver.update(ContentUris.withAppendedId( result = mContentResolver.update(ContentUris.withAppendedId(
@ -354,11 +377,16 @@ public class SqlData {
result = mContentResolver.update(ContentUris.withAppendedId( result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
======= =======
=======
>>>>>>> liuyitao-branch
result = mContentResolver.update(ContentUris.withAppendedId( result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null); Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, null, null);
} else { } else {
result = mContentResolver.update(ContentUris.withAppendedId( result = mContentResolver.update(ContentUris.withAppendedId(
Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues, Notes.CONTENT_DATA_URI, mDataId), mDiffDataValues,
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
" ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE " ? in (SELECT " + NoteColumns.ID + " FROM " + TABLE.NOTE
+ " WHERE " + NoteColumns.VERSION + "=?)", new String[] { + " WHERE " + NoteColumns.VERSION + "=?)", new String[] {
@ -366,15 +394,19 @@ public class SqlData {
}); });
} }
if (result == 0) { if (result == 0) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果没有更新任何数据，则输出警告日志 // 如果没有更新任何数据，则输出警告日志
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.w(TAG, "there is no update. maybe user updates note when syncing"); Log.w(TAG, "there is no update. maybe user updates note when syncing");
} }
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 清空差异数据 // 清空差异数据
mDiffDataValues.clear(); mDiffDataValues.clear();
@ -390,6 +422,8 @@ public class SqlData {
} }
======= =======
=======
>>>>>>> liuyitao-branch
mDiffDataValues.clear(); mDiffDataValues.clear();
mIsCreate = false; mIsCreate = false;
} }
@ -397,5 +431,8 @@ public class SqlData {
public long getId() { public long getId() {
return mDataId; return mDataId;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }

108
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java
Unescape View File

@ -43,6 +43,7 @@ public class SqlNote {
private static final int INVALID_ID = -99999; private static final int INVALID_ID = -99999;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 定义查询笔记的投影，包含需要查询的列 // 定义查询笔记的投影，包含需要查询的列
public static final String[] PROJECTION_NOTE = new String[] { public static final String[] PROJECTION_NOTE = new String[] {
@ -150,6 +151,8 @@ public class SqlNote {
try { try {
// 通过 ID 查询笔记数据 // 通过 ID 查询笔记数据
======= =======
=======
>>>>>>> liuyitao-branch
public static final String[] PROJECTION_NOTE = new String[] { public static final String[] PROJECTION_NOTE = new String[] {
NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID, NoteColumns.ID, NoteColumns.ALERTED_DATE, NoteColumns.BG_COLOR_ID,
NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE, NoteColumns.CREATED_DATE, NoteColumns.HAS_ATTACHMENT, NoteColumns.MODIFIED_DATE,
@ -276,12 +279,16 @@ public class SqlNote {
private void loadFromCursor(long id) { private void loadFromCursor(long id) {
Cursor c = null; Cursor c = null;
try { try {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)", c = mContentResolver.query(Notes.CONTENT_NOTE_URI, PROJECTION_NOTE, "(_id=?)",
new String[] { new String[] {
String.valueOf(id) String.valueOf(id)
}, null); }, null);
if (c != null) { if (c != null) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
c.moveToNext(); // 移动到第一条数据 c.moveToNext(); // 移动到第一条数据
loadFromCursor(c); // 载入数据 loadFromCursor(c); // 载入数据
@ -292,6 +299,8 @@ public class SqlNote {
if (c != null) if (c != null)
c.close(); // 关闭游标 c.close(); // 关闭游标
======= =======
=======
>>>>>>> liuyitao-branch
c.moveToNext(); c.moveToNext();
loadFromCursor(c); loadFromCursor(c);
} else { } else {
@ -300,11 +309,15 @@ public class SqlNote {
} finally { } finally {
if (c != null) if (c != null)
c.close(); c.close();
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
private void loadFromCursor(Cursor c) { private void loadFromCursor(Cursor c) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
mId = c.getLong(ID_COLUMN); // 从游标中获取并设置 ID mId = c.getLong(ID_COLUMN); // 从游标中获取并设置 ID
mAlertDate = c.getLong(ALERTED_DATE_COLUMN); // 从游标中获取并设置提醒日期 mAlertDate = c.getLong(ALERTED_DATE_COLUMN); // 从游标中获取并设置提醒日期
@ -327,6 +340,8 @@ public class SqlNote {
try { try {
// 通过笔记ID查询数据内容 // 通过笔记ID查询数据内容
======= =======
=======
>>>>>>> liuyitao-branch
mId = c.getLong(ID_COLUMN); mId = c.getLong(ID_COLUMN);
mAlertDate = c.getLong(ALERTED_DATE_COLUMN); mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
mBgColorId = c.getInt(BG_COLOR_ID_COLUMN); mBgColorId = c.getInt(BG_COLOR_ID_COLUMN);
@ -345,6 +360,9 @@ public class SqlNote {
Cursor c = null; Cursor c = null;
mDataList.clear(); mDataList.clear();
try { try {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA, c = mContentResolver.query(Notes.CONTENT_DATA_URI, SqlData.PROJECTION_DATA,
"(note_id=?)", new String[] { "(note_id=?)", new String[] {
@ -352,6 +370,7 @@ public class SqlNote {
}, null); }, null);
if (c != null) { if (c != null) {
if (c.getCount() == 0) { if (c.getCount() == 0) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
Log.w(TAG, "it seems that the note has not data");// 输出警告日志 Log.w(TAG, "it seems that the note has not data");// 输出警告日志
return; return;
@ -367,6 +386,8 @@ public class SqlNote {
if (c != null) if (c != null)
c.close();// 关闭游标 c.close();// 关闭游标
======= =======
=======
>>>>>>> liuyitao-branch
Log.w(TAG, "it seems that the note has not data"); Log.w(TAG, "it seems that the note has not data");
return; return;
} }
@ -380,12 +401,16 @@ public class SqlNote {
} finally { } finally {
if (c != null) if (c != null)
c.close(); c.close();
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
public boolean setContent(JSONObject js) { public boolean setContent(JSONObject js) {
try { try {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 解析JSON对象中的note字段 // 解析JSON对象中的note字段
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@ -400,6 +425,8 @@ public class SqlNote {
.getString(NoteColumns.SNIPPET) : ""; .getString(NoteColumns.SNIPPET) : "";
// 如果正在创建一个新的note，或者之前的snippet和当前传入的snippet不相等，则更新snippet字段 // 如果正在创建一个新的note，或者之前的snippet和当前传入的snippet不相等，则更新snippet字段
======= =======
=======
>>>>>>> liuyitao-branch
JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) { if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_SYSTEM) {
Log.w(TAG, "cannot set system folder"); Log.w(TAG, "cannot set system folder");
@ -407,6 +434,9 @@ public class SqlNote {
// for folder we can only update the snnipet and type // for folder we can only update the snnipet and type
String snippet = note.has(NoteColumns.SNIPPET) ? note String snippet = note.has(NoteColumns.SNIPPET) ? note
.getString(NoteColumns.SNIPPET) : ""; .getString(NoteColumns.SNIPPET) : "";
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mIsCreate || !mSnippet.equals(snippet)) { if (mIsCreate || !mSnippet.equals(snippet)) {
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
@ -415,14 +445,18 @@ public class SqlNote {
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
: Notes.TYPE_NOTE; : Notes.TYPE_NOTE;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果正在创建一个新的note，或者之前的type和当前传入的type不相等，则更新type字段 // 如果正在创建一个新的note，或者之前的type和当前传入的type不相等，则更新type字段
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mIsCreate || mType != type) { if (mIsCreate || mType != type) {
mDiffNoteValues.put(NoteColumns.TYPE, type); mDiffNoteValues.put(NoteColumns.TYPE, type);
} }
mType = type; mType = type;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
}else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { }else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
// 如果类型为笔记类型，则解析data数组 // 如果类型为笔记类型，则解析data数组
@ -430,6 +464,11 @@ public class SqlNote {
// 获取note的ID字段，如果没有则设置为INVALID_ID常量值 // 获取note的ID字段，如果没有则设置为INVALID_ID常量值
long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID; long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
// 如果正在创建一个新的note，或者之前的id和当前传入的id不相等，则更新ID字段 // 如果正在创建一个新的note，或者之前的id和当前传入的id不相等，则更新ID字段
=======
} else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
long id = note.has(NoteColumns.ID) ? note.getLong(NoteColumns.ID) : INVALID_ID;
>>>>>>> liuyitao-branch
======= =======
} else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) { } else if (note.getInt(NoteColumns.TYPE) == Notes.TYPE_NOTE) {
JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA); JSONArray dataArray = js.getJSONArray(GTaskStringUtils.META_HEAD_DATA);
@ -440,9 +479,14 @@ public class SqlNote {
} }
mId = id; mId = id;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 解析并更新其他成员变量 // 解析并更新其他成员变量
long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0; long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note.getLong(NoteColumns.ALERTED_DATE) : 0;
=======
long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
.getLong(NoteColumns.ALERTED_DATE) : 0;
>>>>>>> liuyitao-branch
======= =======
long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note long alertDate = note.has(NoteColumns.ALERTED_DATE) ? note
.getLong(NoteColumns.ALERTED_DATE) : 0; .getLong(NoteColumns.ALERTED_DATE) : 0;
@ -452,11 +496,14 @@ public class SqlNote {
} }
mAlertDate = alertDate; mAlertDate = alertDate;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 解析snippet和type字段 // 解析snippet和type字段
String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : ""; String snippet = note.has(NoteColumns.SNIPPET) ? note.getString(NoteColumns.SNIPPET) : "";
// 如果正在创建一个新的note，或者之前的snippet和当前传入的snippet不相等，则更新snippet字段 // 如果正在创建一个新的note，或者之前的snippet和当前传入的snippet不相等，则更新snippet字段
======= =======
=======
>>>>>>> liuyitao-branch
int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note int bgColorId = note.has(NoteColumns.BG_COLOR_ID) ? note
.getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext); .getInt(NoteColumns.BG_COLOR_ID) : ResourceParser.getDefaultBgId(mContext);
if (mIsCreate || mBgColorId != bgColorId) { if (mIsCreate || mBgColorId != bgColorId) {
@ -494,15 +541,23 @@ public class SqlNote {
String snippet = note.has(NoteColumns.SNIPPET) ? note String snippet = note.has(NoteColumns.SNIPPET) ? note
.getString(NoteColumns.SNIPPET) : ""; .getString(NoteColumns.SNIPPET) : "";
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mIsCreate || !mSnippet.equals(snippet)) { if (mIsCreate || !mSnippet.equals(snippet)) {
mDiffNoteValues.put(NoteColumns.SNIPPET, snippet); mDiffNoteValues.put(NoteColumns.SNIPPET, snippet);
} }
mSnippet = snippet; mSnippet = snippet;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE; int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) : Notes.TYPE_NOTE;
// 如果正在创建一个新的note，或者之前的type和当前传入的type不相等，则更新type字段 // 如果正在创建一个新的note，或者之前的type和当前传入的type不相等，则更新type字段
=======
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
: Notes.TYPE_NOTE;
>>>>>>> liuyitao-branch
======= =======
int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE) int type = note.has(NoteColumns.TYPE) ? note.getInt(NoteColumns.TYPE)
: Notes.TYPE_NOTE; : Notes.TYPE_NOTE;
@ -512,6 +567,7 @@ public class SqlNote {
} }
mType = type; mType = type;
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 遍历data数组 // 遍历data数组
for (int i = 0; i < dataArray.length(); i++) { for (int i = 0; i < dataArray.length(); i++) {
@ -520,6 +576,8 @@ public class SqlNote {
// 检查data数组中的id字段，并查找对应的SqlData对象 // 检查data数组中的id字段，并查找对应的SqlData对象
======= =======
=======
>>>>>>> liuyitao-branch
int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID) int widgetId = note.has(NoteColumns.WIDGET_ID) ? note.getInt(NoteColumns.WIDGET_ID)
: AppWidgetManager.INVALID_APPWIDGET_ID; : AppWidgetManager.INVALID_APPWIDGET_ID;
if (mIsCreate || mWidgetId != widgetId) { if (mIsCreate || mWidgetId != widgetId) {
@ -544,6 +602,9 @@ public class SqlNote {
for (int i = 0; i < dataArray.length(); i++) { for (int i = 0; i < dataArray.length(); i++) {
JSONObject data = dataArray.getJSONObject(i); JSONObject data = dataArray.getJSONObject(i);
SqlData sqlData = null; SqlData sqlData = null;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (data.has(DataColumns.ID)) { if (data.has(DataColumns.ID)) {
long dataId = data.getLong(DataColumns.ID); long dataId = data.getLong(DataColumns.ID);
@ -554,31 +615,41 @@ public class SqlNote {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果未找到对应的SqlData对象，则创建一个新的对象并添加到数据列表中 // 如果未找到对应的SqlData对象，则创建一个新的对象并添加到数据列表中
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (sqlData == null) { if (sqlData == null) {
sqlData = new SqlData(mContext); sqlData = new SqlData(mContext);
mDataList.add(sqlData); mDataList.add(sqlData);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 调用SqlData对象的setContent方法，传递JSON数据进行处理 // 调用SqlData对象的setContent方法，传递JSON数据进行处理
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
sqlData.setContent(data); sqlData.setContent(data);
} }
} }
} catch (JSONException e) { } catch (JSONException e) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 处理异常情况，打印错误信息并返回false // 处理异常情况，打印错误信息并返回false
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 返回true，表示设置内容成功 // 返回true，表示设置内容成功
@ -640,6 +711,8 @@ public class SqlNote {
// 如果出现异常，则返回 null // 如果出现异常，则返回 null
return null; // 返回null return null; // 返回null
======= =======
=======
>>>>>>> liuyitao-branch
return true; return true;
} }
@ -689,14 +762,21 @@ public class SqlNote {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
public void setParentId(long id) { public void setParentId(long id) {
mParentId = id; mParentId = id;
mDiffNoteValues.put(NoteColumns.PARENT_ID, id); mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
}//设置父节点ID }//设置父节点ID
=======
}
>>>>>>> liuyitao-branch
======= =======
} }
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -704,6 +784,7 @@ public class SqlNote {
public void setGtaskId(String gid) { public void setGtaskId(String gid) {
mDiffNoteValues.put(NoteColumns.GTASK_ID, gid); mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
//设置Google任务ID //设置Google任务ID
public void setSyncId(long syncId) { public void setSyncId(long syncId) {
@ -745,6 +826,8 @@ public class SqlNote {
try { try {
// 将Uri路径中的第二个片段转换为long类型，并赋值给mId // 将Uri路径中的第二个片段转换为long类型，并赋值给mId
======= =======
=======
>>>>>>> liuyitao-branch
public void setSyncId(long syncId) { public void setSyncId(long syncId) {
mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId); mDiffNoteValues.put(NoteColumns.SYNC_ID, syncId);
@ -778,6 +861,9 @@ public class SqlNote {
Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues); Uri uri = mContentResolver.insert(Notes.CONTENT_NOTE_URI, mDiffNoteValues);
try { try {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
mId = Long.valueOf(uri.getPathSegments().get(1)); mId = Long.valueOf(uri.getPathSegments().get(1));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@ -788,9 +874,12 @@ public class SqlNote {
throw new IllegalStateException("Create thread id failed"); throw new IllegalStateException("Create thread id failed");
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果是笔记类型，则循环提交数据内容更改 // 如果是笔记类型，则循环提交数据内容更改
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mType == Notes.TYPE_NOTE) { if (mType == Notes.TYPE_NOTE) {
for (SqlData sqlData : mDataList) { for (SqlData sqlData : mDataList) {
@ -798,9 +887,12 @@ public class SqlNote {
} }
} }
} else { } else {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果不是新建笔记 // 如果不是新建笔记
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) { if (mId <= 0 && mId != Notes.ID_ROOT_FOLDER && mId != Notes.ID_CALL_RECORD_FOLDER) {
Log.e(TAG, "No such note"); Log.e(TAG, "No such note");
@ -810,6 +902,7 @@ public class SqlNote {
mVersion ++; mVersion ++;
int result = 0; int result = 0;
if (!validateVersion) { if (!validateVersion) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果不需要验证版本，则直接通过mId更新mDiffNoteValues到数据库中 // 如果不需要验证版本，则直接通过mId更新mDiffNoteValues到数据库中
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
@ -821,6 +914,8 @@ public class SqlNote {
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
======= =======
=======
>>>>>>> liuyitao-branch
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ NoteColumns.ID + "=?)", new String[] { + NoteColumns.ID + "=?)", new String[] {
String.valueOf(mId) String.valueOf(mId)
@ -828,6 +923,9 @@ public class SqlNote {
} else { } else {
result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "(" result = mContentResolver.update(Notes.CONTENT_NOTE_URI, mDiffNoteValues, "("
+ NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)", + NoteColumns.ID + "=?) AND (" + NoteColumns.VERSION + "<=?)",
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
new String[] { new String[] {
String.valueOf(mId), String.valueOf(mVersion) String.valueOf(mId), String.valueOf(mVersion)
@ -838,9 +936,12 @@ public class SqlNote {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果是笔记类型，则循环提交数据内容更改 // 如果是笔记类型，则循环提交数据内容更改
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (mType == Notes.TYPE_NOTE) { if (mType == Notes.TYPE_NOTE) {
for (SqlData sqlData : mDataList) { for (SqlData sqlData : mDataList) {
@ -849,8 +950,12 @@ public class SqlNote {
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 刷新本地信息 // 刷新本地信息
=======
// refresh local info
>>>>>>> liuyitao-branch
======= =======
// refresh local info // refresh local info
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -858,9 +963,12 @@ public class SqlNote {
if (mType == Notes.TYPE_NOTE) if (mType == Notes.TYPE_NOTE)
loadDataContent(); loadDataContent();
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 清空mDiffNoteValues和将mIsCreate设置为false // 清空mDiffNoteValues和将mIsCreate设置为false
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
mDiffNoteValues.clear(); mDiffNoteValues.clear();
mIsCreate = false; mIsCreate = false;

71
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java
Unescape View File

@ -33,6 +33,7 @@ import org.json.JSONObject;
public class Task extends Node { public class Task extends Node {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private static final String TAG = Task.class.getSimpleName(); // 定义一个私有静态常量TAG，值为Task.class.getSimpleName() private static final String TAG = Task.class.getSimpleName(); // 定义一个私有静态常量TAG，值为Task.class.getSimpleName()
@ -146,6 +147,8 @@ public class Task extends Node {
try { try {
// 获取Google Task的ID并设置到本地笔记或任务中 // 获取Google Task的ID并设置到本地笔记或任务中
======= =======
=======
>>>>>>> liuyitao-branch
private static final String TAG = Task.class.getSimpleName(); private static final String TAG = Task.class.getSimpleName();
private boolean mCompleted; private boolean mCompleted;
@ -252,13 +255,20 @@ public class Task extends Node {
if (js != null) { if (js != null) {
try { try {
// id // id
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 获取Google Task的最后修改时间戳并设置到本地笔记或任务中 // 获取Google Task的最后修改时间戳并设置到本地笔记或任务中
=======
// last_modified
>>>>>>> liuyitao-branch
======= =======
// last_modified // last_modified
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -266,8 +276,12 @@ public class Task extends Node {
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 获取Google Task的名称并设置到本地笔记或任务中 // 获取Google Task的名称并设置到本地笔记或任务中
=======
// name
>>>>>>> liuyitao-branch
======= =======
// name // name
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -275,8 +289,12 @@ public class Task extends Node {
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 获取Google Task的备注信息并设置到本地笔记或任务中 // 获取Google Task的备注信息并设置到本地笔记或任务中
=======
// notes
>>>>>>> liuyitao-branch
======= =======
// notes // notes
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -284,8 +302,12 @@ public class Task extends Node {
setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES)); setNotes(js.getString(GTaskStringUtils.GTASK_JSON_NOTES));
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 获取Google Task的删除状态并设置到本地笔记或任务中 // 获取Google Task的删除状态并设置到本地笔记或任务中
=======
// deleted
>>>>>>> liuyitao-branch
======= =======
// deleted // deleted
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -293,6 +315,7 @@ public class Task extends Node {
setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED)); setDeleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_DELETED));
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 获取Google Task的完成状态并设置到本地笔记或任务中 // 获取Google Task的完成状态并设置到本地笔记或任务中
if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
@ -301,11 +324,16 @@ public class Task extends Node {
} catch (JSONException e) { // 如果解析过程出现异常 } catch (JSONException e) { // 如果解析过程出现异常
// 记录异常日志并抛出异常 // 记录异常日志并抛出异常
======= =======
=======
>>>>>>> liuyitao-branch
// completed // completed
if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) { if (js.has(GTaskStringUtils.GTASK_JSON_COMPLETED)) {
setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED)); setCompleted(js.getBoolean(GTaskStringUtils.GTASK_JSON_COMPLETED));
} }
} catch (JSONException e) { } catch (JSONException e) {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
@ -316,6 +344,7 @@ public class Task extends Node {
public void setContentByLocalJSON(JSONObject js) { public void setContentByLocalJSON(JSONObject js) {
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE) if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) { // 如果参数为空或缺少必要的数据字段 || !js.has(GTaskStringUtils.META_HEAD_DATA)) { // 如果参数为空或缺少必要的数据字段
Log.w(TAG, "setContentByLocalJSON: nothing is available"); // 记录警告日志 Log.w(TAG, "setContentByLocalJSON: nothing is available"); // 记录警告日志
@ -346,6 +375,8 @@ public class Task extends Node {
Log.e(TAG, e.toString()); // 记录异常日志 Log.e(TAG, e.toString()); // 记录异常日志
e.printStackTrace(); // 打印异常堆栈信息 e.printStackTrace(); // 打印异常堆栈信息
======= =======
=======
>>>>>>> liuyitao-branch
|| !js.has(GTaskStringUtils.META_HEAD_DATA)) { || !js.has(GTaskStringUtils.META_HEAD_DATA)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
} }
@ -370,11 +401,15 @@ public class Task extends Node {
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
public JSONObject getLocalJSONFromContent() { public JSONObject getLocalJSONFromContent() {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
String name = getName(); // 获取名称 String name = getName(); // 获取名称
try { try {
@ -387,6 +422,8 @@ public class Task extends Node {
// 创建JSON对象，并填充数据 // 创建JSON对象，并填充数据
======= =======
=======
>>>>>>> liuyitao-branch
String name = getName(); String name = getName();
try { try {
if (mMetaInfo == null) { if (mMetaInfo == null) {
@ -396,13 +433,20 @@ public class Task extends Node {
return null; return null;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
JSONObject note = new JSONObject(); JSONObject note = new JSONObject();
JSONArray dataArray = new JSONArray(); JSONArray dataArray = new JSONArray();
JSONObject data = new JSONObject(); JSONObject data = new JSONObject();
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
data.put(DataColumns.CONTENT, name); // 设置数据内容为名称 data.put(DataColumns.CONTENT, name); // 设置数据内容为名称
=======
data.put(DataColumns.CONTENT, name);
>>>>>>> liuyitao-branch
======= =======
data.put(DataColumns.CONTENT, name); data.put(DataColumns.CONTENT, name);
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
@ -410,6 +454,7 @@ public class Task extends Node {
js.put(GTaskStringUtils.META_HEAD_DATA, dataArray); js.put(GTaskStringUtils.META_HEAD_DATA, dataArray);
note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
js.put(GTaskStringUtils.META_HEAD_NOTE, note); js.put(GTaskStringUtils.META_HEAD_NOTE, note);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
return js; // 返回JSON对象 return js; // 返回JSON对象
} else { } else {
@ -425,6 +470,8 @@ public class Task extends Node {
data.put(DataColumns.CONTENT, getName()); // 设置数据内容为名称 data.put(DataColumns.CONTENT, getName()); // 设置数据内容为名称
break; // 跳出循环 break; // 跳出循环
======= =======
=======
>>>>>>> liuyitao-branch
return js; return js;
} else { } else {
// synced task // synced task
@ -436,11 +483,15 @@ public class Task extends Node {
if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) { if (TextUtils.equals(data.getString(DataColumns.MIME_TYPE), DataConstants.NOTE)) {
data.put(DataColumns.CONTENT, getName()); data.put(DataColumns.CONTENT, getName());
break; break;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
note.put(NoteColumns.TYPE, Notes.TYPE_NOTE); note.put(NoteColumns.TYPE, Notes.TYPE_NOTE);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
return mMetaInfo; // 返回元信息对象 return mMetaInfo; // 返回元信息对象
} }
@ -449,17 +500,23 @@ public class Task extends Node {
e.printStackTrace(); // 打印异常堆栈信息 e.printStackTrace(); // 打印异常堆栈信息
return null; // 返回null return null; // 返回null
======= =======
=======
>>>>>>> liuyitao-branch
return mMetaInfo; return mMetaInfo;
} }
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
return null; return null;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
public void setMetaInfo(MetaData metaData) { public void setMetaInfo(MetaData metaData) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if (metaData != null && metaData.getNotes() != null) { // 如果元数据不为空且笔记不为空 if (metaData != null && metaData.getNotes() != null) { // 如果元数据不为空且笔记不为空
try { try {
@ -468,25 +525,34 @@ public class Task extends Node {
Log.w(TAG, e.toString()); // 记录警告日志 Log.w(TAG, e.toString()); // 记录警告日志
mMetaInfo = null; // 设置元信息为空 mMetaInfo = null; // 设置元信息为空
======= =======
=======
>>>>>>> liuyitao-branch
if (metaData != null && metaData.getNotes() != null) { if (metaData != null && metaData.getNotes() != null) {
try { try {
mMetaInfo = new JSONObject(metaData.getNotes()); mMetaInfo = new JSONObject(metaData.getNotes());
} catch (JSONException e) { } catch (JSONException e) {
Log.w(TAG, e.toString()); Log.w(TAG, e.toString());
mMetaInfo = null; mMetaInfo = null;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
//获取同步操作类型 //获取同步操作类型
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public int getSyncAction(Cursor c) { public int getSyncAction(Cursor c) {
try { try {
JSONObject noteInfo = null; JSONObject noteInfo = null;
if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) { if (mMetaInfo != null && mMetaInfo.has(GTaskStringUtils.META_HEAD_NOTE)) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 获取笔记信息对象 noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); // 获取笔记信息对象
} }
@ -573,6 +639,8 @@ public class Task extends Node {
return this.mParent; return this.mParent;
}//获取任务的父任务列表 }//获取任务的父任务列表
======= =======
=======
>>>>>>> liuyitao-branch
noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE); noteInfo = mMetaInfo.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
} }
@ -658,6 +726,9 @@ public class Task extends Node {
public TaskList getParent() { public TaskList getParent() {
return this.mParent; return this.mParent;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }

92
src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java
Unescape View File

@ -31,6 +31,7 @@ import java.util.ArrayList;
public class TaskList extends Node { public class TaskList extends Node {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
private static final String TAG = TaskList.class.getSimpleName(); // TAG用于在日志中标识类名 private static final String TAG = TaskList.class.getSimpleName(); // TAG用于在日志中标识类名
@ -90,6 +91,8 @@ public class TaskList extends Node {
======= =======
=======
>>>>>>> liuyitao-branch
private static final String TAG = TaskList.class.getSimpleName(); private static final String TAG = TaskList.class.getSimpleName();
private int mIndex; private int mIndex;
@ -133,11 +136,15 @@ public class TaskList extends Node {
return js; return js;
} }
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
public JSONObject getUpdateAction(int actionId) { public JSONObject getUpdateAction(int actionId) {
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
try { try {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 设置操作类型为更新 // 设置操作类型为更新
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
@ -167,6 +174,8 @@ public class TaskList extends Node {
// 抛出自定义异常 // 抛出自定义异常
======= =======
=======
>>>>>>> liuyitao-branch
// action_type // action_type
js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE, js.put(GTaskStringUtils.GTASK_JSON_ACTION_TYPE,
GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE); GTaskStringUtils.GTASK_JSON_ACTION_TYPE_UPDATE);
@ -186,6 +195,9 @@ public class TaskList extends Node {
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
throw new ActionFailureException("fail to generate tasklist-update jsonobject"); throw new ActionFailureException("fail to generate tasklist-update jsonobject");
} }
@ -198,38 +210,52 @@ public class TaskList extends Node {
try { try {
// id // id
if (js.has(GTaskStringUtils.GTASK_JSON_ID)) { if (js.has(GTaskStringUtils.GTASK_JSON_ID)) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果JSON对象包含ID字段，则将ID设置为相应的值 // 如果JSON对象包含ID字段，则将ID设置为相应的值
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID)); setGid(js.getString(GTaskStringUtils.GTASK_JSON_ID));
} }
// last_modified // last_modified
if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) { if (js.has(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果JSON对象包含last_modified字段，则将last_modified设置为相应的值 // 如果JSON对象包含last_modified字段，则将last_modified设置为相应的值
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED)); setLastModified(js.getLong(GTaskStringUtils.GTASK_JSON_LAST_MODIFIED));
} }
// name // name
if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) { if (js.has(GTaskStringUtils.GTASK_JSON_NAME)) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果JSON对象包含name字段，则将name设置为相应的值 // 如果JSON对象包含name字段，则将name设置为相应的值
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME)); setName(js.getString(GTaskStringUtils.GTASK_JSON_NAME));
} }
} catch (JSONException e) { } catch (JSONException e) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 打印异常信息 // 打印异常信息
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
// 抛出自定义异常 // 抛出自定义异常
=======
Log.e(TAG, e.toString());
e.printStackTrace();
>>>>>>> liuyitao-branch
======= =======
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
@ -240,6 +266,7 @@ public class TaskList extends Node {
} }
public void setContentByLocalJSON(JSONObject js) { public void setContentByLocalJSON(JSONObject js) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 检查传入的JSON对象是否为空或者不包含指定的字段 // 检查传入的JSON对象是否为空或者不包含指定的字段
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
@ -276,6 +303,8 @@ public class TaskList extends Node {
} catch (JSONException e) { } catch (JSONException e) {
// 打印异常信息 // 打印异常信息
======= =======
=======
>>>>>>> liuyitao-branch
if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) { if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
Log.w(TAG, "setContentByLocalJSON: nothing is avaiable"); Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
} }
@ -298,12 +327,16 @@ public class TaskList extends Node {
Log.e(TAG, "error type"); Log.e(TAG, "error type");
} }
} catch (JSONException e) { } catch (JSONException e) {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 从内容中获取本地JSON对象 * 从内容中获取本地JSON对象
@ -326,6 +359,8 @@ public class TaskList extends Node {
// 检查文件夹名称是否为默认文件夹或通话笔记文件夹，如果是，则设置文件夹类型为系统类型，否则设置为文件夹类型 // 检查文件夹名称是否为默认文件夹或通话笔记文件夹，如果是，则设置文件夹类型为系统类型，否则设置为文件夹类型
======= =======
=======
>>>>>>> liuyitao-branch
public JSONObject getLocalJSONFromContent() { public JSONObject getLocalJSONFromContent() {
try { try {
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
@ -336,6 +371,9 @@ public class TaskList extends Node {
folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(), folderName = folderName.substring(GTaskStringUtils.MIUI_FOLDER_PREFFIX.length(),
folderName.length()); folderName.length());
folder.put(NoteColumns.SNIPPET, folderName); folder.put(NoteColumns.SNIPPET, folderName);
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT) if (folderName.equals(GTaskStringUtils.FOLDER_DEFAULT)
|| folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE)) || folderName.equals(GTaskStringUtils.FOLDER_CALL_NOTE))
@ -343,6 +381,7 @@ public class TaskList extends Node {
else else
folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER); folder.put(NoteColumns.TYPE, Notes.TYPE_FOLDER);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 将文件夹JSON对象放入根JSON对象中的头部注释字段中 // 将文件夹JSON对象放入根JSON对象中的头部注释字段中
js.put(GTaskStringUtils.META_HEAD_NOTE, folder); js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
@ -355,17 +394,23 @@ public class TaskList extends Node {
e.printStackTrace(); e.printStackTrace();
// 返回空值 // 返回空值
======= =======
=======
>>>>>>> liuyitao-branch
js.put(GTaskStringUtils.META_HEAD_NOTE, folder); js.put(GTaskStringUtils.META_HEAD_NOTE, folder);
return js; return js;
} catch (JSONException e) { } catch (JSONException e) {
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
return null; return null;
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
/* /*
* 获取同步操作类型 * 获取同步操作类型
@ -386,6 +431,8 @@ public class TaskList extends Node {
} else { } else {
// 验证gtask id // 验证gtask id
======= =======
=======
>>>>>>> liuyitao-branch
public int getSyncAction(Cursor c) { public int getSyncAction(Cursor c) {
try { try {
if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) { if (c.getInt(SqlNote.LOCAL_MODIFIED_COLUMN) == 0) {
@ -399,35 +446,48 @@ public class TaskList extends Node {
} }
} else { } else {
// validate gtask id // validate gtask id
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) { if (!c.getString(SqlNote.GTASK_ID_COLUMN).equals(getGid())) {
Log.e(TAG, "gtask id doesn't match"); Log.e(TAG, "gtask id doesn't match");
return SYNC_ACTION_ERROR; return SYNC_ACTION_ERROR;
} }
if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) { if (c.getLong(SqlNote.SYNC_ID_COLUMN) == getLastModified()) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 仅有本地修改 // 仅有本地修改
return SYNC_ACTION_UPDATE_REMOTE; return SYNC_ACTION_UPDATE_REMOTE;
} else { } else {
// 对于文件夹冲突，只应用本地修改 // 对于文件夹冲突，只应用本地修改
======= =======
=======
>>>>>>> liuyitao-branch
// local modification only // local modification only
return SYNC_ACTION_UPDATE_REMOTE; return SYNC_ACTION_UPDATE_REMOTE;
} else { } else {
// for folder conflicts, just apply local modification // for folder conflicts, just apply local modification
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
return SYNC_ACTION_UPDATE_REMOTE; return SYNC_ACTION_UPDATE_REMOTE;
} }
} }
} catch (Exception e) { } catch (Exception e) {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 打印异常信息 // 打印异常信息
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, e.toString()); Log.e(TAG, e.toString());
e.printStackTrace(); e.printStackTrace();
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 返回错误的同步操作类型 // 返回错误的同步操作类型
return SYNC_ACTION_ERROR; return SYNC_ACTION_ERROR;
@ -456,6 +516,8 @@ public class TaskList extends Node {
if (ret) { if (ret) {
// 设置子任务的前一个兄弟和父任务 // 设置子任务的前一个兄弟和父任务
======= =======
=======
>>>>>>> liuyitao-branch
return SYNC_ACTION_ERROR; return SYNC_ACTION_ERROR;
} }
@ -469,12 +531,16 @@ public class TaskList extends Node {
ret = mChildren.add(task); ret = mChildren.add(task);
if (ret) { if (ret) {
// need to set prior sibling and parent // need to set prior sibling and parent
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
task.setPriorSibling(mChildren.isEmpty() ? null : mChildren task.setPriorSibling(mChildren.isEmpty() ? null : mChildren
.get(mChildren.size() - 1)); .get(mChildren.size() - 1));
task.setParent(this); task.setParent(this);
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 返回是否成功添加子任务的信息 // 返回是否成功添加子任务的信息
return ret; return ret;
@ -491,16 +557,22 @@ public class TaskList extends Node {
if (index < 0 || index > mChildren.size()) { if (index < 0 || index > mChildren.size()) {
// 如果不合法，则记录日志，返回失败 // 如果不合法，则记录日志，返回失败
======= =======
=======
>>>>>>> liuyitao-branch
return ret; return ret;
} }
public boolean addChildTask(Task task, int index) { public boolean addChildTask(Task task, int index) {
if (index < 0 || index > mChildren.size()) { if (index < 0 || index > mChildren.size()) {
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Log.e(TAG, "add child task: invalid index"); Log.e(TAG, "add child task: invalid index");
return false; return false;
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 查找子任务是否已经在列表中 // 查找子任务是否已经在列表中
int pos = mChildren.indexOf(task); int pos = mChildren.indexOf(task);
@ -511,11 +583,16 @@ public class TaskList extends Node {
// 更新任务列表 // 更新任务列表
======= =======
=======
>>>>>>> liuyitao-branch
int pos = mChildren.indexOf(task); int pos = mChildren.indexOf(task);
if (task != null && pos == -1) { if (task != null && pos == -1) {
mChildren.add(index, task); mChildren.add(index, task);
// update the task list // update the task list
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
Task preTask = null; Task preTask = null;
Task afterTask = null; Task afterTask = null;
@ -524,15 +601,19 @@ public class TaskList extends Node {
if (index != mChildren.size() - 1) if (index != mChildren.size() - 1)
afterTask = mChildren.get(index + 1); afterTask = mChildren.get(index + 1);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 设置前一个兄弟和后一个兄弟 // 设置前一个兄弟和后一个兄弟
======= =======
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
task.setPriorSibling(preTask); task.setPriorSibling(preTask);
if (afterTask != null) if (afterTask != null)
afterTask.setPriorSibling(task); afterTask.setPriorSibling(task);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 返回是否成功添加子任务的信息 // 返回是否成功添加子任务的信息
return true; return true;
@ -582,6 +663,8 @@ public class TaskList extends Node {
int pos = mChildren.indexOf(task); // 查找子任务在列表中的位置 int pos = mChildren.indexOf(task); // 查找子任务在列表中的位置
// 如果子任务不在列表中，则记录日志，返回失败 // 如果子任务不在列表中，则记录日志，返回失败
======= =======
=======
>>>>>>> liuyitao-branch
return true; return true;
} }
@ -614,12 +697,16 @@ public class TaskList extends Node {
} }
int pos = mChildren.indexOf(task); int pos = mChildren.indexOf(task);
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
if (pos == -1) { if (pos == -1) {
Log.e(TAG, "move child task: the task should in the list"); Log.e(TAG, "move child task: the task should in the list");
return false; return false;
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 如果子任务本来就在目标位置上，则直接返回成功 // 如果子任务本来就在目标位置上，则直接返回成功
if (pos == index) if (pos == index)
@ -702,6 +789,8 @@ public class TaskList extends Node {
public int getIndex() { public int getIndex() {
return this.mIndex; // 返回索引位置 return this.mIndex; // 返回索引位置
======= =======
=======
>>>>>>> liuyitao-branch
if (pos == index) if (pos == index)
return true; return true;
return (removeChildTask(task) && addChildTask(task, index)); return (removeChildTask(task) && addChildTask(task, index));
@ -747,6 +836,9 @@ public class TaskList extends Node {
public int getIndex() { public int getIndex() {
return this.mIndex; return this.mIndex;
<<<<<<< HEAD
>>>>>>> liuyitao-branch
=======
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
} }
} }

6
src/Notes-master/local.properties
Unescape View File

@ -3,6 +3,7 @@
# #
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Thu Dec 21 01:09:02 CST 2023 #Thu Dec 21 01:09:02 CST 2023
@ -12,3 +13,8 @@ sdk.dir=C\:\\Users\\lenovo\\AppData\\Local\\Android\\Sdk
#Thu Nov 09 19:48:40 CST 2023 #Thu Nov 09 19:48:40 CST 2023
sdk.dir=D\:\\Android\\Sdk sdk.dir=D\:\\Android\\Sdk
>>>>>>> liuyitao-branch >>>>>>> liuyitao-branch
=======
#
#Thu Nov 09 19:48:40 CST 2023
sdk.dir=D\:\\Android\\Sdk
>>>>>>> liuyitao-branch

Write Preview
Loading…
Cancel
Save