version:1.6.1

fix:休息日管控完善
add:

app/build.gradle

@@ -1,22 +1,25 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 def appName() {
     return "SnInfo"
 }
 
 def releaseTime() {
-    return new Date().format("yyyyMMddHHmm", TimeZone.getDefault())
+    return new Date().format("yyyyMMdd", TimeZone.getDefault())
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.info.sn"
-        minSdkVersion 23
-        targetSdkVersion 28
-        versionCode 35
-        versionName "1.3.5"
+        minSdkVersion 24
+        targetSdkVersion 29
+        versionCode 61
+        versionName "1.6.1"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
@@ -29,7 +32,12 @@ android {
                 JPUSH_APPKEY : "edf9cec22731b8b2fed56ee6", //JPush 上注册的包名对应的 Appkey.
                 JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
         ]
-
+        buildConfigField "String", "SCREEN_URL", '"https://homework.uiuios.com:3018/wm/is_online"'
+        javaCompileOptions {
+            annotationProcessorOptions {
+                includeCompileClasspath true
+            }
+        }
     }
 
     compileOptions {
@@ -43,9 +51,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     lintOptions {
         checkReleaseBuilds false
     }
+
     //签名
     signingConfigs {
         zhanRui {
@@ -56,19 +66,23 @@ android {
             v1SigningEnabled true
             v2SigningEnabled true
         }
+
         debug {
             storeFile file("src/keys/xueshibaoos.jks")
             storePassword "123456"
             keyAlias "xueshibaoos"
             keyPassword "123456"
-            v2SigningEnabled false
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
+
         release {//  签名文件
             storeFile file("src/keys/xueshibaoos.jks")
             storePassword "123456"
             keyAlias "xueshibaoos"
             keyPassword "123456"
-            v2SigningEnabled false
+            v1SigningEnabled true
+            v2SigningEnabled true
         }
     }
 
@@ -77,6 +91,9 @@ android {
         zhanRuiRelease {
             buildConfigField "String", "platform", '"ZhanRui"'
             signingConfig signingConfigs.zhanRui
+            manifestPlaceholders = [
+                    AMAP_KEY: "8c4e1d478cb91e6b5713562bc424efba"
+            ]
         }
 
         zhanRuiDebug.initWith(debug)
@@ -85,6 +102,9 @@ android {
             buildConfigField "String", "platform", '"ZhanRui"'
             debuggable true
             signingConfig signingConfigs.zhanRui
+            manifestPlaceholders = [
+                    AMAP_KEY: "8c4e1d478cb91e6b5713562bc424efba"
+            ]
         }
 
         debug {
@@ -102,6 +122,9 @@ android {
                     }
                 }
             }
+            manifestPlaceholders = [
+                    AMAP_KEY: "83869aed8624eb00615c2b6d3d15d777"
+            ]
         }
 
         release {
@@ -124,27 +147,31 @@ android {
                     }
                 }
             }
+            manifestPlaceholders = [
+                    AMAP_KEY: "83869aed8624eb00615c2b6d3d15d777"
+            ]
         }
     }
+
     lintOptions {
         checkReleaseBuilds false
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false
     }
-
-
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+//    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     compileOnly files('src/main/libs/classes.jar')
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     //implementation 'com.android.support:multidex:1.0.3'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     //极光推送
     implementation 'cn.jiguang.sdk:jpush:3.8.6'  // 此处以JPush 3.8.6 版本为例。
@@ -152,7 +179,7 @@ dependencies {
     //动态权限框架
     implementation 'com.hjq:xxpermissions:6.0'
     //okhttp
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     //Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
@@ -160,23 +187,38 @@ dependencies {
     //RxJava
     implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    //声明周期管理
+    implementation 'com.trello.rxlifecycle2:rxlifecycle:2.2.2'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-android:2.2.2'
+    implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.2'
 
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.google.zxing:core:3.3.0'
 
-    implementation 'com.alibaba:fastjson:1.2.70'
+    implementation 'com.alibaba:fastjson:1.2.76'
 
     //implementation 'com.blankj:utilcode:1.26.0'
     implementation 'com.arialyy.aria:core:3.8.15'
-    annotationProcessor 'com.arialyy.aria:compiler:3.8.15'
+    kapt 'com.arialyy.aria:compiler:3.8.15'
 
     implementation "org.java-websocket:Java-WebSocket:1.4.1"
 
     //高德地图定位
     implementation 'com.amap.api:location:5.1.0'
     //屏幕适配方案
+    implementation 'com.blankj:utilcodex:1.30.6'
+    //autosize会改变第三方view的大小
     //https://github.com/JessYanCoding/AndroidAutoSize
-    implementation 'me.jessyan:autosize:1.2.1'
+    //implementation 'me.jessyan:autosize:1.2.1'
+    implementation 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar'
+
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+
+    implementation 'com.jakewharton:butterknife:10.2.1'
+//    If you are using Kotlin, replace annotationProcessor with kapt.
+//    annotationProcessor rootProject.ext.dependencies["butterknife-compiler"]
+    kapt 'com.jakewharton:butterknife-compiler:10.2.1'
 }
 
 preBuild {