fix: 合集顺序播放

.github/workflows/main.yml

@@ -1,157 +1,84 @@
-name: Pilipala Release
+name: build_apk
 
 # action事件触发
 on:
   push:
     # push tag时触发
     tags:
-      - "v*.*.*"
+      - 'v*.*.*'
 
 # 可以有多个jobs
 jobs:
-  android:
+    build_apk:
-    # 运行环境 ubuntu-latest window-latest mac-latest
+        # 运行环境 ubuntu-latest window-latest mac-latest
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
 
-    # 每个jobs中可以有多个steps
+        # 每个jobs中可以有多个steps
-    steps:
+        steps:
-      - name: 代码迁出
+            - name: 代码迁出
-        uses: actions/checkout@v3
+              uses: actions/checkout@v3
 
-      - name: 构建Java环境
+            - name: 构建Java环境
-        uses: actions/setup-java@v3
+              uses: actions/setup-java@v3
-        with:
+              with:
-          distribution: "zulu"
+                  distribution: "zulu"
-          java-version: "17"
+                  java-version: "17"
-          token: ${{secrets.GIT_TOKEN}}
+                  token: ${{secrets.GIT_TOKEN}}
 
-      - name: 检查缓存
+            - name: 检查缓存
-        uses: actions/cache@v2
+              uses: actions/cache@v2
-        id: cache-flutter
+              id: cache-flutter
-        with:
+              with:
-          path: /root/flutter-sdk # Flutter SDK 的路径
+                  path: /root/flutter-sdk # Flutter SDK 的路径
-          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
+                  key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
 
-      - name: 安装Flutter
+            - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
+              if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2
+              uses: subosito/flutter-action@v2
-        with:
+              with:
-          flutter-version: 3.16.5
+                  flutter-version: 3.10.6
-          channel: any
+                  channel: any
 
-      - name: 下载项目依赖
+            - name: 下载项目依赖
-        run: flutter pub get
+              run: flutter pub get
 
-      - name: 解码生成 jks
+            - name: 解码生成 jks
-        run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
+              run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
-        env:
+              env:
-          KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+                  KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
 
-      - name: flutter build apk
+            - name: flutter build apk
-        run: flutter build apk --release --split-per-abi
+              # 对应 android/app/build.gradle signingConfigs中的配置项
-        env:
+              run: flutter build apk --release --split-per-abi
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+              env:
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+                  KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
+                  KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+                  KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
 
-      - name: flutter build apk
+            - name: 获取版本号
-        run: flutter build apk --release
+              id: version
-        env:
+              run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
 
-      - name: 获取版本号
+            # - name: 获取当前日期
-        id: version
+            #   id: date
-        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
+            #   run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT
 
-      # - name: 获取当前日期
+            - name: 重命名应用 Pili-arm64-v8a-*.*.*.0101.apk
-      #   id: date
+              run: |
-      #   run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT
+                # DATE=${{ steps.date.outputs.date }}
+                for file in build/app/outputs/flutter-apk/app-*-release.apk; do
+                  if [[ $file =~ app-(.*)-release.apk ]]; then
+                    new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}-${{ steps.version.outputs.version }}.apk"
+                    mv "$file" "$new_file_name"
+                  fi
+                done
 
-      - name: 重命名应用
+            - name: 构建和发布release
-        run: |
+              uses: ncipollo/release-action@v1
-          # DATE=${{ steps.date.outputs.date }}
+              with:
-          for file in build/app/outputs/flutter-apk/app-*.apk; do
+                  # release title
-            if [[ $file =~ app-(.?*)release.apk ]]; then
+                  name: v${{ steps.version.outputs.version }}
-              new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}${{ steps.version.outputs.version }}.apk"
+                  artifacts: "build/app/outputs/flutter-apk/Pili-*.apk"
-              mv "$file" "$new_file_name"
+                  bodyFile: "change_log/${{steps.version.outputs.version}}.md"
-            fi
+                  token: ${{ secrets.GIT_TOKEN }}
-          done
+                  allowUpdates: true
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          name: Pilipala-Release
-          path: |
-            build/app/outputs/flutter-apk/Pili-*.apk
-
-  iOS:
-    runs-on: macos-latest
-
-    steps:
-      - name: 代码迁出
-        uses: actions/checkout@v4
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2.10.0
-        with:
-          cache: true
-          flutter-version: 3.16.5
-
-      - name: flutter build ipa
-        run: |
-          flutter build ios --release --no-codesign 
-          ln -sf ./build/ios/iphoneos Payload
-          zip -r9 app.ipa Payload/runner.app
-
-      - name: 获取版本号
-        id: version
-        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
-
-      - name: 重命名应用
-        run: |
-          DATE=${{ steps.date.outputs.date }}
-          for file in app.ipa; do
-            new_file_name="build/Pili-${{ steps.version.outputs.version }}.ipa"
-            mv "$file" "$new_file_name"
-          done
-
-      - name: 上传
-        uses: actions/upload-artifact@v3
-        with:
-          if-no-files-found: error
-          name: Pilipala-Release
-          path: |
-            build/Pili-*.ipa
-
-  upload:
-    runs-on: ubuntu-latest
-
-    needs:
-      - android
-      - iOS
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: Pilipala-Release
-          path: ./Pilipala-Release
-
-      - name: Install dependencies
-        run: sudo apt-get install tree -y
-
-      - name: Get version
-        id: version
-        run: echo "version=${GITHUB_REF#refs/tags/v}" >>$GITHUB_OUTPUT
-
-      - name: Upload Release
-        uses: ncipollo/release-action@v1
-        with:
-          name: v${{ steps.version.outputs.version }}
-          token: ${{ secrets.GIT_TOKEN }}
-          omitBodyDuringUpdate: true
-          omitNameDuringUpdate: true
-          omitPrereleaseDuringUpdate: true
-          allowUpdates: true
-          artifacts: Pilipala-Release/*

.gitignore

@@ -21,29 +21,6 @@ migrate_working_dir/
 # is commented out by default.
 #.vscode/
 
-# Flutter repo-specific
-/bin/cache/
-/bin/internal/bootstrap.bat
-/bin/internal/bootstrap.sh
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/devicelab/ABresults*.json
-/dev/docs/doc/
-/dev/docs/api_docs.zip
-/dev/docs/flutter.docs.zip
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/dev/integration_tests/**/xcuserdata
-/dev/integration_tests/**/Pods
-/packages/flutter/coverage/
-version
-analysis_benchmark.json
-
-# packages file containing multi-root paths
-.packages.generated
-
 # Flutter/Dart/Pub related
 **/doc/api/
 **/ios/Flutter/.last_build_id
@@ -54,83 +31,14 @@ analysis_benchmark.json
 .pub-cache/
 .pub/
 /build/
-flutter_*.png
+
-linked_*.ds
+# Symbolication related
-unlinked.ds
+app.*.symbols
-unlinked_spec.ds
 
 # Obfuscation related
 app.*.map.json
 
-# Android related
+# Android Studio will place build artifacts here
-**/android/**/gradle-wrapper.jar
+/android/app/debug
-.gradle/
+/android/app/profile
-**/android/captures/
+/android/app/release
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-**/android/key.properties
-*.jks
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/.last_build_id
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/ephemeral
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# macOS
-**/Flutter/ephemeral/
-**/Pods/
-**/macos/Flutter/GeneratedPluginRegistrant.swift
-**/macos/Flutter/ephemeral
-**/xcuserdata/
-
-# Windows
-**/windows/flutter/generated_plugin_registrant.cc
-**/windows/flutter/generated_plugin_registrant.h
-**/windows/flutter/generated_plugins.cmake
-
-# Linux
-**/linux/flutter/generated_plugin_registrant.cc
-**/linux/flutter/generated_plugin_registrant.h
-**/linux/flutter/generated_plugins.cmake
-
-# Coverage
-coverage/
-
-# Symbols
-app.*.symbols
-
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-!/dev/ci/**/Gemfile.lock
-!.vscode/settings.json

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -3,38 +3,29 @@
 </div>
 
 
-
 <div align="center">
     <h1>PiliPala</h1>
