Merge branch 'main' of https://bdgit.educoder.net/p5rgyhf38/zyh1_gitpractice into 111

Notes-master/app/build.gradle.kts

@@ -37,11 +37,16 @@ dependencies {
     implementation(libs.material)
     implementation(libs.activity)
     implementation(libs.constraintlayout)
-    implementation(fileTree(mapOf(
-        "dir" to "C:\\Users\\ASUS\\Desktop\\xiaomi1\\zyh1_gitpractice\\Notes-master\\httpcomponents-client-4.5.14-bin\\lib",
-        "include" to listOf("*.aar", "*.jar"),
-
-    )))
+    //    部分需要重新修改
+//    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("C:\\Users\\ASUS\\Desktop\\xiaomi1\\zyh1_gitpractice\\Notes-master\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("C:\\Users\\ASUS\\Desktop\\xiaomi1\\zyh1_gitpractice\\Notes-master\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("C:\\Users\\ASUS\\Desktop\\xiaomi1\\zyh1_gitpractice\\Notes-master\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
     androidTestImplementation(libs.espresso.core)