Merge pull request #641 from xiaoyaocz/dev

Release 1.7.7 / TV 1.2.4

Author: xiaoyaocz

.github/workflows/publish_app_dev.yaml

@@ -45,7 +45,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.x'
+          flutter-version: '3.27.x'
           cache: true 
 
       # 打开MAC Desktop支持
@@ -166,7 +166,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.22.x"
+          flutter-version: "3.27.x"
           cache: true
       # 安装依赖
       - name: Update apt-get
@@ -215,7 +215,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.22.x"
+          flutter-version: "3.27.x"
           cache: true
       - name: Enable Flutter Desktop
         run: flutter config --enable-windows-desktop

.github/workflows/publish_app_release.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.x'
+          flutter-version: '3.27.x'
           cache: true 
 
       # 打开MAC Desktop支持
@@ -159,7 +159,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.22.x"
+          flutter-version: "3.27.x"
           cache: true
       # 安装依赖
       - name: Update apt-get
@@ -230,7 +230,7 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.22.x"
+          flutter-version: "3.27.x"
           cache: true
       - name: Enable Flutter Desktop
         run: flutter config --enable-windows-desktop

.github/workflows/publish_tv_app_release.yaml

@@ -40,7 +40,7 @@ jobs:
       - name: Flutter action
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.x'
+          flutter-version: '3.27.x'
           cache: true
 
       #更新Flutter的packages

.gitignore

@@ -0,0 +1,2 @@
+simple_live_app/.vscode/settings.json
+simple_live_tv_app/.vscode/settings.json

assets/app_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "1.7.6",
-    "version_num": 10706,
-    "version_desc": "- 修复虎牙播放中断 #585",
+    "version": "1.7.7",
+    "version_num": 10707,
+    "version_desc": "- 1. 修复哔哩哔哩分类加载失败 #630\n- 2. 支持WebDAV同步 #617 @SlotSun\n- 3. 修复屏蔽词列表同步失败 #619 @SlotSun\n- 4. 修复虎牙断流 #585 @SlotSun",
     "prerelease":false,
     "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"
 }

assets/tv_app_version.json

@@ -1,7 +1,7 @@
 {
-    "version": "1.2.3",
-    "version_num": 10203,
-    "version_desc": "- 修复虎牙播放中断 #585",
+    "version": "1.2.4",
+    "version_num": 10204,
+    "version_desc": "- 修复哔哩哔哩分类加载失败\n- 支持原生播放器，播放更流畅 @bgylde #581",
     "prerelease":true,
     "download_url": "https://github.com/xiaoyaocz/dart_simple_live/releases"
 }

simple_live_app/.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.27.4"
+}

simple_live_app/.metadata

@@ -1,23 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-  channel: stable
+  revision: "d8a9f9a52e5af486f80d932e838ee93861ffd863"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-    - platform: linux
-      create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
-      base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8
+      create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863
+      base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863
+    - platform: android
+      create_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863
+      base_revision: d8a9f9a52e5af486f80d932e838ee93861ffd863
 
   # User provided section
 

simple_live_app/android/.gitignore

@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks

simple_live_app/android/app/build.gradle

@@ -1,64 +1,40 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
 android {
-    compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    namespace = "com.xycz.simple_live"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.xycz.simple_live"
+        applicationId = "com.xycz.simple_live"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
         multiDexEnabled true
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
-
     packagingOptions {
         pickFirst 'lib/**/libc++_shared.so'
     }
@@ -72,6 +48,7 @@ android {
            v2SigningEnabled true
        }
     }
+
     buildTypes {
         buildTypes {
             debug {
@@ -93,9 +70,5 @@ android {
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10"
+    source = "../.."
 }