From 248ca0a14765b03743da28b837ff7d14e4eb9bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=85=E5=B0=94=E4=BF=8A?= <waixingfeitixia@163.com>
Date: Thu, 22 Jan 2026 08:09:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Notesmaster/.idea/vcs.xml                 |  1 +
 src/Notesmaster/app/.project                  | 28 +++++++++++++++++
 src/Notesmaster/app/build.gradle.kts          | 31 +++++++++++--------
 .../app/src/main/AndroidManifest.xml          | 16 ++++++----
 4 files changed, 57 insertions(+), 19 deletions(-)
 create mode 100644 src/Notesmaster/app/.project

diff --git a/src/Notesmaster/.idea/vcs.xml b/src/Notesmaster/.idea/vcs.xml
index 94a25f7..fdf1fc8 100644
--- a/src/Notesmaster/.idea/vcs.xml
+++ b/src/Notesmaster/.idea/vcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Notesmaster/app/.project b/src/Notesmaster/app/.project
new file mode 100644
index 0000000..4b50465
--- /dev/null
+++ b/src/Notesmaster/app/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1769005612568</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/src/Notesmaster/app/build.gradle.kts b/src/Notesmaster/app/build.gradle.kts
index 29cdd19..8f118ed 100644
--- a/src/Notesmaster/app/build.gradle.kts
+++ b/src/Notesmaster/app/build.gradle.kts
@@ -44,22 +44,27 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.constraintlayout)
-    
+
     // RecyclerView依赖
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.cursoradapter:cursoradapter:1.0.0")
-    
-    //    部分需要重新修改
-//    implementation(fileTree(mapOf(
-//        "dir" to "D:\\Code\\AndroidCode\\Notesmaster\\httpcomponents-client-4.5.14-bin\\lib",
-//        "include" to listOf("*.aar", "*.jar"),
-//        "exclude" to listOf("")
-//    )))
-    //修改为如下代码：
-    implementation(files("D:\\college\\studying\\studying\\2025.09\\SE\\android\\client\\lib\\httpclient-osgi-4.5.14.jar"))
-    implementation(files("D:\\college\\studying\\studying\\2025.09\\SE\\android\\client\\lib\\httpclient-win-4.5.14.jar"))
-    implementation(files("D:\\college\\studying\\studying\\2025.09\\SE\\android\\client\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
-}
\ No newline at end of file
+}
+
+// ==================== 条件编译配置 ====================
+// 暂时禁用Google Tasks同步功能，保留代码为未来开发准备
+//
+// gtask包说明：
+// - gtask包中包含Google Tasks同步相关代码
+// - 依赖Apache HttpClient 4.5.14库（已移除）
+// - AndroidManifest.xml中已注释GTaskSyncService
+//
+// 未来若需启用同步功能，请执行以下步骤：
+// 1. 重命名或删除gtask包（重命名为gtask.disabled避免编译）
+// 2. 在dependencies块中添加以下依赖（替换路径为实际路径）：
+//    implementation(files("<your_path>/httpclient-osgi-4.5.14.jar"))
+//    implementation(files("<your_path>/httpclient-win-4.5.14.jar"))
+//    implementation(files("<your_path>/httpcore-4.4.16.jar"))
+// 3. 在AndroidManifest.xml中取消注释GTaskSyncService（第85-90行）
diff --git a/src/Notesmaster/app/src/main/AndroidManifest.xml b/src/Notesmaster/app/src/main/AndroidManifest.xml
index dd4774c..34b32a4 100644
--- a/src/Notesmaster/app/src/main/AndroidManifest.xml
+++ b/src/Notesmaster/app/src/main/AndroidManifest.xml
@@ -182,12 +182,16 @@
             android:windowSoftInputMode="stateVisible|adjustResize">
         </activity>
 
-        <!-- ==================== 同步服务 ==================== -->
-        <!-- Google任务同步服务，用于与Google Tasks同步数据 -->
-        <service
-            android:name="net.micode.notes.gtask.remote.GTaskSyncService"
-            android:exported="false" >
-        </service>
+         <!-- ==================== 同步服务 ==================== -->
+         <!-- Google任务同步服务，用于与Google Tasks同步数据 -->
+         <!-- 暂时禁用同步功能，为未来云同步开发暂留代码 -->
+         <!-- 若需启用，请在build.gradle.kts中移除sourceSets.exclude("**/gtask/**")并添加Apache HttpClient依赖 -->
+         <!--
+         <service
+             android:name="net.micode.notes.gtask.remote.GTaskSyncService"
+             android:exported="false" >
+         </service>
+         -->
 
         <!-- ==================== 搜索元数据 ==================== -->
         <!-- 指定默认的搜索活动为NoteEditActivity -->