ziji wu comment

This commit is contained in:
ziji Wu 2019-09-12 09:27:10 +08:00
parent 08b2573d76
commit bfd46b4614
6 changed files with 154 additions and 140 deletions

View File

@ -6,25 +6,13 @@
</shared> </shared>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment=""> <list default="true" id="c8515555-ebbc-49d5-889b-0c59bd6c3b6d" name="默认更改列表" comment="ziji wu comment">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/data/Contact.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note$NoteData.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/Note.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/transforms/dexBuilder/debug/0/net/micode/notes/model/WorkingNote.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/outputs/apk/debug/app-debug.apk" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -35,7 +23,7 @@
<component name="DefaultGradleProjectSettings"> <component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" /> <option name="isMigrated" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_15" /> <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_24" />
<component name="ExternalProjectsManager"> <component name="ExternalProjectsManager">
<system id="GRADLE"> <system id="GRADLE">
<state> <state>
@ -46,60 +34,63 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_note_edit.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
<provider editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="android-designer2" /> <state relative-caret-position="322">
</entry> <caret line="52" column="17" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
</file> <folding>
<file pinned="false" current-in-tab="false"> <element signature="imports" expanded="true" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_record_folder.xml"> </folding>
<provider editor-type-id="text-editor" /> </state>
<provider selected="true" editor-type-id="android-designer2" /> </provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_edit.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list_dropdown.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/color/primary_text_dark.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/color/secondary_text_dark.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/bg_color_btn_mask.png">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/edit_title_blue.9.png">
<provider editor-type-id="images" />
<provider selected="true" editor-type-id="ninepatcheditor" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
<provider editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<provider selected="true" editor-type-id="android-designer2" /> <state relative-caret-position="408">
<caret line="263" column="18" lean-forward="true" selection-start-line="263" selection-start-column="18" selection-end-line="263" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="48" column="28" selection-start-line="48" selection-start-column="28" selection-end-line="48" selection-end-column="28" />
<folding>
<element signature="e#2949#2950#0" expanded="true" />
<element signature="e#2998#2999#0" expanded="true" />
<element signature="e#3040#3041#0" expanded="true" />
<element signature="e#3083#3084#0" expanded="true" />
<element signature="e#3118#3119#0" expanded="true" />
<element signature="e#3162#3163#0" expanded="true" />
<element signature="e#3204#3205#0" expanded="true" />
<element signature="e#3247#3248#0" expanded="true" />
<element signature="e#3304#3305#0" expanded="true" />
<element signature="e#3353#3354#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-132">
<caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
</state>
</provider>
</entry> </entry>
</file> </file>
</leaf> </leaf>
@ -108,6 +99,7 @@
<findStrings> <findStrings>
<find>WrongNoteID</find> <find>WrongNoteID</find>
<find>e.printStackTrace();</find> <find>e.printStackTrace();</find>
<find>TextNote</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>WRONGNOTEID</replace> <replace>WRONGNOTEID</replace>
@ -132,7 +124,9 @@
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" /> <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" /> <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java" /> <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java" />
<option value="$PROJECT_DIR$/app/src/main/res/xml/widget_4x_info.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" /> <option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java" />
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java" />
</list> </list>
</option> </option>
</component> </component>
@ -149,7 +143,6 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="AndroidView"> <pane id="AndroidView">
<subPane> <subPane>
<expand> <expand>
@ -243,12 +236,13 @@
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane" /> <pane id="ProjectPane" />
<pane id="PackagesPane" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_15" /> <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_15" />
<property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2019-09-11T09:54:58.901Z" /> <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2019-09-12T00:37:20.288Z" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" /> <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
<property name="android.sdk.path" value="D:/Android_SDK/SDK" /> <property name="android.sdk.path" value="D:/Android_SDK/SDK" />
@ -395,9 +389,10 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="878" extended-state="6" /> <frame x="-7" y="-7" width="1550" height="878" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.18967828" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.1842448" />
<window_info id="设计器" order="2" /> <window_info id="设计器" order="2" />
<window_info id="Resources Explorer" order="3" weight="0.3297587" /> <window_info id="Resources Explorer" order="3" weight="0.3297587" />
<window_info id="Structure" order="4" side_tool="true" /> <window_info id="Structure" order="4" side_tool="true" />
@ -405,24 +400,24 @@
<window_info id="Image Layers" order="6" /> <window_info id="Image Layers" order="6" />
<window_info id="Capture Tool" order="7" /> <window_info id="Capture Tool" order="7" />
<window_info id="Favorites" order="8" side_tool="true" /> <window_info id="Favorites" order="8" side_tool="true" />
<window_info anchor="bottom" id="Messages" weight="0.3297587" />
<window_info anchor="bottom" id="Run" order="0" weight="0.3297587" /> <window_info anchor="bottom" id="Run" order="0" weight="0.3297587" />
<window_info anchor="bottom" id="SonarLint" order="1" weight="0.3297587" /> <window_info anchor="bottom" id="SonarLint" order="1" weight="0.3297587" />
<window_info anchor="bottom" id="Logcat" order="2" /> <window_info anchor="bottom" id="Logcat" order="2" />
<window_info anchor="bottom" id="TODO" order="3" weight="0.3297587" /> <window_info anchor="bottom" id="TODO" order="3" weight="0.3297587" />
<window_info anchor="bottom" id="Android Profiler" order="4" /> <window_info anchor="bottom" id="Android Profiler" order="4" show_stripe_button="false" />
<window_info anchor="bottom" id="Find" order="5" weight="0.3297587" /> <window_info anchor="bottom" id="Find" order="5" weight="0.3297587" />
<window_info anchor="bottom" id="Debug" order="6" /> <window_info anchor="bottom" id="Debug" order="6" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.3297587" /> <window_info anchor="bottom" id="Terminal" order="7" weight="0.3297587" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" weight="0.3294271" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.3297587" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.3297587" />
<window_info anchor="bottom" id="Build" order="10" weight="0.32931727" /> <window_info anchor="bottom" id="Build" order="10" weight="0.32931727" />
<window_info anchor="right" id="Preview" weight="0.3297587" /> <window_info anchor="bottom" id="Messages" order="11" weight="0.3297587" />
<window_info anchor="right" id="Gradle" order="0" /> <window_info anchor="right" id="Gradle" order="0" />
<window_info anchor="right" id="Device File Explorer" order="1" side_tool="true" /> <window_info anchor="right" id="Device File Explorer" order="1" side_tool="true" />
<window_info anchor="right" id="Theme Preview" order="2" /> <window_info anchor="right" id="Theme Preview" order="2" />
<window_info anchor="right" id="Capture Analysis" order="3" /> <window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="right" id="Palette&#9;" order="4" /> <window_info anchor="right" id="Palette&#9;" order="4" />
<window_info anchor="right" id="Preview" order="5" weight="0.3294271" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
@ -485,25 +480,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-140">
<caret line="180" column="12" selection-start-line="180" selection-start-column="12" selection-end-line="180" selection-end-column="12" />
<folding>
<element signature="e#2949#2950#0" expanded="true" />
<element signature="e#2998#2999#0" expanded="true" />
<element signature="e#3040#3041#0" expanded="true" />
<element signature="e#3083#3084#0" expanded="true" />
<element signature="e#3118#3119#0" expanded="true" />
<element signature="e#3162#3163#0" expanded="true" />
<element signature="e#3204#3205#0" expanded="true" />
<element signature="e#3247#3248#0" expanded="true" />
<element signature="e#3304#3305#0" expanded="true" />
<element signature="e#3353#3354#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/tool/BackupUtils.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5620"> <state relative-caret-position="5620">
@ -511,13 +487,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1408">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/WorkingNote.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="431"> <state relative-caret-position="431">
@ -525,36 +494,9 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="68" column="50" lean-forward="true" selection-start-line="68" selection-start-column="50" selection-end-line="68" selection-end-column="50" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-147">
<caret line="243" column="56" lean-forward="true" selection-start-line="243" selection-start-column="56" selection-end-line="243" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<caret line="49" column="24" selection-start-line="49" selection-start-column="24" selection-end-line="49" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/widget_2x_info.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/preferences.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
@ -565,25 +507,25 @@
<entry file="file://$PROJECT_DIR$/app/src/main/res/raw-zh-rCN/introduction"> <entry file="file://$PROJECT_DIR$/app/src/main/res/raw-zh-rCN/introduction">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_note_edit.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_record_folder.xml">
<provider editor-type-id="text-editor" /> <provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_edit.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_edit.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_record_folder.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/call_note_edit.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list_dropdown.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/note_list_dropdown.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/color/primary_text_dark.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/color/primary_text_dark.xml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
@ -599,8 +541,68 @@
<provider selected="true" editor-type-id="ninepatcheditor" /> <provider selected="true" editor-type-id="ninepatcheditor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/sub_folder.xml">
<provider editor-type-id="text-editor" />
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/widget_2x_info.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/xml/widget_4x_info.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="20">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-132">
<caret line="44" column="38" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="48" column="28" selection-start-line="48" selection-start-column="28" selection-end-line="48" selection-end-column="28" />
<folding>
<element signature="e#2949#2950#0" expanded="true" />
<element signature="e#2998#2999#0" expanded="true" />
<element signature="e#3040#3041#0" expanded="true" />
<element signature="e#3083#3084#0" expanded="true" />
<element signature="e#3118#3119#0" expanded="true" />
<element signature="e#3162#3163#0" expanded="true" />
<element signature="e#3204#3205#0" expanded="true" />
<element signature="e#3247#3248#0" expanded="true" />
<element signature="e#3304#3305#0" expanded="true" />
<element signature="e#3353#3354#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140">
<caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
<caret line="52" column="17" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Notes.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="263" column="18" lean-forward="true" selection-start-line="263" selection-start-column="18" selection-end-line="263" selection-end-column="18" />
</state>
</provider>
</entry> </entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">

