开源准备

SuyhanStudio · Nov 30, 2021 · 906cc32 · 906cc32
1 parent 67f0641
commit 906cc32
Show file tree

Hide file tree

Showing 7 changed files with 692 additions and 12 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/LICENSE b/LICENSE
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.sgpublic.aidescit"
         minSdkVersion 26
         targetSdkVersion 31
-        versionCode 210905
-        versionName "2.0.0 Build 12"
+        versionCode 210914
+        versionName "2.0.0 Build 13"
 
         renderscriptTargetApi 26
         renderscriptSupportModeEnabled true
@@ -84,10 +84,10 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0-alpha02'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/app/src/main/java/com/sgpublic/aidescit/helper/APIHelper.kt b/app/src/main/java/com/sgpublic/aidescit/helper/APIHelper.kt
@@ -151,10 +151,10 @@ class APIHelper(private val access: String, private val refresh: String) {
 
     private fun onReturn(url: String, argArray: Map<String, Any>? = null, method: Int = METHOD_POST, withSign: Boolean = true): Call {
         val client: OkHttpClient = OkHttpClient.Builder().run{
-            readTimeout(5, TimeUnit.SECONDS)
-            writeTimeout(5, TimeUnit.SECONDS)
+            readTimeout(10, TimeUnit.SECONDS)
+            writeTimeout(10, TimeUnit.SECONDS)
             connectTimeout(10, TimeUnit.SECONDS)
-            callTimeout(5, TimeUnit.MINUTES)
+            callTimeout(10, TimeUnit.MINUTES)
             followRedirects(false)
             followSslRedirects(false)
             build()

diff --git a/app/src/main/java/com/sgpublic/aidescit/manager/CacheManager.kt b/app/src/main/java/com/sgpublic/aidescit/manager/CacheManager.kt
@@ -21,7 +21,7 @@ class CacheManager (context: Context) {
         return this
     }
 
-    fun read(name: String): JSONObject?{
+    fun read(name: String): JSONObject? {
         return try {
             val cacheString = File(cacheDir, name).readText()
             JSONObject(cacheString)

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.30'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.1'
-        //noinspection DifferentKotlinGradleVersion
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong