Merge branch 'qutian_Fang' into 'develop'

ziji wu

none

See merge request !5

.idea/gradle.xml

@@ -3,11 +3,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/mi" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>

.idea/libraries/Gradle__org_apache_http_legacy_android_28.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Gradle: org.apache.http.legacy-android-28">
     <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-28/optional/org.apache.http.legacy.jar!/" />
+      <root url="jar://G:/Android/Sdk/platforms/android-28/optional/org.apache.http.legacy.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

.idea/modules.xml

@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Notes-master.iml" filepath="$PROJECT_DIR$/Notes-master.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/mi/mi.iml" filepath="$PROJECT_DIR$/mi/mi.iml" />
     </modules>
   </component>
 </project>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

app/build.gradle

@@ -39,3 +39,4 @@ android {
 dependencies {
     implementation fileTree(dir: 'D:\\httpcomponents-client-4.5.5\\lib', include: ['*.aar', '*.jar'], exclude: [])
 }
+

app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml

@@ -36,7 +36,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,34 +1,4 @@
-#Mon Sep 16 11:26:19 CST 2019
-path.1=classes.dex
+#Mon Sep 30 18:48:09 CST 2019
+base.0=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
 path.0=classes.dex
-renamed.10=classes11.dex
-renamed.9=classes10.dex
-renamed.8=classes9.dex
-renamed.7=classes8.dex
-renamed.6=classes7.dex
-renamed.5=classes6.dex
-renamed.4=classes5.dex
-renamed.3=classes4.dex
-renamed.2=classes3.dex
-base.9=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\20
-renamed.1=classes2.dex
-base.8=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\19
 renamed.0=classes.dex
-base.7=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\18
-base.6=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\17
-base.5=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\16
-base.4=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\15
-base.3=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\14
-base.2=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\13
-base.1=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\12
-base.0=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\11
-base.10=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\21
-path.10=classes.dex
-path.9=classes.dex
-path.8=classes.dex
-path.7=classes.dex
-path.6=classes.dex
-path.5=classes.dex
-path.4=classes.dex
-path.3=classes.dex
-path.2=classes.dex

app/build/intermediates/incremental/packageDebug/tmp/debug/file-input-save-data.txt

@@ -1,47 +1,7 @@
 #Internal package file, do not edit.
-#Mon Sep 16 11:26:19 CST 2019
-4.path=classes.dex
-8.set=DEX
-6.path=classes.dex
+#Wed Sep 25 15:44:20 CST 2019
 0.baseType=DIRECTORY
-10.path=classes.dex
-5.baseType=DIRECTORY
-1.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\11
-8.path=classes.dex
-3.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\13
-4.set=DEX
-5.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\15
-7.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\19
-9.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\12
-1.baseType=DIRECTORY
-0.set=DEX
-6.baseType=DIRECTORY
-7.set=DEX
-3.set=DEX
-2.baseType=DIRECTORY
-10.baseType=DIRECTORY
-1.path=classes.dex
-7.baseType=DIRECTORY
-3.path=classes.dex
-10.set=DEX
-5.path=classes.dex
-0.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\14
-7.path=classes.dex
-9.path=classes.dex
-6.set=DEX
-2.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\16
-4.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\18
-3.baseType=DIRECTORY
-6.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\17
-10.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\20
-8.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\21
-2.set=DEX
-8.baseType=DIRECTORY
-9.set=DEX
-count=11
-4.baseType=DIRECTORY
-5.set=DEX
-9.baseType=DIRECTORY
+0.base=F\:\\Notes-master\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
 0.path=classes.dex
-1.set=DEX
-2.path=classes.dex
+0.set=DEX
+count=1

app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml

@@ -37,7 +37,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

@@ -36,7 +36,8 @@
     <application
         android:debuggable="true"
         android:icon="@drawable/icon_app"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:testOnly="true" >
         <activity
             android:name="net.micode.notes.ui.NotesListActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

app/build/intermediates/transforms/dexBuilder/debug/__content__.json

@@ -1 +1 @@
-[{"name":"slice_0","index":0,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_1","index":1,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_2","index":2,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_3","index":3,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_4","index":4,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_5","index":5,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_6","index":6,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_7","index":7,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_8","index":8,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"slice_9","index":9,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-0","index":10,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-1","index":11,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-2","index":12,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-3","index":13,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-4","index":14,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-5","index":15,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-6","index":16,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-7","index":17,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-8","index":18,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\incremental-runtime-classes\\debug\\instant-run.jar-9","index":19,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\instant_run_app_info_output_file\\debug\\generateDebugInstantRunAppInfo\\instant-run-bootstrap.jar-1","index":21,"scopes":["MAIN_SPLIT"],"types":["DEX_ARCHIVE"],"format":"JAR","present":true}]
+[{"name":"F:\\Notes-master\\app\\build\\intermediates\\javac\\debug\\compileDebugJavaWithJavac\\classes","index":0,"scopes":["PROJECT"],"types":["DEX_ARCHIVE"],"format":"DIRECTORY","present":true}]

app/build/intermediates/transforms/dexMerger/debug/__content__.json

@@ -1 +1 @@
-[{"name":"slice_0","index":0,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_1","index":1,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_2","index":2,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_3","index":3,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_4","index":4,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_5","index":5,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_6","index":6,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_7","index":7,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_8","index":8,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"slice_9","index":9,"scopes":["SUB_PROJECTS","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\externalLibsDexMerger\\debug\\0","index":10,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\10.jar","index":11,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\11.jar","index":12,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\12.jar","index":13,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\13.jar","index":14,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\14.jar","index":15,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\15.jar","index":16,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\16.jar","index":17,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\17.jar","index":18,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\18.jar","index":19,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\19.jar","index":20,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"F:\\Notes-master\\app\\build\\intermediates\\transforms\\dexBuilder\\debug\\21.jar","index":21,"scopes":["MAIN_SPLIT"],"types":["DEX"],"format":"DIRECTORY","present":true},{"name":"externalLibs","index":22,"scopes":["EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
+[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","MAIN_SPLIT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]

app/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,12 +1,12 @@
 -- Merging decision tree log ---
 manifest
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-148:12
 	package
 		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:19:5-31
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
@@ -21,215 +21,215 @@ INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:18:1-150:12
 		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:20:5-28
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
+uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-81
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:22-78
+uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:24:5-88
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:24:22-85
+uses-permission#android.permission.INTERNET
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:25:5-67
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:25:22-64
+uses-permission#android.permission.READ_CONTACTS
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:26:5-72
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:26:22-69
+uses-permission#android.permission.MANAGE_ACCOUNTS
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:27:5-74
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:27:22-71
+uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:28:5-80
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:28:22-77
+uses-permission#android.permission.GET_ACCOUNTS
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:29:5-71
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:29:22-68
+uses-permission#android.permission.USE_CREDENTIALS
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:30:5-74
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:30:22-71
+uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:31:5-81
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:31:22-78
+application
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:33:5-147:19
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:35:9-41
+	android:icon
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:34:9-42
+activity#net.micode.notes.ui.NotesListActivity
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:36:9-49:20
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:39:13-45
+	android:launchMode
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:40:13-43
+	android:windowSoftInputMode
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:43:13-52
+	android:uiOptions
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:42:13-57
+	android:configChanges
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:38:13-74
+	android:theme
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:37:13-49
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:45:13-48:29
+action#android.intent.action.MAIN
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:46:17-69
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:46:25-66
+category#android.intent.category.LAUNCHER
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:47:17-77
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:47:27-74
+activity#net.micode.notes.ui.NoteEditActivity
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:51:9-79:20
+	android:launchMode
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:54:13-43
+	android:configChanges
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:53:13-74
+	android:theme
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:55:13-45
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:52:13-48
+intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:57:13-62:29
+action#android.intent.action.VIEW
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:58:17-69
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:58:25-66
+category#android.intent.category.DEFAULT
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:59:17-76
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:59:27-73
+data
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:60:17-78
+	android:mimeType
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:60:23-75
+intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:64:13-69:29
+action#android.intent.action.INSERT_OR_EDIT
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:65:17-79
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:65:25-76
+intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:71:13-74:29
+action#android.intent.action.SEARCH
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:72:17-71
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:72:25-68
+meta-data#android.app.searchable
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:76:13-78:54
+	android:resource
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:78:17-51
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:77:17-54
+provider#net.micode.notes.data.NotesProvider
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:81:9-84:43
+	android:authorities
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:83:13-47
+	android:multiprocess
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:84:13-40
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:82:13-63
+receiver#net.micode.notes.widget.NoteWidgetProvider_2x
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:86:9-98:20
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:88:13-50
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:87:13-57
+intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:89:13-93:29
+action#android.appwidget.action.APPWIDGET_UPDATE
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:90:17-84
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:90:25-81
+action#android.appwidget.action.APPWIDGET_DELETED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:91:17-85
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:91:25-82
+action#android.intent.action.PRIVACY_MODE_CHANGED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:92:17-85
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:92:25-82
+meta-data#android.appwidget.provider
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:95:13-97:58
+	android:resource
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:97:17-55
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:96:17-58
+receiver#net.micode.notes.widget.NoteWidgetProvider_4x
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:99:9-112:20
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:101:13-50
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:100:13-57
+receiver#net.micode.notes.ui.AlarmInitReceiver
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:114:9-118:20
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:114:19-55
+intent-filter#action:name:android.intent.action.BOOT_COMPLETED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:115:13-117:29
+action#android.intent.action.BOOT_COMPLETED
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:116:17-79
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:116:25-76
+receiver#net.micode.notes.ui.AlarmReceiver
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:120:9-123:20
+	android:process
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:122:13-38
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:121:13-61
+activity#net.micode.notes.ui.AlarmAlertActivity
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:125:9-130:20
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:127:13-45
+	android:launchMode
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:128:13-48
+	android:theme
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:129:13-75
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:126:13-50
+activity#net.micode.notes.ui.NotesPreferenceActivity
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:132:9-137:20
+	android:label
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:134:13-54
+	android:launchMode
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:135:13-43
+	android:theme
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:136:13-60
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:133:13-71
+service#net.micode.notes.gtask.remote.GTaskSyncService
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:139:9-142:19
+	android:exported
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:141:13-37
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:140:13-74
+meta-data#android.app.default_searchable
+ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:144:9-146:52
+	android:value
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:146:13-49
+	android:name
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:145:13-58
 uses-sdk
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
-INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
+INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
 	android:targetSdkVersion
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:5-44
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
 	android:minSdkVersion
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:23:15-41
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
+		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml
 		INJECTED from F:\Notes-master\app\src\main\AndroidManifest.xml
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:25:5-81
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:25:22-78
-uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:26:5-88
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:26:22-85
-uses-permission#android.permission.INTERNET
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:27:5-67
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:27:22-64
-uses-permission#android.permission.READ_CONTACTS
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:28:5-72
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:28:22-69
-uses-permission#android.permission.MANAGE_ACCOUNTS
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:29:5-74
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:29:22-71
-uses-permission#android.permission.AUTHENTICATE_ACCOUNTS
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:30:5-80
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:30:22-77
-uses-permission#android.permission.GET_ACCOUNTS
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:31:5-71
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:31:22-68
-uses-permission#android.permission.USE_CREDENTIALS
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:32:5-74
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:32:22-71
-uses-permission#android.permission.RECEIVE_BOOT_COMPLETED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:33:5-81
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:33:22-78
-application
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:35:5-149:19
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:37:9-41
-	android:icon
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:36:9-42
-activity#net.micode.notes.ui.NotesListActivity
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:38:9-51:20
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:41:13-45
-	android:launchMode
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:42:13-43
-	android:windowSoftInputMode
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:45:13-52
-	android:uiOptions
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:44:13-57
-	android:configChanges
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:40:13-74
-	android:theme
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:43:13-45
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:39:13-49
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:47:13-50:29
-action#android.intent.action.MAIN
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:48:17-69
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:48:25-66
-category#android.intent.category.LAUNCHER
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:49:17-77
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:49:27-74
-activity#net.micode.notes.ui.NoteEditActivity
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:53:9-81:20
-	android:launchMode
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:56:13-43
-	android:configChanges
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:55:13-74
-	android:theme
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:57:13-45
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:54:13-48
-intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:59:13-64:29
-action#android.intent.action.VIEW
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:60:17-69
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:60:25-66
-category#android.intent.category.DEFAULT
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:61:17-76
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:61:27-73
-data
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:62:17-78
-	android:mimeType
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:62:23-75
-intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:66:13-71:29
-action#android.intent.action.INSERT_OR_EDIT
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:67:17-79
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:67:25-76
-intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:73:13-76:29
-action#android.intent.action.SEARCH
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:74:17-71
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:74:25-68
-meta-data#android.app.searchable
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:78:13-80:54
-	android:resource
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:80:17-51
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:79:17-54
-provider#net.micode.notes.data.NotesProvider
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:83:9-86:43
-	android:authorities
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:85:13-47
-	android:multiprocess
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:86:13-40
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:84:13-63
-receiver#net.micode.notes.widget.NoteWidgetProvider_2x
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:88:9-100:20
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:90:13-50
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:89:13-57
-intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:91:13-95:29
-action#android.appwidget.action.APPWIDGET_UPDATE
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:92:17-84
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:92:25-81
-action#android.appwidget.action.APPWIDGET_DELETED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:93:17-85
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:93:25-82
-action#android.intent.action.PRIVACY_MODE_CHANGED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:94:17-85
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:94:25-82
-meta-data#android.appwidget.provider
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:97:13-99:58
-	android:resource
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:99:17-55
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:98:17-58
-receiver#net.micode.notes.widget.NoteWidgetProvider_4x
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:101:9-114:20
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:103:13-50
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:102:13-57
-receiver#net.micode.notes.ui.AlarmInitReceiver
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:116:9-120:20
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:116:19-55
-intent-filter#action:name:android.intent.action.BOOT_COMPLETED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:117:13-119:29
-action#android.intent.action.BOOT_COMPLETED
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:118:17-79
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:118:25-76
-receiver#net.micode.notes.ui.AlarmReceiver
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:122:9-125:20
-	android:process
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:124:13-38
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:123:13-61
-activity#net.micode.notes.ui.AlarmAlertActivity
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:127:9-132:20
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:129:13-45
-	android:launchMode
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:130:13-48
-	android:theme
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:131:13-75
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:128:13-50
-activity#net.micode.notes.ui.NotesPreferenceActivity
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:134:9-139:20
-	android:label
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:136:13-54
-	android:launchMode
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:137:13-43
-	android:theme
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:138:13-60
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:135:13-71
-service#net.micode.notes.gtask.remote.GTaskSyncService
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:141:9-144:19
-	android:exported
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:143:13-37
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:142:13-74
-meta-data#android.app.default_searchable
-ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:146:9-148:52
-	android:value
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:148:13-49
-	android:name
-		ADDED from F:\Notes-master\app\src\main\AndroidManifest.xml:147:13-58

app/src/main/java/net/micode/notes/data/Contact.java

@@ -24,7 +24,9 @@ import android.telephony.PhoneNumberUtils;
 import android.util.Log;
 
 import java.util.HashMap;
-
+/*
+联系人数据库
+ */
 public class Contact {
     private static HashMap<String, String> sContactCache;
     private static final String TAG = "Contact";

app/src/main/java/net/micode/notes/data/Notes.java

@@ -17,6 +17,9 @@
 package net.micode.notes.data;
 
 import android.net.Uri;
+/*
+便签数据库
+ */
 public class Notes {
     public static final String AUTHORITY = "micode_notes";
     public static final String TAG = "Notes";

app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java

@@ -26,7 +26,9 @@ import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.DataConstants;
 import net.micode.notes.data.Notes.NoteColumns;
 
-
+/*
+便签数据库帮助类
+ */
 public class NotesDatabaseHelper extends SQLiteOpenHelper {
     private static final String DB_NAME = "note.db";
 

app/src/main/java/net/micode/notes/data/NotesProvider.java

@@ -34,7 +34,9 @@ import net.micode.notes.data.Notes.DataColumns;
 import net.micode.notes.data.Notes.NoteColumns;
 import net.micode.notes.data.NotesDatabaseHelper.TABLE;
 
-
+/*
+便签信息提供类
+ */
 public class NotesProvider extends ContentProvider {
     private static final UriMatcher mMatcher;
 

app/src/main/java/net/micode/notes/gtask/data/MetaData.java

@@ -25,7 +25,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 /*
-为小米便签
+关于同步任务的元数据
  */
 public class MetaData extends Task {
     private final static String TAG = MetaData.class.getSimpleName();
@@ -34,11 +34,14 @@ public class MetaData extends Task {
 
     public void setMeta(String gid, JSONObject metaInfo) {
         try {
+            //put中第一个元素在tool包中
             metaInfo.put(GTaskStringUtils.META_HEAD_GTASK_ID, gid);
         } catch (JSONException e) {
             Log.e(TAG, "failed to put related gid");
         }
+        //建立便签
         setNotes(metaInfo.toString());
+        //函数中的元素依然在tool包中,设置便签名
         setName(GTaskStringUtils.META_NOTE_NAME);
     }
 
@@ -52,10 +55,12 @@ public class MetaData extends Task {
     }
 
     @Override
+
     public void setContentByRemoteJSON(JSONObject js) {
         super.setContentByRemoteJSON(js);
         if (getNotes() != null) {
             try {
+                //将trim()去掉两端无意义字符后的字符串转化为JSON格式
                 JSONObject metaInfo = new JSONObject(getNotes().trim());
                 mRelatedGid = metaInfo.getString(GTaskStringUtils.META_HEAD_GTASK_ID);
             } catch (JSONException e) {
@@ -64,7 +69,7 @@ public class MetaData extends Task {
             }
         }
     }
-
+    //以下三个函数表示不能在这里调用只能在Task类中调用
     @Override
     public void setContentByLocalJSON(JSONObject js) {
         // this function should not be called

app/src/main/java/net/micode/notes/gtask/data/Node.java

@@ -21,6 +21,7 @@ import android.database.Cursor;
 import org.json.JSONObject;
 
 public abstract class Node {
+    //定义结点的属性变量
     public static final int SYNC_ACTION_NONE = 0;
 
     public static final int SYNC_ACTION_ADD_REMOTE = 1;
@@ -47,6 +48,7 @@ public abstract class Node {
 
     private boolean mDeleted;
 
+    //构造Node
     public Node() {
         mGid = null;
         mName = "";
@@ -57,15 +59,15 @@ public abstract class Node {
     public abstract JSONObject getCreateAction(int actionId);
 
     public abstract JSONObject getUpdateAction(int actionId);
-
+    //通过远程JSON设置内容
     public abstract void setContentByRemoteJSON(JSONObject js);
-
+    //通过本地JSON设置内容
     public abstract void setContentByLocalJSON(JSONObject js);
-
+    //从内容获得本地JSON
     public abstract JSONObject getLocalJSONFromContent();
-
+    //获得同步动作
     public abstract int getSyncAction(Cursor c);
-
+    //下面是一系列初始化
     public void setGid(String gid) {
         this.mGid = gid;
     }

app/src/main/java/net/micode/notes/gtask/data/SqlData.java

@@ -34,7 +34,9 @@ import net.micode.notes.gtask.exception.ActionFailureException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-
+/*
+同步任务基本数据
+ */
 public class SqlData {
     private static final String TAG = SqlData.class.getSimpleName();
 
@@ -44,6 +46,7 @@ public class SqlData {
             DataColumns.ID, DataColumns.MIME_TYPE, DataColumns.CONTENT, DataColumns.DATA1,
             DataColumns.DATA3
     };
+    //数据库参数
 
     public static final int DATA_ID_COLUMN = 0;
 
@@ -70,7 +73,7 @@ public class SqlData {
     private String mDataContentData3;
 
     private ContentValues mDiffDataValues;
-
+    //构造函数两种
     public SqlData(Context context) {
         mContentResolver = context.getContentResolver();
         mIsCreate = true;
@@ -88,7 +91,7 @@ public class SqlData {
         loadFromCursor(c);
         mDiffDataValues = new ContentValues();
     }
-
+    //根据cursor确定属性参数
     private void loadFromCursor(Cursor c) {
         mDataId = c.getLong(DATA_ID_COLUMN);
         mDataMimeType = c.getString(DATA_MIME_TYPE_COLUMN);
@@ -96,7 +99,7 @@ public class SqlData {
         mDataContentData1 = c.getLong(DATA_CONTENT_DATA_1_COLUMN);
         mDataContentData3 = c.getString(DATA_CONTENT_DATA_3_COLUMN);
     }
-
+    //根据JSON的内容设置属性
     public void setContent(JSONObject js) throws JSONException {
         long dataId = js.has(DataColumns.ID) ? js.getLong(DataColumns.ID) : INVALID_ID;
         if (mIsCreate || mDataId != dataId) {
@@ -129,7 +132,7 @@ public class SqlData {
         }
         mDataContentData3 = dataContentData3;
     }
-
+    //利用JSON获取内容属性
     public JSONObject getContent() throws JSONException {
         if (mIsCreate) {
             Log.e(TAG, "it seems that we haven't created this in database yet");
@@ -143,7 +146,7 @@ public class SqlData {
         js.put(DataColumns.DATA3, mDataContentData3);
         return js;
     }
-
+    //传入noteid为建立便签准备
     public void commit(long noteId, boolean validateVersion, long version) {
 
         if (mIsCreate) {

app/src/main/java/net/micode/notes/gtask/data/SqlNote.java

@@ -51,7 +51,7 @@ public class SqlNote {
             NoteColumns.LOCAL_MODIFIED, NoteColumns.ORIGIN_PARENT_ID, NoteColumns.GTASK_ID,
             NoteColumns.VERSION
     };
-
+    //一系列参数......
     public static final int ID_COLUMN = 0;
 
     public static final int ALERTED_DATE_COLUMN = 1;
@@ -121,7 +121,7 @@ public class SqlNote {
     private ContentValues mDiffNoteValues;
 
     private ArrayList<SqlData> mDataList;
-
+    //三类构造函数
     public SqlNote(Context context) {
         mContext = context;
         mContentResolver = context.getContentResolver();
@@ -165,7 +165,7 @@ public class SqlNote {
         mDiffNoteValues = new ContentValues();
 
     }
-
+    //递归查询符合的id
     private void loadFromCursor(long id) {
         Cursor c = null;
         try {
@@ -184,7 +184,7 @@ public class SqlNote {
                 c.close();
         }
     }
-
+    //利用cursor设置属性参数
     private void loadFromCursor(Cursor c) {
         mId = c.getLong(ID_COLUMN);
         mAlertDate = c.getLong(ALERTED_DATE_COLUMN);
@@ -199,7 +199,7 @@ public class SqlNote {
         mWidgetType = c.getInt(WIDGET_TYPE_COLUMN);
         mVersion = c.getLong(VERSION_COLUMN);
     }
-
+    //根据数据库查询id
     private void loadDataContent() {
         Cursor c = null;
         mDataList.clear();
@@ -225,7 +225,7 @@ public class SqlNote {
                 c.close();
         }
     }
-
+    //根据JSON的内容设置属性参数
     public boolean setContent(JSONObject js) {
         try {
             JSONObject note = js.getJSONObject(GTaskStringUtils.META_HEAD_NOTE);
@@ -358,7 +358,7 @@ public class SqlNote {
         }
         return true;
     }
-
+    //小米便签获取内容
     public JSONObject getContent() {
         try {
             JSONObject js = new JSONObject();
@@ -411,7 +411,7 @@ public class SqlNote {
         mParentId = id;
         mDiffNoteValues.put(NoteColumns.PARENT_ID, id);
     }
-
+    //设置同步任务ID
     public void setGtaskId(String gid) {
         mDiffNoteValues.put(NoteColumns.GTASK_ID, gid);
     }
@@ -494,7 +494,7 @@ public class SqlNote {
             }
         }
 
-        // refresh local info
+        // refresh local infof
         loadFromCursor(mId);
         if (mType == Notes.TYPE_NOTE)
             loadDataContent();

app/src/main/java/net/micode/notes/gtask/data/Task.java

@@ -53,7 +53,7 @@ public class Task extends Node {
         mParent = null;
         mMetaInfo = null;
     }
-
+    //获得创造的动作
     public JSONObject getCreateAction(int actionId) {
         JSONObject js = new JSONObject();
 
@@ -102,7 +102,7 @@ public class Task extends Node {
 
         return js;
     }
-
+    //获得更新的动作
     public JSONObject getUpdateAction(int actionId) {
         JSONObject js = new JSONObject();
 
@@ -134,7 +134,7 @@ public class Task extends Node {
 
         return js;
     }
-
+    //通过远程JSON设置内容
     public void setContentByRemoteJSON(JSONObject js) {
         if (js != null) {
             try {
@@ -174,7 +174,7 @@ public class Task extends Node {
             }
         }
     }
-
+    //通过本地JSON设置内容
     public void setContentByLocalJSON(JSONObject js) {
         if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)
                 || !js.has(GTaskStringUtils.META_HEAD_DATA)) {

app/src/main/java/net/micode/notes/gtask/data/TaskList.java

@@ -102,7 +102,7 @@ public class TaskList extends Node {
 
         return js;
     }
-
+    //通过远程JSON设置内容
     public void setContentByRemoteJSON(JSONObject js) {
         if (js != null) {
             try {
@@ -128,7 +128,7 @@ public class TaskList extends Node {
             }
         }
     }
-
+    //通过本地JSON设置内容(在Node中有涉及)
     public void setContentByLocalJSON(JSONObject js) {
         if (js == null || !js.has(GTaskStringUtils.META_HEAD_NOTE)) {
             Log.w(TAG, "setContentByLocalJSON: nothing is avaiable");
@@ -215,11 +215,11 @@ public class TaskList extends Node {
 
         return SYNC_ACTION_ERROR;
     }
-
+    //获得子任务数量
     public int getChildTaskCount() {
         return mChildren.size();
     }
-
+    //添加子任务
     public boolean addChildTask(Task task) {
         boolean ret = false;
         if (task != null && !mChildren.contains(task)) {
@@ -233,7 +233,7 @@ public class TaskList extends Node {
         }
         return ret;
     }
-
+    //通过索引添加子任务
     public boolean addChildTask(Task task, int index) {
         if (index < 0 || index > mChildren.size()) {
             Log.e(TAG, "add child task: invalid index");
@@ -259,7 +259,7 @@ public class TaskList extends Node {
 
         return true;
     }
-
+    //移除子任务
     public boolean removeChildTask(Task task) {
         boolean ret = false;
         int index = mChildren.indexOf(task);
@@ -280,7 +280,7 @@ public class TaskList extends Node {
         }
         return ret;
     }
-
+    //移动子任务
     public boolean moveChildTask(Task task, int index) {
 
         if (index < 0 || index >= mChildren.size()) {
@@ -298,7 +298,7 @@ public class TaskList extends Node {
             return true;
         return (removeChildTask(task) && addChildTask(task, index));
     }
-
+    //通过Gid找到子任务
     public Task findChildTaskByGid(String gid) {
         for (int i = 0; i < mChildren.size(); i++) {
             Task t = mChildren.get(i);
@@ -308,7 +308,7 @@ public class TaskList extends Node {
         }
         return null;
     }
-
+    //获得子任务的索引
     public int getChildTaskIndex(Task task) {
         return mChildren.indexOf(task);
     }
@@ -320,7 +320,7 @@ public class TaskList extends Node {
         }
         return mChildren.get(index);
     }
-
+    //通过Gid获取子任务
     public Task getChilTaskByGid(String gid) {
         for (Task task : mChildren) {
             if (task.getGid().equals(gid))

app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java

@@ -15,7 +15,9 @@
  */
 
 package net.micode.notes.gtask.exception;
-
+/*
+动作失败异常
+ */
 public class ActionFailureException extends RuntimeException {
     private static final long serialVersionUID = 4425249765923293627L;
 

app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java

@@ -15,7 +15,9 @@
  */
 
 package net.micode.notes.gtask.exception;
-
+/*
+网络失败异常
+ */
 public class NetworkFailureException extends Exception {
     private static final long serialVersionUID = 2107610287180234136L;
 

app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java

@@ -28,7 +28,9 @@ import net.micode.notes.R;
 import net.micode.notes.ui.NotesListActivity;
 import net.micode.notes.ui.NotesPreferenceActivity;
 
-
+/*
+Gtask异步任务
+ */
 public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
 
     private static int GTASK_SYNC_NOTIFICATION_ID = 5234235;

app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java

@@ -60,7 +60,10 @@ import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
-
+/*
+Gtask客户端类，提供登录Google账户，创建任务和任务列表
+添加和删除节点，提交、重置更新，获取任务列表等功能
+ */
 public class GTaskClient {
     private static final String TAG = GTaskClient.class.getSimpleName();
 

app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java

@@ -47,7 +47,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 
-
+/*
+Gtask管理者类，提供初始化任务列表，同步便签内容和文件夹
+添加、更新本地和远端节点，更新本地同步任务ID等功能
+ */
 public class GTaskManager {
     private static final String TAG = GTaskManager.class.getSimpleName();
 

app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java

@@ -22,7 +22,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.IBinder;
-
+/*
+Gtask同步服务
+ */
 public class GTaskSyncService extends Service {
     public final static String ACTION_STRING_NAME = "sync_action_type";
 

local.properties

@@ -2,6 +2,7 @@
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
-#
-#Wed Sep 04 23:57:44 CST 2019
-sdk.dir=C\:\\Users\\dsj6789\\AppData\\Local\\Android\\Sdk
+# For customization when using a Version Control System, please read the
+# header note.
+#Wed Sep 25 15:17:41 CST 2019
+sdk.dir=G\:\\Android\\Sdk

settings.gradle

@@ -1 +1 @@
-include ':app'
+include ':app', ':mi'