From 4cc62124bd3890186b18be5a9041e544bf38f446 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, 15 Jan 2026 20:40:02 +0800
Subject: [PATCH] update

---
 src/.idea/.gitignore                      |  3 ---
 src/.idea/misc.xml                        |  6 ------
 src/.idea/modules.xml                     |  8 --------
 src/.idea/vcs.xml                         |  7 -------
 src/Notesmaster/.idea/vcs.xml             |  1 +
 src/Notesmaster/README.md                 |  2 --
 src/Notesmaster/app/build.gradle.kts      | 14 ++++----------
 src/Notesmaster/gradle/libs.versions.toml |  2 +-
 8 files changed, 6 insertions(+), 37 deletions(-)
 delete mode 100644 src/.idea/.gitignore
 delete mode 100644 src/.idea/misc.xml
 delete mode 100644 src/.idea/modules.xml
 delete mode 100644 src/.idea/vcs.xml
 delete mode 100644 src/Notesmaster/README.md

diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/src/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml
deleted file mode 100644
index 1945ce5..0000000
--- a/src/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml
deleted file mode 100644
index a8bd67d..0000000
--- a/src/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/git.iml" filepath="$PROJECT_DIR$/git.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
deleted file mode 100644
index 5fcf6b7..0000000
--- a/src/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Notesmaster" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
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/README.md b/src/Notesmaster/README.md
deleted file mode 100644
index e35f67a..0000000
--- a/src/Notesmaster/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-小米便签阅读学习
-
diff --git a/src/Notesmaster/app/build.gradle.kts b/src/Notesmaster/app/build.gradle.kts
index 232c48a..a87bc6d 100644
--- a/src/Notesmaster/app/build.gradle.kts
+++ b/src/Notesmaster/app/build.gradle.kts
@@ -45,16 +45,10 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.constraintlayout)
-    //    部分需要重新修改
-//    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"))
+
+    implementation(files("D:\\ke\\software_enginering\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("D:\\ke\\software_enginering\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("D:\\ke\\software_enginering\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)
diff --git a/src/Notesmaster/gradle/libs.versions.toml b/src/Notesmaster/gradle/libs.versions.toml
index 65c3dc2..91e0cd5 100644
--- a/src/Notesmaster/gradle/libs.versions.toml
+++ b/src/Notesmaster/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.1"
+agp = "8.12.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"