From 1446cf7d54f0fc14da123ee47045242835d810e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=89=E7=A5=A5?= <1120863985@qq.com>
Date: Fri, 14 Apr 2023 14:34:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 101 +---
src/.idea/compiler.xml | 2 +-
src/.idea/deploymentTargetDropDown.xml | 6 +-
src/.idea/gradle.xml | 2 +-
src/.idea/misc.xml | 2 +-
src/.idea/modules.xml | 10 +-
.../net/micode/notes/gtask/data/MetaData.java | 44 +-
.../net/micode/notes/gtask/data/Node.java | 88 +++-
.../net/micode/notes/gtask/data/SqlData.java | 92 +++-
.../net/micode/notes/gtask/data/SqlNote.java | 217 +++++++--
.../net/micode/notes/gtask/data/Task.java | 107 +++--
.../net/micode/notes/gtask/data/TaskList.java | 251 +++++-----
.../exception/ActionFailureException.java | 7 +-
.../exception/NetworkFailureException.java | 7 +-
.../notes/gtask/remote/GTaskASyncTask.java | 72 +--
.../notes/gtask/remote/GTaskClient.java | 431 +++++++++++-------
src/local.properties | 7 +-
17 files changed, 942 insertions(+), 504 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 798f19a..15886a2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,84 +10,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -115,7 +66,7 @@
"RunOnceActivity.cidr.known.project.marker": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"cidr.known.project.marker": "true",
- "last_opened_file_path": "D:/softwareengineering/Notes-master",
+ "last_opened_file_path": "D:/TOUGE/gitProject",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
@@ -177,9 +128,7 @@
-
-
-
+
diff --git a/src/.idea/compiler.xml b/src/.idea/compiler.xml
index b589d56..fb7f4a8 100644
--- a/src/.idea/compiler.xml
+++ b/src/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/.idea/deploymentTargetDropDown.xml b/src/.idea/deploymentTargetDropDown.xml
index bbba2ed..d07e8ff 100644
--- a/src/.idea/deploymentTargetDropDown.xml
+++ b/src/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,15 @@
-
+
+<<<<<<< HEAD:src/.idea/deploymentTargetDropDown.xml
+=======
+
+>>>>>>> cyx_branch:.idea/deploymentTargetDropDown.xml
\ No newline at end of file
diff --git a/src/.idea/gradle.xml b/src/.idea/gradle.xml
index cbbe561..a0de2a1 100644
--- a/src/.idea/gradle.xml
+++ b/src/.idea/gradle.xml
@@ -7,7 +7,7 @@
-
+