m

androidExampleDemo/app/build.gradle

@@ -1,4 +1,5 @@
 plugins {
+<<<<<<< HEAD
     id 'com.android.application'
 }
 
@@ -9,6 +10,19 @@ android {
     defaultConfig {
         applicationId "com.example.agentclient"
         minSdk 24
+=======
+    alias(libs.plugins.android.application)
+    id 'dagger.hilt.android.plugin'
+}
+
+android {
+    namespace 'com.example.demo'
+    compileSdk 34
+
+    defaultConfig {
+        applicationId "com.example.demo"
+        minSdk 26
+>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684
         targetSdk 34
         versionCode 1
         versionName "1.0"
@@ -22,6 +36,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+<<<<<<< HEAD
     
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -30,10 +45,16 @@ android {
     
     buildFeatures {
         viewBinding true
+=======
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684
     }
 }
 
 dependencies {
+<<<<<<< HEAD
     // Android Core
     implementation 'androidx.core:core:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
@@ -56,3 +77,37 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
+=======
+    // 基础Android库
+    implementation libs.appcompat
+    implementation libs.material
+    
+    // 生命周期和ViewModel
+    implementation libs.lifecycle.viewmodel
+    implementation libs.lifecycle.livedata
+    
+    // Room数据库
+    implementation libs.room.runtime
+    annotationProcessor libs.room.compiler
+    
+    // 网络库
+    implementation libs.retrofit
+    implementation libs.retrofit.gson
+    implementation libs.okhttp.logging
+    
+    // 依赖注入
+    implementation libs.hilt.android
+    annotationProcessor libs.hilt.compiler
+    
+    // 工作管理器
+    implementation libs.work.runtime
+    
+    // 蓝牙库
+    implementation libs.ble
+    
+    // 测试库
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
+}
+>>>>>>> 7c5f94d47066e9f9fb4cd23e74fe34d53d326684