Merge branch 'master' of C:\Users\wds81\StudioProjects\NavinfoOutDoorDataCollect with conflicts.

app/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.myapplication"
-        minSdkVersion 16
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"
@@ -52,19 +52,23 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
 
 
-    //retrofit+rxjava
+    //retrofit+rxJava
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     //转换器，请求结果转换成Model
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    //配合Rxjava 使用
+    //配合RxJava 使用
     implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    //EventBus
+    implementation 'org.greenrobot:eventbus:3.1.1'
 
-
+/*    //加载html
+    implementation 'com.github.sendtion:XRichText:1.9.4'*/
     //加载图片的依赖包
     implementation 'com.github.bumptech.glide:glide:4.8.0'
-
+    //弹窗  https://github.com/kongzue/DialogV3
+    implementation 'com.kongzue.dialog_v3x:dialog:3.2.4'
     //xRecyclerview下拉刷新控件
     implementation project(':xrecyclerview')