Branch_master
周治峰 3 years ago
parent c8829e97d5
commit edc2a816ae

@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0b8d77b1-831e-411e-9c03-3e50453873f4" name="Default Changelist" comment="" />
<list default="true" id="0b8d77b1-831e-411e-9c03-3e50453873f4" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/build/classes/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DefaultGradleProjectSettings">
<option name="testRunner" value="GRADLE" />
<option name="delegatedBuild" value="true" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
@ -35,8 +43,15 @@
<file pinned="false" current-in-tab="true">
<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="550">
<caret line="85" column="25" selection-start-line="85" selection-start-column="25" selection-end-line="85" selection-end-column="25" />
<state relative-caret-position="430">
<caret line="101" column="40" lean-forward="true" selection-start-line="101" selection-start-column="40" selection-end-line="101" selection-end-column="40" />
<folding>
<element signature="e#3511#3512#0" expanded="true" />
<element signature="e#3581#3582#0" expanded="true" />
<element signature="e#3616#3617#0" expanded="true" />
<element signature="e#3672#3673#0" expanded="true" />
<element signature="e#3775#3776#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -100,6 +115,16 @@
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/src/main/java/net/micode/notes/model/Note.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1912" />
<option name="y" value="-8" />
@ -108,13 +133,99 @@
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="PackagesPane" proportions="" version="1">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="net" type="462c0819:PsiDirectoryNode" />
<item name="micode" type="462c0819:PsiDirectoryNode" />
<item name="notes" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Notes-master" type="b2602c69:ProjectViewProjectNode" />
<item name="Notes-master" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="res" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -138,15 +249,120 @@
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="0b8d77b1-831e-411e-9c03-3e50453873f4" name="Default Changelist" comment="" />
<created>1683251455719</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1683251455719</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1048" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Designer" />
<window_info active="true" content_ui="combo" id="Project" visible="true" weight="0.2109375" />
<window_info id="Structure" side_tool="true" />
<window_info id="Image Layers" />
<window_info id="Capture Tool" />
<window_info id="Resources Explorer" />
<window_info id="Favorites" side_tool="true" />
<window_info id="Captures" order="0" weight="0.25" />
<window_info anchor="bottom" id="Build" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="TODO" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Build" order="0" weight="0.32977587" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="right" id="Gradle" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" id="Palette&#9;" />
</layout>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/data/Contact.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#2637#0" 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="725">
<caret line="43" selection-start-line="43" selection-end-line="43" />
<folding>
<element signature="e#0#8921#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/MetaData.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#2518#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/Node.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="18" column="7" selection-start-line="18" selection-start-column="7" selection-end-line="18" selection-end-column="7" />
<folding>
<element signature="e#0#2496#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/net/micode/notes/gtask/data/SqlData.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#6896#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>
<folding>
<element signature="e#0#14666#0" expanded="true" />
</folding>
</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>
<folding>
<element signature="e#0#12291#0" expanded="true" />
</folding>
</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="430">
<caret line="101" column="40" lean-forward="true" selection-start-line="101" selection-start-column="40" selection-end-line="101" selection-end-column="40" />
<folding>
<element signature="e#3511#3512#0" expanded="true" />
<element signature="e#3581#3582#0" expanded="true" />
<element signature="e#3616#3617#0" expanded="true" />
<element signature="e#3672#3673#0" expanded="true" />
<element signature="e#3775#3776#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">

@ -82,29 +82,29 @@ public class Note {
}
public void setNoteValue(String key, String value) {
mNoteDiffValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
mNoteDiffValues.put(key, value); // 将key,value存储在mNoteDiffValues中
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1); // 标记本地被修改过
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis()); // 标记最近修改时间为当前系统时间
}
public void setTextData(String key, String value) {
mNoteData.setTextData(key, value);
mNoteData.setTextData(key, value); // 设置文本数据即将key和value存储到mNoteData中
}
public void setTextDataId(long id) {
mNoteData.setTextDataId(id);
mNoteData.setTextDataId(id); // 为文本数据设置ID方便在后续的操作中进行对应
}
public long getTextDataId() {
return mNoteData.mTextDataId;
return mNoteData.mTextDataId; // 获取文本数据ID
}
public void setCallDataId(long id) {
mNoteData.setCallDataId(id);
mNoteData.setCallDataId(id); // 存储该Note的电话数据ID
}
public void setCallData(String key, String value) {
mNoteData.setCallData(key, value);
mNoteData.setCallData(key, value); // 存储电话相关数据即将key和value存储到mNoteData中
}
public boolean isLocalModified() {

Loading…
Cancel
Save