Merge remote-tracking branch 'origin/master'

DanteAndroid · Feb 12, 2019 · f99b464 · f99b464
1 parent 181f71c
commit f99b464
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'realm-android'
 apply plugin: 'com.bugtags.library.plugin'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.dante.diary"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 51
+        targetSdkVersion 27
+        versionCode 52
         versionName "2.1"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -53,6 +53,7 @@ android {
         exclude 'META-INF/NOTICE.txt'
     }
 
+
 //    flavorDimensions "default"
 //    productFlavors {
 //        yingyongbao {
@@ -65,7 +66,7 @@ android {
 }
 
 ext {
-    supportVersion = "28.0.0"
+    supportVersion = "27.1.1"
 }
 
 bugtags {
@@ -76,34 +77,32 @@ bugtags {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.github.XunMengWinter:CircularAnim:0.3.4'
+    implementation'com.github.XunMengWinter:CircularAnim:0.3.4'
     //============== common ==============
     implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar'
     implementation 'moe.feng:AlipayZeroSdk:1.1'
     implementation 'com.github.jaychang0917:SimpleText:1.2.1'
     implementation 'com.bugtags.library:bugtags-lib:2.3.1'
     implementation 'com.github.bumptech.glide:glide:3.8.0'
     implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'com.blankj:utilcode:1.3.6'
     implementation 'com.hwangjr.proguard:proguardconfig:1.0.1@aar'
-    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.44'
+    implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.34'
     implementation 'com.yqritc:recyclerview-flexibledivider:1.4.0'
     implementation 'com.hendraanggrian:collapsingtoolbarlayout-subtitle:27.0.1'
     implementation 'com.ncapdevi:frag-nav:1.4.0'
-    implementation 'com.roughike:bottom-bar:2.3.1'
+    implementation 'com.roughike:bottom-bar:2.1.1'
     implementation 'org.greenrobot:eventbus:3.1.1'
 
     //============== Rxjava ==============
     implementation 'com.artemzin.rxjava:proguard-rules:1.3.3.0'
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'com.squareup.retrofit2:adapter-rxjava:2.4.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
     //============== custom ==============
-    implementation "com.android.support:support-vector-drawable:$supportVersion"
     implementation 'uk.co.samuelwall:material-tap-target-prompt:2.1.0'
     implementation 'com.github.deano2390:FlowTextView:2.0.5'
     implementation 'com.github.stfalcon:chatkit:0.2.1'
@@ -115,8 +114,8 @@ dependencies {
     implementation 'io.github.yavski:fab-speed-dial:1.0.6'
     implementation 'com.classic.common:multiple-status-view:1.2'
     implementation 'jp.wasabeef:glide-transformations:2.0.1'
-    implementation 'cn.leancloud.android:avoscloud-sdk:v4.7.9'
-    implementation('cn.leancloud.android:avoscloud-push:v4.7.9@aar') { transitive = true }
+    implementation 'cn.leancloud.android:avoscloud-sdk:v4.6.4'
+    implementation('cn.leancloud.android:avoscloud-push:v4.6.4@aar') { transitive = true }
 // 推送与实时聊天需要的包
 
     //============== official ==============
@@ -125,11 +124,13 @@ dependencies {
     implementation "com.android.support:support-v4:$supportVersion"
     implementation "com.android.support:cardview-v7:$supportVersion"
     implementation "com.android.support:recyclerview-v7:$supportVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
 
     //============== debug ==============
 //    implementation 'cn.jiguang.sdk:jpush:3.0.3'
 //    implementation 'cn.jiguang.sdk:jcore:1.1.1'
+    implementation "com.android.support:support-vector-drawable:$supportVersion"
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 //    releaseimplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
     //    debugimplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,8 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
 
     <application
         android:name=".base.App"