解决冲突

app/build.gradle

@@ -20,19 +20,14 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    compileOptions {
-
-        sourceCompatibility JavaVersion.VERSION_1_8
-
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
+//    compileOptions {
+//        sourceCompatibility JavaVersion.VERSION_1_8
+//        targetCompatibility JavaVersion.VERSION_1_8
+//    }
 }
 
 
-
-    dependencies {
+dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
@@ -50,6 +45,7 @@ android {
     implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0'
 
 
+
     //网络框架
     implementation 'com.lzy.net:okgo:3.0.4'
     implementation 'com.google.code.gson:gson:2.8.5'
@@ -70,4 +66,5 @@ android {
 
     //xRecyclerview下拉刷新控件
     implementation project(':xrecyclerview')
+
 }