Chore: Sync Upstream, Bump To 2.0.9.2 , And resolve conflicts

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.41.6"
+  "flutter": "3.44.4"
 }

.github/ISSUE_TEMPLATE/bug-反馈.yml

@@ -11,18 +11,18 @@ body:
       options:
         - label: 搜索了 [历史 issue](https://github.com/FRBLanApps/PiliSuper/issues?q=is%3Aissue) ，并未发现相同问题
           required: true
-        - label: 搜索了 [上游的历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同问题
+        - label: 搜索了 [上游的历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，404 not found
           required: true
         - label: 正在使用最新版本。
           required: true
         - label: 已排除网络问题
           required: true
+        - label: 我并没有详细看这些选项，我只是机械化的选了这些，请关闭本issue。
+          required: false
         - label: 已排除账号问题
           required: true
         - label: 已排除设置问题
           required: true
-        - label: 我并没有详细看这些选项，我只是机械化的选了这些，请关闭本issue。
-          required: false
 
   - type: checkboxes
     id: assign

.github/ISSUE_TEMPLATE/功能请求.yml

@@ -11,14 +11,15 @@ body:
       options:
         - label: 搜索了 [历史 issue](https://github.com/FRBLanApps/PiliSuper/issues?q=is%3Aissue) ，并未发现相同功能请求
           required: true
-        - label: 搜索了 [上游的历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同功能请求
+        - label: 搜索了 [上游的历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，404 not found
           required: true
         - label: 正在使用最新版本。
           required: true
-        - label: 设置中未搜索到该功能
-          required: true
         - label: 我并没有详细看这些选项，我只是机械化的选了这些，请关闭本issue。
           required: false
+        - label: 设置中未搜索到该功能
+          required: true
+
 
   - type: checkboxes
     id: assign

.github/workflows/build.yml

@@ -26,6 +26,10 @@ on:
         description: "Build Android"
         default: true
         type: boolean
+      build_android_dev:
+        description: "Build Android Dev version"
+        default: true
+        type: boolean
       build_ios:
         description: "Build iOS"
         default: true
@@ -77,7 +81,7 @@ jobs:
         run: |
             dart pub global activate rename
 
-      - name: Build
+      - name: Build Release
         env:
           KEYSTORE_B64: ${{ secrets.SIGN_KEYSTORE_BASE64 }}
           KEY_ALIAS:    ${{ secrets.KEY_ALIAS }}
@@ -115,13 +119,45 @@ jobs:
             "${SIGN_ARGS[@]}" \
             "${NAME_ARGS[@]}" \
 
+      - name: Build Dev
+        env:
+          KEYSTORE_B64: ${{ secrets.SIGN_KEYSTORE_BASE64 }}
+          KEY_ALIAS:    ${{ secrets.KEY_ALIAS }}
+          KEY_PASS:     ${{ secrets.KEY_PASSWORD }}
+          STORE_PASS:   ${{ secrets.KEYSTORE_PASSWORD }}
+        if: ${{ github.event_name == 'pull_request' || inputs.build_android_dev == true }}
+        run: |
+          SIGN_ARGS=()
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" && -n "$KEYSTORE_B64" ]]; then
+            SIGN_ARGS+=(
+              --sign
+              --keystore-base64 "$KEYSTORE_B64"
+              --key-alias       "$KEY_ALIAS"
+              --key-password    "$KEY_PASS"
+              --store-password  "$STORE_PASS"
+              --clean-keys
+            )
+          fi
+
+          python3 build.py android \
+            --output-prefix PiliSuper \
+            --output dist \
+            --dev \
+            --skip_rename \
+            --no-patches \
+            --no-pub-get \
+            "${SIGN_ARGS[@]}" \
+
       - name: Release
         if: ${{ inputs.tag != '' }}
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ inputs.tag }}
           name:     ${{ inputs.tag }}
-          files:    dist/PiliSuper_android_*.apk
+          files: |
+            dist/PiliSuper_android_*_arm64-v8a.apk
+            dist/PiliSuper_android_*_armeabi-v7a.apk
+            dist/PiliSuper_android_*_x86_64.apk
 
       - uses: actions/upload-artifact@v7
         with:
@@ -140,6 +176,24 @@ jobs:
           name: Android_x86_64
           path: dist/PiliSuper_android_*_x86_64.apk
           archive: false
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Android_arm64-v8a
+          path: dist/PiliSuper_android_*_arm64-v8a_dev.apk
+          archive: false
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Android_armeabi-v7a
+          path: dist/PiliSuper_android_*_armeabi-v7a_dev.apk
+          archive: false
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: Android_x86_64
+          path: dist/PiliSuper_android_*_x86_64_dev.apk
+          archive: false
 
   # ───────────── iOS ─────────────
   ios:

.gitignore

@@ -5,10 +5,13 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
+Package.resolved
 
 # IntelliJ related
 *.iml
@@ -146,4 +149,4 @@ pili_release.json
 
 dist
 
-test*.dart
+test*

README.md

@@ -31,6 +31,10 @@
 直接在关于那里找导入/导出登录信息/设置即可。
 产生的文本既适用于本项目，也适用于上游的PiliPlus。
 
+## 致歉
+
+抱歉各位用户，近两个月团队成员都在忙于中考高考与竞赛等人生大事，无暇顾及本软件的开发工作，对此，我们深表歉意，我们将会在未来给大家带来更好的功能更新，敬请期待。
+
 ## 适配平台
 
 - [x] Android

analysis_options.yaml

@@ -12,7 +12,6 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - lib/grpc/bilibili/**
-    # - lib/grpc/google/**
     # - lib/common/widgets/flutter/**
 
 formatter:

android/app/build.gradle.kts

@@ -3,11 +3,20 @@ import org.jetbrains.kotlin.konan.properties.Properties
 
 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")
 }
 
+val agpMajorVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    .substringBefore('.')
+    .toInt()
+val builtInKotlinProperty = providers.gradleProperty("android.builtInKotlin").orNull
+val isBuiltInKotlinEnabled = agpMajorVersion >= 9 &&
+        (builtInKotlinProperty == null || builtInKotlinProperty.toBoolean())
+if (!isBuiltInKotlinEnabled) {
+    apply(plugin = "org.jetbrains.kotlin.android")
+}
+
 android {
     namespace = "com.example.piliplus"
     compileSdk = flutter.compileSdkVersion
@@ -18,12 +27,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
-        }
-    }
-
     defaultConfig {
         applicationId = "com.example.piliplus"
         minSdk = flutter.minSdkVersion
@@ -51,6 +54,12 @@ android {
         }
     }
 
+    buildFeatures {
+        if (project.hasProperty("dev")) {
+            resValues = true
+        }
+    }
+
     buildTypes {
         all {
             signingConfig = config ?: signingConfigs["debug"]
@@ -82,6 +91,12 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
+    }
+}
+
 flutter {
     source = "../.."
 }