-<div align="center">
-    
-![GitHub repo size](https://img.shields.io/github/repo-size/guozhigq/pilipala) 
-![GitHub Repo stars](https://img.shields.io/github/stars/guozhigq/pilipala) 
-![GitHub all releases](https://img.shields.io/github/downloads/guozhigq/pilipala/total) 
-</div>
     <p>使用Flutter开发的BiliBili第三方客户端</p>
-    
+    <br/>
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/510shots_so.png" width="32%" alt="home" />
+     <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/510shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/174shots_so.png" width="32%" alt="home" />
+    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/174shots_so.png" width="32%" alt="home" />
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/850shots_so.png" width="32%" alt="home" />
+    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/850shots_so.png" width="32%" alt="home" />
-<br/>
+    <br/>
-<img src="https://github.com/guozhigq/pilipala/blob/main/assets/screenshots/main_screen.png" width="96%" alt="home" />
+    <img src="https://github.com/guozhigq/pilipala/blob/main/assets/sreenshot/main_screen.png" width="96%" alt="home" />
-<br/>
+    <br/>
 </div>
 
 ## 开发环境
 Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 
 ```bash
-[✓] Flutter (Channel stable, 3.16.4, on macOS 14.1.2 23B92 darwin-arm64, locale
+[✓] Flutter (Channel stable, 3.10.6, on macOS 12.1 21C52 darwin-arm64, locale
     zh-Hans-CN)
-[✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
+[✓] Android toolchain - develop for Android devices (Android SDK version 33.0.2)
-[✓] Xcode - develop for iOS and macOS (Xcode 15.1)
+[✓] Xcode - develop for iOS and macOS (Xcode 13.4)
 [✓] Chrome - develop for the web
-[✓] Android Studio (version 2022.3)
+[✓] Android Studio (version 2022.2)
-[✓] VS Code (version 1.85.1)
+[✓] VS Code (version 1.77.3)
-[✓] Connected device (3 available)
-[✓] Network resources
 
 ```
 
@@ -44,7 +35,6 @@ Xcode 13.4 不支持**auto_orientation**，请注释相关代码
 ## 技术交流
 
 Telegram: https://t.me/+lm_oOVmF0RJiODk1
-QQ频道: https://pd.qq.com/s/365esodk3
 
 
 <br/>
@@ -90,7 +80,7 @@ QQ频道: https://pd.qq.com/s/365esodk3
   - [x] 画质选择（高清画质未解锁）
   - [x] 音质选择（视视频而定）
   - [x] 解码格式选择（视视频而定）
-  - [x] 弹幕
+  - [ ] 弹幕
   - [ ] 字幕
   - [x] 记忆播放
   - [x] 视频比例：高度/宽度适应、填充、包含等

android/app/build.gradle

@@ -58,11 +58,11 @@ android {
         applicationId "com.guozhigq.pilipala"
         // 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 flutter.minSdkVersion
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        minSdkVersion 21
+        minSdkVersion 19
-        multiDexEnabled true
     }
 
     signingConfigs {
@@ -94,14 +94,3 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
-
-ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3]
-import com.android.build.OutputFile
-android.applicationVariants.all { variant ->
-  variant.outputs.each { output ->
-    def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
-    if (abiVersionCode != null) {
-      output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode
-    }
-  }
-}

android/app/src/main/AndroidManifest.xml

@@ -39,13 +39,9 @@
         android:label="PiliPala"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        xmlns:tools="http://schemas.android.com/tools"
+        android:enableOnBackInvokedCallback="true">
-        android:enableOnBackInvokedCallback="true"
-        android:allowBackup="false"
-        android:fullBackupContent="false"
-        tools:replace="android:allowBackup">
         <activity
-            android:name="com.ryanheise.audioservice.AudioServiceActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
@@ -67,9 +63,9 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="bilibili" android:host="forward" />
@@ -226,24 +222,6 @@
 
             </intent-filter>
         </activity>
-        <service 
-            android:name="com.ryanheise.audioservice.AudioService"
-            android:foregroundServiceType="mediaPlayback"
-            android:exported="true" 
-            tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService" />
-            </intent-filter>
-        </service>
-
-        <receiver 
-            android:name="com.ryanheise.audioservice.MediaButtonReceiver"
-            android:exported="true" 
-            tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver> 
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
@@ -256,8 +234,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <!--
       Media access permissions.
       Android 13 or higher.

android/app/src/main/res/drawable/ic_baseline_forward_10_24.xml

@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M18,13c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8H18z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M10.86,15.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M12.25,13.44v0.74c0,1.9 1.31,1.82 1.44,1.82c0.14,0 1.44,0.09 1.44,-1.82v-0.74c0,-1.9 -1.31,-1.82 -1.44,-1.82C13.55,11.62 12.25,11.53 12.25,13.44zM14.29,13.32v0.97c0,0.77 -0.21,1.03 -0.59,1.03c-0.38,0 -0.6,-0.26 -0.6,-1.03v-0.97c0,-0.75 0.22,-1.01 0.59,-1.01C14.07,12.3 14.29,12.57 14.29,13.32z"/>
-</vector>

android/app/src/main/res/drawable/ic_baseline_replay_10_24.xml

@@ -1,7 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,5V1l-5,5l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.41,5 11.99,5z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M10.89,16h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09V16z"/>
-    <path android:fillColor="@android:color/white" android:pathData="M15.17,14.24c0,0.32 -0.03,0.6 -0.1,0.82s-0.17,0.42 -0.29,0.57s-0.28,0.26 -0.45,0.33s-0.37,0.1 -0.59,0.1s-0.41,-0.03 -0.59,-0.1s-0.33,-0.18 -0.46,-0.33s-0.23,-0.34 -0.3,-0.57s-0.11,-0.5 -0.11,-0.82V13.5c0,-0.32 0.03,-0.6 0.1,-0.82s0.17,-0.42 0.29,-0.57s0.28,-0.26 0.45,-0.33s0.37,-0.1 0.59,-0.1s0.41,0.03 0.59,0.1c0.18,0.07 0.33,0.18 0.46,0.33s0.23,0.34 0.3,0.57s0.11,0.5 0.11,0.82V14.24zM14.32,13.38c0,-0.19 -0.01,-0.35 -0.04,-0.48s-0.07,-0.23 -0.12,-0.31s-0.11,-0.14 -0.19,-0.17s-0.16,-0.05 -0.25,-0.05s-0.18,0.02 -0.25,0.05s-0.14,0.09 -0.19,0.17s-0.09,0.18 -0.12,0.31s-0.04,0.29 -0.04,0.48v0.97c0,0.19 0.01,0.35 0.04,0.48s0.07,0.24 0.12,0.32s0.11,0.14 0.19,0.17s0.16,0.05 0.25,0.05s0.18,-0.02 0.25,-0.05s0.14,-0.09 0.19,-0.17s0.09,-0.19 0.11,-0.32s0.04,-0.29 0.04,-0.48V13.38z"/>
-</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/app/src/main/res/raw/keep.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools"
-  tools:keep="@drawable/*" />

change_log/1.0.10.1016.md

@@ -1,4 +0,0 @@
-## 1.0.10
-
-### 修复
-+ 长按倍速抬起后未恢复默认倍速

change_log/1.0.11.1112.md

@@ -1,26 +0,0 @@
-## 1.0.11
-
-### 新功能
-+ 适配了原生媒体通知栏 @Daydreamer-riri
-+ 视频主题图标 @Daydreamer-riri
-+ 关闭软件后自动画中画播放
-+ UP主分组管理
-+ md2样式底栏
-+ 
-
- 
-### 修复
-+ 历史记录记忆播放
-+ 部分类型视频连播
-+ 播放速度选择框不支持返回手势
-+ 播放速度选择框不支持返回手势
-+ 视频播放速度总是显示1.0X
-+ 评论页面计数错误
-+ 退出视频还有声音
-
-  
-### 优化
-+ 视频加载速度
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.12.1114.md

@@ -1,11 +0,0 @@
-## 1.0.12
-
- 
-### 修复
-+ iOS端视频播放时没有声音
-+ 超过6分钟弹幕不显示
-+ 视频详情页网络异常
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.13.1217.md

@@ -1,22 +0,0 @@
-## 1.0.13
-
-
-### 新功能
-+ 视频详情页稍后再看
-+ 发送弹幕 感谢@orz12
-+ 消息展示
-+ up主页显示获赞数
-+ up主页显示合集
-+ 视频详情页「ai总结」增加开关
-  
-### 修复
-+ 首页推荐问题（需要重新登录）
-+ 长按倍速逻辑
-+ 视频详情页网络异常
-
-### 优化
-+ 设置面板样式 感谢@GuMengYu @KoolShow
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.14.1225.md

@@ -1,28 +0,0 @@
-## 1.0.14
-
-圣诞节快乐～ 🎉
-
-大部分内容由@orz12提供，感谢👏
-
-### 修复
-+ 全屏弹幕消失
-+ iOS全屏/退出全屏视频暂停
-+ 个人主页关注状态
-+ 视频合集向下滑动UI问题
-+ 媒体库滑动底栏不隐藏
-+ 个人主页动态加载问题 * 2
-+ 未登录状态访问个人主页异常
-+ 视频搜索标题特殊字符转义
-+ iOS闪退
-+ 消息页面夜间模式异常
-+ 消息页面含有撤回消息时异常
-+ 弹幕速度
-
-### 优化
-+ 全屏播放方案优化
-+ 弹幕加载逻辑优化
-+ 点赞、投币逻辑优化
-+ 进度条及播放时间渲染优化
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.15.0101.md

@@ -1,22 +0,0 @@
-## 1.0.15
-
-元旦快乐～ 🎉
-
-### 功能
-+ 转发动态评论展示
-+ 推荐、最热、收藏视频增肌日期显示
-
-### 修复
-+ 全屏播放相关问题
-+ 评论区@用户展示问题
-+ 登录状态闪退问题
-+ pip意外触发问题
-+ 动态页tab切换样式问题
-
-### 优化
-+ 首页默认使用web端推荐
-+ 取消iOS路由切换效果
-+ 视频分享中添加Up主
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.16.0102.md

@@ -1,15 +0,0 @@
-## 1.0.16
-
-
-### 功能
-+ toast 背景支持透明度调节
-
-### 修复
-+ web端推荐未展示【已关注】
-+ up主动态页异常
-+ 未打开自动播放时，视频详情页异常
-+ 视频暂停状态取消自动ip
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.17.0125.md

@@ -1,39 +0,0 @@
-## 1.0.17
-
-
-### 功能
-+ 视频全屏时隐藏进度条
-+ 动态内容增加投稿跳转
-+ 未开启自动播放时点击封面播放
-+ 弹幕发送标识
-+ 定时关闭
-+ 推荐视频卡片拉黑up功能
-+ 首页tabbar编辑排序
-
-### 修复
-+ 连续跳转搜索页未刷新
-+ 搜索结果为空时页面异常
-+ 评论区链接解析
-+ 视频全屏状态栏背景色
-+ 私信对话气泡位置
-+ 设置up关注分组样式
-+ 每次推荐请求数据相同
-+ iOS代理网络异常
-+ 双击切换播放状态无声
-+ 设置自定义倍速白屏
-+ 免登录查看1080p
-
-### 优化
-+ 首页web端推荐观看数展示
-+ 首页web端推荐接口更新
-+ 首页样式
-+ 搜索页跳转
-+ 弹幕资源优化
-+ 图片渲染占用内存优化（部分）
-+ 两次返回退出应用
-+ schame 补充
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.18.0130.md

@@ -1,16 +0,0 @@
-## 1.0.18
-
-
-### 功能
-
-
-### 修复
-
-
-### 优化
-
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.19.0131.md

@@ -1,15 +0,0 @@
-## 1.0.19
-
-
-### 修复
-+ 视频404、评论加载错误
-+ bvav转换
-
-### 优化
-+ 视频详情页内存占用
-
-  
-
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.8.0917.md

@@ -1,24 +0,0 @@
-## 1.0.8
-
-直播弹幕、循环播放等功能开发中
-
-### 新功能
-+ 用户拉黑功能
-+ gif图片保存
-+ 删除已看历史记录
- 
-### 修复
-+ 弹幕数量较少
-+ 弹幕屏蔽设置自动记忆
-+ 动态页面渲染
-+ 用户主页数据错乱
-+ 大家都在搜空白
-+ 默认自动全屏，顶部操作栏丢失
-  
-  
-### 优化
-+ 全屏状态栏区域显示优化
-+ 图片保存至PiliPala文件夹
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

change_log/1.0.9.1015.md

@@ -1,28 +0,0 @@
-## 1.0.9
-
-
-### 新功能
-+ 自定义倍速、默认倍速
-+ 历史记录搜索
-+ 收藏夹搜索
-+ 历史记录多选删除
-+ 视频循环播放
-+ 免登录看1080P
-+ 评论区视频链接跳转
-+ up主分组
-+ up主投稿搜索
- 
-### 修复
-+ 搜索视频标题乱码
-+ 屏幕帧率
-+ 动态页面渲染
-
-  
-  
-### 优化
-+ 快进手势
-+ 视频简介链接匹配
-+ 视频全屏时安全区域
-
-更多更新日志可在Github上查看
-问题反馈、功能建议请查看「关于」页面。

fastlane/metadata/android/en-US/full_description.txt

@@ -1,9 +0,0 @@
-PiliPala is a third-party Bilibili client developed in Flutter.
-
-Top Features:
-
-* List of recommended videos
-* List of hottest videos
-* Popular live streams
-* List of bangumis
-* Block videos from blacklisted users

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +0,0 @@
-A third-party Bilibili client developed in Flutter

fastlane/metadata/android/en-US/title.txt

@@ -1 +0,0 @@
-PiliPala

fastlane/metadata/android/zh-CN/changelogs/2001.txt

@@ -1,21 +0,0 @@
-修复
-
-* 全屏弹幕消失
-* iOS 全屏/退出全屏视频暂停
-* 个人主页关注状态
-* 视频合集向下滑动UI问题
-* 媒体库滑动底栏不隐藏
-* 个人主页动态加载问题 * 2
-* 未登录状态访问个人主页异常
-* 视频搜索标题特殊字符转义
-* iOS 闪退
-* 消息页面夜间模式异常
-* 消息页面含有撤回消息时异常
-* 弹幕速度
-
-优化
-
-* 全屏播放方案优化
-* 弹幕加载逻辑优化
-* 点赞、投币逻辑优化
-* 进度条及播放时间渲染优化

fastlane/metadata/android/zh-CN/full_description.txt

@@ -1,9 +0,0 @@
-PiliPala 是使用 Flutter 开发的 BiliBili 第三方客户端。
-
-主要功能：
-
-* 推荐视频列表 (app 端)
-* 最热视频列表
-* 热门直播
-* 番剧列表
-* 屏蔽黑名单内用户视频

fastlane/metadata/android/zh-CN/short_description.txt

@@ -1 +0,0 @@
-使用 Flutter 开发的 BiliBili 第三方客户端

fastlane/metadata/android/zh-CN/title.txt

@@ -1 +0,0 @@
-PiliPala

ios/Podfile

@@ -37,11 +37,5 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-      deployment_target = config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']
-      if !deployment_target.nil? && !deployment_target.empty? && deployment_target.to_f < 12.0
-        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
-      end
-    end
   end
 end

ios/Podfile.lock

@@ -1,32 +1,19 @@
 PODS:
   - appscheme (1.0.4):
     - Flutter
-  - audio_service (0.0.1):
-    - Flutter
-  - audio_session (0.0.1):
-    - Flutter
-  - auto_orientation (0.0.1):
-    - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
-  - flutter_mailer (0.0.1):
-    - Flutter
   - flutter_volume_controller (0.0.1):
     - Flutter
-  - fluttertoast (0.0.2):
-    - Flutter
-    - Toast
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - gt3_flutter_plugin (0.0.8):
+  - image_gallery_saver (2.0.2):
     - Flutter
-    - GT3Captcha-iOS
-  - GT3Captcha-iOS (0.15.8.3)
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_native_event_loop (1.0.0):
@@ -41,8 +28,6 @@ PODS:
   - permission_handler_apple (9.1.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
-  - saver_gallery (0.0.1):
-    - Flutter
   - screen_brightness_ios (0.1.0):
     - Flutter
   - share_plus (0.0.1):
@@ -54,7 +39,6 @@ PODS:
     - Flutter
   - system_proxy (0.0.1):
     - Flutter
-  - Toast (4.1.0)
   - url_launcher_ios (0.0.1):
     - Flutter
   - volume_controller (0.0.1):
@@ -68,23 +52,17 @@ PODS:
 
 DEPENDENCIES:
   - appscheme (from `.symlinks/plugins/appscheme/ios`)
-  - audio_service (from `.symlinks/plugins/audio_service/ios`)
-  - audio_session (from `.symlinks/plugins/audio_session/ios`)
-  - auto_orientation (from `.symlinks/plugins/auto_orientation/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
-  - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
-  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
-  - gt3_flutter_plugin (from `.symlinks/plugins/gt3_flutter_plugin/ios`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_native_event_loop (from `.symlinks/plugins/media_kit_native_event_loop/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
-  - saver_gallery (from `.symlinks/plugins/saver_gallery/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
@@ -99,33 +77,21 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - FMDB
-    - GT3Captcha-iOS
     - ReachabilitySwift
-    - Toast
 
 EXTERNAL SOURCES:
   appscheme:
     :path: ".symlinks/plugins/appscheme/ios"
-  audio_service:
-    :path: ".symlinks/plugins/audio_service/ios"
-  audio_session:
-    :path: ".symlinks/plugins/audio_session/ios"
-  auto_orientation:
-    :path: ".symlinks/plugins/auto_orientation/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
   device_info_plus:
     :path: ".symlinks/plugins/device_info_plus/ios"
   Flutter:
     :path: Flutter
-  flutter_mailer:
-    :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_volume_controller:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
-  fluttertoast:
+  image_gallery_saver:
-    :path: ".symlinks/plugins/fluttertoast/ios"
+    :path: ".symlinks/plugins/image_gallery_saver/ios"
-  gt3_flutter_plugin:
-    :path: ".symlinks/plugins/gt3_flutter_plugin/ios"
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_native_event_loop:
@@ -138,8 +104,6 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
-  saver_gallery:
-    :path: ".symlinks/plugins/saver_gallery/ios"
   screen_brightness_ios:
     :path: ".symlinks/plugins/screen_brightness_ios/ios"
   share_plus:
@@ -163,38 +127,30 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   appscheme: b1c3f8862331cb20430cf9e0e4af85dbc1572ad8
-  audio_service: f509d65da41b9521a61f1c404dd58651f265a567
-  audio_session: 4f3e461722055d21515cf3261b64c973c062f345
-  auto_orientation: 102ed811a5938d52c86520ddd7ecd3a126b5d39d
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
-  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
+  device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  gt3_flutter_plugin: bfa1f26e9a09dc00401514be5ed437f964cabf23
+  image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
-  GT3Captcha-iOS: 5e3b1077834d8a9d6f4d64a447a30af3e14affe6
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
   media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
-  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  saver_gallery: 2b4e584106fde2407ab51560f3851564963e6b78
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
+  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
   sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   status_bar_control: 7c84146799e6a076315cc1550f78ef53aae3e446
   system_proxy: bec1a5c5af67dd3e3ebf43979400a8756c04cc44
-  Toast: ec33c32b8688982cecc6348adeae667c1b9938da
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
   webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
-PODFILE CHECKSUM: 637cd290bed23275b5f5ffcc7eb1e73d0a5fb2be
+PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -121,6 +121,7 @@
 				3DA6FBBC55FDD1E3261D6D67 /* Pods-Runner.release.xcconfig */,
 				32E2926120A1A8DC0E629BC6 /* Pods-Runner.profile.xcconfig */,
 			);
+			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -139,7 +140,6 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				5A372F23F3CF0118D6526BAC /* [CP] Embed Pods Frameworks */,
-				B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -268,23 +268,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		B78851E7B29A4C3961AC483C /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -360,7 +343,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -376,7 +359,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = RN352BA826;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -438,7 +421,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -487,7 +470,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -505,7 +488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = RN352BA826;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -528,7 +511,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = RN352BA826;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

ios/Runner/Base.lproj/Main.storyboard

@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Flutter View Controller-->
@@ -16,14 +14,13 @@
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-11" y="-41"/>
         </scene>
     </scenes>
 </document>

ios/Runner/Info.plist

@@ -103,9 +103,5 @@
 				</array>
 			</dict>
 		</array>
-		<key>UIBackgroundModes</key>
-		<array>
-			<string>audio</string>
-		</array>
 	</dict>
 </plist>

lib/common/constants.dart

@@ -9,11 +9,7 @@ class StyleString {
 }
 
 class Constants {
-  // 27eb53fc9058f8c3  移动端 Android
+  static const String appKey = '27eb53fc9058f8c3';
-  // 4409e2ce8ffd12b8  TV端
-  static const String appKey = '4409e2ce8ffd12b8';
-  // 59b43e04ad6965f34319062b478f83dd TV端
-  static const String appSec = '59b43e04ad6965f34319062b478f83dd';
   static const String thirdSign = '04224646d1fea004e79606d3b038c84a';
   static const String thirdApi =
       'https://www.mcbbs.net/template/mcbbs/image/special_photo_bg.png';

lib/common/widgets/badge.dart

@@ -1,5 +1,37 @@
 import 'package:flutter/material.dart';
 
+// Widget pBadge(
+//   text,
+//   context,
+//   double? top,
+//   double? right,
+//   double? bottom,
+//   double? left, {
+//   type = 'primary',
+// }) {
+//   Color bgColor = Theme.of(context).colorScheme.primary;
+//   Color color = Theme.of(context).colorScheme.onPrimary;
+//   if (type == 'gray') {
+//     bgColor = Colors.black54.withOpacity(0.4);
+//     color = Colors.white;
+//   }
+//   return Positioned(
+//     top: top,
+//     left: left,
+//     right: right,
+//     bottom: bottom,
+//     child: Container(
+//       padding: const EdgeInsets.symmetric(vertical: 1, horizontal: 6),
+//       decoration:
+//           BoxDecoration(borderRadius: BorderRadius.circular(4), color: bgColor),
+//       child: Text(
+//         text,
+//         style: TextStyle(fontSize: 11, color: color),
+//       ),
+//     ),
+//   );
+// }
+
 class PBadge extends StatelessWidget {
   final String? text;
   final double? top;

lib/common/widgets/content_container.dart

@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ContentContainer extends StatelessWidget {
-  final Widget? contentWidget;
-  final Widget? bottomWidget;
-  final bool isScrollable;
-  final Clip? childClipBehavior;
-
-  const ContentContainer(
-      {Key? key,
-      this.contentWidget,
-      this.bottomWidget,
-      this.isScrollable = true,
-      this.childClipBehavior})
-      : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (BuildContext context, BoxConstraints constraints) {
-        return SingleChildScrollView(
-          clipBehavior: childClipBehavior ?? Clip.hardEdge,
-          physics: isScrollable ? null : const NeverScrollableScrollPhysics(),
-          child: ConstrainedBox(
-            constraints: constraints.copyWith(
-              minHeight: constraints.maxHeight,
-              maxHeight: double.infinity,
-            ),
-            child: IntrinsicHeight(
-              child: Column(
-                children: <Widget>[
-                  if (contentWidget != null)
-                    Expanded(
-                      child: contentWidget!,
-                    )
-                  else
-                    const Spacer(),
-                  if (bottomWidget != null) bottomWidget!,
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

lib/common/widgets/custom_toast.dart

@@ -1,27 +1,17 @@
 import 'package:flutter/material.dart';
-import 'package:hive/hive.dart';
-import 'package:pilipala/utils/storage.dart';
-
-Box<dynamic> setting = GStrorage.setting;
 
 class CustomToast extends StatelessWidget {
-  const CustomToast({super.key, required this.msg});
-
   final String msg;
+  const CustomToast({Key? key, required this.msg}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final double toastOpacity =
-        setting.get(SettingBoxKey.defaultToastOp, defaultValue: 1.0) as double;
     return Container(
       margin:
           EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 30),
       padding: const EdgeInsets.symmetric(horizontal: 17, vertical: 10),
       decoration: BoxDecoration(
-        color: Theme.of(context)
+        color: Theme.of(context).colorScheme.primaryContainer,
-            .colorScheme
-            .primaryContainer
-            .withOpacity(toastOpacity),
         borderRadius: BorderRadius.circular(20),
       ),
       child: Text(

lib/common/widgets/html_render.dart

@@ -1,95 +1,135 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
-import 'package:get/get.dart';
-import 'network_img_layer.dart';
 
 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
-  const HtmlRender({
+  String? htmlContent;
+  final int? imgCount;
+  final List? imgList;
+
+  HtmlRender({
     this.htmlContent,
     this.imgCount,
     this.imgList,
     super.key,
   });
 
-  final String? htmlContent;
-  final int? imgCount;
-  final List<String>? imgList;
-
   @override
   Widget build(BuildContext context) {
     return Html(
       data: htmlContent,
-      onLinkTap: (String? url, Map<String, String> buildContext, attributes) {},
+      // tagsList: Html.tags..addAll(["form", "label", "input"]),
+      onLinkTap: (url, buildContext, attributes) => {},
       extensions: [
         TagExtension(
-          tagsToExtend: <String>{'img'},
+          tagsToExtend: {"img"},
-          builder: (ExtensionContext extensionContext) {
+          builder: (extensionContext) {
-            try {
+            String? imgUrl = extensionContext.attributes['src'];
-              final Map<String, dynamic> attributes =
+            if (imgUrl!.startsWith('//')) {
-                  extensionContext.attributes;
+              imgUrl = 'https:$imgUrl';
-              final List<dynamic> key = attributes.keys.toList();
-              String imgUrl = key.contains('src')
-                  ? attributes['src'] as String
-                  : attributes['data-src'] as String;
-              if (imgUrl.startsWith('//')) {
-                imgUrl = 'https:$imgUrl';
-              }
-              if (imgUrl.startsWith('http://')) {
-                imgUrl = imgUrl.replaceAll('http://', 'https://');
-              }
-              imgUrl = imgUrl.contains('@') ? imgUrl.split('@').first : imgUrl;
-              final bool isEmote = imgUrl.contains('/emote/');
-              final bool isMall = imgUrl.contains('/mall/');
-              if (isMall) {
-                return const SizedBox();
-              }
-              // bool inTable =
-              //     extensionContext.element!.previousElementSibling == null ||
-              //         extensionContext.element!.nextElementSibling == null;
-              // imgUrl = Utils().imageUrl(imgUrl!);
-              // return Image.network(
-              //   imgUrl,
-              //   width: isEmote ? 22 : null,
-              //   height: isEmote ? 22 : null,
-              // );
-              return NetworkImgLayer(
-                width: isEmote ? 22 : Get.size.width - 24,
-                height: isEmote ? 22 : 200,
-                src: imgUrl,
-              );
-            } catch (err) {
-              return const SizedBox();
             }
+            if (imgUrl.startsWith('http://')) {
+              imgUrl = imgUrl.replaceAll('http://', 'https://');
+            }
+
+            print(imgUrl);
+            bool isEmote = imgUrl.contains('/emote/');
+            bool isMall = imgUrl.contains('/mall/');
+            if (isMall) {
+              return SizedBox();
+            }
+            // bool inTable =
+            //     extensionContext.element!.previousElementSibling == null ||
+            //         extensionContext.element!.nextElementSibling == null;
+            // imgUrl = Utils().imageUrl(imgUrl!);
+            return Image.network(
+              imgUrl,
+              width: isEmote ? 22 : null,
+              height: isEmote ? 22 : null,
+            );
           },
         ),
       ],
       style: {
-        'html': Style(
+        "html": Style(
           fontSize: FontSize.medium,
           lineHeight: LineHeight.percent(140),
         ),
-        'body': Style(margin: Margins.zero, padding: HtmlPaddings.zero),
+        "body": Style(margin: Margins.zero, padding: HtmlPaddings.zero),
-        'a': Style(
+        "a": Style(
           color: Theme.of(context).colorScheme.primary,
           textDecoration: TextDecoration.none,
         ),
-        'p': Style(
+        "p": Style(
-          margin: Margins.only(bottom: 10),
+          margin: Margins.only(bottom: 0),
         ),
-        'span': Style(
+        "span": Style(
           fontSize: FontSize.medium,
-          height: Height(1.65),
         ),
-        'div': Style(height: Height.auto()),
+        "li > p": Style(
-        'li > p': Style(
           display: Display.inline,
         ),
-        'li': Style(
+        "li": Style(
           padding: HtmlPaddings.only(bottom: 4),
           textAlign: TextAlign.justify,
         ),
-        'img': Style(margin: Margins.only(top: 4, bottom: 4)),
+        "image": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "p > img": Style(margin: Margins.only(top: 4, bottom: 4)),
+        "code": Style(
+            backgroundColor: Theme.of(context).colorScheme.onInverseSurface),
+        "code > span": Style(textAlign: TextAlign.start),
+        "hr": Style(
+          margin: Margins.zero,
+          padding: HtmlPaddings.zero,
+          border: Border(
+            top: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'table': Style(
+          border: Border(
+            right: BorderSide(
+              width: 0.5,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+            bottom: BorderSide(
+              width: 0.5,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'tr': Style(
+          border: Border(
+            top: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+            left: BorderSide(
+              width: 1.0,
+              color:
+                  Theme.of(context).colorScheme.onBackground.withOpacity(0.3),
+            ),
+          ),
+        ),
+        'thead': Style(
+          backgroundColor: Theme.of(context).colorScheme.background,
+        ),
+        'th': Style(
+          padding: HtmlPaddings.only(left: 3, right: 3),
+        ),
+        'td': Style(
+          padding: HtmlPaddings.all(4.0),
+          alignment: Alignment.center,
+          textAlign: TextAlign.center,
+        ),
       },
     );
   }

lib/common/widgets/live_card.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import '../../utils/utils.dart';
+import 'package:pilipala/common/constants.dart';
-import '../constants.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'network_img_layer.dart';
+import 'package:pilipala/utils/utils.dart';
 
 class LiveCard extends StatelessWidget {
   // ignore: prefer_typing_uninitialized_variables
-  final dynamic liveItem;
+  final liveItem;
 
   const LiveCard({
     Key? key,
@@ -14,7 +14,7 @@ class LiveCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final String heroTag = Utils.makeHeroTag(liveItem.roomid);
+    String heroTag = Utils.makeHeroTag(liveItem.roomid);
 
     return Card(
       elevation: 0,
@@ -23,6 +23,7 @@ class LiveCard extends StatelessWidget {
         borderRadius: BorderRadius.circular(0),
         side: BorderSide(
           color: Theme.of(context).dividerColor.withOpacity(0.08),
+          width: 1,
         ),
       ),
       margin: EdgeInsets.zero,
@@ -32,16 +33,15 @@ class LiveCard extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(builder:
+              child: LayoutBuilder(builder: (context, boxConstraints) {
-                  (BuildContext context, BoxConstraints boxConstraints) {
+                double maxWidth = boxConstraints.maxWidth;
-                final double maxWidth = boxConstraints.maxWidth;
+                double maxHeight = boxConstraints.maxHeight;
-                final double maxHeight = boxConstraints.maxHeight;
                 return Stack(
                   children: [
                     Hero(
                       tag: heroTag,
                       child: NetworkImgLayer(
-                        src: liveItem.cover as String,
+                        src: liveItem.cover,
                         type: 'emote',
                         width: maxWidth,
                         height: maxHeight,
@@ -58,7 +58,7 @@ class LiveCard extends StatelessWidget {
                           // view: liveItem.stat.view,
                           // danmaku: liveItem.stat.danmaku,
                           // duration: liveItem.duration,
-                          online: liveItem.online as int,
+                          online: liveItem.online,
                         ),
                       ),
                     ),
@@ -90,7 +90,7 @@ class LiveContent extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Text(
-            liveItem.title as String,
+            liveItem.title,
             textAlign: TextAlign.start,
             style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
             maxLines: 2,
@@ -99,7 +99,7 @@ class LiveContent extends StatelessWidget {
           SizedBox(
             width: double.infinity,
             child: Text(
-              liveItem.uname as String,
+              liveItem.uname,
               maxLines: 1,
               style: TextStyle(
                 fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
@@ -114,10 +114,10 @@ class LiveContent extends StatelessWidget {
 }
 
 class LiveStat extends StatelessWidget {
-  const LiveStat({super.key, required this.online});
-
   final int? online;
 
+  const LiveStat({Key? key, required this.online}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -136,7 +136,7 @@ class LiveStat extends StatelessWidget {
       ),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: <Widget>[
+        children: [
           // Row(
           // children: [
           // StatView(

lib/common/widgets/network_img_layer.dart

@@ -1,101 +1,78 @@
-import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
+import 'package:cached_network_image/cached_network_image.dart';
 import 'package:hive/hive.dart';
-import 'package:pilipala/utils/extension.dart';
+import 'package:pilipala/common/constants.dart';
-import '../../utils/storage.dart';
+import 'package:pilipala/utils/storage.dart';
-import '../constants.dart';
 
-Box<dynamic> setting = GStrorage.setting;
+Box setting = GStrorage.setting;
 
 class NetworkImgLayer extends StatelessWidget {
+  final String? src;
+  final double? width;
+  final double? height;
+  final double? cacheW;
+  final double? cacheH;
+  final String? type;
+  final Duration? fadeOutDuration;
+  final Duration? fadeInDuration;
+  final int? quality;
+
   const NetworkImgLayer({
-    super.key,
+    Key? key,
     this.src,
     required this.width,
     required this.height,
+    this.cacheW,
+    this.cacheH,
     this.type,
     this.fadeOutDuration,
     this.fadeInDuration,
     // 图片质量 默认1%
     this.quality,
-    this.origAspectRatio,
+  }) : super(key: key);
-  });
-
-  final String? src;
-  final double width;
-  final double height;
-  final String? type;
-  final Duration? fadeOutDuration;
-  final Duration? fadeInDuration;
-  final int? quality;
-  final double? origAspectRatio;
 
   @override
   Widget build(BuildContext context) {
-    final String imageUrl =
+    double pr = MediaQuery.of(context).devicePixelRatio;
-        '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? 100}q.webp';
+    int picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
-    int? memCacheWidth, memCacheHeight;
-    double aspectRatio = (width / height).toDouble();
 
-    void setMemCacheSizes() {
+    // double pr = 2;
-      if (aspectRatio > 1) {
+    return src != ''
-        memCacheHeight = height.cacheSize(context);
-      } else if (aspectRatio < 1) {
-        memCacheWidth = width.cacheSize(context);
-      } else {
-        if (origAspectRatio != null && origAspectRatio! > 1) {
-          memCacheWidth = width.cacheSize(context);
-        } else if (origAspectRatio != null && origAspectRatio! < 1) {
-          memCacheHeight = height.cacheSize(context);
-        } else {
-          memCacheWidth = width.cacheSize(context);
-          memCacheHeight = height.cacheSize(context);
-        }
-      }
-    }
-
-    setMemCacheSizes();
-
-    if (memCacheWidth == null && memCacheHeight == null) {
-      memCacheWidth = width.toInt();
-    }
-
-    return src != '' && src != null
         ? ClipRRect(
-            clipBehavior: Clip.antiAlias,
+            clipBehavior: Clip.hardEdge,
-            borderRadius: BorderRadius.circular(
+            borderRadius: BorderRadius.circular(type == 'avatar'
-              type == 'avatar'
+                ? 50
-                  ? 50
+                : type == 'emote'
-                  : type == 'emote'
+                    ? 0
-                      ? 0
+                    : StyleString.imgRadius.x),
-                      : StyleString.imgRadius.x,
-            ),
             child: CachedNetworkImage(
-              imageUrl: imageUrl,
+              imageUrl:
-              width: width,
+                  '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? picQuality}q.webp',
-              height: height,
+              width: width ?? double.infinity,
-              memCacheWidth: memCacheWidth,
+              height: height ?? double.infinity,
-              memCacheHeight: memCacheHeight,
+              alignment: Alignment.center,
+              maxWidthDiskCache: ((cacheW ?? width!) * pr).toInt(),
+              // maxHeightDiskCache: (cacheH ?? height!).toInt(),
+              memCacheWidth: ((cacheW ?? width!) * pr).toInt(),
+              // memCacheHeight: (cacheH ?? height!).toInt(),
               fit: BoxFit.cover,
               fadeOutDuration:
-                  fadeOutDuration ?? const Duration(milliseconds: 120),
+                  fadeOutDuration ?? const Duration(milliseconds: 200),
               fadeInDuration:
-                  fadeInDuration ?? const Duration(milliseconds: 120),
+                  fadeInDuration ?? const Duration(milliseconds: 200),
-              filterQuality: FilterQuality.high,
+              // filterQuality: FilterQuality.high,
-              errorWidget: (BuildContext context, String url, Object error) =>
+              errorWidget: (context, url, error) => placeholder(context),
-                  placeholder(context),
+              placeholder: (context, url) => placeholder(context),
-              placeholder: (BuildContext context, String url) =>
-                  placeholder(context),
             ),
           )
         : placeholder(context);
   }
 
-  Widget placeholder(BuildContext context) {
+  Widget placeholder(context) {
     return Container(
-      width: width,
+      width: width ?? double.infinity,
-      height: height,
+      height: height ?? double.infinity,
-      clipBehavior: Clip.antiAlias,
+      clipBehavior: Clip.hardEdge,
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.onInverseSurface.withOpacity(0.4),
         borderRadius: BorderRadius.circular(type == 'avatar'
@@ -105,16 +82,13 @@ class NetworkImgLayer extends StatelessWidget {
                 : StyleString.imgRadius.x),
       ),
       child: Center(
-        child: Image.asset(
+          child: Image.asset(
-          type == 'avatar'
+        type == 'avatar'
-              ? 'assets/images/noface.jpeg'
+            ? 'assets/images/noface.jpeg'
-              : 'assets/images/loading.png',
+            : 'assets/images/loading.png',
-          width: width,
+        width: 300,
-          height: height,
+        height: 300,
-          cacheWidth: width.cacheSize(context),
+      )),
-          cacheHeight: height.cacheSize(context),
-        ),
-      ),
     );
   }
 }

lib/common/widgets/overlay_pop.dart

@@ -1,17 +1,16 @@
 import 'package:flutter/material.dart';
-import '../../utils/download.dart';
+import 'package:pilipala/common/constants.dart';
-import '../constants.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
-import 'network_img_layer.dart';
+import 'package:pilipala/utils/download.dart';
 
 class OverlayPop extends StatelessWidget {
-  const OverlayPop({super.key, this.videoItem, this.closeFn});
-
   final dynamic videoItem;
   final Function? closeFn;
+  const OverlayPop({super.key, this.videoItem, this.closeFn});
 
   @override
   Widget build(BuildContext context) {
-    final double imgWidth = MediaQuery.sizeOf(context).width - 8 * 2;
+    double imgWidth = MediaQuery.of(context).size.width - 8 * 2;
     return Container(
       margin: const EdgeInsets.symmetric(horizontal: 8),
       decoration: BoxDecoration(
@@ -20,6 +19,7 @@ class OverlayPop extends StatelessWidget {
       ),
       child: Column(
         mainAxisSize: MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Stack(
@@ -27,7 +27,7 @@ class OverlayPop extends StatelessWidget {
               NetworkImgLayer(
                 width: imgWidth,
                 height: imgWidth / StyleString.aspectRatio,
-                src: videoItem.pic! as String,
+                src: videoItem.pic!,
                 quality: 100,
               ),
               Positioned(
@@ -61,7 +61,7 @@ class OverlayPop extends StatelessWidget {
                 children: [
                   Expanded(
                     child: Text(
-                      videoItem.title! as String,
+                      videoItem.title!,
                     ),
                   ),
                   const SizedBox(width: 4),
@@ -69,10 +69,7 @@ class OverlayPop extends StatelessWidget {
                     tooltip: '保存封面图',
                     onPressed: () async {
                       await DownloadUtils.downloadImg(
-                        videoItem.pic != null
+                          videoItem.pic ?? videoItem.cover);
-                            ? videoItem.pic as String
-                            : videoItem.cover as String,
-                      );
                       // closeFn!();
                     },
                     icon: const Icon(Icons.download, size: 20),

lib/common/widgets/pull_to_refresh_header.dart

@@ -17,8 +17,8 @@ class PullToRefreshHeader extends StatelessWidget {
     this.info,
     this.lastRefreshTime, {
     this.color,
-    super.key,
+    Key? key,
-  });
+  }) : super(key: key);
 
   final PullToRefreshScrollNotificationInfo? info;
   final DateTime? lastRefreshTime;
@@ -28,7 +28,7 @@ class PullToRefreshHeader extends StatelessWidget {
   Widget build(BuildContext context) {
     final PullToRefreshScrollNotificationInfo? infos = info;
     if (infos == null) {
-      return const SizedBox();
+      return Container();
     }
     String text = '';
     if (infos.mode == PullToRefreshIndicatorMode.armed) {
@@ -65,6 +65,7 @@ class PullToRefreshHeader extends StatelessWidget {
             top: top,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
               children: <Widget>[
                 Expanded(
                   child: Container(

lib/common/widgets/video_card_h.dart

@@ -1,49 +1,43 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import '../../http/search.dart';
+import 'package:flutter/material.dart';
-import '../../http/user.dart';
+import 'package:pilipala/common/constants.dart';
-import '../../http/video.dart';
+import 'package:pilipala/common/widgets/badge.dart';
-import '../../utils/utils.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
-import '../constants.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
-import 'badge.dart';
+import 'package:pilipala/http/search.dart';
-import 'network_img_layer.dart';
+import 'package:pilipala/http/user.dart';
-import 'stat/danmu.dart';
+import 'package:pilipala/pages/member/index.dart';
-import 'stat/view.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
 
 // 视频卡片 - 水平布局
 class VideoCardH extends StatelessWidget {
-  const VideoCardH({
-    super.key,
-    required this.videoItem,
-    this.longPress,
-    this.longPressEnd,
-    this.source = 'normal',
-    this.showOwner = true,
-    this.showView = true,
-    this.showDanmaku = true,
-    this.showPubdate = false,
-  });
   // ignore: prefer_typing_uninitialized_variables
   final videoItem;
   final Function()? longPress;
   final Function()? longPressEnd;
   final String source;
-  final bool showOwner;
+
-  final bool showView;
+  const VideoCardH({
-  final bool showDanmaku;
+    Key? key,
-  final bool showPubdate;
+    required this.videoItem,
+    this.longPress,
+    this.longPressEnd,
+    this.source = 'normal',
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final int aid = videoItem.aid;
+    int aid = videoItem.aid;
-    final String bvid = videoItem.bvid;
+    String bvid = videoItem.bvid;
-    final String heroTag = Utils.makeHeroTag(aid);
+    String heroTag = Utils.makeHeroTag(aid);
     return GestureDetector(
       onLongPress: () {
-        if (longPress != null) {
+        // if (longPress != null) {
-          longPress!();
+        //   longPress!();
-        }
+        // }
+        MemberController().blockUser(videoItem.mid);
       },
       // onLongPressEnd: (details) {
       //   if (longPressEnd != null) {
@@ -53,7 +47,7 @@ class VideoCardH extends StatelessWidget {
       child: InkWell(
         onTap: () async {
           try {
-            final int cid =
+            int cid =
                 videoItem.cid ?? await SearchHttp.ab2c(aid: aid, bvid: bvid);
             Get.toNamed('/video?bvid=$bvid&cid=$cid',
                 arguments: {'videoItem': videoItem, 'heroTag': heroTag});
@@ -65,11 +59,11 @@ class VideoCardH extends StatelessWidget {
           padding: const EdgeInsets.fromLTRB(
               StyleString.safeSpace, 5, StyleString.safeSpace, 5),
           child: LayoutBuilder(
-            builder: (BuildContext context, BoxConstraints boxConstraints) {
+            builder: (context, boxConstraints) {
-              final double width = (boxConstraints.maxWidth -
+              double width = (boxConstraints.maxWidth -
                       StyleString.cardSpace *
                           6 /
-                          MediaQuery.textScalerOf(context).scale(1.0)) /
+                          MediaQuery.of(context).textScaleFactor) /
                   2;
               return Container(
                 constraints: const BoxConstraints(minHeight: 88),
@@ -77,28 +71,29 @@ class VideoCardH extends StatelessWidget {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.start,
                   crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
+                  children: [
                     AspectRatio(
                       aspectRatio: StyleString.aspectRatio,
                       child: LayoutBuilder(
-                        builder: (BuildContext context,
+                        builder: (context, boxConstraints) {
-                            BoxConstraints boxConstraints) {
+                          double maxWidth = boxConstraints.maxWidth;
-                          final double maxWidth = boxConstraints.maxWidth;
+                          double maxHeight = boxConstraints.maxHeight;
-                          final double maxHeight = boxConstraints.maxHeight;
                           return Stack(
                             children: [
                               Hero(
                                 tag: heroTag,
                                 child: NetworkImgLayer(
-                                  src: videoItem.pic as String,
+                                  src: videoItem.pic,
                                   width: maxWidth,
                                   height: maxHeight,
                                 ),
                               ),
                               PBadge(
                                 text: Utils.timeFormat(videoItem.duration!),
+                                top: null,
                                 right: 6.0,
                                 bottom: 6.0,
+                                left: null,
                                 type: 'gray',
                               ),
                               // if (videoItem.rcmdReason != null &&
@@ -110,14 +105,7 @@ class VideoCardH extends StatelessWidget {
                         },
                       ),
                     ),
-                    VideoContent(
+                    VideoContent(videoItem: videoItem, source: source)
-                      videoItem: videoItem,
-                      source: source,
-                      showOwner: showOwner,
-                      showView: showView,
-                      showDanmaku: showDanmaku,
-                      showPubdate: showPubdate,
-                    )
                   ],
                 ),
               );
@@ -133,20 +121,8 @@ class VideoContent extends StatelessWidget {
   // ignore: prefer_typing_uninitialized_variables
   final videoItem;
   final String source;
-  final bool showOwner;
+  const VideoContent(
-  final bool showView;
+      {super.key, required this.videoItem, this.source = 'normal'});
-  final bool showDanmaku;
-  final bool showPubdate;
-
-  const VideoContent({
-    super.key,
-    required this.videoItem,
-    this.source = 'normal',
-    this.showOwner = true,
-    this.showView = true,
-    this.showDanmaku = true,
-    this.showPubdate = false,
-  });
 
   @override
   Widget build(BuildContext context) {
@@ -158,7 +134,7 @@ class VideoContent extends StatelessWidget {
           children: [
             if (videoItem.title is String) ...[
               Text(
-                videoItem.title as String,
+                videoItem.title,
                 textAlign: TextAlign.start,
                 style: const TextStyle(
                   fontWeight: FontWeight.w500,
@@ -171,9 +147,9 @@ class VideoContent extends StatelessWidget {
                 maxLines: 2,
                 text: TextSpan(
                   children: [
-                    for (final i in videoItem.title) ...[
+                    for (var i in videoItem.title) ...[
                       TextSpan(
-                        text: i['text'] as String,
+                        text: i['text'],
                         style: TextStyle(
                           fontWeight: FontWeight.w500,
                           letterSpacing: 0.3,
@@ -205,67 +181,23 @@ class VideoContent extends StatelessWidget {
             //     ),
             //   ),
             // const SizedBox(height: 4),
-            if (showPubdate)
-              Text(
-                Utils.dateFormat(videoItem.pubdate!),
-                style: TextStyle(
-                    fontSize: 11, color: Theme.of(context).colorScheme.outline),
-              ),
-            if (showOwner)
-              Row(
-                children: [
-                  Text(
-                    videoItem.owner.name as String,
-                    style: TextStyle(
-                      fontSize:
-                          Theme.of(context).textTheme.labelMedium!.fontSize,
-                      color: Theme.of(context).colorScheme.outline,
-                    ),
-                  ),
-                ],
-              ),
             Row(
               children: [
-                if (showView) ...[
+                Text(
-                  StatView(
+                  videoItem.owner.name,
-                    theme: 'gray',
+                  style: TextStyle(
-                    view: videoItem.stat.view as int,
+                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    color: Theme.of(context).colorScheme.outline,
                   ),
-                  const SizedBox(width: 8),
+                ),
-                ],
-                if (showDanmaku)
-                  StatDanMu(
-                    theme: 'gray',
-                    danmu: videoItem.stat.danmaku as int,
-                  ),
-
                 const Spacer(),
-                // SizedBox(
-                //   width: 20,
-                //   height: 20,
-                //   child: IconButton(
-                //     tooltip: '稍后再看',
-                //     style: ButtonStyle(
-                //       padding: MaterialStateProperty.all(EdgeInsets.zero),
-                //     ),
-                //     onPressed: () async {
-                //       var res =
-                //           await UserHttp.toViewLater(bvid: videoItem.bvid);
-                //       SmartDialog.showToast(res['msg']);
-                //     },
-                //     icon: Icon(
-                //       Icons.more_vert_outlined,
-                //       color: Theme.of(context).colorScheme.outline,
-                //       size: 14,
-                //     ),
-                //   ),
-                // ),
                 if (source == 'normal')
                   SizedBox(
                     width: 24,
                     height: 24,
                     child: PopupMenuButton<String>(
                       padding: EdgeInsets.zero,
+                      tooltip: '稍后再看',
                       icon: Icon(
                         Icons.more_vert_outlined,
                         color: Theme.of(context).colorScheme.outline,
@@ -279,11 +211,11 @@ class VideoContent extends StatelessWidget {
                         PopupMenuItem<String>(
                           onTap: () async {
                             var res = await UserHttp.toViewLater(
-                                bvid: videoItem.bvid as String);
+                                bvid: videoItem.bvid);
                             SmartDialog.showToast(res['msg']);
                           },
                           value: 'pause',
-                          height: 40,
+                          height: 35,
                           child: const Row(
                             children: [
                               Icon(Icons.watch_later_outlined, size: 16),
@@ -292,60 +224,20 @@ class VideoContent extends StatelessWidget {
                             ],
                           ),
                         ),
-                        const PopupMenuDivider(),
+                        // PopupMenuItem<String>(
-                        PopupMenuItem<String>(
+                        //   onTap: () async {
-                          onTap: () async {
+                        //     MemberController().blockUser(videoItem.mid);
-                            SmartDialog.show(
+                        //   },
-                              useSystem: true,
+                        //   value: 'block',
-                              animationType:
+                        //   height: 35,
-                                  SmartAnimationType.centerFade_otherSlide,
+                        //   child: const Row(
-                              builder: (BuildContext context) {
+                        //     children: [
-                                return AlertDialog(
+                        //       Icon(Icons.block, size: 16),
-                                  title: const Text('提示'),
+                        //       SizedBox(width: 6),
-                                  content: Text(
+                        //       Text('拉黑up', style: TextStyle(fontSize: 13))
-                                      '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
+                        //     ],
-                                      '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
+                        //   ),
-                                  actions: [
+                        // ),
-                                    TextButton(
-                                      onPressed: () => SmartDialog.dismiss(),
-                                      child: Text(
-                                        '点错了',
-                                        style: TextStyle(
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .outline),
-                                      ),
-                                    ),
-                                    TextButton(
-                                      onPressed: () async {
-                                        var res = await VideoHttp.relationMod(
-                                          mid: videoItem.owner.mid,
-                                          act: 5,
-                                          reSrc: 11,
-                                        );
-                                        SmartDialog.dismiss();
-                                        SmartDialog.showToast(res['code'] == 0
-                                            ? '成功'
-                                            : res['msg']);
-                                      },
-                                      child: const Text('确认'),
-                                    )
-                                  ],
-                                );
-                              },
-                            );
-                          },
-                          value: 'pause',
-                          height: 40,
-                          child: Row(
-                            children: [
-                              const Icon(Icons.block, size: 16),
-                              const SizedBox(width: 6),
-                              Text('拉黑：${videoItem.owner.name}',
-                                  style: const TextStyle(fontSize: 13))
-                            ],
-                          ),
-                        ),
                       ],
                     ),
                   ),

lib/common/widgets/video_card_v.dart

@@ -1,16 +1,16 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-import '../../http/dynamics.dart';
+import 'package:flutter/material.dart';
-import '../../http/search.dart';
+import 'package:pilipala/common/constants.dart';
-import '../../http/user.dart';
+import 'package:pilipala/common/widgets/badge.dart';
-import '../../http/video.dart';
+import 'package:pilipala/common/widgets/stat/danmu.dart';
-import '../../models/common/search_type.dart';
+import 'package:pilipala/common/widgets/stat/view.dart';
-import '../../utils/id_utils.dart';
+import 'package:pilipala/http/search.dart';
-import '../../utils/utils.dart';
+import 'package:pilipala/http/user.dart';
-import '../constants.dart';
+import 'package:pilipala/models/common/search_type.dart';
-import 'badge.dart';
+import 'package:pilipala/utils/id_utils.dart';
-import 'network_img_layer.dart';
+import 'package:pilipala/utils/utils.dart';
+import 'package:pilipala/common/widgets/network_img_layer.dart';
 
 // 视频卡片 - 垂直布局
 class VideoCardV extends StatelessWidget {
@@ -27,11 +27,6 @@ class VideoCardV extends StatelessWidget {
     this.longPressEnd,
   }) : super(key: key);
 
-  bool isStringNumeric(String str) {
-    RegExp numericRegex = RegExp(r'^\d+$');
-    return numericRegex.hasMatch(str);
-  }
-
   void onPushDetail(heroTag) async {
     String goto = videoItem.goto;
     switch (goto) {
@@ -53,7 +48,7 @@ class VideoCardV extends StatelessWidget {
               arguments: {
                 'pic': videoItem.pic,
                 'heroTag': heroTag,
-                'videoType': SearchType.media_bangumi,
+                // 'videoType': SearchType.media_bangumi,
               },
             ),
           );
@@ -67,47 +62,6 @@ class VideoCardV extends StatelessWidget {
           'heroTag': heroTag,
         });
         break;
-      // 动态
-      case 'picture':
-        try {
-          String dynamicType = 'picture';
-          String uri = videoItem.uri;
-          String id = '';
-          if (videoItem.uri.startsWith('bilibili://article/')) {
-            // https://www.bilibili.com/read/cv27063554
-            dynamicType = 'read';
-            RegExp regex = RegExp(r'\d+');
-            Match match = regex.firstMatch(videoItem.uri)!;
-            String matchedNumber = match.group(0)!;
-            videoItem.param = int.parse(matchedNumber);
-            id = 'cv${videoItem.param}';
-          }
-          if (uri.startsWith('http')) {
-            String path = Uri.parse(uri).path;
-            if (isStringNumeric(path.split('/')[1])) {
-              // 请求接口
-              var res =
-                  await DynamicsHttp.dynamicDetail(id: path.split('/')[1]);
-              if (res['status']) {
-                Get.toNamed('/dynamicDetail', arguments: {
-                  'item': res['data'],
-                  'floor': 1,
-                  'action': 'detail'
-                });
-              }
-              return;
-            }
-          }
-          Get.toNamed('/htmlRender', parameters: {
-            'url': uri,
-            'title': videoItem.title,
-            'id': id,
-            'dynamicType': dynamicType
-          });
-        } catch (err) {
-          SmartDialog.showToast(err.toString());
-        }
-        break;
       default:
         SmartDialog.showToast(videoItem.goto);
         Get.toNamed(
@@ -158,12 +112,12 @@ class VideoCardV extends StatelessWidget {
                           height: maxHeight,
                         ),
                       ),
-                      if (videoItem.duration > 0)
+                      if (videoItem.duration != null)
                         if (crossAxisCount == 1) ...[
                           PBadge(
                             bottom: 10,
                             right: 10,
-                            text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ] else ...[
                           PBadge(
@@ -171,7 +125,7 @@ class VideoCardV extends StatelessWidget {
                             right: 7,
                             size: 'small',
                             type: 'gray',
-                            text: Utils.timeFormat(videoItem.duration),
+                            text: videoItem.duration,
                           )
                         ],
                     ],
@@ -216,10 +170,15 @@ class VideoContent extends StatelessWidget {
                 ),
                 if (videoItem.goto == 'av' && crossAxisCount == 1) ...[
                   const SizedBox(width: 10),
-                  VideoPopupMenu(
+                  WatchLater(
                     size: 32,
                     iconSize: 18,
-                    videoItem: videoItem,
+                    callFn: () async {
+                      int aid = videoItem.param;
+                      var res =
+                          await UserHttp.toViewLater(bvid: IdUtils.av2bv(aid));
+                      SmartDialog.showToast(res['msg']);
+                    },
                   ),
                 ],
               ],
@@ -260,14 +219,6 @@ class VideoContent extends StatelessWidget {
                     fs: 9,
                   )
                 ],
-                if (videoItem.isFollowed == 1) ...[
-                  const PBadge(
-                    text: '已关注',
-                    stack: 'normal',
-                    size: 'small',
-                    type: 'color',
-                  )
-                ],
                 Expanded(
                   flex: crossAxisCount == 1 ? 0 : 1,
                   child: Text(
@@ -295,10 +246,15 @@ class VideoContent extends StatelessWidget {
                   const Spacer(),
                 ],
                 if (videoItem.goto == 'av' && crossAxisCount != 1) ...[
-                  VideoPopupMenu(
+                  WatchLater(
                     size: 24,
                     iconSize: 14,
-                    videoItem: videoItem,
+                    callFn: () async {
+                      int aid = videoItem.param;
+                      var res =
+                          await UserHttp.toViewLater(bvid: IdUtils.av2bv(aid));
+                      SmartDialog.showToast(res['msg']);
+                    },
                   ),
                 ] else ...[
                   const SizedBox(height: 24)
@@ -322,33 +278,37 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return RichText(
+    return Row(
-      maxLines: 1,
+      children: [
-      text: TextSpan(
+        Text(
-        style: TextStyle(
+          '${videoItem.stat.view}观看',
-          fontSize: MediaQuery.textScalerOf(context)
+          style: TextStyle(
-              .scale(Theme.of(context).textTheme.labelSmall!.fontSize!),
+            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-          color: Theme.of(context).colorScheme.outline,
+            color: Theme.of(context).colorScheme.outline,
+          ),
         ),
-        children: [
+        Text(
-          TextSpan(text: '${Utils.numFormat(videoItem.stat.view)}观看'),
+          ' • ${videoItem.stat.danmu}弹幕',
-          TextSpan(text: ' • ${Utils.numFormat(videoItem.stat.danmu)}弹幕'),
+          style: TextStyle(
-        ],
+            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-      ),
+            color: Theme.of(context).colorScheme.outline,
+          ),
+        ),
+      ],
     );
   }
 }
 
-class VideoPopupMenu extends StatelessWidget {
+class WatchLater extends StatelessWidget {
   final double? size;
   final double? iconSize;
-  final dynamic videoItem;
+  final Function? callFn;
 
-  const VideoPopupMenu({
+  const WatchLater({
     Key? key,
     required this.size,
     required this.iconSize,
-    required this.videoItem,
+    this.callFn,
   }) : super(key: key);
 
   @override
@@ -358,6 +318,7 @@ class VideoPopupMenu extends StatelessWidget {
       height: size,
       child: PopupMenuButton<String>(
         padding: EdgeInsets.zero,
+        tooltip: '稍后再看',
         icon: Icon(
           Icons.more_vert_outlined,
           color: Theme.of(context).colorScheme.outline,
@@ -368,13 +329,9 @@ class VideoPopupMenu extends StatelessWidget {
         onSelected: (String type) {},
         itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
           PopupMenuItem<String>(
-            onTap: () async {
+            onTap: () => callFn!(),
-              var res =
-                  await UserHttp.toViewLater(bvid: videoItem.bvid as String);
-              SmartDialog.showToast(res['msg']);
-            },
             value: 'pause',
-            height: 40,
+            height: 35,
             child: const Row(
               children: [
                 Icon(Icons.watch_later_outlined, size: 16),
@@ -383,55 +340,6 @@ class VideoPopupMenu extends StatelessWidget {
               ],
             ),
           ),
-          const PopupMenuDivider(),
-          PopupMenuItem<String>(
-            onTap: () async {
-              SmartDialog.show(
-                useSystem: true,
-                animationType: SmartAnimationType.centerFade_otherSlide,
-                builder: (BuildContext context) {
-                  return AlertDialog(
-                    title: const Text('提示'),
-                    content: Text(
-                        '确定拉黑:${videoItem.owner.name}(${videoItem.owner.mid})?'
-                        '\n\n注：被拉黑的Up可以在隐私设置-黑名单管理中解除'),
-                    actions: [
-                      TextButton(
-                        onPressed: () => SmartDialog.dismiss(),
-                        child: Text(
-                          '点错了',
-                          style: TextStyle(
-                              color: Theme.of(context).colorScheme.outline),
-                        ),
-                      ),
-                      TextButton(
-                        onPressed: () async {
-                          var res = await VideoHttp.relationMod(
-                            mid: videoItem.owner.mid,
-                            act: 5,
-                            reSrc: 11,
-                          );
-                          SmartDialog.dismiss();
-                          SmartDialog.showToast(res['msg'] ?? '成功');
-                        },
-                        child: const Text('确认'),
-                      )
-                    ],
-                  );
-                },
-              );
-            },
-            value: 'pause',
-            height: 40,
-            child: Row(
-              children: [
-                const Icon(Icons.block, size: 16),
-                const SizedBox(width: 6),
-                Text('拉黑：${videoItem.owner.name}',
-                    style: const TextStyle(fontSize: 13))
-              ],
-            ),
-          ),
         ],
       ),
     );

lib/http/api.dart

@@ -1,17 +1,15 @@
-import 'constants.dart';
-
 class Api {
   // 推荐视频
   static const String recommendListApp =
-      '${HttpString.appBaseUrl}/x/v2/feed/index';
+      'https://app.bilibili.com/x/v2/feed/index';
-  static const String recommendListWeb = '/x/web-interface/index/top/feed/rcmd';
+  static const String recommendList = '/x/web-interface/index/top/feed/rcmd';
 
   // 热门视频
   static const String hotList = '/x/web-interface/popular';
 
   // 视频流
   // https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/video/videostream_url.md
-  static const String videoUrl = '/x/player/wbi/playurl';
+  static const String videoUrl = '/x/player/playurl';
 
   // 视频详情
   // 竖屏 https://api.bilibili.com/x/web-interface/view?aid=527403921
@@ -99,9 +97,6 @@ class Api {
   // 操作用户关系
   static const String relationMod = '/x/relation/modify';
 
-  // 相互关系查询 // 失效
-  // static const String relationSearch = '/x/space/wbi/acc/relation';
-
   // 评论列表
   // https://api.bilibili.com/x/v2/reply/main?csrf=6e22efc1a47225ea25f901f922b5cfdd&mode=3&oid=254175381&pagination_str=%7B%22offset%22:%22%22%7D&plat=1&seek_rpid=0&type=11
   static const String replyList = '/x/v2/reply';
@@ -131,14 +126,12 @@ class Api {
   static const String userFavFolder = '/x/v3/fav/folder/created/list';
 
   /// 收藏夹 详情
-  /// media_id  当前收藏夹id 搜索全部时为默认收藏夹id
+  /// media_id int 收藏夹id
   /// pn int 当前页
   /// ps int pageSize
   /// keyword String 搜索词
   /// order String 排序方式 view 最多播放 mtime 最近收藏 pubtime 最近投稿
   /// tid int 分区id
-  /// platform web
-  /// type 0 当前收藏夹 1 全部收藏夹
   // https://api.bilibili.com/x/v3/fav/resource/list?media_id=76614671&pn=1&ps=20&keyword=&order=mtime&type=0&tid=0
   static const String userFavFolderDetail = '/x/v3/fav/resource/list';
 
@@ -154,7 +147,7 @@ class Api {
 
   // 动态点赞
   static const String likeDynamic =
-      '${HttpString.tUrl}/dynamic_like/v1/dynamic_like/thumb';
+      'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb';
 
   // 获取稍后再看
   static const String seeYouLater = '/x/v2/history/toview';
@@ -174,9 +167,6 @@ class Api {
   // 删除某条历史记录
   static const String delHistory = '/x/v2/history/delete';
 
-  // 搜索历史记录
-  static const String searchHistory = '/x/web-goblin/history/search';
-
   // 热搜
   static const String hotSearchList =
       'https://s.search.bilibili.com/main/hotword';
@@ -185,7 +175,7 @@ class Api {
   static const String searchDefault = '/x/web-interface/wbi/search/default';
 
   // 搜索关键词
-  static const String searchSuggest =
+  static const String serachSuggest =
       'https://s.search.bilibili.com/main/suggest';
 
   // 分类搜索
@@ -214,28 +204,21 @@ class Api {
   // https://api.bilibili.com/x/relation/tags
   static const String followingsClass = '/x/relation/tags';
 
-  // 搜索follow
-  static const followSearch = '/x/relation/followings/search';
-
   // 粉丝
   // vmid 用户id pn 页码 ps 每页个数，最大50 order: desc
   // order_type 排序规则 最近访问传空，最常访问传 attention
-  static const String fans = '/x/relation/fans';
+  static const String fans = 'https://api.bilibili.com/x/relation/fans';
 
   // 直播
   // ?page=1&page_size=30&platform=web
   static const String liveList =
-      '${HttpString.liveBaseUrl}/xlive/web-interface/v1/second/getUserRecommend';
+      'https://api.live.bilibili.com/xlive/web-interface/v1/second/getUserRecommend';
 
   // 直播间详情
   // cid roomId
   // qn 80:流畅，150:高清，400:蓝光，10000:原画，20000:4K, 30000:杜比
   static const String liveRoomInfo =
-      '${HttpString.liveBaseUrl}/xlive/web-room/v2/index/getRoomPlayInfo';
+      'https://api.live.bilibili.com/xlive/web-room/v2/index/getRoomPlayInfo';
-
-  // 直播间详情 H5
-  static const String liveRoomInfoH5 =
-      '${HttpString.liveBaseUrl}/xlive/web-room/v1/index/getH5InfoByRoom';
 
   // 用户信息 需要Wbi签名
   // https://api.bilibili.com/x/space/wbi/acc/info?mid=503427686&token=&platform=web&web_location=1550101&w_rid=d709892496ce93e3d94d6d37c95bde91&wts=1689301482
@@ -321,160 +304,6 @@ class Api {
 
   static const String webDanmaku = '/x/v2/dm/web/seg.so';
 
-  //发送视频弹幕
+  // 搜索历史记录
-  //https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/danmaku/action.md
+  static const String searchHistory = '/x/web-goblin/history/search';
-  static const String shootDanmaku = '/x/v2/dm/post';
-
-  // up主分组
-  static const String followUpTag = '/x/relation/tags';
-
-  // 设置Up主分组
-  // 0 添加至默认分组  否则使用,分割tagid
-  static const String addUsers = '/x/relation/tags/addUsers';
-
-  // 获取指定分组下的up
-  static const String followUpGroup = '/x/relation/tag';
-
-  /// 私聊
-  ///  'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions?
-  /// session_type=1&
-  /// group_fold=1&
-  /// unfollow_fold=0&
-  /// sort_rule=2&
-  /// build=0&
-  /// mobi_app=web&
-  /// w_rid=8641d157fb9a9255eb2159f316ee39e2&
-  /// wts=1697305010
-
-  static const String sessionList =
-      '${HttpString.tUrl}/session_svr/v1/session_svr/get_sessions';
-
-  /// 私聊用户信息
-  /// uids
-  /// build=0&mobi_app=web
-  static const String sessionAccountList =
-      '${HttpString.tUrl}/account/v1/user/cards';
-
-  /// https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs?
-  /// talker_id=400787461&
-  /// session_type=1&
-  /// size=20&
-  /// sender_device_id=1&
-  /// build=0&
-  /// mobi_app=web&
-  /// web_location=333.1296&
-  /// w_rid=cfe3bf58c9fe181bbf4dd6c75175e6b0&
-  /// wts=1697350697
-
-  static const String sessionMsg =
-      '${HttpString.tUrl}/svr_sync/v1/svr_sync/fetch_session_msgs';
-
-  /// 标记已读 POST
-  /// talker_id:
-  /// session_type: 1
-  /// ack_seqno: 920224140918926
-  /// build: 0
-  /// mobi_app: web
-  /// csrf_token:
-  /// csrf:
-  static const String updateAck =
-      '${HttpString.tUrl}/session_svr/v1/session_svr/update_ack';
-
-  // 获取某个动态详情
-  // timezone_offset=-480
-  // id=849312409672744983
-  // features=itemOpusStyle
-  static const String dynamicDetail = '/x/polymer/web-dynamic/v1/detail';
-
-  // AI总结
-  /// https://api.bilibili.com/x/web-interface/view/conclusion/get?
-  /// bvid=BV1ju4y1s7kn&
-  /// cid=1296086601&
-  /// up_mid=4641697&
-  /// w_rid=1607c6c5a4a35a1297e31992220900ae&
-  /// wts=1697033079
-  static const String aiConclusion = '/x/web-interface/view/conclusion/get';
-
-  // captcha验证码
-  static const String getCaptcha =
-      '${HttpString.passBaseUrl}/x/passport-login/captcha?source=main_web';
-
-  // web端短信验证码
-  static const String smsCode =
-      '${HttpString.passBaseUrl}/x/passport-login/web/sms/send';
-
-  // web端验证码登录
-
-  // web端密码登录
-
-  // app端短信验证码
-  static const String appSmsCode =
-      '${HttpString.passBaseUrl}/x/passport-login/sms/send';
-
-  // app端验证码登录
-
-  // 获取短信验证码
-  // static const String appSafeSmsCode =
-  //     'https://passport.bilibili.com/x/safecenter/common/sms/send';
-
-  /// app端密码登录
-  /// username
-  /// password
-  /// key
-  /// rhash
-  static const String loginInByPwdApi =
-      '${HttpString.passBaseUrl}/x/passport-login/oauth2/login';
-
-  /// 密码加密密钥
-  /// disable_rcmd
-  /// local_id
-  static const getWebKey = '${HttpString.passBaseUrl}/x/passport-login/web/key';
-
-  /// cookie转access_key
-  static const cookieToKey =
-      '${HttpString.passBaseUrl}/x/passport-tv-login/h5/qrcode/confirm';
-
-  /// 申请二维码(TV端)
-  static const getTVCode =
-      'https://passport.snm0516.aisee.tv/x/passport-tv-login/qrcode/auth_code';
-
-  ///扫码登录（TV端）
-  static const qrcodePoll =
-      '${HttpString.passBaseUrl}/x/passport-tv-login/qrcode/poll';
-
-  /// 置顶视频
-  static const getTopVideoApi = '/x/space/top/arc';
-
-  /// 主页 - 最近投币的视频
-  /// vmid
-  /// gaia_source = main_web
-  /// web_location
-  /// w_rid
-  /// wts
-  static const getRecentCoinVideoApi = '/x/space/coin/video';
-
-  /// 最近点赞的视频
-  static const getRecentLikeVideoApi = '/x/space/like/video';
-
-  /// 最近追番
-  static const getRecentBangumiApi = '/x/space/bangumi/follow/list';
-
-  /// 用户专栏
-  static const getMemberSeasonsApi = '/x/polymer/web-space/home/seasons_series';
-
-  /// 获赞数 播放数
-  /// mid
-  static const getMemberViewApi = '/x/space/upstat';
-
-  /// 查询某个专栏
-  /// mid
-  /// season_id
-  /// sort_reverse
-  /// page_num
-  /// page_size
-  static const getSeasonDetailApi =
-      '/x/polymer/web-space/seasons_archives_list';
-
-  /// 获取未读动态数
-  static const getUnreadDynamic = '/x/web-interface/dynamic/entrance';
 }

lib/http/bangumi.dart

@@ -1,5 +1,5 @@
-import '../models/bangumi/list.dart';
+import 'package:pilipala/http/index.dart';
-import 'index.dart';
+import 'package:pilipala/models/bangumi/list.dart';
 
 class BangumiHttp {
   static Future bangumiList({int? page}) async {

lib/http/black.dart

@@ -1,5 +1,5 @@
-import '../models/user/black.dart';
+import 'package:pilipala/http/index.dart';
-import 'index.dart';
+import 'package:pilipala/models/user/black.dart';
 
 class BlackHttp {
   static Future blackList({required int pn, int? ps}) async {