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

2021-05-28 18:48:31 +08:00
parent e5d85ac72f
commit 3ff0d534b8
22 changed files with 411 additions and 56 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ allprojects {
    repositories {
        google()
        jcenter()
+        maven { url 'https://jitpack.io' }
        maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
    }
 }