pb7rqtu85
/
notes
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Wiki Activity

更新1

Browse Source
Branch_master
周治峰 2 years ago
parent edc2a816ae
commit b8f3b3b778
8 changed files with 95 additions and 172 deletions
Show Stats Download Patch File Download Diff File

BIN
Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

4
Notes-master/.gradle/buildOutputCleanup/cache.properties
Unescape View File

@ -1,2 +1,2 @@
#Wed Apr 12 08:36:10 CST 2023
gradle.version=7.5
#Thu May 18 23:20:09 CST 2023
gradle.version=7.4

BIN
Notes-master/.gradle/buildOutputCleanup/outputFiles.bin
View File

Binary file not shown.

8
Notes-master/.idea/gradle.xml
Unescape View File

@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="resolveModulePerSourceSet" value="false" />
<option name="testRunner" value="PLATFORM" />
<option name="gradleHome" value="$PROJECT_DIR$/../../../../gradle-7.4-bin/gradle-7.4" />
<option name="gradleJvm" value="1.8" />
</GradleProjectSettings>
</option>
</component>

3
Notes-master/.idea/misc.xml
Unescape View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

12
Notes-master/.idea/runConfigurations.xml
Unescape View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>

197
Notes-master/.idea/workspace.xml
Unescape View File

@ -1,120 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="0b8d77b1-831e-411e-9c03-3e50453873f4" name="Default Changelist" comment="">
<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/cache.properties" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/runConfigurations.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<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">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<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="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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</file>
<file pinned="false" current-in-tab="false">
<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>
</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>
<folding>
<element signature="e#0#14666#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/NotesProvider.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#12291#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
@ -126,18 +30,18 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1912" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1048" />
<option name="x" value="240" />
<option name="y" value="125" />
<option name="width" value="1440" />
<option name="height" value="765" />
</component>
<component name="ProjectId" id="2PyHWgT1stRKJvwfyvESfmX3A2O" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -226,25 +130,24 @@
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="android.sdk.path" value="D:/Android_Studio_SDK/Android_sdk" />
<property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.cidr.known.project.marker": "true",
"android.gradle.sync.needed": "true",
"cidr.known.project.marker": "true",
"last_opened_file_path": "D:/MI1/notes/notes/Notes-master",
"settings.editor.selected.configurable": "http.proxy",
"show.do.not.copy.http.proxy.settings.to.gradle": "true"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="SvnConfiguration">
<configuration />
</component>
@ -259,26 +162,25 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="1912" y="-8" width="1936" height="1048" extended-state="6" />
<editor active="true" />
<frame x="-7" y="-7" width="1550" height="830" extended-state="6" />
<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="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;" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2109375" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Image Layers" order="3" />
<window_info id="Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Resources Explorer" order="6" />
<window_info id="Favorites" order="7" side_tool="true" />
<window_info active="true" anchor="bottom" id="Build" order="0" visible="true" weight="0.32916668" />
<window_info anchor="bottom" id="Version Control" order="1" />
<window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Terminal" order="3" />
<window_info anchor="bottom" id="Event Log" order="4" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="0" />
<window_info anchor="right" id="Gradle" order="1" />
<window_info anchor="right" id="Theme Preview" order="2" />
<window_info anchor="right" id="Palette&#9;" order="3" />
</layout>
</component>
<component name="editorHistoryManager">
@ -350,13 +252,14 @@
</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" />
<state relative-caret-position="217">
<caret line="160" column="7" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<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#3714#3715#0" expanded="true" />
<element signature="e#3775#3776#0" expanded="true" />
</folding>
</state>

43
Notes-master/app/src/main/java/net/micode/notes/model/Note.java
Unescape View File

@ -107,15 +107,24 @@ public class Note {
mNoteData.setCallData(key, value); // 存储电话相关数据，即将key和value存储到mNoteData中
}
public boolean isLocalModified() {
public boolean isLocalModified() { //判断当前笔记是否被本地修改过
return mNoteDiffValues.size() > 0 || mNoteData.isLocalModified();
}
/**
* 同步笔记数据到云端方法
*
* @param context 上下文对象
* @param noteId 笔记ID
* @return 如果笔记数据同步成功，则返回true；否则返回false
*/
public boolean syncNote(Context context, long noteId) {
// 检查笔记ID的合法性
if (noteId <= 0) {
throw new IllegalArgumentException("Wrong note id:" + noteId);
}
// 如果本地未做修改，则直接返回true
if (!isLocalModified()) {
return true;
}
@ -125,44 +134,63 @@ public class Note {
* {@link NoteColumns#MODIFIED_DATE}. For data safety, though update note fails, we also update the
* note data info
*/
// 使用ContentResolver更新本地笔记数据
if (context.getContentResolver().update(
ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, noteId), mNoteDiffValues, null,
null) == 0) {
// 如果更新操作失败，则记录一条错误日志
Log.e(TAG, "Update note error, should not happen");
// Do not return, fall through
// 无论更新是否成功，都清除笔记差异数据对象mNoteDiffValues中的数据
// 这样做是为了确保下次同步操作不会再次上传已经同步的数据
}
mNoteDiffValues.clear();
// 如果笔记数据有本地修改，则将修改后的数据上传到云端
if (mNoteData.isLocalModified()
&& (mNoteData.pushIntoContentResolver(context, noteId) == null)) {
// 如果上传失败，则返回false
return false;
}
// 如果笔记数据同步成功，则返回true
return true;
}
/**
* 笔记数据类，用于存储笔记的文本内容和通话记录数据
*/
private class NoteData {
// 文本内容在ContentProvider中的ID
private long mTextDataId;
// 文本内容的键值对的集合
private ContentValues mTextDataValues;
// 通话记录在ContentProvider中的ID。
private long mCallDataId;
// 通话记录的键值对的集合。
private ContentValues mCallDataValues;
// 日志标签
private static final String TAG = "NoteData";
/**
* 构造函数，用于初始化成员变量
*/
public NoteData() {
mTextDataValues = new ContentValues();
mCallDataValues = new ContentValues();
mTextDataId = 0;
mCallDataId = 0;
mTextDataValues = new ContentValues(); // 存储笔记文本数据的键值对
mCallDataValues = new ContentValues(); // 存储笔记电话数据的键值对
mTextDataId = 0; // 记录笔记文本数据在数据库中的ID
mCallDataId = 0; // 记录笔记电话数据在数据库中的ID
}
// 判断笔记是否已被本地修改过
boolean isLocalModified() {
return mTextDataValues.size() > 0 || mCallDataValues.size() > 0;
}
// 设置笔记文本数据在数据库中的ID
void setTextDataId(long id) {
if(id <= 0) {
throw new IllegalArgumentException("Text data id should larger than 0");
@ -170,6 +198,7 @@ public class Note {
mTextDataId = id;
}
// 设置笔记电话数据在数据库中的ID
void setCallDataId(long id) {
if (id <= 0) {
throw new IllegalArgumentException("Call data id should larger than 0");
@ -177,12 +206,14 @@ public class Note {
mCallDataId = id;
}
// 修改笔记电话数据
void setCallData(String key, String value) {
mCallDataValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);
mNoteDiffValues.put(NoteColumns.MODIFIED_DATE, System.currentTimeMillis());
}
// 修改笔记文本数据
void setTextData(String key, String value) {
mTextDataValues.put(key, value);
mNoteDiffValues.put(NoteColumns.LOCAL_MODIFIED, 1);

Write Preview
Loading…
Cancel
Save