Merge pull request #79 from GuoXiCheng/dev

add updateAPK

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
 env:
-  LATEST_VERSION: "1.4.1"
+  LATEST_VERSION: "1.4.2"
 
 jobs:
   build-and-deploy:

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdk 24
         targetSdk 32
         versionCode 1
-        versionName "1.4.1"
+        versionName "1.4.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/AndroidManifest.xml

@@ -2,9 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.android.skip">
-<!--    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />-->
+
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -16,6 +18,17 @@
         android:theme="@style/Theme.OneClick"
         android:networkSecurityConfig="@xml/network_security_config"
         tools:targetApi="31">
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="com.android.skip.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+
         <activity
             android:name="com.android.skip.MainActivity"
             android:exported="true"

app/src/main/java/com/android/skip/MainActivity.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.FileProvider
 import com.android.skip.dataclass.PackageInfo
 import com.android.skip.manager.*
 import com.android.skip.ui.theme.OneClickTheme
@@ -38,6 +39,7 @@ import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.yaml.snakeyaml.Yaml
+import java.io.File
 import java.util.*
 import kotlin.concurrent.thread
 
@@ -67,6 +69,9 @@ var isNeedUpdateAPK by mutableStateOf(false)
 // 最新版本号
 var latestVersionText by mutableStateOf("")
 
+// 立即更新
+var isUpdateAPKClicked by mutableStateOf(false)
+
 
 class MainActivity : ComponentActivity() {
 
@@ -190,7 +195,7 @@ class MainActivity : ComponentActivity() {
                     negativeText = "暂不更新",
                     positiveText = "立即更新"
                 ) {
-
+                    isUpdateAPKClicked = true
                 }
                 isNeedUpdateAPK = false
             }
@@ -222,11 +227,29 @@ class MainActivity : ComponentActivity() {
                         if (latestVersion != BuildConfig.VERSION_NAME.trim()) {
                             isNeedUpdateAPK = true
                             latestVersionText = latestVersion
+                        } else {
+                            ToastManager.showToast(this, "当前版本已是最新版")
                         }
 
                         isCheckUpdateBtnClicked = false
                     }
                 }
+                isUpdateAPKClicked -> {
+                    thread {
+                        HttpManager.downLoadNewAPK(latestVersionText, this)
+                        val latestVersionAPK = "SKIP-v$latestVersionText.apk"
+                        val apkFile = File(this.getExternalFilesDir(null), latestVersionAPK)
+                        println(apkFile.name)
+                        val apkUri = FileProvider.getUriForFile(this, this.applicationContext.packageName + ".provider", apkFile)
+
+                        val intent = Intent(Intent.ACTION_VIEW)
+                        intent.setDataAndType(apkUri, "application/vnd.android.package-archive")
+                        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_GRANT_READ_URI_PERMISSION
+                        this.startActivity(intent)
+
+                        isUpdateAPKClicked = false
+                    }
+                }
             }
 
         }

app/src/main/java/com/android/skip/manager/HttpManager.kt

@@ -1,9 +1,12 @@
 package com.android.skip.manager
 
+import android.content.Context
 import com.android.skip.BuildConfig
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import org.yaml.snakeyaml.Yaml
+import java.io.File
+import java.io.FileOutputStream
 
 object HttpManager {
     private const val BASE_URL = "https://guoxicheng.github.io/SKIP"
@@ -33,4 +36,19 @@ object HttpManager {
             BuildConfig.VERSION_NAME.trim()
         }
     }
+
+    fun downLoadNewAPK(latestVersion: String, context: Context) {
+        try {
+            val latestVersionAPK = "SKIP-v$latestVersion.apk"
+            val request = Request.Builder().url("$BASE_URL/$latestVersionAPK").build()
+            client.newCall(request).execute().use { response ->
+                val fos = FileOutputStream(File(context.getExternalFilesDir(null), latestVersionAPK))
+                fos.use {
+                    fos.write(response.body()?.bytes())
+                }
+            }
+        } catch (e: Exception) {
+            LogManager.i(e.toString())
+        }
+    }
 }

app/src/main/res/xml/file_paths.xml

@@ -0,0 +1,3 @@
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-files-path name="files" path="." />
+</paths>