View File

@ -52,7 +52,6 @@ public class Contact {
if(sContactCache.containsKey(phoneNumber)) { if(sContactCache.containsKey(phoneNumber)) {
return sContactCache.get(phoneNumber); return sContactCache.get(phoneNumber);
} }
//todo:不符合但入口但出口原则
String selection = CALLER_ID_SELECTION.replace("+", String selection = CALLER_ID_SELECTION.replace("+",
PhoneNumberUtils.toCallerIDMinMatch(phoneNumber)); PhoneNumberUtils.toCallerIDMinMatch(phoneNumber));

View File

@ -20,6 +20,7 @@ import android.net.Uri;
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";
//todo:参数含义
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;
@ -54,13 +55,19 @@ public class Notes {
/** /**
* Uri to query all notes and folders * Uri to query all notes and folders
*/ */
//获取便签存放位置的URI,用于查找notes和folders
public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note"); public static final Uri CONTENT_NOTE_URI = Uri.parse("content://" + AUTHORITY + "/note");
/** /**
* Uri to query data * Uri to query data
*/ */
//获取数据存放位置URI用于查找数据
public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data"); public static final Uri CONTENT_DATA_URI = Uri.parse("content://" + AUTHORITY + "/data");
/**
*该类声明了一系列关于便签的final变量没有定义方法
*/
public interface NoteColumns { public interface NoteColumns {
/** /**
* The unique ID for a row * The unique ID for a row
@ -167,6 +174,9 @@ public class Notes {
public static final String VERSION = "version"; public static final String VERSION = "version";
} }
/*
* 该类声明了一系列关于数据的final变量没有定义方法
* */
public interface DataColumns { public interface DataColumns {
/** /**
* The unique ID for a row * The unique ID for a row
@ -241,12 +251,15 @@ public class Notes {
public static final String DATA5 = "data5"; public static final String DATA5 = "data5";
} }
/*
* 该类是对接口DataColumns的实现没有声明方法
* */
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>
*/ */
public static final String MODE = DATA1; public static final String MODE = DATA1;//DATA1-DataColumns中声明
public static final int MODE_CHECK_LIST = 1; public static final int MODE_CHECK_LIST = 1;