fix wakelock

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

.fvmrc

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

.github/ISSUE_TEMPLATE/bug-反馈.yml

@@ -9,10 +9,24 @@ body:
     attributes:
       label: 检查清单
       options:
-        - label: 之前没有人提交过类似或相同的 bug report。
+        - label: 搜索了 [历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同问题
           required: true
         - label: 正在使用最新版本。
           required: true
+        - label: 已排除网络问题
+          required: true
+        - label: 已排除账号问题
+          required: true
+        - label: 已排除设置问题
+          required: true
+  
+  - type: checkboxes
+    id: assign
+    attributes:
+      label: Assign
+      options:
+        - label: self-assign
+          required: false
 
   - type: textarea
     id: version

.github/ISSUE_TEMPLATE/功能请求.yml

@@ -9,10 +9,20 @@ body:
     attributes:
       label: 检查清单
       options:
-        - label: 之前没有人提交过类似或相同的功能请求。
+        - label: 搜索了 [历史 issue](https://github.com/bggRGjQaUbCoE/PiliPlus/issues?q=is%3Aissue) ，并未发现相同功能请求
           required: true
         - label: 正在使用最新版本。
           required: true
+        - label: 设置中未搜索到该功能
+          required: true
+
+  - type: checkboxes
+    id: assign
+    attributes:
+      label: Assign
+      options:
+        - label: self-assign
+          required: false
 
   - type: textarea
     id: desc

.github/workflows/android.yml

@@ -1,88 +0,0 @@
-name: Android Release
-
-on:
-  pull_request:
-        types:
-          - opened
-          - synchronize
-          - reopened
-          - ready_for_review
-        paths-ignore:
-          - '**.md'
-  workflow_dispatch:
-
-jobs:
-  android:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 代码迁出
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 构建Java环境
-        uses: actions/setup-java@v4
-        with:
-          distribution: "zulu"
-          java-version: "17"
-
-      - name: 检查缓存
-        uses: actions/cache@v4
-        id: cache-flutter
-        with:
-          path: /root/flutter-sdk # Flutter SDK 的路径
-          key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
-
-      - name: 安装Flutter
-        if: steps.cache-flutter.outputs.cache-hit != 'true'
-        uses: subosito/flutter-action@v2
-        with:
-          channel: stable
-          flutter-version-file: pubspec.yaml
-
-      - name: 下载项目依赖
-        run: flutter pub get
-
-      - name: 更新版本号
-        run: |
-          version_name=$(yq e .version pubspec.yaml | cut -d "+" -f 1)
-          sed -i "s/version: .*/version: $version_name-$(git rev-parse --short HEAD)+$(git rev-list --count HEAD)/g" pubspec.yaml
-
-      - name: Write key
-        if: github.event_name != 'pull_request'
-        run: |
-          if [ ! -z "${{ secrets.SIGN_KEYSTORE_BASE64 }}" ]; then
-            echo "${{ secrets.SIGN_KEYSTORE_BASE64 }}" | base64 --decode > android/app/key.jks
-            echo storeFile='key.jks' >> android/key.properties
-            echo storePassword='${{ secrets.KEYSTORE_PASSWORD }}' >> android/key.properties
-            echo keyAlias='${{ secrets.KEY_ALIAS }}' >> android/key.properties
-            echo keyPassword='${{ secrets.KEY_PASSWORD }}' >> android/key.properties
-          fi
-
-      - name: flutter build apk
-        run: |
-          chmod +x lib/scripts/build.sh
-          lib/scripts/build.sh
-          flutter build apk --release --split-per-abi
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-arm64-v8a
-          path: |
-            build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-armeabi-v7a
-          path: |
-            build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
-
-      - name: 上传
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-x86_64
-          path: |
-            build/app/outputs/flutter-apk/app-x86_64-release.apk

.github/workflows/build.yml

@@ -0,0 +1,168 @@
+name: Build
+
+on:
+    pull_request:
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - ready_for_review
+        paths-ignore:
+            - "**.md"
+    workflow_dispatch:
+        inputs:
+            build_android:
+                description: "Build Android"
+                required: false
+                default: true
+                type: boolean
+
+            build_ios:
+                description: "Build iOS"
+                required: false
+                default: true
+                type: boolean
+
+            build_mac:
+                description: "Build Mac"
+                required: false
+                default: true
+                type: boolean
+
+            build_win_x64:
+                description: "Build Win-x64"
+                required: false
+                default: true
+                type: boolean
+
+            build_linux_x64:
+                description: "Build Linux-x64"
+                required: false
+                default: true
+                type: boolean
+
+            tag:
+                description: "tag"
+                required: false
+                default: ""
+                type: string
+
+jobs:
+    android:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_android == 'true' }}
+        name: Release Android
+        runs-on: ubuntu-latest
+        permissions: write-all
+
+        steps:
+            - name: 代码迁出
+              uses: actions/checkout@v5
+              with:
+                  fetch-depth: 0
+
+            - name: 构建Java环境
+              uses: actions/setup-java@v5
+              with:
+                  distribution: "zulu"
+                  java-version: "17"
+                  cache: "gradle"
+                  cache-dependency-path: |
+                      android/*.gradle*
+                      android/**/gradle-wrapper.properties
+
+            - name: 安装Flutter
+              uses: subosito/flutter-action@v2
+              id: flutter-action
+              with:
+                  channel: stable
+                  flutter-version-file: pubspec.yaml
+                  cache: true
+
+            - name: apply bottom sheet patch
+              working-directory: ${{ env.FLUTTER_ROOT }}
+              run: git apply $GITHUB_WORKSPACE/lib/scripts/bottom_sheet_patch.diff
+              continue-on-error: true
+
+            - name: Write key
+              if: github.event_name == 'workflow_dispatch'
+              run: |
+                  if [ ! -z "${{ secrets.SIGN_KEYSTORE_BASE64 }}" ]; then
+                    echo "${{ secrets.SIGN_KEYSTORE_BASE64 }}" | base64 --decode > android/app/key.jks
+                    echo storeFile='key.jks' >> android/key.properties
+                    echo storePassword='${{ secrets.KEYSTORE_PASSWORD }}' >> android/key.properties
+                    echo keyAlias='${{ secrets.KEY_ALIAS }}' >> android/key.properties
+                    echo keyPassword='${{ secrets.KEY_PASSWORD }}' >> android/key.properties
+                  fi
+
+            - name: Set and Extract version
+              shell: pwsh
+              run: lib/scripts/build.ps1 android
+
+            - name: flutter build apk
+              run: flutter build apk --release --split-per-abi --dart-define-from-file=pili_release.json --pub
+
+            - name: rename
+              run: |
+                  for file in build/app/outputs/flutter-apk/app-*-release.apk; do
+                    abi=$(echo "$file" | sed -E 's|.*app-(.*)-release\.apk|\1|')
+                    mv "$file" "PiliPlus_android_${{ env.version }}_${abi}.apk"
+                  done
+              shell: bash
+
+            - name: Release
+              if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag != '' }}
+              uses: softprops/action-gh-release@v2
+              with:
+                  tag_name: ${{ github.event.inputs.tag }}
+                  name: ${{ github.event.inputs.tag }}
+                  files: |
+                      PiliPlus_android_*.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_arm64-v8a
+                  path: |
+                      PiliPlus_android_*_arm64-v8a.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_armeabi-v7a
+                  path: |
+                      PiliPlus_android_*_armeabi-v7a.apk
+
+            - name: 上传
+              uses: actions/upload-artifact@v4
+              with:
+                  name: Android_x86_64
+                  path: |
+                      PiliPlus_android_*_x86_64.apk
+
+    ios:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_ios == 'true' }}
+        uses: ./.github/workflows/ios.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    mac:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_mac == 'true' }}
+        uses: ./.github/workflows/mac.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    win_x64:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_win_x64 == 'true' }}
+        uses: ./.github/workflows/win_x64.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}
+
+    linux_x64:
+        if: ${{ github.event_name == 'pull_request' || github.event.inputs.build_linux_x64 == 'true' }}
+        uses: ./.github/workflows/linux_x64.yml
+        permissions: write-all
+        with:
+            tag: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || '' }}

.github/workflows/ios.yml

@@ -1,19 +1,14 @@
 name: Build for iOS
 
 on:
-  pull_request:
-        types:
-          - opened
-          - synchronize
-          - reopened
-          - ready_for_review
-        paths-ignore:
-          - '**.md'
-  workflow_dispatch:
+  workflow_call:
     inputs:
-      branch:
+      tag:
+        description: "tag"
         required: false
-        default: 'main'
+        default: ""
+        type: string
+  workflow_dispatch:
 
 jobs:
   build-macos-app:
@@ -21,9 +16,8 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.inputs.branch }}
           fetch-depth: 0
 
       - name: Setup flutter
@@ -32,21 +26,27 @@ jobs:
           channel: stable
           flutter-version-file: pubspec.yaml
 
-      - name: 更新版本号
-        run: |
-          version_name=$(yq e '.version' pubspec.yaml | cut -d "+" -f 1)
-          sed -i '' "s/version: .*/version: $version_name+$(git rev-list --count HEAD)/" pubspec.yaml
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
 
       - name: Build iOS
         run: |
-          chmod +x lib/scripts/build.sh
-          lib/scripts/build.sh
-          flutter build ios --release --no-codesign 
+          flutter build ios --release --no-codesign --dart-define-from-file=pili_release.json
           ln -sf ./build/ios/iphoneos Payload
-          zip -r9 ios-release-no-sign.ipa Payload/runner.app
+          zip -r9 PiliPlus_ios_${{env.version}}.ipa Payload/runner.app
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_ios_*.ipa
 
       - name: Upload ios release
         uses: actions/upload-artifact@v4
         with:
-          name: ios-release
-          path: ios-release-no-sign.ipa
+          name: iOS-release
+          path: PiliPlus_ios_*.ipa

.github/workflows/linux_x64.yml

@@ -0,0 +1,260 @@
+name: Build for Linux x64
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-linux-app:
+    name: Release Linux x64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y clang cmake libgtk-3-dev ninja-build libayatana-appindicator3-dev unzip webkit2gtk-4.1 libasound2-dev rpm patchelf
+          sudo apt-get install -y gcc g++ autoconf automake debhelper glslang-dev ladspa-sdk xutils-dev libasound2-dev \
+              libarchive-dev libbluray-dev libbs2b-dev libcaca-dev libcdio-paranoia-dev libdrm-dev \
+              libdav1d-dev libdvdnav-dev libegl1-mesa-dev libepoxy-dev libfontconfig-dev libfreetype6-dev \
+              libfribidi-dev libgl1-mesa-dev libgbm-dev libgme-dev libgsm1-dev libharfbuzz-dev libjpeg-dev \
+              libbrotli-dev liblcms2-dev libmodplug-dev libmp3lame-dev libopenal-dev \
+              libopus-dev libopencore-amrnb-dev libopencore-amrwb-dev libpulse-dev librtmp-dev \
+              libsdl2-dev libsixel-dev libssh-dev libsoxr-dev libspeex-dev libtool \
+              libv4l-dev libva-dev libvdpau-dev libvorbis-dev libvo-amrwbenc-dev \
+              libunwind-dev libvpx-dev libwayland-dev libx11-dev libxext-dev \
+              libxkbcommon-dev libxrandr-dev libxss-dev libxv-dev libxvidcore-dev \
+              linux-libc-dev nasm ninja-build pkg-config python3 python3-docutils wayland-protocols \
+              x11proto-core-dev zlib1g-dev libfdk-aac-dev libtheora-dev libwebp-dev \
+              unixodbc-dev libpq-dev libxxhash-dev libaom-dev \
+              libgtk-3-0 libblkid1 liblzma5 libmpv-dev
+        shell: bash
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+          cache: true
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+        #TODO: deb and rpm packages need to be build
+      - name: Build Linux
+        run: flutter build linux --release -v --pub --dart-define-from-file=pili_release.json
+
+      - name: Package .tar.gz
+        run: tar -zcvf PiliPlus_linux_${{ env.version }}_amd64.tar.gz -C build/linux/x64/release/bundle .
+
+      - name: Packege deb
+        run: |
+          printf "建立构建目录...\n"
+          mkdir "PiliPlus_linux_${{ env.version }}_amd64"
+          pushd "PiliPlus_linux_${{ env.version }}_amd64"
+          mkdir -p opt/PiliPlus
+          mkdir -p usr/share/applications
+          mkdir -p usr/share/icons/hicolor/512x512/apps
+
+          printf "复制文件...\n"
+          cp -r ../build/linux/x64/release/bundle/* opt/PiliPlus
+          cp -r ../assets/linux/DEBIAN .
+          cp ../assets/linux/piliplus.desktop usr/share/applications
+          cp ../assets/images/logo/logo.png usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          printf "修改控制文件...\n"
+          # 替换版本号
+          sed -i  "2s/version_need_change/${{ env.version }}/g" DEBIAN/control
+          # 计算安装大小并替换
+          SIZE_KB=$(du -s -b --apparent-size . | awk '{print int($1)}')
+          SIZE_KB=$(($SIZE_KB - $(du -s -b --apparent-size DEBIAN | awk '{print int($1)}')))
+          SIZE_KB=$(echo $SIZE_KB | awk '{print int($1/1024 + 0.999)}')
+          printf "\t安装大小: %s KB\n" "$SIZE_KB"
+          sed -i "9s/size_need_change/${SIZE_KB}/g" DEBIAN/control
+
+          printf "生成并写入 md5sums ...\n"
+          md5sum opt/PiliPlus/piliplus >> DEBIAN/md5sums
+          md5sum opt/PiliPlus/lib/* >> DEBIAN/md5sums
+          md5sum opt/PiliPlus/data/icudtl.dat >> DEBIAN/md5sums
+
+          printf "设置权限...\n"
+          chmod 0644 DEBIAN/control
+          chmod 0644 DEBIAN/md5sums
+          chmod 0755 DEBIAN/postinst
+          chmod 0755 DEBIAN/postrm
+          chmod 0755 DEBIAN/prerm
+
+          printf "打包 deb 文件...\n"
+          popd
+          dpkg-deb --build --verbose --root-owner-group "PiliPlus_linux_${{ env.version }}_amd64"
+          printf "完成: PiliPlus_linux_%s_amd64.deb\n" "${{ env.version }}"
+        shell: bash
+
+      - name: Packege rpm
+        run: |
+          printf "建立 RPM 构建目录...\n"
+          RPM_BUILD_ROOT="$PWD/rpm_build"
+          mkdir -p "$RPM_BUILD_ROOT/BUILD" "$RPM_BUILD_ROOT/RPMS" "$RPM_BUILD_ROOT/SOURCES" "$RPM_BUILD_ROOT/SPECS" "$RPM_BUILD_ROOT/SRPMS"
+
+          printf "准备源码归档（仅包含运行时与元数据）...\n"
+          DATE="$(date '+%a %b %d %Y')"
+          SRC_DIR="$PWD/piliplus-${{ env.version }}"
+          mkdir -p "$SRC_DIR/bundle" "$SRC_DIR/assets"
+          cp -r build/linux/x64/release/bundle/* "$SRC_DIR/bundle/"
+          cp assets/linux/piliplus.desktop "$SRC_DIR/assets/piliplus.desktop"
+          cp assets/images/logo/logo.png "$SRC_DIR/assets/piliplus.png"
+          tar -zcvf "$RPM_BUILD_ROOT/SOURCES/piliplus-${{ env.version }}.tar.gz" -C "$PWD" "piliplus-${{ env.version }}"
+
+          printf "生成 spec 文件...\n"
+          cat > "$RPM_BUILD_ROOT/SPECS/piliplus.spec" <<EOF
+          Name:           piliplus
+          Version:        ${{ env.version }}
+          Release:        1%{?dist}
+          Summary:        PiliPlus Linux Version
+          License:        GPL-3.0
+          Source0:        piliplus-${{ env.version }}.tar.gz
+          Requires:       desktop-file-utils, hicolor-icon-theme
+
+          %description
+          使用 Flutter 开发的 BiliBili 第三方客户端
+
+          %prep
+          %setup -q -n piliplus-${{ env.version }}
+
+          %build
+
+          %install
+          mkdir -p %{buildroot}/opt/PiliPlus
+          cp -r bundle/* %{buildroot}/opt/PiliPlus/
+
+          # 二进制权限与命令行入口
+          chmod 755 %{buildroot}/opt/PiliPlus/piliplus
+          mkdir -p %{buildroot}/usr/bin
+          ln -sf /opt/PiliPlus/piliplus %{buildroot}/usr/bin/piliplus
+
+          # 桌面集成
+          mkdir -p %{buildroot}/usr/share/applications
+          install -m 644 assets/piliplus.desktop %{buildroot}/usr/share/applications/piliplus.desktop
+
+          mkdir -p %{buildroot}/usr/share/icons/hicolor/512x512/apps
+          install -m 644 assets/piliplus.png %{buildroot}/usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          %post
+          update-desktop-database -q || true
+          gtk-update-icon-cache -q -t -f %{_datadir}/icons/hicolor || true
+
+          %postun
+          update-desktop-database -q || true
+          gtk-update-icon-cache -q -t -f %{_datadir}/icons/hicolor || true
+
+          %files
+          /opt/PiliPlus
+          /usr/bin/piliplus
+          /usr/share/applications/piliplus.desktop
+          /usr/share/icons/hicolor/512x512/apps/piliplus.png
+
+          %changelog
+          * DATE - ${{ env.version }}-1
+          - Initial RPM release
+          EOF
+
+          sed -i "s/DATE/${DATE}/g" "$RPM_BUILD_ROOT/SPECS/piliplus.spec"
+
+          printf "构建 RPM 包...\n"
+          rpmbuild --define "_topdir $RPM_BUILD_ROOT" -bb "$RPM_BUILD_ROOT/SPECS/piliplus.spec"
+
+          printf "移动生成的 RPM...\n"
+          find "$RPM_BUILD_ROOT/RPMS" -name "*.rpm" -exec mv {} "PiliPlus_linux_${{ env.version }}_amd64.rpm" \;
+
+          printf "完成: PiliPlus_linux_%s_amd64.rpm\n" "${{ env.version }}"
+        shell: bash
+      
+      - name: Package AppImage
+        run: |
+          printf "下载 appimagetool...\n"
+          wget -q https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          chmod +x appimagetool-x86_64.AppImage
+
+          printf "建立 AppDir 目录结构...\n"
+          APPDIR="PiliPlus.AppDir"
+          mkdir -p "$APPDIR/usr/bin"
+          mkdir -p "$APPDIR/usr/lib"
+          mkdir -p "$APPDIR/usr/share/applications"
+          mkdir -p "$APPDIR/usr/share/icons/hicolor/512x512/apps"
+
+          printf "复制应用文件...\n"
+          cp -r build/linux/x64/release/bundle/* "$APPDIR/usr/bin/"
+          
+          printf "复制桌面文件和图标...\n"
+          cp assets/linux/piliplus.desktop "$APPDIR/piliplus.desktop"
+          cp assets/linux/piliplus.desktop "$APPDIR/usr/share/applications/piliplus.desktop"
+          cp assets/images/logo/logo.png "$APPDIR/piliplus.png"
+          cp assets/images/logo/logo.png "$APPDIR/usr/share/icons/hicolor/512x512/apps/piliplus.png"
+          
+          printf "创建 AppRun 启动脚本...\n"
+          cat > "$APPDIR/AppRun" <<'APPRUN_EOF'
+          #!/bin/bash
+          SELF=$(readlink -f "$0")
+          HERE=${SELF%/*}
+          export PATH="${HERE}/usr/bin:${PATH}"
+          export LD_LIBRARY_PATH="${HERE}/usr/lib:${LD_LIBRARY_PATH}"
+          exec "${HERE}/usr/bin/piliplus" "$@"
+          APPRUN_EOF
+          chmod +x "$APPDIR/AppRun"
+
+          printf "修改桌面文件中的 Exec 路径...\n"
+          sed -i 's|Exec=piliplus|Exec=piliplus|g' "$APPDIR/piliplus.desktop"
+          sed -i 's|Icon=piliplus|Icon=piliplus|g' "$APPDIR/piliplus.desktop"
+
+          printf "打包 AppImage...\n"
+          ARCH=x86_64 ./appimagetool-x86_64.AppImage "$APPDIR" "PiliPlus_linux_${{ env.version }}_amd64.AppImage"
+          
+          printf "完成: PiliPlus_linux_%s_amd64.AppImage\n" "${{ env.version }}"
+        shell: bash
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_linux_*.tar.gz
+            PiliPlus_linux_*.deb
+            PiliPlus_linux_*.rpm
+            PiliPlus_linux_*.AppImage
+
+      - name: Upload linux targz package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_targz_amd64_packege
+          path: PiliPlus_linux_*.tar.gz
+
+      - name: Upload linux deb package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_deb_amd64_package
+          path: PiliPlus_linux_*.deb
+
+      - name: Upload linux rpm package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_rpm_amd64_package
+          path: PiliPlus_linux_*.rpm
+      
+      - name: Upload linux AppImage package
+        uses: actions/upload-artifact@v4
+        with:
+          name: Linux_AppImage_amd64_package
+          path: PiliPlus_linux_*.AppImage

.github/workflows/mac.yml

@@ -0,0 +1,58 @@
+name: Build for Mac
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-mac-app:
+    name: Release Mac
+    runs-on: macos-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+      - name: Build Mac
+        run: flutter build macos --release --dart-define-from-file=pili_release.json
+
+      - name: Prepare Upload
+        run: |
+          npm install --global create-dmg
+          create-dmg build/macos/Build/Products/Release/PiliPlus.app
+        continue-on-error: true
+
+      - name: Rename DMG
+        run: mv PiliPlus*.dmg PiliPlus_macos_${{ env.version }}.dmg
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_macos_*.dmg
+
+      - name: Upload macos release
+        uses: actions/upload-artifact@v4
+        with:
+          name: macOS-release
+          path: PiliPlus_macos_*.dmg

.github/workflows/win_x64.yml

@@ -0,0 +1,80 @@
+name: Build for Windows x64
+
+on:
+  workflow_call:
+    inputs:
+      tag:
+        description: "tag"
+        required: false
+        default: ""
+        type: string
+  workflow_dispatch:
+
+jobs:
+  build-windows-app:
+    name: Release Windows x64
+    runs-on: windows-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Setup flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+          flutter-version-file: pubspec.yaml
+
+      - name: Add fastforge and Inno Setup
+        run: |
+          dart pub global activate fastforge
+          choco install innosetup
+
+      - name: Add Chinese language file for Inno Setup
+        run: |
+          Copy-Item "windows/packaging/exe/ChineseSimplified.isl" "C:\Program Files (x86)\Inno Setup 6\Languages\ChineseSimplified.isl"
+        shell: pwsh
+
+      - name: Set and Extract version
+        shell: pwsh
+        run: lib/scripts/build.ps1
+
+      - name: Build Windows
+        run: |
+          fastforge package --platform windows --targets exe --flutter-build-args="dart-define-from-file=pili_release.json"
+
+      - name: Prepare Upload
+        run: |
+          mkdir -p Release/PiliPlus-Win
+          mkdir -p PiliPlus-Win-Setup
+          mv build/windows/x64/runner/Release/* Release/PiliPlus-Win/
+          mv dist/**/*.exe PiliPlus-Win-Setup/PiliPlus_windows_${{env.version}}_x64_setup.exe
+
+      - name: Compress
+        if: ${{ github.event.inputs.tag != '' }}
+        run: |
+          Compress-Archive -Path "Release/PiliPlus-Win" -DestinationPath "PiliPlus_windows_${{env.version}}_x64.zip"
+        shell: pwsh
+
+      - name: Release
+        if: ${{ github.event.inputs.tag != '' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.event.inputs.tag }}
+          name: ${{ github.event.inputs.tag }}
+          files: |
+            PiliPlus_windows_*.zip
+            PiliPlus-Win-Setup/PiliPlus_windows_*.exe
+
+      - name: Upload windows file release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows-file-x64-release
+          path: Release
+
+      - name: Upload windows setup release
+        uses: actions/upload-artifact@v4
+        with:
+          name: Windows-setup-x64-release
+          path: PiliPlus-Win-Setup

.gitignore

@@ -19,7 +19,7 @@ migrate_working_dir/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter repo-specific
 /bin/cache/
@@ -134,7 +134,16 @@ app.*.symbols
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
 !.vscode/settings.json
-
-/lib/build_config.dart
+!.vscode/launch.json
+!.vscode/tasks.json
 
 devtools_options.yaml
+
+# FVM Version Cache
+.fvm/
+
+pili_release.json
+
+dist
+
+test.dart

.vscode/launch.json

@@ -1,22 +1,22 @@
 {
-    // 使用 IntelliSense 了解相关属性。 
+    // 使用 IntelliSense 了解相关属性。
     // 悬停以查看现有属性的描述。
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "piliplus",
+            "name": "PiliPlus",
             "request": "launch",
             "type": "dart"
         },
         {
-            "name": "piliplus (profile mode)",
+            "name": "PiliPlus (profile mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "profile"
         },
         {
-            "name": "piliplus (release mode)",
+            "name": "PiliPlus (release mode)",
             "request": "launch",
             "type": "dart",
             "flutterMode": "release"

README.md

@@ -22,22 +22,18 @@
 <br/>
 </div>
 
-## 开发环境
-
-```bash
-[✓] Flutter (Channel stable, 3.24.0, on Microsoft Windows [版本 10.0.19045.4046], locale zh-CN)
-[✓] Android toolchain - develop for Android devices (Android SDK version 34.0.0)
-[✓] Xcode - develop for iOS and macOS (Xcode 15.1)
-[✓] Chrome - develop for the web
-[✓] Android Studio (version 2022.3)
-[✓] VS Code (version 1.85.1)
-[✓] Connected device (3 available)
-[✓] Network resources
-
-```
 
 <br/>
 
+## 适配平台
+
+- [x] Android
+- [x] iOS
+- [x] Pad
+- [x] Windows
+- [x] Linux
+
+[![Packaging status](https://repology.org/badge/vertical-allrepos/piliplus.svg)](https://repology.org/project/piliplus/versions)
 
 ## refactor
 
@@ -47,6 +43,16 @@
 
 ## feat
 
+- [x] DLNA 投屏
+- [x] 离线缓存/播放
+- [x] 移动端支持点击弹幕悬停，点赞、复制、举报 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 播放音频
+- [x] 跳过番剧片头/片尾
+- [x] 安卓端 `loudnorm` 适配 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] Win/Mac 支持极验、短信登录 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] 视频截取动图 by [@My-Responsitories](https://github.com/My-Responsitories)
+- [x] AI 原声翻译
+- [x] SuperChat
 - [x] 播放课堂视频
 - [x] 发起投票
 - [x] 发布动态/评论支持`富文本编辑`/`表情显示`/`@用户`
@@ -135,11 +141,6 @@
 
 ## 功能
 
-目前着重移动端(Android、iOS)和Pad端，暂时没有适配桌面端、手表端等
-
-<br/>
-
-
 - [x] 推荐视频列表(app端)
 - [x] 最热视频列表
 - [x] 热门直播
@@ -152,7 +153,7 @@
   - [x] 粉丝、关注用户、拉黑用户查看
   - [x] 用户主页查看
   - [x] 关注/取关用户
-  - [ ] 离线缓存
+  - [x] 离线缓存
   - [x] 稍后再看
   - [x] 观看记录
   - [x] 我的收藏
@@ -239,3 +240,13 @@
 <br/>
 <br/>
 <br/>
+
+## Star History
+
+<a href="https://www.star-history.com/#bggRGjQaUbCoE/PiliPlus&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=bggRGjQaUbCoE/PiliPlus&type=Date" />
+ </picture>
+</a>

analysis_options.yaml

@@ -61,5 +61,7 @@ linter:
     - use_decorated_box
     - use_named_constants
     - use_null_aware_elements
+    - unnecessary_lambdas
+    - use_is_even_rather_than_modulo
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

android/.gitignore

@@ -11,3 +11,6 @@ GeneratedPluginRegistrant.java
 key.properties
 **/*.keystore
 **/*.jks
+
+/build
+/.kotlin

android/app/build.gradle.kts

@@ -24,8 +24,7 @@ android {
 
     defaultConfig {
         applicationId = "com.example.piliplus"
-//        minSdk = flutter.minSdkVersion
-        minSdkVersion(23)
+        minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -54,12 +53,12 @@ android {
         all {
             signingConfig = config ?: signingConfigs["debug"]
         }
-//        release {
-//            proguardFiles(
-//                getDefaultProguardFile("proguard-android-optimize.txt"),
-//                "proguard-rules.pro"
-//            )
-//        }
+        release {
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
         debug {
             applicationIdSuffix = ".debug"
         }

android/app/proguard-rules.pro

@@ -1 +1,3 @@
--keep class com.yalantis.ucrop.util.RectUtils { *; }
+-dontwarn javax.annotation.Nullable
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.OpenSSLProvider

android/app/src/main/AndroidManifest.xml

@@ -109,6 +109,7 @@
                 <data android:host="uper" />
                 <data android:host="article"
                     android:pathPattern="/readlist" />
+                <data android:host="opus" />
                 <data android:host="advertise" android:path="/home" />
                 <data android:host="clip" />
                 <data android:host="search" android:pathPattern=".*" />
@@ -176,7 +177,6 @@
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Ucrop.CropTheme"/>
 
         <receiver 
@@ -210,4 +210,5 @@
       -->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
 </manifest>

android/app/src/main/kotlin/com/example/PiliPlus/MainActivity.kt

@@ -1,116 +0,0 @@
-package com.example.piliplus
-
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-import com.ryanheise.audioservice.AudioServiceActivity
-import android.content.ComponentName
-import android.content.Intent
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import android.view.WindowManager.LayoutParams
-import kotlin.system.exitProcess
-
-class MainActivity : AudioServiceActivity() {
-    private lateinit var methodChannel: MethodChannel
-
-    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
-        super.configureFlutterEngine(flutterEngine)
-
-        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
-        methodChannel.setMethodCallHandler { call, result ->
-            if (call.method == "back") {
-                back()
-            } else if (call.method == "biliSendCommAntifraud") {
-                try {
-                    val action = call.argument<Int>("action") ?: 0
-                    val oid = call.argument<Number>("oid") ?: 0L
-                    val type = call.argument<Int>("type") ?: 0
-                    val rpid = call.argument<Number>("rpid") ?: 0L
-                    val root = call.argument<Number>("root") ?: 0L
-                    val parent = call.argument<Number>("parent") ?: 0L
-                    val ctime = call.argument<Number>("ctime") ?: 0L
-                    val commentText = call.argument<String>("comment_text") ?: ""
-                    val pictures = call.argument<String?>("pictures")
-                    val sourceId = call.argument<String>("source_id") ?: ""
-                    val uid = call.argument<Number>("uid") ?: 0L
-                    val cookies = call.argument<List<String>>("cookies") ?: emptyList<String>()
-
-                    val intent = Intent().apply {
-                        component = ComponentName("icu.freedomIntrovert.biliSendCommAntifraud", "icu.freedomIntrovert.biliSendCommAntifraud.ByXposedLaunchedActivity")
-                        putExtra("action", action)
-                        putExtra("oid", oid.toLong())
-                        putExtra("type", type)
-                        putExtra("rpid", rpid.toLong())
-                        putExtra("root", root.toLong())
-                        putExtra("parent", parent.toLong())
-                        putExtra("ctime", ctime.toLong())
-                        putExtra("comment_text", commentText)
-                        if(pictures != null)
-                            putExtra("pictures", pictures)
-                        putExtra("source_id", sourceId)
-                        putExtra("uid", uid.toLong())
-                        putStringArrayListExtra("cookies", ArrayList(cookies))
-                    }
-                    startActivity(intent)
-                } catch (e: Exception) {}
-            } else if (call.method == "linkVerifySettings") {
-                try {
-                    val intent = Intent(android.provider.Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
-                        Uri.parse("package:" + context.packageName))
-                    context.startActivity(intent)
-                } catch (t: Throwable) {
-                    try {
-                        val intent = Intent("android.intent.action.MAIN", Uri.parse("package:" + context.packageName))
-                        intent.setClassName("com.android.settings", "com.android.settings.applications.InstalledAppOpenByDefaultActivity")
-                        context.startActivity(intent)
-                    } catch (t2: Throwable) {
-                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
-                            Uri.parse("package:" + context.packageName))
-                        context.startActivity(intent)
-                    }
-                }
-            } else {
-                result.notImplemented()
-            }
-        }
-    }
-
-    private fun back() {
-        val intent = Intent(Intent.ACTION_MAIN).apply {
-            addCategory(Intent.CATEGORY_HOME)
-            flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        }
-        startActivity(intent)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            window.attributes.layoutInDisplayCutoutMode =
-                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        android.os.Process.killProcess(android.os.Process.myPid())
-        exitProcess(0)
-    }
-
-    override fun onUserLeaveHint() {
-        super.onUserLeaveHint()
-        methodChannel.invokeMethod("onUserLeaveHint", null)
-    }
-
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration?) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        MethodChannel(
-            flutterEngine!!.getDartExecutor()!!.getBinaryMessenger(),
-            "floating"
-        ).invokeMethod("onPipChanged", isInPictureInPictureMode)
-    }
-}

android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt

@@ -0,0 +1,179 @@
+package com.example.piliplus
+
+import android.app.PictureInPictureParams
+import android.app.SearchManager
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.res.Configuration
+import android.os.Build
+import android.os.Bundle
+import android.provider.MediaStore
+import android.provider.Settings
+import android.view.WindowManager.LayoutParams
+import androidx.core.net.toUri
+import com.ryanheise.audioservice.AudioServiceActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugin.common.MethodChannel
+import kotlin.system.exitProcess
+
+class MainActivity : AudioServiceActivity() {
+    private lateinit var methodChannel: MethodChannel
+
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+
+        methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
+        methodChannel.setMethodCallHandler { call, result ->
+            when (call.method) {
+                "back" -> back();
+                "biliSendCommAntifraud" -> {
+                    try {
+                        val action = call.argument<Int>("action") ?: 0
+                        val oid = call.argument<Number>("oid") ?: 0L
+                        val type = call.argument<Int>("type") ?: 0
+                        val rpid = call.argument<Number>("rpid") ?: 0L
+                        val root = call.argument<Number>("root") ?: 0L
+                        val parent = call.argument<Number>("parent") ?: 0L
+                        val ctime = call.argument<Number>("ctime") ?: 0L
+                        val commentText = call.argument<String>("comment_text") ?: ""
+                        val pictures = call.argument<String?>("pictures")
+                        val sourceId = call.argument<String>("source_id") ?: ""
+                        val uid = call.argument<Number>("uid") ?: 0L
+                        val cookies = call.argument<List<String>>("cookies") ?: emptyList<String>()
+
+                        val intent = Intent().apply {
+                            component = ComponentName(
+                                "icu.freedomIntrovert.biliSendCommAntifraud",
+                                "icu.freedomIntrovert.biliSendCommAntifraud.ByXposedLaunchedActivity"
+                            )
+                            putExtra("action", action)
+                            putExtra("oid", oid.toLong())
+                            putExtra("type", type)
+                            putExtra("rpid", rpid.toLong())
+                            putExtra("root", root.toLong())
+                            putExtra("parent", parent.toLong())
+                            putExtra("ctime", ctime.toLong())
+                            putExtra("comment_text", commentText)
+                            if (pictures != null)
+                                putExtra("pictures", pictures)
+                            putExtra("source_id", sourceId)
+                            putExtra("uid", uid.toLong())
+                            putStringArrayListExtra("cookies", ArrayList(cookies))
+                        }
+                        startActivity(intent)
+                    } catch (_: Exception) {
+                    }
+                }
+
+                "linkVerifySettings" -> {
+                    val uri = ("package:" + context.packageName).toUri()
+                    try {
+                        val intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                            Intent(Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS, uri)
+                        } else {
+                            Intent("android.intent.action.MAIN", uri).setClassName(
+                                "com.android.settings",
+                                "com.android.settings.applications.InstalledAppOpenByDefaultActivity"
+                            )
+                        }
+                        context.startActivity(intent)
+                    } catch (_: Throwable) {
+                        val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, uri)
+                        context.startActivity(intent)
+                    }
+                }
+
+                "music" -> {
+                    val title = call.argument<String>("title")
+                    val intent = Intent(MediaStore.INTENT_ACTION_MEDIA_SEARCH).apply {
+                        putExtra(SearchManager.QUERY, title)
+                        putExtra(MediaStore.EXTRA_MEDIA_TITLE, title)
+                        call.argument<String?>("artist")
+                            ?.let { putExtra(MediaStore.EXTRA_MEDIA_ARTIST, it) }
+                        call.argument<String?>("album")
+                            ?.let { putExtra(MediaStore.EXTRA_MEDIA_ALBUM, it) }
+
+                        addCategory(Intent.CATEGORY_DEFAULT)
+                    }
+                    try {
+                        if (packageManager.resolveActivity(
+                                intent,
+                                PackageManager.MATCH_DEFAULT_ONLY
+                            ) != null
+                        ) {
+                            startActivity(intent)
+                            result.success(true)
+                            return@setMethodCallHandler
+                        }
+                    } catch (_: Throwable) {
+                    }
+                    try {
+                        intent.action = MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH
+                        if (packageManager.resolveActivity(
+                                intent,
+                                PackageManager.MATCH_DEFAULT_ONLY
+                            ) != null
+                        ) {
+                            startActivity(intent)
+                            result.success(true)
+                            return@setMethodCallHandler
+                        }
+                    } catch (_: Throwable) {
+                    }
+                    result.success(false)
+                }
+
+                "setPipAutoEnterEnabled" -> {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        val params = PictureInPictureParams.Builder()
+                            .setAutoEnterEnabled(call.argument<Boolean>("autoEnable") ?: false)
+                            .build()
+                        setPictureInPictureParams(params)
+                    }
+                }
+
+                else -> result.notImplemented()
+            }
+        }
+    }
+
+    private fun back() {
+        val intent = Intent(Intent.ACTION_MAIN).apply {
+            addCategory(Intent.CATEGORY_HOME)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        }
+        startActivity(intent)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            window.attributes.layoutInDisplayCutoutMode =
+                LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+        }
+    }
+
+    override fun onDestroy() {
+        stopService(Intent(this, com.ryanheise.audioservice.AudioService::class.java))
+        super.onDestroy()
+        android.os.Process.killProcess(android.os.Process.myPid())
+        exitProcess(0)
+    }
+
+    override fun onUserLeaveHint() {
+        super.onUserLeaveHint()
+        methodChannel.invokeMethod("onUserLeaveHint", null)
+    }
+
+    override fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        newConfig: Configuration?
+    ) {
+        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
+        MethodChannel(
+            flutterEngine!!.dartExecutor.binaryMessenger,
+            "floating"
+        ).invokeMethod("onPipChanged", isInPictureInPictureMode)
+    }
+}

android/app/src/main/res/values-v35/styles.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Ucrop.CropTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:fitsSystemWindows">true</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
-    </style>
-</resources>

android/build.gradle.kts

@@ -34,8 +34,8 @@ subprojects {
             }
 
             project.tasks.withType<KotlinCompile>().configureEach {
-                kotlinOptions {
-                    jvmTarget = "17"
+                compilerOptions {
+                    jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
                 }
             }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
+zipStorePath=wrapper/dists

android/settings.gradle.kts

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.9.1" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("com.android.application") version "8.12.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
 }
 
 include(":app")

assets/linux/DEBIAN/control

@@ -0,0 +1,16 @@
+Package: PiliPlus
+Version: version_need_change
+Maintainer: gh-MzA4Nzk <githubaccount2333@proton.me>
+Original-Maintainer: bggRGjQaUbCoE <githubaccount56556@proton.me>
+Section: x11
+Priority: optional
+Architecture: amd64
+Essential: no
+Installed-Size: size_need_change
+Description: third-party Bilibili client developed in Flutter
+Homepage: https://github.com/bggRGjQaUbCoE/PiliPlus
+Depends: libgtk-3-0t64,
+         libmpv2,
+         gir1.2-ayatanaappindicator3-0.1,
+         libayatana-appindicator3-1
+

assets/linux/DEBIAN/postinst

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+ln -sf /opt/PiliPlus/piliplus /usr/bin/piliplus
+chmod +x /usr/bin/piliplus
+
+if [ $1 == "config" ] && [ -x /usr/binupdate-mime-database ]; then
+    echo "updating mime database..."
+    update-mime-database  /usr/share/mime || true
+fi
+
+if [ $1 == "config" ] && [ -x /usr/bin/gtk-update-icon-cache ]; then
+    echo "updating icon cache..."
+    gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor || true
+fi
+
+if [ $1 == "config" ] && [ -x /usr/bin/update-desktop-database ]; then
+    echo "updating desktop database..."
+    update-desktop-database -q /usr/share/applications || true
+fi
+
+exit 0

assets/linux/DEBIAN/postrm

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+rm /usr/bin/piliplus
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+    if [ -x /usr/bin/update-desktop-database ]; then
+        echo "updating desktop database..."
+        update-desktop-database -q /usr/share/applications || true
+    fi
+
+    if [ -x /usr/bin/gtk-update-icon-cache ]; then
+        echo "updating icon cache..."
+        gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
+    fi
+
+    if [ -x /usr/bin/update-mime-database ]; then
+        echo "updating mime database..."
+        update-mime-database /usr/share/mime || true
+    fi
+fi
+
+if [ $1 = "purge" ]; then
+    echo "Removing user data..."
+    rm -rf /home/*/.local/share/com.example.PiliPlus || true
+    rm -rf /root/.local/share/com.example.PiliPlus || true
+fi
+
+exit 0

assets/linux/DEBIAN/prerm

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    echo "Stopping PiliPlus if running..."
+    pkill -x piliplus || true
+fi
+
+exit 0

assets/linux/piliplus.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=PiliPlus
+Comment=A third-party Bilibili Client developed in Flutter
+Comment[zh_CN]=使用 Flutter 开发的 BiliBili 第三方客户端
+Exec=piliplus
+Icon=piliplus
+Terminal=false
+Categories=Video;AudioVideo;Player;

change_log/1.0.0.0817.md

@@ -1,11 +0,0 @@
-## 1.0.0
-
-### 初始版本
-+ 直播、推荐、动态功能
-+ 投稿、番剧播放功能
-+ 播放器手势支持
-+ 画质、音质、解码格式支持
-+ 点赞、投币、收藏功能
-+ 关注/取关、用户主页功能
-+ 评论功能
-+ 历史记录、稍后再看功能

change_log/1.0.1.0817.md

@@ -1,7 +0,0 @@
-## 1.0.1
-
-### 修复
-+ 升级播放器依赖
-+ android平台 AV1格式视频支持
-+ 视频全屏功能
-

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.2.0819.md

@@ -1,19 +0,0 @@
-## 1.0.2
-
-### 新功能
-+ 自动检查更新
-+ 封面图片保存
-+ 动态跳转番剧
-+ 历史记录番剧记忆播放
-+ 一键清空稍后再看
-  
-### 修复
-+ 切换分P cid未切换
-+ cookie存储问题
-+ 登录/退出登录问题
-  
-### 优化
-+ 页面空/异常状态样式
-+ 退出登录提示
-+ 请求节流
-+ 全屏播放

change_log/1.0.3.0821.md

@@ -1,19 +0,0 @@
-## 1.0.3
-
-建议卸载1.0.2版本，重新安装
-### 新功能
-+ 底部播放进度条设置
-+ 复制图片链接
-
-  
-### 修复
-+ 用户数据格式修改
-+ video Fit
-+ 没有audio 资源的视频异常
-+ 评论区域图片无法点击
-+ 视频进度条拖动问题
-  
-### 优化
-+ 页面空/异常状态样式
-+ 部分页面样式
-+ 图片预览页面样式

change_log/1.0.4.0822.md

@@ -1,21 +0,0 @@
-## 1.0.4
-
-### 新功能
-+ 热搜刷新
-+ 视频搜索排序、筛选
-+ app字体大小自定义
-+ app主题色自定义
-+ 「课堂」类动态渲染
-
-  
-### 修复
-+ 搜索词联想richText渲染异常
-+ 部分动态点赞异常
-+ 默认视频解码格式
-+ 搜索页面返回搜索词未清空
-+ 动态详情评论加载异常
-+ 动态页面下拉刷新数据异常
-  
-### 优化
-+ 一些样式修改
-+ 取消热搜词缓存

change_log/1.0.5.0826.md

@@ -1,30 +0,0 @@
-## 1.0.5
-
-主要是bug修复跟一部分小功能，弹幕功能需要下一版。
-问题反馈请前往QQ频道或提交issues。
-感谢🙏酷友「无力感*」「斤斤计较呀」「Pseudopamine」
-
-### 新功能
-+ 高帧率支持
-+ 默认评论排序设置
-+ 默认动态类别设置
-+ 动态合集查看
-+ 同时观看人数
-+ iOS路由切换效果
-
-  
-### 修复
-+ 收藏夹翻页
-+ 首页搜索框频繁点击消失
-+ 评论排序切换空白
-+ 快速返回首页
-+ 重复进入个人中心页面数据未刷新
-+ 动态goods数据异常
-+ 大会员切换番剧
-+ 高画质codes匹配
-
-  
-### 优化
-+ 倍速选择
-+ 播放器亮度记忆
-+ 下载对应版本apk

change_log/1.0.6.0902.md

@@ -1,34 +0,0 @@
-## 1.0.6
-
-问题反馈、功能建议请查看「关于」页面。
-
-### 新功能
-+ 首页单列布局
-+ 首页推荐展示播放量、弹幕数
-+ 简单弹幕功能实现（持续开发中...）
-+ 评论区搜索关键词开关 issues#46
-+ 热搜榜隐藏功能 issues#35
-+ 自动全屏 issues#37
-+ 快速收藏功能
-+ 双击快进/快退开关
-+ 评论链接跳转视频
-+ 支持移除单个稍后再看
-+ app scheme外链跳转
-
-  
-### 修复
-+ 杜比、无损音频切换
-+ 收藏夹展示 issues#42
-+ 搜索建议次 issues#47
-
-  
-### 优化
-+ 倍速选择优化
-+ 导航条沉浸
-+ 取消Hero动画
-+ 视频锁定逻辑
-+ 登录逻辑优化
-+ 图片预览样式
-+ +评论区用户点击范围
-+ 关注、粉丝页面优化
-+ 关闭自动播放时播放器初始化逻辑

change_log/1.0.7.0908.md

@@ -1,22 +0,0 @@
-## 1.0.7
-
-默认倍速、直播弹幕、专栏等功能开发中
-
-### 新功能
-+ 弹幕设置、屏蔽功能
-+ 不是很完美的后台播放功能
-+ 不是很完美的画中画(pip)功能（Android端）
- 
-### 修复
-+ 动态页面加载异常
-+ 网络异常时页面空白
-+ 竖屏全屏状态栏问题
-+ iOS端代理请求异常
-  
-### 优化
-+ 图片预览
-+ 全屏播放时自动旋转
-+ 转发内容增加视频标题
-
-更多更新日志可在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上查看
-问题反馈、功能建议请查看「关于」页面。

distribute_options.yaml

@@ -0,0 +1 @@
+output: dist/

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

@@ -1,10 +0,0 @@
-PiliPlus is a third-party Bilibili client developed in Flutter, 
-fork from PiliPalaX (https://github.com/orz12/PiliPalaX).
-
-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 @@
-PiliPlus

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

@@ -1,10 +0,0 @@
-PiliPlus 是使用 Flutter 开发的 BiliBili 第三方客户端，
-是由PiliPalaX仓库fork并进行了差异化开发的版本
-
-主要功能：
-
-* 推荐视频列表
-* 最热视频列表
-* 热门直播
-* 番剧列表
-* 屏蔽黑名单内用户视频

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

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

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

@@ -1 +0,0 @@
-PiliPlus

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

ios/Flutter/Debug.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1,2 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,4 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

ios/Runner/AppDelegate.swift

@@ -1,7 +1,7 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

lib/build_config.dart

@@ -0,0 +1,16 @@
+class BuildConfig {
+  static const int versionCode = int.fromEnvironment(
+    'pili.code',
+    defaultValue: 1,
+  );
+  static const String versionName = String.fromEnvironment(
+    'pili.name',
+    defaultValue: 'SNAPSHOT',
+  );
+
+  static const int buildTime = int.fromEnvironment('pili.time');
+  static const String commitHash = String.fromEnvironment(
+    'pili.hash',
+    defaultValue: 'N/A',
+  );
+}

lib/common/constants.dart

@@ -1,4 +1,3 @@
-import 'package:PiliPlus/http/constants.dart';
 import 'package:flutter/material.dart';
 
 class StyleString {
@@ -7,13 +6,15 @@ class StyleString {
   static const BorderRadius mdRadius = BorderRadius.all(imgRadius);
   static const Radius imgRadius = Radius.circular(10);
   static const double aspectRatio = 16 / 10;
-  static const bottomSheetRadius = BorderRadius.only(
-    topLeft: Radius.circular(18),
-    topRight: Radius.circular(18),
+  static const bottomSheetRadius = BorderRadius.vertical(
+    top: Radius.circular(18),
   );
 }
 
 class Constants {
+  static const appName = 'PiliPlus';
+  static const sourceCodeUrl = 'https://github.com/bggRGjQaUbCoE/PiliPlus';
+
   // 27eb53fc9058f8c3  移动端 Android
   // 4409e2ce8ffd12b8  HD版
   static const String appKey = 'dfca71928277209b';
@@ -41,7 +42,7 @@ class Constants {
   static const baseHeaders = {
     'connection': 'keep-alive',
     'accept-encoding': 'br,gzip',
-    'referer': HttpString.baseUrl,
+    // 'referer': HttpString.baseUrl,
     'env': 'prod',
     'app-key': 'android64',
     'x-bili-aurora-zone': 'sh001',
@@ -75,221 +76,221 @@ class Constants {
   ];
 
   //内容来自 https://passport.bilibili.com/web/generic/country/list
-  static List<Map<String, dynamic>> get internationalDialingPrefix => [
-    {"id": 1, "cname": "中国大陆", "country_id": "86"},
-    {"id": 5, "cname": "中国香港特别行政区", "country_id": "852"},
-    {"id": 2, "cname": "中国澳门特别行政区", "country_id": "853"},
-    {"id": 3, "cname": "中国台湾", "country_id": "886"},
-    {"id": 4, "cname": "美国", "country_id": "1"},
-    {"id": 6, "cname": "比利时", "country_id": "32"},
-    {"id": 7, "cname": "澳大利亚", "country_id": "61"},
-    {"id": 8, "cname": "法国", "country_id": "33"},
-    {"id": 9, "cname": "加拿大", "country_id": "1"},
-    {"id": 10, "cname": "日本", "country_id": "81"},
-    {"id": 11, "cname": "新加坡", "country_id": "65"},
-    {"id": 12, "cname": "韩国", "country_id": "82"},
-    {"id": 13, "cname": "马来西亚", "country_id": "60"},
-    {"id": 14, "cname": "英国", "country_id": "44"},
-    {"id": 15, "cname": "意大利", "country_id": "39"},
-    {"id": 16, "cname": "德国", "country_id": "49"},
-    {"id": 18, "cname": "俄罗斯", "country_id": "7"},
-    {"id": 19, "cname": "新西兰", "country_id": "64"}, //common:1-19
-    {"id": 153, "cname": "瓦利斯群岛和富图纳群岛", "country_id": "1681"},
-    {"id": 152, "cname": "葡萄牙", "country_id": "351"},
-    {"id": 151, "cname": "帕劳", "country_id": "680"},
-    {"id": 150, "cname": "诺福克岛", "country_id": "672"},
-    {"id": 149, "cname": "挪威", "country_id": "47"},
-    {"id": 148, "cname": "纽埃岛", "country_id": "683"},
-    {"id": 147, "cname": "尼日利亚", "country_id": "234"},
-    {"id": 146, "cname": "尼日尔", "country_id": "227"},
-    {"id": 145, "cname": "尼加拉瓜", "country_id": "505"},
-    {"id": 144, "cname": "尼泊尔", "country_id": "977"},
-    {"id": 143, "cname": "瑙鲁", "country_id": "674"},
-    {"id": 154, "cname": "格鲁吉亚", "country_id": "995"},
-    {"id": 155, "cname": "瑞典", "country_id": "46"},
-    {"id": 165, "cname": "沙特阿拉伯", "country_id": "966"},
-    {"id": 164, "cname": "桑给巴尔岛", "country_id": "259"},
-    {"id": 163, "cname": "塞舌尔共和国", "country_id": "248"},
-    {"id": 162, "cname": "塞浦路斯", "country_id": "357"},
-    {"id": 161, "cname": "塞内加尔", "country_id": "221"},
-    {"id": 160, "cname": "塞拉利昂", "country_id": "232"},
-    {"id": 159, "cname": "萨摩亚，东部", "country_id": "684"},
-    {"id": 158, "cname": "萨摩亚，西部", "country_id": "685"},
-    {"id": 157, "cname": "萨尔瓦多", "country_id": "503"},
-    {"id": 156, "cname": "瑞士", "country_id": "41"},
-    {"id": 166, "cname": "圣多美和普林西比", "country_id": "239"},
-    {"id": 142, "cname": "塞尔维亚", "country_id": "381"},
-    {"id": 141, "cname": "南非", "country_id": "27"},
-    {"id": 128, "cname": "毛里塔尼亚", "country_id": "222"},
-    {"id": 127, "cname": "毛里求斯", "country_id": "230"},
-    {"id": 126, "cname": "马歇尔岛", "country_id": "692"},
-    {"id": 125, "cname": "马提尼克岛", "country_id": "596"},
-    {"id": 124, "cname": "马其顿", "country_id": "389"},
-    {"id": 123, "cname": "马里亚纳岛", "country_id": "1670"},
-    {"id": 122, "cname": "马里", "country_id": "223"},
-    {"id": 121, "cname": "马拉维", "country_id": "265"},
-    {"id": 120, "cname": "马耳他", "country_id": "356"},
-    {"id": 119, "cname": "马尔代夫", "country_id": "960"},
-    {"id": 129, "cname": "蒙古", "country_id": "976"},
-    {"id": 130, "cname": "蒙特塞拉特岛", "country_id": "1664"},
-    {"id": 140, "cname": "纳米比亚", "country_id": "264"},
-    {"id": 139, "cname": "墨西哥", "country_id": "52"},
-    {"id": 138, "cname": "莫桑比克", "country_id": "258"},
-    {"id": 137, "cname": "摩纳哥", "country_id": "377"},
-    {"id": 136, "cname": "摩洛哥", "country_id": "212"},
-    {"id": 135, "cname": "摩尔多瓦", "country_id": "373"},
-    {"id": 134, "cname": "缅甸", "country_id": "95"},
-    {"id": 133, "cname": "密克罗尼西亚", "country_id": "691"},
-    {"id": 132, "cname": "秘鲁", "country_id": "51"},
-    {"id": 131, "cname": "孟加拉国", "country_id": "880"},
-    {"id": 118, "cname": "马达加斯加", "country_id": "261"},
-    {"id": 167, "cname": "圣卢西亚", "country_id": "1784"},
-    {"id": 216, "cname": "智利", "country_id": "56"},
-    {"id": 203, "cname": "牙买加", "country_id": "1876"},
-    {"id": 202, "cname": "叙利亚", "country_id": "963"},
-    {"id": 201, "cname": "匈牙利", "country_id": "36"},
-    {"id": 200, "cname": "科特迪瓦", "country_id": "225"},
-    {"id": 199, "cname": "希腊", "country_id": "30"},
-    {"id": 198, "cname": "西班牙", "country_id": "34"},
-    {"id": 197, "cname": "乌兹别克斯坦", "country_id": "998"},
-    {"id": 196, "cname": "乌拉圭", "country_id": "598"},
-    {"id": 195, "cname": "乌克兰", "country_id": "380"},
-    {"id": 194, "cname": "乌干达", "country_id": "256"},
-    {"id": 204, "cname": "亚美尼亚", "country_id": "374"},
-    {"id": 205, "cname": "也门", "country_id": "967"},
-    {"id": 215, "cname": "直布罗陀", "country_id": "350"},
-    {"id": 214, "cname": "乍得", "country_id": "235"},
-    {"id": 213, "cname": "赞比亚", "country_id": "260"},
-    {"id": 212, "cname": "越南", "country_id": "84"},
-    {"id": 211, "cname": "约旦", "country_id": "962"},
-    {"id": 210, "cname": "印尼", "country_id": "62"},
-    {"id": 209, "cname": "印度", "country_id": "91"},
-    {"id": 208, "cname": "以色列", "country_id": "972"},
-    {"id": 207, "cname": "伊朗", "country_id": "98"},
-    {"id": 206, "cname": "伊拉克", "country_id": "964"},
-    {"id": 193, "cname": "文莱", "country_id": "673"},
-    {"id": 192, "cname": "委内瑞拉", "country_id": "58"},
-    {"id": 191, "cname": "维珍群岛(英属)", "country_id": "1284"},
-    {"id": 178, "cname": "泰国", "country_id": "66"},
-    {"id": 177, "cname": "索马里", "country_id": "252"},
-    {"id": 176, "cname": "所罗门群岛", "country_id": "677"},
-    {"id": 175, "cname": "苏里南", "country_id": "597"},
-    {"id": 174, "cname": "苏丹", "country_id": "249"},
-    {"id": 173, "cname": "斯威士兰", "country_id": "268"},
-    {"id": 172, "cname": "斯洛文尼亚", "country_id": "386"},
-    {"id": 171, "cname": "斯洛伐克", "country_id": "421"},
-    {"id": 170, "cname": "斯里兰卡", "country_id": "94"},
-    {"id": 169, "cname": "圣皮埃尔和密克隆群岛", "country_id": "508"},
-    {"id": 179, "cname": "坦桑尼亚", "country_id": "255"},
-    {"id": 180, "cname": "汤加", "country_id": "676"},
-    {"id": 190, "cname": "维珍群岛(美属)", "country_id": "1340"},
-    {"id": 189, "cname": "瓦努阿图", "country_id": "678"},
-    {"id": 188, "cname": "托克劳岛", "country_id": "690"},
-    {"id": 187, "cname": "土库曼斯坦", "country_id": "993"},
-    {"id": 186, "cname": "土耳其", "country_id": "90"},
-    {"id": 185, "cname": "图瓦卢", "country_id": "688"},
-    {"id": 184, "cname": "突尼斯", "country_id": "216"},
-    {"id": 183, "cname": "阿森松岛", "country_id": "247"},
-    {"id": 182, "cname": "特立尼达和多巴哥", "country_id": "1868"},
-    {"id": 181, "cname": "特克斯和凯科斯", "country_id": "1649"},
-    {"id": 168, "cname": "圣马力诺", "country_id": "378"},
-    {"id": 67, "cname": "法属圭亚那", "country_id": "594"},
-    {"id": 54, "cname": "不丹", "country_id": "975"},
-    {"id": 53, "cname": "博茨瓦纳", "country_id": "267"},
-    {"id": 52, "cname": "伯利兹", "country_id": "501"},
-    {"id": 51, "cname": "玻利维亚", "country_id": "591"},
-    {"id": 50, "cname": "波兰", "country_id": "48"},
-    {"id": 49, "cname": "波黑", "country_id": "387"},
-    {"id": 48, "cname": "波多黎各", "country_id": "1787"},
-    {"id": 47, "cname": "冰岛", "country_id": "354"},
-    {"id": 46, "cname": "贝宁", "country_id": "229"},
-    {"id": 45, "cname": "保加利亚", "country_id": "359"},
-    {"id": 55, "cname": "布基纳法索", "country_id": "226"},
-    {"id": 56, "cname": "布隆迪", "country_id": "257"},
-    {"id": 66, "cname": "法属波利尼西亚", "country_id": "689"},
-    {"id": 65, "cname": "法罗岛", "country_id": "298"},
-    {"id": 64, "cname": "厄立特里亚", "country_id": "291"},
-    {"id": 63, "cname": "厄瓜多尔", "country_id": "593"},
-    {"id": 62, "cname": "多米尼加代表", "country_id": "1809"},
-    {"id": 61, "cname": "多米尼加", "country_id": "1767"},
-    {"id": 60, "cname": "多哥", "country_id": "228"},
-    {"id": 59, "cname": "迪戈加西亚岛", "country_id": "246"},
-    {"id": 58, "cname": "丹麦", "country_id": "45"},
-    {"id": 57, "cname": "赤道几内亚", "country_id": "240"},
-    {"id": 44, "cname": "百慕大群岛", "country_id": "1441"},
-    {"id": 43, "cname": "白俄罗斯", "country_id": "375"},
-    {"id": 42, "cname": "巴西", "country_id": "55"},
-    {"id": 29, "cname": "爱尔兰", "country_id": "353"},
-    {"id": 28, "cname": "埃塞俄比亚", "country_id": "251"},
-    {"id": 27, "cname": "埃及", "country_id": "20"},
-    {"id": 26, "cname": "阿塞拜疆", "country_id": "994"},
-    {"id": 25, "cname": "阿曼", "country_id": "968"},
-    {"id": 24, "cname": "阿联酋", "country_id": "971"},
-    {"id": 23, "cname": "阿根廷", "country_id": "54"},
-    {"id": 22, "cname": "阿富汗", "country_id": "93"},
-    {"id": 21, "cname": "阿尔及利亚", "country_id": "213"},
-    {"id": 20, "cname": "阿尔巴尼亚", "country_id": "355"},
-    {"id": 30, "cname": "爱沙尼亚", "country_id": "372"},
-    {"id": 31, "cname": "安道尔", "country_id": "376"},
-    {"id": 41, "cname": "巴拿马", "country_id": "507"},
-    {"id": 40, "cname": "巴林", "country_id": "973"},
-    {"id": 39, "cname": "巴拉圭", "country_id": "595"},
-    {"id": 38, "cname": "巴基斯坦", "country_id": "92"},
-    {"id": 37, "cname": "巴哈马群岛", "country_id": "1242"},
-    {"id": 36, "cname": "巴布亚新几内亚", "country_id": "675"},
-    {"id": 35, "cname": "巴巴多斯", "country_id": "1246"},
-    {"id": 34, "cname": "奥地利", "country_id": "43"},
-    {"id": 33, "cname": "安提瓜岛和巴布达", "country_id": "1268"},
-    {"id": 32, "cname": "安哥拉", "country_id": "244"},
-    {"id": 68, "cname": "非洲中部", "country_id": "236"},
-    {"id": 117, "cname": "罗马尼亚", "country_id": "40"},
-    {"id": 104, "cname": "科威特", "country_id": "965"},
-    {"id": 103, "cname": "科摩罗", "country_id": "269"},
-    {"id": 102, "cname": "开曼群岛", "country_id": "1345"},
-    {"id": 101, "cname": "卡塔尔", "country_id": "974"},
-    {"id": 100, "cname": "喀麦隆", "country_id": "237"},
-    {"id": 99, "cname": "聚会岛", "country_id": "262"},
-    {"id": 98, "cname": "津巴布韦", "country_id": "263"},
-    {"id": 97, "cname": "捷克", "country_id": "420"},
-    {"id": 96, "cname": "柬埔寨", "country_id": "855"},
-    {"id": 95, "cname": "加蓬", "country_id": "241"},
-    {"id": 105, "cname": "克罗地亚", "country_id": "385"},
-    {"id": 106, "cname": "肯尼亚", "country_id": "254"},
-    {"id": 116, "cname": "卢旺达", "country_id": "250"},
-    {"id": 115, "cname": "卢森堡", "country_id": "352"},
-    {"id": 114, "cname": "利比亚", "country_id": "218"},
-    {"id": 113, "cname": "利比里亚", "country_id": "231"},
-    {"id": 112, "cname": "立陶宛", "country_id": "370"},
-    {"id": 111, "cname": "黎巴嫩", "country_id": "961"},
-    {"id": 110, "cname": "老挝", "country_id": "856"},
-    {"id": 109, "cname": "莱索托", "country_id": "266"},
-    {"id": 108, "cname": "拉脱维亚", "country_id": "371"},
-    {"id": 107, "cname": "库克岛", "country_id": "682"},
-    {"id": 94, "cname": "加纳", "country_id": "233"},
-    {"id": 93, "cname": "几内亚比绍", "country_id": "245"},
-    {"id": 92, "cname": "几内亚", "country_id": "224"},
-    {"id": 79, "cname": "格林纳达", "country_id": "1473"},
-    {"id": 78, "cname": "哥斯达黎加", "country_id": "506"},
-    {"id": 77, "cname": "哥伦比亚", "country_id": "57"},
-    {"id": 76, "cname": "刚果(金)", "country_id": "243"},
-    {"id": 75, "cname": "刚果", "country_id": "242"},
-    {"id": 74, "cname": "冈比亚", "country_id": "220"},
-    {"id": 73, "cname": "福克兰岛", "country_id": "500"},
-    {"id": 72, "cname": "佛得角", "country_id": "238"},
-    {"id": 71, "cname": "芬兰", "country_id": "358"},
-    {"id": 70, "cname": "斐济", "country_id": "679"},
-    {"id": 80, "cname": "格陵兰岛", "country_id": "299"},
-    {"id": 81, "cname": "古巴", "country_id": "53"},
-    {"id": 91, "cname": "吉尔吉斯斯坦", "country_id": "996"},
-    {"id": 90, "cname": "吉布提", "country_id": "253"},
-    {"id": 89, "cname": "基里巴斯", "country_id": "686"},
-    {"id": 88, "cname": "维克岛", "country_id": "1808"},
-    {"id": 87, "cname": "洪都拉斯", "country_id": "504"},
-    {"id": 86, "cname": "荷兰", "country_id": "31"},
-    {"id": 85, "cname": "朝鲜", "country_id": "850"},
-    {"id": 84, "cname": "海地", "country_id": "509"},
-    {"id": 83, "cname": "关岛", "country_id": "1671"},
-    {"id": 82, "cname": "瓜德罗普岛", "country_id": "590"},
-    {"id": 69, "cname": "菲律宾", "country_id": "63"},
+  static const internationalDialingPrefix = [
+    (id: 1, cname: "中国大陆", countryId: 86),
+    (id: 5, cname: "中国香港特别行政区", countryId: 852),
+    (id: 2, cname: "中国澳门特别行政区", countryId: 853),
+    (id: 3, cname: "中国台湾", countryId: 886),
+    (id: 4, cname: "美国", countryId: 1),
+    (id: 6, cname: "比利时", countryId: 32),
+    (id: 7, cname: "澳大利亚", countryId: 61),
+    (id: 8, cname: "法国", countryId: 33),
+    (id: 9, cname: "加拿大", countryId: 1),
+    (id: 10, cname: "日本", countryId: 81),
+    (id: 11, cname: "新加坡", countryId: 65),
+    (id: 12, cname: "韩国", countryId: 82),
+    (id: 13, cname: "马来西亚", countryId: 60),
+    (id: 14, cname: "英国", countryId: 44),
+    (id: 15, cname: "意大利", countryId: 39),
+    (id: 16, cname: "德国", countryId: 49),
+    (id: 18, cname: "俄罗斯", countryId: 7),
+    (id: 19, cname: "新西兰", countryId: 64),
+    (id: 153, cname: "瓦利斯群岛和富图纳群岛", countryId: 1681),
+    (id: 152, cname: "葡萄牙", countryId: 351),
+    (id: 151, cname: "帕劳", countryId: 680),
+    (id: 150, cname: "诺福克岛", countryId: 672),
+    (id: 149, cname: "挪威", countryId: 47),
+    (id: 148, cname: "纽埃岛", countryId: 683),
+    (id: 147, cname: "尼日利亚", countryId: 234),
+    (id: 146, cname: "尼日尔", countryId: 227),
+    (id: 145, cname: "尼加拉瓜", countryId: 505),
+    (id: 144, cname: "尼泊尔", countryId: 977),
+    (id: 143, cname: "瑙鲁", countryId: 674),
+    (id: 154, cname: "格鲁吉亚", countryId: 995),
+    (id: 155, cname: "瑞典", countryId: 46),
+    (id: 165, cname: "沙特阿拉伯", countryId: 966),
+    (id: 164, cname: "桑给巴尔岛", countryId: 259),
+    (id: 163, cname: "塞舌尔共和国", countryId: 248),
+    (id: 162, cname: "塞浦路斯", countryId: 357),
+    (id: 161, cname: "塞内加尔", countryId: 221),
+    (id: 160, cname: "塞拉利昂", countryId: 232),
+    (id: 159, cname: "萨摩亚，东部", countryId: 684),
+    (id: 158, cname: "萨摩亚，西部", countryId: 685),
+    (id: 157, cname: "萨尔瓦多", countryId: 503),
+    (id: 156, cname: "瑞士", countryId: 41),
+    (id: 166, cname: "圣多美和普林西比", countryId: 239),
+    (id: 142, cname: "塞尔维亚", countryId: 381),
+    (id: 141, cname: "南非", countryId: 27),
+    (id: 128, cname: "毛里塔尼亚", countryId: 222),
+    (id: 127, cname: "毛里求斯", countryId: 230),
+    (id: 126, cname: "马歇尔岛", countryId: 692),
+    (id: 125, cname: "马提尼克岛", countryId: 596),
+    (id: 124, cname: "马其顿", countryId: 389),
+    (id: 123, cname: "马里亚纳岛", countryId: 1670),
+    (id: 122, cname: "马里", countryId: 223),
+    (id: 121, cname: "马拉维", countryId: 265),
+    (id: 120, cname: "马耳他", countryId: 356),
+    (id: 119, cname: "马尔代夫", countryId: 960),
+    (id: 129, cname: "蒙古", countryId: 976),
+    (id: 130, cname: "蒙特塞拉特岛", countryId: 1664),
+    (id: 140, cname: "纳米比亚", countryId: 264),
+    (id: 139, cname: "墨西哥", countryId: 52),
+    (id: 138, cname: "莫桑比克", countryId: 258),
+    (id: 137, cname: "摩纳哥", countryId: 377),
+    (id: 136, cname: "摩洛哥", countryId: 212),
+    (id: 135, cname: "摩尔多瓦", countryId: 373),
+    (id: 134, cname: "缅甸", countryId: 95),
+    (id: 133, cname: "密克罗尼西亚", countryId: 691),
+    (id: 132, cname: "秘鲁", countryId: 51),
+    (id: 131, cname: "孟加拉国", countryId: 880),
+    (id: 118, cname: "马达加斯加", countryId: 261),
+    (id: 167, cname: "圣卢西亚", countryId: 1784),
+    (id: 216, cname: "智利", countryId: 56),
+    (id: 203, cname: "牙买加", countryId: 1876),
+    (id: 202, cname: "叙利亚", countryId: 963),
+    (id: 201, cname: "匈牙利", countryId: 36),
+    (id: 200, cname: "科特迪瓦", countryId: 225),
+    (id: 199, cname: "希腊", countryId: 30),
+    (id: 198, cname: "西班牙", countryId: 34),
+    (id: 197, cname: "乌兹别克斯坦", countryId: 998),
+    (id: 196, cname: "乌拉圭", countryId: 598),
+    (id: 195, cname: "乌克兰", countryId: 380),
+    (id: 194, cname: "乌干达", countryId: 256),
+    (id: 204, cname: "亚美尼亚", countryId: 374),
+    (id: 205, cname: "也门", countryId: 967),
+    (id: 215, cname: "直布罗陀", countryId: 350),
+    (id: 214, cname: "乍得", countryId: 235),
+    (id: 213, cname: "赞比亚", countryId: 260),
+    (id: 212, cname: "越南", countryId: 84),
+    (id: 211, cname: "约旦", countryId: 962),
+    (id: 210, cname: "印尼", countryId: 62),
+    (id: 209, cname: "印度", countryId: 91),
+    (id: 208, cname: "以色列", countryId: 972),
+    (id: 207, cname: "伊朗", countryId: 98),
+    (id: 206, cname: "伊拉克", countryId: 964),
+    (id: 193, cname: "文莱", countryId: 673),
+    (id: 192, cname: "委内瑞拉", countryId: 58),
+    (id: 191, cname: "维珍群岛(英属)", countryId: 1284),
+    (id: 178, cname: "泰国", countryId: 66),
+    (id: 177, cname: "索马里", countryId: 252),
+    (id: 176, cname: "所罗门群岛", countryId: 677),
+    (id: 175, cname: "苏里南", countryId: 597),
+    (id: 174, cname: "苏丹", countryId: 249),
+    (id: 173, cname: "斯威士兰", countryId: 268),
+    (id: 172, cname: "斯洛文尼亚", countryId: 386),
+    (id: 171, cname: "斯洛伐克", countryId: 421),
+    (id: 170, cname: "斯里兰卡", countryId: 94),
+    (id: 169, cname: "圣皮埃尔和密克隆群岛", countryId: 508),
+    (id: 179, cname: "坦桑尼亚", countryId: 255),
+    (id: 180, cname: "汤加", countryId: 676),
+    (id: 190, cname: "维珍群岛(美属)", countryId: 1340),
+    (id: 189, cname: "瓦努阿图", countryId: 678),
+    (id: 188, cname: "托克劳岛", countryId: 690),
+    (id: 187, cname: "土库曼斯坦", countryId: 993),
+    (id: 186, cname: "土耳其", countryId: 90),
+    (id: 185, cname: "图瓦卢", countryId: 688),
+    (id: 184, cname: "突尼斯", countryId: 216),
+    (id: 183, cname: "阿森松岛", countryId: 247),
+    (id: 182, cname: "特立尼达和多巴哥", countryId: 1868),
+    (id: 181, cname: "特克斯和凯科斯", countryId: 1649),
+    (id: 168, cname: "圣马力诺", countryId: 378),
+    (id: 67, cname: "法属圭亚那", countryId: 594),
+    (id: 54, cname: "不丹", countryId: 975),
+    (id: 53, cname: "博茨瓦纳", countryId: 267),
+    (id: 52, cname: "伯利兹", countryId: 501),
+    (id: 51, cname: "玻利维亚", countryId: 591),
+    (id: 50, cname: "波兰", countryId: 48),
+    (id: 49, cname: "波黑", countryId: 387),
+    (id: 48, cname: "波多黎各", countryId: 1787),
+    (id: 47, cname: "冰岛", countryId: 354),
+    (id: 46, cname: "贝宁", countryId: 229),
+    (id: 45, cname: "保加利亚", countryId: 359),
+    (id: 55, cname: "布基纳法索", countryId: 226),
+    (id: 56, cname: "布隆迪", countryId: 257),
+    (id: 66, cname: "法属波利尼西亚", countryId: 689),
+    (id: 65, cname: "法罗岛", countryId: 298),
+    (id: 64, cname: "厄立特里亚", countryId: 291),
+    (id: 63, cname: "厄瓜多尔", countryId: 593),
+    (id: 62, cname: "多米尼加代表", countryId: 1809),
+    (id: 61, cname: "多米尼加", countryId: 1767),
+    (id: 60, cname: "多哥", countryId: 228),
+    (id: 59, cname: "迪戈加西亚岛", countryId: 246),
+    (id: 58, cname: "丹麦", countryId: 45),
+    (id: 57, cname: "赤道几内亚", countryId: 240),
+    (id: 44, cname: "百慕大群岛", countryId: 1441),
+    (id: 43, cname: "白俄罗斯", countryId: 375),
+    (id: 42, cname: "巴西", countryId: 55),
+    (id: 29, cname: "爱尔兰", countryId: 353),
+    (id: 28, cname: "埃塞俄比亚", countryId: 251),
+    (id: 27, cname: "埃及", countryId: 20),
+    (id: 26, cname: "阿塞拜疆", countryId: 994),
+    (id: 25, cname: "阿曼", countryId: 968),
+    (id: 24, cname: "阿联酋", countryId: 971),
+    (id: 23, cname: "阿根廷", countryId: 54),
+    (id: 22, cname: "阿富汗", countryId: 93),
+    (id: 21, cname: "阿尔及利亚", countryId: 213),
+    (id: 20, cname: "阿尔巴尼亚", countryId: 355),
+    (id: 30, cname: "爱沙尼亚", countryId: 372),
+    (id: 31, cname: "安道尔", countryId: 376),
+    (id: 41, cname: "巴拿马", countryId: 507),
+    (id: 40, cname: "巴林", countryId: 973),
+    (id: 39, cname: "巴拉圭", countryId: 595),
+    (id: 38, cname: "巴基斯坦", countryId: 92),
+    (id: 37, cname: "巴哈马群岛", countryId: 1242),
+    (id: 36, cname: "巴布亚新几内亚", countryId: 675),
+    (id: 35, cname: "巴巴多斯", countryId: 1246),
+    (id: 34, cname: "奥地利", countryId: 43),
+    (id: 33, cname: "安提瓜岛和巴布达", countryId: 1268),
+    (id: 32, cname: "安哥拉", countryId: 244),
+    (id: 68, cname: "非洲中部", countryId: 236),
+    (id: 117, cname: "罗马尼亚", countryId: 40),
+    (id: 104, cname: "科威特", countryId: 965),
+    (id: 103, cname: "科摩罗", countryId: 269),
+    (id: 102, cname: "开曼群岛", countryId: 1345),
+    (id: 101, cname: "卡塔尔", countryId: 974),
+    (id: 100, cname: "喀麦隆", countryId: 237),
+    (id: 99, cname: "聚会岛", countryId: 262),
+    (id: 98, cname: "津巴布韦", countryId: 263),
+    (id: 97, cname: "捷克", countryId: 420),
+    (id: 96, cname: "柬埔寨", countryId: 855),
+    (id: 95, cname: "加蓬", countryId: 241),
+    (id: 105, cname: "克罗地亚", countryId: 385),
+    (id: 106, cname: "肯尼亚", countryId: 254),
+    (id: 116, cname: "卢旺达", countryId: 250),
+    (id: 115, cname: "卢森堡", countryId: 352),
+    (id: 114, cname: "利比亚", countryId: 218),
+    (id: 113, cname: "利比里亚", countryId: 231),
+    (id: 112, cname: "立陶宛", countryId: 370),
+    (id: 111, cname: "黎巴嫩", countryId: 961),
+    (id: 110, cname: "老挝", countryId: 856),
+    (id: 109, cname: "莱索托", countryId: 266),
+    (id: 108, cname: "拉脱维亚", countryId: 371),
+    (id: 107, cname: "库克岛", countryId: 682),
+    (id: 94, cname: "加纳", countryId: 233),
+    (id: 93, cname: "几内亚比绍", countryId: 245),
+    (id: 92, cname: "几内亚", countryId: 224),
+    (id: 79, cname: "格林纳达", countryId: 1473),
+    (id: 78, cname: "哥斯达黎加", countryId: 506),
+    (id: 77, cname: "哥伦比亚", countryId: 57),
+    (id: 76, cname: "刚果(金)", countryId: 243),
+    (id: 75, cname: "刚果", countryId: 242),
+    (id: 74, cname: "冈比亚", countryId: 220),
+    (id: 73, cname: "福克兰岛", countryId: 500),
+    (id: 72, cname: "佛得角", countryId: 238),
+    (id: 71, cname: "芬兰", countryId: 358),
+    (id: 70, cname: "斐济", countryId: 679),
+    (id: 80, cname: "格陵兰岛", countryId: 299),
+    (id: 81, cname: "古巴", countryId: 53),
+    (id: 91, cname: "吉尔吉斯斯坦", countryId: 996),
+    (id: 90, cname: "吉布提", countryId: 253),
+    (id: 89, cname: "基里巴斯", countryId: 686),
+    (id: 88, cname: "维克岛", countryId: 1808),
+    (id: 87, cname: "洪都拉斯", countryId: 504),
+    (id: 86, cname: "荷兰", countryId: 31),
+    (id: 85, cname: "朝鲜", countryId: 850),
+    (id: 84, cname: "海地", countryId: 509),
+    (id: 83, cname: "关岛", countryId: 1671),
+    (id: 82, cname: "瓜德罗普岛", countryId: 590),
+    (id: 69, cname: "菲律宾", countryId: 63),
   ];
 }

lib/common/skeleton/dynamic_card.dart

@@ -21,6 +21,7 @@ class DynamicCardSkeleton extends StatelessWidget {
           ),
         ),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Row(
               children: [
@@ -51,44 +52,36 @@ class DynamicCardSkeleton extends StatelessWidget {
                 ),
               ],
             ),
+            const SizedBox(height: 10),
             Container(
+              color: color,
               width: double.infinity,
-              margin: const EdgeInsets.only(top: 10),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Container(
-                    color: color,
-                    width: double.infinity,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: double.infinity,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 300,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 250,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                  Container(
-                    color: color,
-                    width: 100,
-                    height: 13,
-                    margin: const EdgeInsets.only(bottom: 7),
-                  ),
-                ],
-              ),
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: double.infinity,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 300,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 250,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
+            ),
+            Container(
+              color: color,
+              width: 100,
+              height: 13,
+              margin: const EdgeInsets.only(bottom: 7),
             ),
             if (GlobalData().dynamicsWaterfallFlow) const Spacer(),
             Row(

lib/common/skeleton/video_card_h.dart

@@ -19,15 +19,11 @@ class VideoCardHSkeleton extends StatelessWidget {
           children: [
             AspectRatio(
               aspectRatio: StyleString.aspectRatio,
-              child: LayoutBuilder(
-                builder: (context, boxConstraints) {
-                  return DecoratedBox(
-                    decoration: BoxDecoration(
-                      color: color,
-                      borderRadius: StyleString.mdRadius,
-                    ),
-                  );
-                },
+              child: DecoratedBox(
+                decoration: BoxDecoration(
+                  color: color,
+                  borderRadius: StyleString.mdRadius,
+                ),
               ),
             ),
             Expanded(

lib/common/skeleton/video_card_v.dart

@@ -10,18 +10,15 @@ class VideoCardVSkeleton extends StatelessWidget {
     final color = Theme.of(context).colorScheme.onInverseSurface;
     return Skeleton(
       child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           AspectRatio(
             aspectRatio: StyleString.aspectRatio,
-            child: LayoutBuilder(
-              builder: (context, boxConstraints) {
-                return DecoratedBox(
-                  decoration: BoxDecoration(
-                    color: color,
-                    borderRadius: StyleString.mdRadius,
-                  ),
-                );
-              },
+            child: DecoratedBox(
+              decoration: BoxDecoration(
+                color: color,
+                borderRadius: StyleString.mdRadius,
+              ),
             ),
           ),
           Padding(

lib/common/skeleton/video_reply.dart

@@ -30,9 +30,8 @@ class VideoReplySkeleton extends StatelessWidget {
               ],
             ),
           ),
-          Container(
-            width: double.infinity,
-            margin: const EdgeInsets.only(
+          Padding(
+            padding: const EdgeInsets.only(
               top: 4,
               left: 57,
               right: 6,

lib/common/widgets/badge.dart

@@ -77,6 +77,9 @@ class PBadge extends StatelessWidget {
       case PBadgeType.free:
         bgColor = theme.freeColor;
         color = Colors.white;
+      case PBadgeType.shop:
+        bgColor = theme.secondaryContainer.withValues(alpha: 0.5);
+        color = theme.onSurfaceVariant;
     }
 
     late EdgeInsets paddingStyle = const EdgeInsets.symmetric(

lib/common/widgets/button/icon_button.dart

@@ -1,50 +1,35 @@
 import 'package:flutter/material.dart';
 
 Widget iconButton({
-  required BuildContext context,
+  BuildContext? context,
   String? tooltip,
-  required IconData icon,
+  required Widget icon,
   required VoidCallback? onPressed,
   double size = 36,
   double? iconSize,
   Color? bgColor,
   Color? iconColor,
 }) {
-  late final theme = Theme.of(context);
+  Color? backgroundColor = bgColor;
+  Color? foregroundColor = iconColor;
+  if (context != null) {
+    final colorScheme = ColorScheme.of(context);
+    backgroundColor = colorScheme.secondaryContainer;
+    foregroundColor = colorScheme.onSecondaryContainer;
+  }
   return SizedBox(
     width: size,
     height: size,
     child: IconButton(
+      icon: icon,
       tooltip: tooltip,
       onPressed: onPressed,
-      icon: Icon(
-        icon,
-        size: iconSize ?? size / 2,
-        color: iconColor ?? theme.colorScheme.onSecondaryContainer,
-      ),
       style: IconButton.styleFrom(
         padding: EdgeInsets.zero,
-        backgroundColor: bgColor ?? theme.colorScheme.secondaryContainer,
+        iconSize: iconSize ?? size / 2,
+        backgroundColor: backgroundColor,
+        foregroundColor: foregroundColor,
       ),
     ),
   );
 }
-
-Widget mediumButton({
-  String? tooltip,
-  IconData? icon,
-  VoidCallback? onPressed,
-}) {
-  return SizedBox(
-    width: 34,
-    height: 34,
-    child: IconButton(
-      tooltip: tooltip,
-      icon: Icon(icon),
-      style: const ButtonStyle(
-        padding: WidgetStatePropertyAll(EdgeInsets.zero),
-      ),
-      onPressed: onPressed,
-    ),
-  );
-}

lib/common/widgets/button/more_btn.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+
+Widget moreTextButton({
+  String text = '查看更多',
+  required VoidCallback onTap,
+  EdgeInsets? padding,
+  Color? color,
+}) {
+  Widget child = Text.rich(
+    style: TextStyle(color: color, height: 1),
+    strutStyle: const StrutStyle(leading: 0, height: 1),
+    TextSpan(
+      children: [
+        TextSpan(text: text),
+        WidgetSpan(
+          alignment: PlaceholderAlignment.middle,
+          child: Icon(
+            size: 22,
+            color: color,
+            Icons.keyboard_arrow_right,
+          ),
+        ),
+      ],
+    ),
+  );
+  if (padding != null) {
+    child = Padding(padding: padding, child: child);
+  }
+  return GestureDetector(
+    behavior: HitTestBehavior.opaque,
+    onTap: onTap,
+    child: child,
+  );
+}

lib/common/widgets/color_palette.dart

@@ -15,11 +15,10 @@ class ColorPalette extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final Hct hct = Hct.fromInt(color.value);
+    final Hct hct = Hct.fromInt(color.toARGB32());
     final primary = Color(Hct.from(hct.hue, 20.0, 90.0).toInt());
     final tertiary = Color(Hct.from(hct.hue + 50, 20.0, 85.0).toInt());
     final primaryContainer = Color(Hct.from(hct.hue, 30.0, 50.0).toInt());
-    final checkbox = Color(Hct.from(hct.hue, 30.0, 40.0).toInt());
     Widget coloredBox(Color color) => Expanded(
       child: ColoredBox(
         color: color,
@@ -51,7 +50,7 @@ class ColorPalette extends StatelessWidget {
             width: 23,
             height: 23,
             decoration: BoxDecoration(
-              color: checkbox,
+              color: Color(Hct.from(hct.hue, 30.0, 40.0).toInt()),
               shape: BoxShape.circle,
             ),
             child: Icon(

lib/common/widgets/custom_icon.dart

@@ -2,7 +2,7 @@
 
 import 'package:flutter/widgets.dart';
 
-class CustomIcon {
+class CustomIcons {
   static const IconData coin = _CustomIconData(0xe800);
   static const IconData dm_off = _CustomIconData(0xe801);
   static const IconData dm_on = _CustomIconData(0xe802);
@@ -10,19 +10,24 @@ class CustomIcon {
   static const IconData dyn = _CustomIconData(0xe804);
   static const IconData fav = _CustomIconData(0xe805);
   static const IconData live_reserve = _CustomIconData(0xe806);
-  static const IconData share = _CustomIconData(0xe807);
-  static const IconData share_line = _CustomIconData(0xe808);
-  static const IconData share_node = _CustomIconData(0xe809);
-  static const IconData star_favorite_line = _CustomIconData(0xe80a);
-  static const IconData star_favorite_solid = _CustomIconData(0xe80b);
-  static const IconData thumbs_down = _CustomIconData(0xe80c);
-  static const IconData thumbs_down_outline = _CustomIconData(0xe80d);
-  static const IconData thumbs_up = _CustomIconData(0xe80e);
-  static const IconData thumbs_up_fill = _CustomIconData(0xe80f);
-  static const IconData thumbs_up_line = _CustomIconData(0xe810);
-  static const IconData thumbs_up_outline = _CustomIconData(0xe811);
-  static const IconData topic_tag = _CustomIconData(0xe812);
-  static const IconData watch_later = _CustomIconData(0xe813);
+  static const IconData player_dm_tip_back = _CustomIconData(0xe807);
+  static const IconData player_dm_tip_copy = _CustomIconData(0xe808);
+  static const IconData player_dm_tip_like = _CustomIconData(0xe809);
+  static const IconData player_dm_tip_like_solid = _CustomIconData(0xe80a);
+  static const IconData player_dm_tip_recall = _CustomIconData(0xe80b);
+  static const IconData share = _CustomIconData(0xe80c);
+  static const IconData share_line = _CustomIconData(0xe80d);
+  static const IconData share_node = _CustomIconData(0xe80e);
+  static const IconData star_favorite_line = _CustomIconData(0xe80f);
+  static const IconData star_favorite_solid = _CustomIconData(0xe810);
+  static const IconData thumbs_down = _CustomIconData(0xe811);
+  static const IconData thumbs_down_outline = _CustomIconData(0xe812);
+  static const IconData thumbs_up = _CustomIconData(0xe813);
+  static const IconData thumbs_up_fill = _CustomIconData(0xe814);
+  static const IconData thumbs_up_line = _CustomIconData(0xe815);
+  static const IconData thumbs_up_outline = _CustomIconData(0xe816);
+  static const IconData topic_tag = _CustomIconData(0xe817);
+  static const IconData watch_later = _CustomIconData(0xe818);
 }
 
 class _CustomIconData extends IconData {

lib/common/widgets/custom_layout.dart

@@ -0,0 +1,462 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// ignore_for_file: uri_does_not_exist_in_doc_import
+
+/// @docImport 'package:flutter/widgets.dart';
+///
+/// @docImport 'stack.dart';
+library;
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+
+class CustomMultiChildLayout extends MultiChildRenderObjectWidget {
+  /// Creates a custom multi-child layout.
+  const CustomMultiChildLayout({
+    super.key,
+    required this.delegate,
+    super.children,
+  });
+
+  /// The delegate that controls the layout of the children.
+  final MultiChildLayoutDelegate delegate;
+
+  @override
+  RenderCustomMultiChildLayoutBox createRenderObject(BuildContext context) {
+    return RenderCustomMultiChildLayoutBox(delegate: delegate);
+  }
+
+  @override
+  void updateRenderObject(
+    BuildContext context,
+    RenderCustomMultiChildLayoutBox renderObject,
+  ) {
+    renderObject.delegate = delegate;
+  }
+}
+
+/// A delegate that controls the layout of multiple children.
+///
+/// Used with [CustomMultiChildLayout] (in the widgets library) and
+/// [RenderCustomMultiChildLayoutBox] (in the rendering library).
+///
+/// Delegates must be idempotent. Specifically, if two delegates are equal, then
+/// they must produce the same layout. To change the layout, replace the
+/// delegate with a different instance whose [shouldRelayout] returns true when
+/// given the previous instance.
+///
+/// Override [getSize] to control the overall size of the layout. The size of
+/// the layout cannot depend on layout properties of the children. This was
+/// a design decision to simplify the delegate implementations: This way,
+/// the delegate implementations do not have to also handle various intrinsic
+/// sizing functions if the parent's size depended on the children.
+/// If you want to build a custom layout where you define the size of that widget
+/// based on its children, then you will have to create a custom render object.
+/// See [MultiChildRenderObjectWidget] with [ContainerRenderObjectMixin] and
+/// [RenderBoxContainerDefaultsMixin] to get started or [RenderStack] for an
+/// example implementation.
+///
+/// Override [performLayout] to size and position the children. An
+/// implementation of [performLayout] must call [layoutChild] exactly once for
+/// each child, but it may call [layoutChild] on children in an arbitrary order.
+/// Typically a delegate will use the size returned from [layoutChild] on one
+/// child to determine the constraints for [performLayout] on another child or
+/// to determine the offset for [positionChild] for that child or another child.
+///
+/// Override [shouldRelayout] to determine when the layout of the children needs
+/// to be recomputed when the delegate changes.
+///
+/// The most efficient way to trigger a relayout is to supply a `relayout`
+/// argument to the constructor of the [MultiChildLayoutDelegate]. The custom
+/// layout will listen to this value and relayout whenever the Listenable
+/// notifies its listeners, such as when an [Animation] ticks. This allows
+/// the custom layout to avoid the build phase of the pipeline.
+///
+/// Each child must be wrapped in a [LayoutId] widget to assign the id that
+/// identifies it to the delegate. The [LayoutId.id] needs to be unique among
+/// the children that the [CustomMultiChildLayout] manages.
+///
+/// {@tool snippet}
+///
+/// Below is an example implementation of [performLayout] that causes one widget
+/// (the follower) to be the same size as another (the leader):
+///
+/// ```dart
+/// // Define your own slot numbers, depending upon the id assigned by LayoutId.
+/// // Typical usage is to define an enum like the one below, and use those
+/// // values as the ids.
+/// enum _Slot {
+///   leader,
+///   follower,
+/// }
+///
+/// class FollowTheLeader extends MultiChildLayoutDelegate {
+///   @override
+///   void performLayout(Size size) {
+///     Size leaderSize = Size.zero;
+///
+///     if (hasChild(_Slot.leader)) {
+///       leaderSize = layoutChild(_Slot.leader, BoxConstraints.loose(size));
+///       positionChild(_Slot.leader, Offset.zero);
+///     }
+///
+///     if (hasChild(_Slot.follower)) {
+///       layoutChild(_Slot.follower, BoxConstraints.tight(leaderSize));
+///       positionChild(_Slot.follower, Offset(size.width - leaderSize.width,
+///           size.height - leaderSize.height));
+///     }
+///   }
+///
+///   @override
+///   bool shouldRelayout(MultiChildLayoutDelegate oldDelegate) => false;
+/// }
+/// ```
+/// {@end-tool}
+///
+/// The delegate gives the leader widget loose constraints, which means the
+/// child determines what size to be (subject to fitting within the given size).
+/// The delegate then remembers the size of that child and places it in the
+/// upper left corner.
+///
+/// The delegate then gives the follower widget tight constraints, forcing it to
+/// match the size of the leader widget. The delegate then places the follower
+/// widget in the bottom right corner.
+///
+/// The leader and follower widget will paint in the order they appear in the
+/// child list, regardless of the order in which [layoutChild] is called on
+/// them.
+///
+/// See also:
+///
+///  * [CustomMultiChildLayout], the widget that uses this delegate.
+///  * [RenderCustomMultiChildLayoutBox], render object that uses this
+///    delegate.
+abstract class MultiChildLayoutDelegate {
+  /// Creates a layout delegate.
+  ///
+  /// The layout will update whenever [relayout] notifies its listeners.
+  MultiChildLayoutDelegate({Listenable? relayout}) : _relayout = relayout;
+
+  final Listenable? _relayout;
+
+  Map<Object, RenderBox>? _idToChild;
+  Set<RenderBox>? _debugChildrenNeedingLayout;
+
+  /// True if a non-null LayoutChild was provided for the specified id.
+  ///
+  /// Call this from the [performLayout] method to determine which children
+  /// are available, if the child list might vary.
+  ///
+  /// This method cannot be called from [getSize] as the size is not allowed
+  /// to depend on the children.
+  bool hasChild(Object childId) => _idToChild![childId] != null;
+
+  /// Ask the child to update its layout within the limits specified by
+  /// the constraints parameter. The child's size is returned.
+  ///
+  /// Call this from your [performLayout] function to lay out each
+  /// child. Every child must be laid out using this function exactly
+  /// once each time the [performLayout] function is called.
+  Size layoutChild(Object childId, BoxConstraints constraints) {
+    final RenderBox? child = _idToChild![childId];
+    assert(() {
+      if (child == null) {
+        throw FlutterError(
+          'The $this custom multichild layout delegate tried to lay out a non-existent child.\n'
+          'There is no child with the id "$childId".',
+        );
+      }
+      if (!_debugChildrenNeedingLayout!.remove(child)) {
+        throw FlutterError(
+          'The $this custom multichild layout delegate tried to lay out the child with id "$childId" more than once.\n'
+          'Each child must be laid out exactly once.',
+        );
+      }
+      try {
+        assert(constraints.debugAssertIsValid(isAppliedConstraint: true));
+      } on AssertionError catch (exception) {
+        throw FlutterError.fromParts(<DiagnosticsNode>[
+          ErrorSummary(
+            'The $this custom multichild layout delegate provided invalid box constraints for the child with id "$childId".',
+          ),
+          DiagnosticsProperty<AssertionError>(
+            'Exception',
+            exception,
+            showName: false,
+          ),
+          ErrorDescription(
+            'The minimum width and height must be greater than or equal to zero.\n'
+            'The maximum width must be greater than or equal to the minimum width.\n'
+            'The maximum height must be greater than or equal to the minimum height.',
+          ),
+        ]);
+      }
+      return true;
+    }());
+    child!.layout(constraints, parentUsesSize: true);
+    return child.size;
+  }
+
+  /// Specify the child's origin relative to this origin.
+  ///
+  /// Call this from your [performLayout] function to position each
+  /// child. If you do not call this for a child, its position will
+  /// remain unchanged. Children initially have their position set to
+  /// (0,0), i.e. the top left of the [RenderCustomMultiChildLayoutBox].
+  void positionChild(Object childId, Offset offset) {
+    final RenderBox? child = _idToChild![childId];
+    assert(() {
+      if (child == null) {
+        throw FlutterError(
+          'The $this custom multichild layout delegate tried to position out a non-existent child:\n'
+          'There is no child with the id "$childId".',
+        );
+      }
+      return true;
+    }());
+    final MultiChildLayoutParentData childParentData =
+        child!.parentData! as MultiChildLayoutParentData;
+    childParentData.offset = offset;
+  }
+
+  DiagnosticsNode _debugDescribeChild(RenderBox child) {
+    final MultiChildLayoutParentData childParentData =
+        child.parentData! as MultiChildLayoutParentData;
+    return DiagnosticsProperty<RenderBox>('${childParentData.id}', child);
+  }
+
+  void _callPerformLayout(Size size, RenderBox? firstChild) {
+    // A particular layout delegate could be called reentrantly, e.g. if it used
+    // by both a parent and a child. So, we must restore the _idToChild map when
+    // we return.
+    final Map<Object, RenderBox>? previousIdToChild = _idToChild;
+
+    Set<RenderBox>? debugPreviousChildrenNeedingLayout;
+    assert(() {
+      debugPreviousChildrenNeedingLayout = _debugChildrenNeedingLayout;
+      _debugChildrenNeedingLayout = <RenderBox>{};
+      return true;
+    }());
+
+    try {
+      _idToChild = <Object, RenderBox>{};
+      RenderBox? child = firstChild;
+      while (child != null) {
+        final MultiChildLayoutParentData childParentData =
+            child.parentData! as MultiChildLayoutParentData;
+        assert(() {
+          if (childParentData.id == null) {
+            throw FlutterError.fromParts(<DiagnosticsNode>[
+              ErrorSummary(
+                'Every child of a RenderCustomMultiChildLayoutBox must have an ID in its parent data.',
+              ),
+              child!.describeForError('The following child has no ID'),
+            ]);
+          }
+          return true;
+        }());
+        _idToChild![childParentData.id!] = child;
+        assert(() {
+          _debugChildrenNeedingLayout!.add(child!);
+          return true;
+        }());
+        child = childParentData.nextSibling;
+      }
+      performLayout(size);
+      assert(() {
+        if (_debugChildrenNeedingLayout!.isNotEmpty) {
+          throw FlutterError.fromParts(<DiagnosticsNode>[
+            ErrorSummary('Each child must be laid out exactly once.'),
+            DiagnosticsBlock(
+              name:
+                  'The $this custom multichild layout delegate forgot '
+                  'to lay out the following '
+                  '${_debugChildrenNeedingLayout!.length > 1 ? 'children' : 'child'}',
+              properties: _debugChildrenNeedingLayout!
+                  .map<DiagnosticsNode>(_debugDescribeChild)
+                  .toList(),
+            ),
+          ]);
+        }
+        return true;
+      }());
+    } finally {
+      _idToChild = previousIdToChild;
+      assert(() {
+        _debugChildrenNeedingLayout = debugPreviousChildrenNeedingLayout;
+        return true;
+      }());
+    }
+  }
+
+  /// Override this method to return the size of this object given the
+  /// incoming constraints.
+  ///
+  /// The size cannot reflect the sizes of the children. If this layout has a
+  /// fixed width or height the returned size can reflect that; the size will be
+  /// constrained to the given constraints.
+  ///
+  /// By default, attempts to size the box to the biggest size
+  /// possible given the constraints.
+  Size getSize(BoxConstraints constraints) => constraints.biggest;
+
+  /// Override this method to lay out and position all children given this
+  /// widget's size.
+  ///
+  /// This method must call [layoutChild] for each child. It should also specify
+  /// the final position of each child with [positionChild].
+  void performLayout(Size size);
+
+  /// Override this method to return true when the children need to be
+  /// laid out.
+  ///
+  /// This should compare the fields of the current delegate and the given
+  /// `oldDelegate` and return true if the fields are such that the layout would
+  /// be different.
+  bool shouldRelayout(covariant MultiChildLayoutDelegate oldDelegate);
+
+  /// Override this method to include additional information in the
+  /// debugging data printed by [debugDumpRenderTree] and friends.
+  ///
+  /// By default, returns the [runtimeType] of the class.
+  @override
+  String toString() => objectRuntimeType(this, 'MultiChildLayoutDelegate');
+}
+
+/// Defers the layout of multiple children to a delegate.
+///
+/// The delegate can determine the layout constraints for each child and can
+/// decide where to position each child. The delegate can also determine the
+/// size of the parent, but the size of the parent cannot depend on the sizes of
+/// the children.
+class RenderCustomMultiChildLayoutBox extends RenderBox
+    with
+        ContainerRenderObjectMixin<RenderBox, MultiChildLayoutParentData>,
+        RenderBoxContainerDefaultsMixin<RenderBox, MultiChildLayoutParentData> {
+  /// Creates a render object that customizes the layout of multiple children.
+  RenderCustomMultiChildLayoutBox({
+    List<RenderBox>? children,
+    required MultiChildLayoutDelegate delegate,
+  }) : _delegate = delegate {
+    addAll(children);
+  }
+
+  @override
+  void setupParentData(RenderBox child) {
+    if (child.parentData is! MultiChildLayoutParentData) {
+      child.parentData = MultiChildLayoutParentData();
+    }
+  }
+
+  /// The delegate that controls the layout of the children.
+  MultiChildLayoutDelegate get delegate => _delegate;
+  MultiChildLayoutDelegate _delegate;
+  set delegate(MultiChildLayoutDelegate newDelegate) {
+    if (_delegate == newDelegate) {
+      return;
+    }
+    final MultiChildLayoutDelegate oldDelegate = _delegate;
+    if (newDelegate.runtimeType != oldDelegate.runtimeType ||
+        newDelegate.shouldRelayout(oldDelegate)) {
+      markNeedsLayout();
+    }
+    _delegate = newDelegate;
+    if (attached) {
+      oldDelegate._relayout?.removeListener(markNeedsLayout);
+      newDelegate._relayout?.addListener(markNeedsLayout);
+    }
+  }
+
+  @override
+  void attach(PipelineOwner owner) {
+    super.attach(owner);
+    _delegate._relayout?.addListener(markNeedsLayout);
+  }
+
+  @override
+  void detach() {
+    _delegate._relayout?.removeListener(markNeedsLayout);
+    super.detach();
+  }
+
+  Size _getSize(BoxConstraints constraints) {
+    assert(constraints.debugAssertIsValid());
+    return constraints.constrain(_delegate.getSize(constraints));
+  }
+
+  // TODO(ianh): It's a bit dubious to be using the getSize function from the delegate to
+  // figure out the intrinsic dimensions. We really should either not support intrinsics,
+  // or we should expose intrinsic delegate callbacks and throw if they're not implemented.
+
+  @override
+  double computeMinIntrinsicWidth(double height) {
+    final double width = _getSize(
+      BoxConstraints.tightForFinite(height: height),
+    ).width;
+    if (width.isFinite) {
+      return width;
+    }
+    return 0.0;
+  }
+
+  @override
+  double computeMaxIntrinsicWidth(double height) {
+    final double width = _getSize(
+      BoxConstraints.tightForFinite(height: height),
+    ).width;
+    if (width.isFinite) {
+      return width;
+    }
+    return 0.0;
+  }
+
+  @override
+  double computeMinIntrinsicHeight(double width) {
+    final double height = _getSize(
+      BoxConstraints.tightForFinite(width: width),
+    ).height;
+    if (height.isFinite) {
+      return height;
+    }
+    return 0.0;
+  }
+
+  @override
+  double computeMaxIntrinsicHeight(double width) {
+    final double height = _getSize(
+      BoxConstraints.tightForFinite(width: width),
+    ).height;
+    if (height.isFinite) {
+      return height;
+    }
+    return 0.0;
+  }
+
+  @override
+  @protected
+  Size computeDryLayout(covariant BoxConstraints constraints) {
+    return _getSize(constraints);
+  }
+
+  @override
+  void performLayout() {
+    size = _getSize(constraints);
+    delegate._callPerformLayout(size, firstChild);
+  }
+
+  @override
+  void paint(PaintingContext context, Offset offset) {
+    defaultPaint(context, offset);
+  }
+
+  @override
+  bool hitTestChildren(BoxHitTestResult result, {required Offset position}) {
+    return defaultHitTestChildren(result, position: position);
+  }
+
+  @override
+  bool get isRepaintBoundary => true;
+}

lib/common/widgets/custom_sliver_persistent_header_delegate.dart

@@ -1,19 +1,21 @@
+import 'dart:io' show Platform;
+
 import 'package:flutter/material.dart';
 
 class CustomSliverPersistentHeaderDelegate
     extends SliverPersistentHeaderDelegate {
-  CustomSliverPersistentHeaderDelegate({
+  const CustomSliverPersistentHeaderDelegate({
     required this.child,
     required this.bgColor,
     double extent = 45,
-    this.needRebuild,
+    this.needRebuild = false,
   }) : _minExtent = extent,
        _maxExtent = extent;
   final double _minExtent;
   final double _maxExtent;
   final Widget child;
   final Color? bgColor;
-  final bool? needRebuild;
+  final bool needRebuild;
 
   @override
   Widget build(
@@ -28,12 +30,14 @@ class CustomSliverPersistentHeaderDelegate
         ? DecoratedBox(
             decoration: BoxDecoration(
               color: bgColor,
-              boxShadow: [
-                BoxShadow(
-                  color: bgColor!,
-                  offset: const Offset(0, -2),
-                ),
-              ],
+              boxShadow: Platform.isIOS
+                  ? null
+                  : [
+                      BoxShadow(
+                        color: bgColor!,
+                        offset: const Offset(0, -1),
+                      ),
+                    ],
             ),
             child: child,
           )
@@ -51,6 +55,6 @@ class CustomSliverPersistentHeaderDelegate
   @override
   bool shouldRebuild(CustomSliverPersistentHeaderDelegate oldDelegate) {
     return oldDelegate.bgColor != bgColor ||
-        (needRebuild == true && oldDelegate.child != child);
+        (needRebuild && oldDelegate.child != child);
   }
 }

lib/common/widgets/custom_toast.dart

@@ -46,7 +46,7 @@ class LoadingWidget extends StatelessWidget {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 30, vertical: 20),
       decoration: BoxDecoration(
-        color: theme.dialogBackgroundColor,
+        color: theme.dialogTheme.backgroundColor,
         borderRadius: const BorderRadius.all(Radius.circular(15)),
       ),
       child: Column(

lib/common/widgets/custom_tooltip.dart

@@ -1,6 +1,7 @@
 import 'dart:math' as math;
 import 'dart:ui' show clampDouble;
 
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
@@ -148,11 +149,21 @@ class CustomTooltipState extends State<CustomTooltip>
   @protected
   @override
   Widget build(BuildContext context) {
-    Widget result = Listener(
-      onPointerDown: _handlePointerDown,
-      behavior: HitTestBehavior.opaque,
-      child: widget.child,
-    );
+    Widget result;
+    if (Utils.isMobile) {
+      result = Listener(
+        onPointerDown: _handlePointerDown,
+        behavior: HitTestBehavior.opaque,
+        child: widget.child,
+      );
+    } else {
+      result = MouseRegion(
+        cursor: MouseCursor.defer,
+        onEnter: (_) => _scheduleShowTooltip(),
+        onExit: (_) => _scheduleDismissTooltip(),
+        child: widget.child,
+      );
+    }
     return OverlayPortal(
       controller: _overlayController,
       overlayChildBuilder: _buildCustomTooltipOverlay,
@@ -184,30 +195,34 @@ class _CustomTooltipOverlay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: onDismiss,
-      child: CustomMultiChildLayout(
-        delegate: _CustomMultiTooltipPositionDelegate(
-          type: type,
-          target: target,
-          verticalOffset: verticalOffset,
-          horizontslOffset: horizontslOffset,
-          preferBelow: false,
-        ),
-        children: [
-          LayoutId(
-            id: 'overlay',
-            child: overlayWidget(),
-          ),
-          if (indicator != null)
-            LayoutId(
-              id: 'indicator',
-              child: indicator!(),
-            ),
-        ],
+    Widget child = CustomMultiChildLayout(
+      delegate: _CustomMultiTooltipPositionDelegate(
+        type: type,
+        target: target,
+        verticalOffset: verticalOffset,
+        horizontslOffset: horizontslOffset,
+        preferBelow: false,
       ),
+      children: [
+        LayoutId(
+          id: 'overlay',
+          child: overlayWidget(),
+        ),
+        if (indicator != null)
+          LayoutId(
+            id: 'indicator',
+            child: indicator!(),
+          ),
+      ],
     );
+    if (Utils.isMobile) {
+      return GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap: onDismiss,
+        child: child,
+      );
+    }
+    return child;
   }
 }
 

lib/common/widgets/dialog/dialog.dart

@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-void showConfirmDialog({
+Future<void> showConfirmDialog({
   required BuildContext context,
   required String title,
   dynamic content,
   required VoidCallback onConfirm,
 }) {
-  showDialog(
+  assert(content is String? || content is Widget);
+  return showDialog(
     context: context,
     builder: (context) {
       return AlertDialog(

lib/common/widgets/dialog/report.dart

@@ -1,10 +1,11 @@
 import 'package:PiliPlus/common/widgets/radio_widget.dart';
 import 'package:PiliPlus/utils/extension.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-void autoWrapReportDialog(
+Future<void> autoWrapReportDialog(
   BuildContext context,
   Map<String, Map<int, String>> options,
   Future<Map> Function(int reasonType, String? reasonDesc, bool banUid)
@@ -14,144 +15,130 @@ void autoWrapReportDialog(
   String? reasonDesc;
   bool banUid = false;
   late final key = GlobalKey<FormState>();
-  showDialog(
+  return showDialog(
     context: context,
-    builder: (context) => StatefulBuilder(
-      builder: (context, setState) {
-        return AlertDialog(
-          title: const Text('举报'),
-          titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
-          contentPadding: const EdgeInsets.symmetric(vertical: 5),
-          actionsPadding: const EdgeInsets.only(
-            left: 16,
-            right: 16,
-            bottom: 10,
-          ),
-          content: Form(
-            key: key,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Flexible(
-                  child: SingleChildScrollView(
-                    child: AnimatedSize(
-                      duration: const Duration(milliseconds: 200),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          const Padding(
-                            padding: EdgeInsets.only(
+    builder: (context) {
+      return AlertDialog(
+        title: const Text('举报'),
+        titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
+        contentPadding: const EdgeInsets.symmetric(vertical: 5),
+        actionsPadding: const EdgeInsets.only(
+          left: 16,
+          right: 16,
+          bottom: 10,
+        ),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Flexible(
+              child: SingleChildScrollView(
+                child: AnimatedSize(
+                  duration: const Duration(milliseconds: 200),
+                  child: Builder(
+                    builder: (context) => Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const Padding(
+                          padding: EdgeInsets.only(
+                            left: 22,
+                            right: 22,
+                            bottom: 5,
+                          ),
+                          child: Text('请选择举报的理由：'),
+                        ),
+                        RadioGroup(
+                          onChanged: (value) {
+                            reasonType = value;
+                            (context as Element).markNeedsBuild();
+                          },
+                          groupValue: reasonType,
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: options.entries.map((entry) {
+                              return WrapRadioOptionsGroup<int>(
+                                groupTitle: entry.key,
+                                options: entry.value,
+                              );
+                            }).toList(),
+                          ),
+                        ),
+                        if (reasonType == 0)
+                          Padding(
+                            padding: const EdgeInsets.only(
                               left: 22,
+                              top: 5,
                               right: 22,
-                              bottom: 5,
                             ),
-                            child: Text('请选择举报的理由：'),
-                          ),
-                          ...options.entries.map(
-                            (entry) => WrapRadioOptionsGroup<int>(
-                              groupTitle: entry.key,
-                              options: entry.value,
-                              selectedValue: reasonType,
-                              onChanged: (value) =>
-                                  setState(() => reasonType = value),
+                            child: Form(
+                              key: key,
+                              child: TextFormField(
+                                autofocus: true,
+                                minLines: 2,
+                                maxLines: 4,
+                                initialValue: reasonDesc,
+                                decoration: const InputDecoration(
+                                  labelText: '为帮助审核人员更快处理，请补充问题类型和出现位置等详细信息',
+                                  border: OutlineInputBorder(),
+                                  contentPadding: EdgeInsets.all(10),
+                                ),
+                                onChanged: (value) => reasonDesc = value,
+                                validator: (value) =>
+                                    value.isNullOrEmpty ? '理由不能为空' : null,
+                              ),
                             ),
                           ),
-                          if (reasonType == 0)
-                            ReasonField(
-                              onChanged: (value) => reasonDesc = value,
-                            ),
-                        ],
-                      ),
+                      ],
                     ),
                   ),
                 ),
-                Padding(
-                  padding: const EdgeInsets.only(left: 14, top: 6),
-                  child: CheckBoxText(
-                    text: '拉黑该用户',
-                    onChanged: (value) => banUid = value,
-                  ),
-                ),
-              ],
-            ),
-          ),
-          actions: [
-            TextButton(
-              onPressed: Get.back,
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
               ),
             ),
-            TextButton(
-              onPressed: () async {
-                if (reasonType == null ||
-                    (reasonType == 0 && key.currentState?.validate() != true)) {
-                  return;
-                }
-                SmartDialog.showLoading();
-                try {
-                  final data = await onSuccess(reasonType!, reasonDesc, banUid);
-                  SmartDialog.dismiss();
-                  if (data['code'] == 0) {
-                    Get.back();
-                    SmartDialog.showToast('举报成功');
-                  } else {
-                    SmartDialog.showToast(data['message']);
-                  }
-                } catch (e) {
-                  SmartDialog.dismiss();
-                  SmartDialog.showToast('提交失败：$e');
-                }
-              },
-              child: const Text('确定'),
+            Padding(
+              padding: const EdgeInsets.only(left: 14, top: 6),
+              child: CheckBoxText(
+                text: '拉黑该用户',
+                onChanged: (value) => banUid = value,
+              ),
             ),
           ],
-        );
-      },
-    ),
-  );
-}
-
-class ReasonField extends StatefulWidget {
-  final ValueChanged<String> onChanged;
-  String? _validator(String? value) => value.isNullOrEmpty ? '理由不能为空' : null;
-
-  const ReasonField({super.key, required this.onChanged});
-
-  @override
-  State<ReasonField> createState() => _ReasonFieldState();
-}
-
-class _ReasonFieldState extends State<ReasonField> {
-  final _controller = TextEditingController();
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(left: 22, top: 5, right: 22),
-      child: TextFormField(
-        controller: _controller,
-        autofocus: true,
-        minLines: 4,
-        maxLines: 4,
-        decoration: const InputDecoration(
-          labelText: '为帮助审核人员更快处理，请补充问题类型和出现位置等详细信息',
-          border: OutlineInputBorder(),
-          contentPadding: EdgeInsets.all(10),
         ),
-        onChanged: widget.onChanged,
-        validator: widget._validator,
-      ),
-    );
-  }
+        actions: [
+          TextButton(
+            onPressed: Get.back,
+            child: Text(
+              '取消',
+              style: TextStyle(color: Theme.of(context).colorScheme.outline),
+            ),
+          ),
+          TextButton(
+            onPressed: () async {
+              if (reasonType == null ||
+                  (reasonType == 0 && key.currentState?.validate() != true)) {
+                return;
+              }
+              SmartDialog.showLoading();
+              try {
+                final data = await onSuccess(reasonType!, reasonDesc, banUid);
+                SmartDialog.dismiss();
+                if (data['code'] == 0) {
+                  Get.back();
+                  SmartDialog.showToast('举报成功');
+                } else {
+                  SmartDialog.showToast(data['message'].toString());
+                }
+              } catch (e) {
+                SmartDialog.dismiss();
+                SmartDialog.showToast('提交失败：$e');
+                if (kDebugMode) rethrow;
+              }
+            },
+            child: const Text('确定'),
+          ),
+        ],
+      );
+    },
+  );
 }
 
 class CheckBoxText extends StatefulWidget {
@@ -186,8 +173,8 @@ class _CheckBoxTextState extends State<CheckBoxText> {
       onTap: () {
         setState(() {
           _selected = !_selected;
+          widget.onChanged(_selected);
         });
-        widget.onChanged(_selected);
       },
       child: Padding(
         padding: const EdgeInsets.all(4),
@@ -246,4 +233,34 @@ class ReportOptions {
       0: '其他',
     },
   };
+
+  static Map<String, Map<int, String>> get danmakuReport => const {
+    '': {
+      1: '违法违禁',
+      2: '色情低俗',
+      3: '赌博诈骗',
+      4: '人身攻击',
+      5: '侵犯隐私',
+      6: '垃圾广告',
+      7: '引战',
+      8: '剧透',
+      9: '恶意刷屏',
+      10: '视频无关',
+      12: '青少年不良信息',
+      13: '违法信息外链',
+      0: '其它', // 11
+    },
+  };
+
+  static Map<String, Map<int, String>> get liveDanmakuReport => const {
+    '': {
+      1: '违法违规',
+      2: '低俗色情',
+      3: '垃圾广告',
+      4: '辱骂引战',
+      5: '政治敏感',
+      6: '青少年不良信息',
+      7: '其他', // avoid show form
+    },
+  };
 }

lib/common/widgets/dialog/report_member.dart

@@ -1,126 +1,122 @@
-import 'package:PiliPlus/common/widgets/radio_widget.dart';
 import 'package:PiliPlus/http/member.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-class MemberReportPanel extends StatefulWidget {
-  const MemberReportPanel({
-    super.key,
-    required this.name,
-    required this.mid,
-  });
+Future<void> showMemberReportDialog(
+  BuildContext context, {
+  required Object? name,
+  required Object mid,
+}) {
+  final Set<int> reason = {};
+  int? reasonV2;
 
-  final dynamic name;
-  final dynamic mid;
-
-  @override
-  State<MemberReportPanel> createState() => _MemberReportPanelState();
-}
-
-class _MemberReportPanelState extends State<MemberReportPanel> {
-  final List<bool> _reasonList = List.generate(3, (_) => false);
-  final Set<int> _reason = {};
-  int? _reasonV2;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    return SingleChildScrollView(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            '举报: ${widget.name}',
-            style: const TextStyle(fontSize: 18),
-          ),
-          const SizedBox(height: 4),
-          Text('uid: ${widget.mid}'),
-          const SizedBox(height: 10),
-          const Text('举报内容（必选，可多选）'),
-          ...List.generate(
-            3,
-            (index) => _checkBoxWidget(
-              _reasonList[index],
-              (value) {
-                setState(() => _reasonList[index] = value);
-                if (value) {
-                  _reason.add(index + 1);
-                } else {
-                  _reason.remove(index + 1);
-                }
-              },
-              const ['头像违规', '昵称违规', '签名违规'][index],
+  return showDialog(
+    context: context,
+    builder: (context) {
+      final theme = Theme.of(context);
+      return AlertDialog(
+        clipBehavior: Clip.hardEdge,
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 20,
+          vertical: 16,
+        ),
+        titleTextStyle: theme.textTheme.bodyMedium,
+        title: Column(
+          spacing: 4,
+          children: [
+            Text(
+              '举报: $name',
+              style: const TextStyle(fontSize: 18),
             ),
-          ),
-          const Text('举报理由（单选，非必选）'),
-          ...List.generate(
-            5,
-            (index) => RadioWidget<int>(
-              value: index,
-              groupValue: _reasonV2,
-              onChanged: (value) {
-                setState(() => _reasonV2 = value);
-              },
-              title: const ['色情低俗', '不实信息', '违禁', '人身攻击', '赌博诈骗'][index],
-            ),
-          ),
-          const SizedBox(height: 10),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.end,
+            Text('uid: $mid'),
+          ],
+        ),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              TextButton(
-                onPressed: Get.back,
-                child: Text(
-                  '取消',
-                  style: TextStyle(color: theme.colorScheme.outline),
+              const Text('举报内容（必选，可多选）'),
+              ...List.generate(
+                3,
+                (index) => Builder(
+                  builder: (context) => CheckboxListTile(
+                    dense: true,
+                    value: reason.contains(index + 1),
+                    controlAffinity: ListTileControlAffinity.leading,
+                    contentPadding: EdgeInsets.zero,
+                    onChanged: (value) {
+                      if (value!) {
+                        reason.add(index + 1);
+                      } else {
+                        reason.remove(index + 1);
+                      }
+                      (context as Element).markNeedsBuild();
+                    },
+                    title: Text(const ['头像违规', '昵称违规', '签名违规'][index]),
+                  ),
                 ),
               ),
-              TextButton(
-                onPressed: () async {
-                  if (_reason.isEmpty) {
-                    SmartDialog.showToast('至少选择一项作为举报内容');
-                  } else {
-                    Get.back();
-                    var result = await MemberHttp.reportMember(
-                      widget.mid,
-                      reason: _reason.join(','),
-                      reasonV2: _reasonV2 != null ? _reasonV2! + 1 : null,
-                    );
-                    if (result['msg'] is String && result['msg'].isNotEmpty) {
-                      SmartDialog.showToast(result['msg']);
-                    } else {
-                      SmartDialog.showToast('举报失败');
-                    }
-                  }
-                },
-                child: const Text('确定'),
+              const Text('举报理由（单选，非必选）'),
+              Builder(
+                builder: (context) => RadioGroup<int>(
+                  onChanged: (v) {
+                    reasonV2 = v;
+                    (context as Element).markNeedsBuild();
+                  },
+                  groupValue: reasonV2,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: List.generate(
+                      5,
+                      (index) => RadioListTile<int>(
+                        toggleable: true,
+                        controlAffinity: ListTileControlAffinity.leading,
+                        contentPadding: const EdgeInsets.only(left: 4),
+                        dense: true,
+                        value: index,
+                        title: Text(
+                          const ['色情低俗', '不实信息', '违禁', '人身攻击', '赌博诈骗'][index],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
             ],
           ),
-        ],
-      ),
-    );
-  }
-}
-
-Widget _checkBoxWidget(
-  bool defValue,
-  ValueChanged onChanged,
-  String title,
-) {
-  return InkWell(
-    onTap: () => onChanged(!defValue),
-    child: Row(
-      children: [
-        Checkbox(
-          value: defValue,
-          onChanged: onChanged,
-          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         ),
-        Text(title),
-      ],
-    ),
+        actions: [
+          TextButton(
+            onPressed: Get.back,
+            child: Text(
+              '取消',
+              style: TextStyle(color: theme.colorScheme.outline),
+            ),
+          ),
+          TextButton(
+            onPressed: () async {
+              if (reason.isEmpty) {
+                SmartDialog.showToast('至少选择一项作为举报内容');
+              } else {
+                Get.back();
+                var result = await MemberHttp.reportMember(
+                  mid,
+                  reason: reason.join(','),
+                  reasonV2: reasonV2 != null ? reasonV2! + 1 : null,
+                );
+                if (result['msg'] is String && result['msg'].isNotEmpty) {
+                  SmartDialog.showToast(result['msg']);
+                } else {
+                  SmartDialog.showToast('举报失败');
+                }
+              }
+            },
+            child: const Text('确定'),
+          ),
+        ],
+      );
+    },
   );
 }

lib/common/widgets/dyn/ink_well.dart

@@ -673,6 +673,12 @@ class _InkResponseState extends State<_InkResponseStateWidget>
   bool _hovering = false;
   final Map<_HighlightType, InkHighlight?> _highlights =
       <_HighlightType, InkHighlight?>{};
+  late final Map<Type, Action<Intent>> _actionMap = <Type, Action<Intent>>{
+    ActivateIntent: CallbackAction<ActivateIntent>(onInvoke: activateOnIntent),
+    ButtonActivateIntent: CallbackAction<ButtonActivateIntent>(
+      onInvoke: activateOnIntent,
+    ),
+  };
   WidgetStatesController? internalStatesController;
 
   bool get highlightsExist => _highlights.values
@@ -974,9 +980,7 @@ class _InkResponseState extends State<_InkResponseStateWidget>
     if (!mounted) {
       return;
     }
-    setState(() {
-      updateFocusHighlights();
-    });
+    setState(updateFocusHighlights);
   }
 
   bool get _shouldShowFocus =>
@@ -1168,22 +1172,129 @@ class _InkResponseState extends State<_InkResponseStateWidget>
     updateHighlight(_HighlightType.hover, value: _hovering);
   }
 
+  bool get _canRequestFocus =>
+      switch (MediaQuery.maybeNavigationModeOf(context)) {
+        NavigationMode.traditional || null => enabled && widget.canRequestFocus,
+        NavigationMode.directional => true,
+      };
+
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTapDown: _primaryEnabled ? handleTapDown : null,
-      onTapUp: _primaryEnabled ? handleTapUp : null,
-      onTap: _primaryEnabled ? handleTap : null,
-      onTapCancel: _primaryEnabled ? handleTapCancel : null,
-      onDoubleTap: widget.onDoubleTap != null ? handleDoubleTap : null,
-      onLongPress: widget.onLongPress != null ? handleLongPress : null,
-      onSecondaryTapDown: _secondaryEnabled ? handleSecondaryTapDown : null,
-      onSecondaryTapUp: _secondaryEnabled ? handleSecondaryTapUp : null,
-      onSecondaryTap: _secondaryEnabled ? handleSecondaryTap : null,
-      onSecondaryTapCancel: _secondaryEnabled ? handleSecondaryTapCancel : null,
-      behavior: HitTestBehavior.opaque,
-      excludeFromSemantics: true,
-      child: widget.child,
+    assert(widget.debugCheckContext(context));
+
+    final ThemeData theme = Theme.of(context);
+    const Set<WidgetState> highlightableStates = <WidgetState>{
+      WidgetState.focused,
+      WidgetState.hovered,
+      WidgetState.pressed,
+    };
+    final Set<WidgetState> nonHighlightableStates = statesController.value
+        .difference(
+          highlightableStates,
+        );
+    // Each highlightable state will be resolved separately to get the corresponding color.
+    // For this resolution to be correct, the non-highlightable states should be preserved.
+    final Set<WidgetState> pressed = <WidgetState>{
+      ...nonHighlightableStates,
+      WidgetState.pressed,
+    };
+    final Set<WidgetState> focused = <WidgetState>{
+      ...nonHighlightableStates,
+      WidgetState.focused,
+    };
+    final Set<WidgetState> hovered = <WidgetState>{
+      ...nonHighlightableStates,
+      WidgetState.hovered,
+    };
+
+    Color getHighlightColorForType(_HighlightType type) {
+      return switch (type) {
+        // The pressed state triggers a ripple (ink splash), per the current
+        // Material Design spec. A separate highlight is no longer used.
+        // See https://material.io/design/interaction/states.html#pressed
+        _HighlightType.pressed =>
+          widget.overlayColor?.resolve(pressed) ??
+              widget.highlightColor ??
+              theme.highlightColor,
+        _HighlightType.focus =>
+          widget.overlayColor?.resolve(focused) ??
+              widget.focusColor ??
+              theme.focusColor,
+        _HighlightType.hover =>
+          widget.overlayColor?.resolve(hovered) ??
+              widget.hoverColor ??
+              theme.hoverColor,
+      };
+    }
+
+    for (final _HighlightType type in _highlights.keys) {
+      _highlights[type]?.color = getHighlightColorForType(type);
+    }
+
+    _currentSplash?.color =
+        widget.overlayColor?.resolve(statesController.value) ??
+        widget.splashColor ??
+        Theme.of(context).splashColor;
+
+    final MouseCursor effectiveMouseCursor =
+        WidgetStateProperty.resolveAs<MouseCursor>(
+          widget.mouseCursor ?? WidgetStateMouseCursor.clickable,
+          statesController.value,
+        );
+
+    return _ParentInkResponseProvider(
+      state: this,
+      child: Actions(
+        actions: _actionMap,
+        child: Focus(
+          focusNode: widget.focusNode,
+          canRequestFocus: _canRequestFocus,
+          onFocusChange: handleFocusUpdate,
+          autofocus: widget.autofocus,
+          child: MouseRegion(
+            cursor: effectiveMouseCursor,
+            onEnter: handleMouseEnter,
+            onExit: handleMouseExit,
+            child: DefaultSelectionStyle.merge(
+              mouseCursor: effectiveMouseCursor,
+              child: Semantics(
+                onTap: widget.excludeFromSemantics || widget.onTap == null
+                    ? null
+                    : simulateTap,
+                onLongPress:
+                    widget.excludeFromSemantics || widget.onLongPress == null
+                    ? null
+                    : simulateLongPress,
+                child: GestureDetector(
+                  onTapDown: _primaryEnabled ? handleTapDown : null,
+                  onTapUp: _primaryEnabled ? handleTapUp : null,
+                  onTap: _primaryEnabled ? handleTap : null,
+                  onTapCancel: _primaryEnabled ? handleTapCancel : null,
+                  onDoubleTap: widget.onDoubleTap != null
+                      ? handleDoubleTap
+                      : null,
+                  onLongPress: widget.onLongPress != null
+                      ? handleLongPress
+                      : null,
+                  onSecondaryTapDown: _secondaryEnabled
+                      ? handleSecondaryTapDown
+                      : null,
+                  onSecondaryTapUp: _secondaryEnabled
+                      ? handleSecondaryTapUp
+                      : null,
+                  onSecondaryTap: _secondaryEnabled ? handleSecondaryTap : null,
+                  onSecondaryTapCancel: _secondaryEnabled
+                      ? handleSecondaryTapCancel
+                      : null,
+                  behavior: HitTestBehavior.opaque,
+                  excludeFromSemantics: true,
+                  child: widget.child,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
     );
   }
 }

lib/common/widgets/dynamic_sliver_appbar_medium.dart

@@ -113,18 +113,14 @@ class _DynamicSliverAppBarMediumState extends State<DynamicSliverAppBarMedium> {
     });
   }
 
-  Orientation? _orientation;
-  late Size size;
+  double? _width;
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    size = MediaQuery.sizeOf(context);
-    final orientation = size.width > size.height
-        ? Orientation.landscape
-        : Orientation.portrait;
-    if (orientation != _orientation) {
-      _orientation = orientation;
+    final width = MediaQuery.widthOf(context);
+    if (_width != width) {
+      _width = width;
       _height = 0;
       _updateHeight();
     }
@@ -139,7 +135,7 @@ class _DynamicSliverAppBarMediumState extends State<DynamicSliverAppBarMedium> {
           alignment: Alignment.topLeft,
           child: SizedBox(
             key: _childKey,
-            width: size.width,
+            width: _width,
             child: widget.flexibleSpace,
           ),
         ),

lib/common/widgets/gesture/immediate_tap_gesture_recognizer.dart

@@ -0,0 +1,174 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/gestures.dart';
+
+class ImmediateTapGestureRecognizer extends OneSequenceGestureRecognizer {
+  ImmediateTapGestureRecognizer({
+    super.debugOwner,
+    super.supportedDevices,
+    super.allowedButtonsFilter,
+    this.onTapDown,
+    required this.onTapUp,
+    this.onTapCancel,
+    this.onTap,
+  });
+
+  GestureTapDownCallback? onTapDown;
+
+  final GestureTapUpCallback onTapUp;
+
+  final GestureTapCancelCallback? onTapCancel;
+
+  final GestureTapCallback? onTap;
+
+  PointerUpEvent? _up;
+  int _activePointer = 0;
+  bool _sentTapDown = false;
+  bool _wonArena = false;
+
+  @override
+  bool isPointerPanZoomAllowed(PointerPanZoomStartEvent event) => false;
+
+  @override
+  bool isPointerAllowed(PointerDownEvent event) =>
+      _activePointer == 0 && super.isPointerAllowed(event);
+
+  @override
+  void addAllowedPointer(PointerDownEvent event) {
+    super.addAllowedPointer(event);
+    _reset(event.pointer);
+  }
+
+  @override
+  void handleEvent(PointerEvent event) {
+    if (event.pointer != _activePointer) {
+      stopTrackingPointer(event.pointer);
+      return;
+    }
+
+    if (event is PointerDownEvent) {
+      _handleTapDown(event);
+    } else if (event is PointerMoveEvent) {
+      _handlePointerMove(event);
+    } else if (event is PointerUpEvent) {
+      _up = event;
+      _handlePointerUp(event);
+    }
+
+    stopTrackingIfPointerNoLongerDown(event);
+  }
+
+  void _handleTapDown(PointerDownEvent event) {
+    if (_sentTapDown) return;
+
+    if (onTapDown != null) {
+      _sentTapDown = true;
+      final details = TapDownDetails(
+        globalPosition: event.position,
+        localPosition: event.localPosition,
+        kind: event.kind,
+      );
+      invokeCallback<void>('onTapDown', () => onTapDown!(details));
+    }
+  }
+
+  void _handlePointerMove(PointerMoveEvent event) {
+    if (event.delta.distanceSquared > 2.0) {
+      _cancelGesture('pointer moved');
+      stopTrackingPointer(event.pointer);
+    }
+  }
+
+  void _handlePointerUp(PointerUpEvent event) {
+    if (_wonArena) {
+      _handleTapUp(event);
+    }
+  }
+
+  void _handleTapUp(PointerUpEvent event) {
+    final details = TapUpDetails(
+      globalPosition: event.position,
+      localPosition: event.localPosition,
+      kind: event.kind,
+    );
+    invokeCallback<void>('onTapUp', () => onTapUp(details));
+
+    if (onTap != null) {
+      invokeCallback<void>('onTap', onTap!);
+    }
+
+    _reset();
+  }
+
+  void _cancelGesture(String reason) {
+    if (_sentTapDown && onTapCancel != null) {
+      invokeCallback<void>('onTapCancel: $reason', onTapCancel!);
+    }
+    _reset();
+  }
+
+  void _reset([int pointer = 0]) {
+    _activePointer = pointer;
+    _up = null;
+    _sentTapDown = false;
+    _wonArena = false;
+  }
+
+  @override
+  void acceptGesture(int pointer) {
+    super.acceptGesture(pointer);
+
+    if (pointer == _activePointer) {
+      _wonArena = true;
+
+      if (_up != null) {
+        _handleTapUp(_up!);
+      }
+    }
+  }
+
+  @override
+  void rejectGesture(int pointer) {
+    super.rejectGesture(pointer);
+
+    if (pointer == _activePointer) {
+      _cancelGesture('gesture rejected by arena');
+      stopTrackingPointer(pointer);
+    }
+  }
+
+  @override
+  void didStopTrackingLastPointer(int pointer) {
+    // wait for arena
+  }
+
+  @override
+  void dispose() {
+    _cancelGesture('disposed');
+    super.dispose();
+  }
+
+  @override
+  String get debugDescription => 'immediate tap';
+
+  @override
+  void debugFillProperties(DiagnosticPropertiesBuilder properties) {
+    super.debugFillProperties(properties);
+    properties
+      ..add(IntProperty('activePointer', _activePointer))
+      ..add(
+        FlagProperty(
+          'sentTapDown',
+          value: _sentTapDown,
+          ifTrue: 'has sentTapDown',
+        ),
+      )
+      ..add(FlagProperty('wonArena', value: _wonArena, ifTrue: 'wonArena'))
+      ..add(
+        DiagnosticsProperty<PointerUpEvent>(
+          'pointerUpEvent',
+          _up,
+          defaultValue: null,
+        ),
+      );
+  }
+}

lib/common/widgets/gesture/mouse_interactive_viewer.dart

@@ -0,0 +1,905 @@
+// Copyright 2014 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io' show Platform;
+import 'dart:math' as math;
+
+import 'package:flutter/foundation.dart' show clampDouble;
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/physics.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter/services.dart';
+import 'package:vector_math/vector_math_64.dart' show Quad, Vector3;
+
+class MouseInteractiveViewer extends StatefulWidget {
+  const MouseInteractiveViewer({
+    super.key,
+    this.clipBehavior = Clip.hardEdge,
+    this.panAxis = PanAxis.free,
+    this.boundaryMargin = EdgeInsets.zero,
+    this.constrained = true,
+    this.maxScale = 2.5,
+    this.minScale = 0.8,
+    this.interactionEndFrictionCoefficient = _kDrag,
+    this.pointerSignalFallback,
+    this.onPointerPanZoomUpdate,
+    this.onPointerPanZoomEnd,
+    this.onPointerDown,
+    this.onInteractionEnd,
+    this.onInteractionStart,
+    this.onInteractionUpdate,
+    this.panEnabled = true,
+    this.scaleEnabled = true,
+    this.scaleFactor = kDefaultMouseScrollToScaleFactor,
+    this.transformationController,
+    this.alignment,
+    this.trackpadScrollCausesScale = false,
+
+    required this.childKey,
+    required this.child,
+  }) : assert(minScale > 0),
+       assert(interactionEndFrictionCoefficient > 0),
+       assert(maxScale > 0),
+       assert(maxScale >= minScale);
+
+  final Alignment? alignment;
+  final Clip clipBehavior;
+  final PanAxis panAxis;
+  final EdgeInsets boundaryMargin;
+  final Widget child;
+  final bool constrained;
+  final bool panEnabled;
+  final bool scaleEnabled;
+  final bool trackpadScrollCausesScale;
+  final double scaleFactor;
+  final double maxScale;
+  final double minScale;
+  final double interactionEndFrictionCoefficient;
+  final PointerSignalEventListener? pointerSignalFallback;
+  final PointerPanZoomUpdateEventListener? onPointerPanZoomUpdate;
+  final PointerPanZoomEndEventListener? onPointerPanZoomEnd;
+  final PointerDownEventListener? onPointerDown;
+  final GestureScaleEndCallback? onInteractionEnd;
+  final GestureScaleStartCallback? onInteractionStart;
+  final GestureScaleUpdateCallback? onInteractionUpdate;
+  final TransformationController? transformationController;
+  final GlobalKey childKey;
+
+  static const double _kDrag = 0.0000135;
+
+  @override
+  State<MouseInteractiveViewer> createState() => _MouseInteractiveViewerState();
+}
+
+class _MouseInteractiveViewerState extends State<MouseInteractiveViewer>
+    with TickerProviderStateMixin {
+  late TransformationController _transformer =
+      widget.transformationController ?? TransformationController();
+
+  final GlobalKey _parentKey = GlobalKey();
+  Animation<Offset>? _animation;
+  Animation<double>? _scaleAnimation;
+  late Offset _scaleAnimationFocalPoint;
+  late AnimationController _controller;
+  late AnimationController _scaleController;
+  Axis? _currentAxis;
+  Offset? _referenceFocalPoint;
+  double? _scaleStart;
+  double? _rotationStart = 0.0;
+  double _currentRotation = 0.0;
+  _GestureType? _gestureType;
+
+  static final gestureSettings = DeviceGestureSettings(
+    touchSlop: Platform.isIOS ? 9 : 4,
+  );
+
+  late final _scaleGestureRecognizer =
+      ScaleGestureRecognizer(
+          debugOwner: this,
+          allowedButtonsFilter: (buttons) => buttons == kPrimaryButton,
+          trackpadScrollToScaleFactor: Offset(0, -1 / widget.scaleFactor),
+          trackpadScrollCausesScale: widget.trackpadScrollCausesScale,
+        )
+        ..gestureSettings = gestureSettings
+        ..onStart = _onScaleStart
+        ..onUpdate = _onScaleUpdate
+        ..onEnd = _onScaleEnd;
+
+  final bool _rotateEnabled = false;
+
+  Rect get _boundaryRect {
+    assert(widget.childKey.currentContext != null);
+    final RenderBox childRenderBox =
+        widget.childKey.currentContext!.findRenderObject()! as RenderBox;
+    final Size childSize = childRenderBox.size;
+    final Rect boundaryRect = widget.boundaryMargin.inflateRect(
+      Offset.zero & childSize,
+    );
+    assert(
+      !boundaryRect.isEmpty,
+      "InteractiveViewer's child must have nonzero dimensions.",
+    );
+    assert(
+      boundaryRect.isFinite ||
+          (boundaryRect.left.isInfinite &&
+              boundaryRect.top.isInfinite &&
+              boundaryRect.right.isInfinite &&
+              boundaryRect.bottom.isInfinite),
+      'boundaryRect must either be infinite in all directions or finite in all directions.',
+    );
+    return boundaryRect;
+  }
+
+  Rect get _viewport {
+    assert(_parentKey.currentContext != null);
+    final RenderBox parentRenderBox =
+        _parentKey.currentContext!.findRenderObject()! as RenderBox;
+    return Offset.zero & parentRenderBox.size;
+  }
+
+  Matrix4 _matrixTranslate(Matrix4 matrix, Offset translation) {
+    if (translation == Offset.zero) {
+      return matrix.clone();
+    }
+
+    final Offset alignedTranslation;
+
+    if (_currentAxis != null) {
+      alignedTranslation = switch (widget.panAxis) {
+        PanAxis.horizontal => _alignAxis(translation, Axis.horizontal),
+        PanAxis.vertical => _alignAxis(translation, Axis.vertical),
+        PanAxis.aligned => _alignAxis(translation, _currentAxis!),
+        PanAxis.free => translation,
+      };
+    } else {
+      alignedTranslation = translation;
+    }
+
+    final Matrix4 nextMatrix = matrix.clone()
+      ..translateByDouble(alignedTranslation.dx, alignedTranslation.dy, 0, 1);
+
+    final Quad nextViewport = _transformViewport(nextMatrix, _viewport);
+
+    if (_boundaryRect.isInfinite) {
+      return nextMatrix;
+    }
+
+    final Quad boundariesAabbQuad = _getAxisAlignedBoundingBoxWithRotation(
+      _boundaryRect,
+      _currentRotation,
+    );
+
+    final Offset offendingDistance = _exceedsBy(
+      boundariesAabbQuad,
+      nextViewport,
+    );
+    if (offendingDistance == Offset.zero) {
+      return nextMatrix;
+    }
+
+    final Offset nextTotalTranslation = _getMatrixTranslation(nextMatrix);
+    final double currentScale = matrix.getMaxScaleOnAxis();
+    final Offset correctedTotalTranslation = Offset(
+      nextTotalTranslation.dx - offendingDistance.dx * currentScale,
+      nextTotalTranslation.dy - offendingDistance.dy * currentScale,
+    );
+    final Matrix4 correctedMatrix = matrix.clone()
+      ..setTranslation(
+        Vector3(
+          correctedTotalTranslation.dx,
+          correctedTotalTranslation.dy,
+          0.0,
+        ),
+      );
+
+    final Quad correctedViewport = _transformViewport(
+      correctedMatrix,
+      _viewport,
+    );
+    final Offset offendingCorrectedDistance = _exceedsBy(
+      boundariesAabbQuad,
+      correctedViewport,
+    );
+    if (offendingCorrectedDistance == Offset.zero) {
+      return correctedMatrix;
+    }
+
+    if (offendingCorrectedDistance.dx != 0.0 &&
+        offendingCorrectedDistance.dy != 0.0) {
+      return matrix.clone();
+    }
+
+    final Offset unidirectionalCorrectedTotalTranslation = Offset(
+      offendingCorrectedDistance.dx == 0.0 ? correctedTotalTranslation.dx : 0.0,
+      offendingCorrectedDistance.dy == 0.0 ? correctedTotalTranslation.dy : 0.0,
+    );
+    return matrix.clone()..setTranslation(
+      Vector3(
+        unidirectionalCorrectedTotalTranslation.dx,
+        unidirectionalCorrectedTotalTranslation.dy,
+        0.0,
+      ),
+    );
+  }
+
+  Matrix4 _matrixScale(Matrix4 matrix, double scale) {
+    if (scale == 1.0) {
+      return matrix.clone();
+    }
+    assert(scale != 0.0);
+
+    final double currentScale = _transformer.value.getMaxScaleOnAxis();
+    final double totalScale = math.max(
+      currentScale * scale,
+      math.max(
+        _viewport.width / _boundaryRect.width,
+        _viewport.height / _boundaryRect.height,
+      ),
+    );
+    final double clampedTotalScale = clampDouble(
+      totalScale,
+      widget.minScale,
+      widget.maxScale,
+    );
+    final double clampedScale = clampedTotalScale / currentScale;
+    return matrix.clone()
+      ..scaleByDouble(clampedScale, clampedScale, clampedScale, 1);
+  }
+
+  Matrix4 _matrixRotate(Matrix4 matrix, double rotation, Offset focalPoint) {
+    if (rotation == 0) {
+      return matrix.clone();
+    }
+    final Offset focalPointScene = _transformer.toScene(focalPoint);
+    return matrix.clone()
+      ..translateByDouble(focalPointScene.dx, focalPointScene.dy, 0, 1)
+      ..rotateZ(-rotation)
+      ..translateByDouble(-focalPointScene.dx, -focalPointScene.dy, 0, 1);
+  }
+
+  bool _gestureIsSupported(_GestureType? gestureType) {
+    return switch (gestureType) {
+      _GestureType.rotate => _rotateEnabled,
+      _GestureType.scale => widget.scaleEnabled,
+      _GestureType.pan || null => widget.panEnabled,
+    };
+  }
+
+  _GestureType _getGestureType(ScaleUpdateDetails details) {
+    final double scale = !widget.scaleEnabled ? 1.0 : details.scale;
+    final double rotation = !_rotateEnabled ? 0.0 : details.rotation;
+    if ((scale - 1).abs() > rotation.abs()) {
+      return _GestureType.scale;
+    } else if (rotation != 0.0) {
+      return _GestureType.rotate;
+    } else {
+      return _GestureType.pan;
+    }
+  }
+
+  // Handle the start of a gesture. All of pan, scale, and rotate are handled
+  // with GestureDetector's scale gesture.
+  void _onScaleStart(ScaleStartDetails details) {
+    widget.onInteractionStart?.call(details);
+
+    if (_controller.isAnimating) {
+      _controller
+        ..stop()
+        ..reset();
+      _animation?.removeListener(_handleInertiaAnimation);
+      _animation = null;
+    }
+    if (_scaleController.isAnimating) {
+      _scaleController
+        ..stop()
+        ..reset();
+      _scaleAnimation?.removeListener(_handleScaleAnimation);
+      _scaleAnimation = null;
+    }
+
+    _gestureType = null;
+    _currentAxis = null;
+    _scaleStart = _transformer.value.getMaxScaleOnAxis();
+    _referenceFocalPoint = _transformer.toScene(details.localFocalPoint);
+    _rotationStart = _currentRotation;
+  }
+
+  // Handle an update to an ongoing gesture. All of pan, scale, and rotate are
+  // handled with GestureDetector's scale gesture.
+  void _onScaleUpdate(ScaleUpdateDetails details) {
+    final double scale = _transformer.value.getMaxScaleOnAxis();
+    _scaleAnimationFocalPoint = details.localFocalPoint;
+    final Offset focalPointScene = _transformer.toScene(
+      details.localFocalPoint,
+    );
+
+    if (_gestureType == _GestureType.pan) {
+      // When a gesture first starts, it sometimes has no change in scale and
+      // rotation despite being a two-finger gesture. Here the gesture is
+      // allowed to be reinterpreted as its correct type after originally
+      // being marked as a pan.
+      _gestureType = _getGestureType(details);
+    } else {
+      _gestureType ??= _getGestureType(details);
+    }
+    if (!_gestureIsSupported(_gestureType)) {
+      widget.onInteractionUpdate?.call(details);
+      return;
+    }
+
+    switch (_gestureType!) {
+      case _GestureType.scale:
+        assert(_scaleStart != null);
+        // details.scale gives us the amount to change the scale as of the
+        // start of this gesture, so calculate the amount to scale as of the
+        // previous call to _onScaleUpdate.
+        final double desiredScale = _scaleStart! * details.scale;
+        final double scaleChange = desiredScale / scale;
+        _transformer.value = _matrixScale(_transformer.value, scaleChange);
+
+        // While scaling, translate such that the user's two fingers stay on
+        // the same places in the scene. That means that the focal point of
+        // the scale should be on the same place in the scene before and after
+        // the scale.
+        final Offset focalPointSceneScaled = _transformer.toScene(
+          details.localFocalPoint,
+        );
+        _transformer.value = _matrixTranslate(
+          _transformer.value,
+          focalPointSceneScaled - _referenceFocalPoint!,
+        );
+
+        // details.localFocalPoint should now be at the same location as the
+        // original _referenceFocalPoint point. If it's not, that's because
+        // the translate came in contact with a boundary. In that case, update
+        // _referenceFocalPoint so subsequent updates happen in relation to
+        // the new effective focal point.
+        final Offset focalPointSceneCheck = _transformer.toScene(
+          details.localFocalPoint,
+        );
+        if (_round(_referenceFocalPoint!) != _round(focalPointSceneCheck)) {
+          _referenceFocalPoint = focalPointSceneCheck;
+        }
+
+      case _GestureType.rotate:
+        if (details.rotation == 0.0) {
+          widget.onInteractionUpdate?.call(details);
+          return;
+        }
+        final double desiredRotation = _rotationStart! + details.rotation;
+        _transformer.value = _matrixRotate(
+          _transformer.value,
+          _currentRotation - desiredRotation,
+          details.localFocalPoint,
+        );
+        _currentRotation = desiredRotation;
+
+      case _GestureType.pan:
+        assert(_referenceFocalPoint != null);
+        // details may have a change in scale here when scaleEnabled is false.
+        // In an effort to keep the behavior similar whether or not scaleEnabled
+        // is true, these gestures are thrown away.
+        if (details.scale != 1.0) {
+          widget.onInteractionUpdate?.call(details);
+          return;
+        }
+        _currentAxis ??= _getPanAxis(_referenceFocalPoint!, focalPointScene);
+        // Translate so that the same point in the scene is underneath the
+        // focal point before and after the movement.
+        final Offset translationChange =
+            focalPointScene - _referenceFocalPoint!;
+        _transformer.value = _matrixTranslate(
+          _transformer.value,
+          translationChange,
+        );
+        _referenceFocalPoint = _transformer.toScene(details.localFocalPoint);
+    }
+    widget.onInteractionUpdate?.call(details);
+  }
+
+  // Handle the end of a gesture of _GestureType. All of pan, scale, and rotate
+  // are handled with GestureDetector's scale gesture.
+  void _onScaleEnd(ScaleEndDetails details) {
+    widget.onInteractionEnd?.call(details);
+    _scaleStart = null;
+    _rotationStart = null;
+    _referenceFocalPoint = null;
+
+    _animation?.removeListener(_handleInertiaAnimation);
+    _scaleAnimation?.removeListener(_handleScaleAnimation);
+    _controller.reset();
+    _scaleController.reset();
+
+    if (!_gestureIsSupported(_gestureType)) {
+      _currentAxis = null;
+      return;
+    }
+
+    switch (_gestureType) {
+      case _GestureType.pan:
+        if (details.velocity.pixelsPerSecond.distance < kMinFlingVelocity) {
+          _currentAxis = null;
+          return;
+        }
+        final Vector3 translationVector = _transformer.value.getTranslation();
+        final Offset translation = Offset(
+          translationVector.x,
+          translationVector.y,
+        );
+        final FrictionSimulation frictionSimulationX = FrictionSimulation(
+          widget.interactionEndFrictionCoefficient,
+          translation.dx,
+          details.velocity.pixelsPerSecond.dx,
+        );
+        final FrictionSimulation frictionSimulationY = FrictionSimulation(
+          widget.interactionEndFrictionCoefficient,
+          translation.dy,
+          details.velocity.pixelsPerSecond.dy,
+        );
+        final double tFinal = _getFinalTime(
+          details.velocity.pixelsPerSecond.distance,
+          widget.interactionEndFrictionCoefficient,
+        );
+        _animation =
+            Tween<Offset>(
+                begin: translation,
+                end: Offset(
+                  frictionSimulationX.finalX,
+                  frictionSimulationY.finalX,
+                ),
+              ).animate(
+                CurvedAnimation(parent: _controller, curve: Curves.decelerate),
+              )
+              ..addListener(_handleInertiaAnimation);
+        _controller
+          ..duration = Duration(milliseconds: (tFinal * 1000).round())
+          ..forward();
+      case _GestureType.scale:
+        if (details.scaleVelocity.abs() < 0.1) {
+          _currentAxis = null;
+          return;
+        }
+        final double scale = _transformer.value.getMaxScaleOnAxis();
+        final FrictionSimulation frictionSimulation = FrictionSimulation(
+          widget.interactionEndFrictionCoefficient * widget.scaleFactor,
+          scale,
+          details.scaleVelocity / 10,
+        );
+        final double tFinal = _getFinalTime(
+          details.scaleVelocity.abs(),
+          widget.interactionEndFrictionCoefficient,
+          effectivelyMotionless: 0.1,
+        );
+        _scaleAnimation =
+            Tween<double>(
+                begin: scale,
+                end: frictionSimulation.x(tFinal),
+              ).animate(
+                CurvedAnimation(
+                  parent: _scaleController,
+                  curve: Curves.decelerate,
+                ),
+              )
+              ..addListener(_handleScaleAnimation);
+        _scaleController
+          ..duration = Duration(milliseconds: (tFinal * 1000).round())
+          ..forward();
+      case _GestureType.rotate || null:
+        break;
+    }
+  }
+
+  void _receivedPointerSignal(PointerSignalEvent event) {
+    final Offset local = event.localPosition;
+    final Offset global = event.position;
+    final double scaleChange;
+    if (event is PointerScrollEvent) {
+      if (event.kind == PointerDeviceKind.trackpad) {
+        widget.onInteractionStart?.call(
+          ScaleStartDetails(focalPoint: global, localFocalPoint: local),
+        );
+
+        final Offset localDelta = PointerEvent.transformDeltaViaPositions(
+          untransformedEndPosition: global + event.scrollDelta,
+          untransformedDelta: event.scrollDelta,
+          transform: event.transform,
+        );
+
+        final Offset focalPointScene = _transformer.toScene(local);
+        final Offset newFocalPointScene = _transformer.toScene(
+          local - localDelta,
+        );
+
+        _transformer.value = _matrixTranslate(
+          _transformer.value,
+          newFocalPointScene - focalPointScene,
+        );
+
+        widget.onInteractionUpdate?.call(
+          ScaleUpdateDetails(
+            focalPoint: global - event.scrollDelta,
+            localFocalPoint: local - localDelta,
+            focalPointDelta: -localDelta,
+          ),
+        );
+        widget.onInteractionEnd?.call(ScaleEndDetails());
+        return;
+      }
+      _handlePointerScrollEvent(event);
+      return;
+    } else if (event is PointerScaleEvent) {
+      scaleChange = event.scale;
+    } else {
+      return;
+    }
+    widget.onInteractionStart?.call(
+      ScaleStartDetails(focalPoint: global, localFocalPoint: local),
+    );
+
+    if (!_gestureIsSupported(_GestureType.scale)) {
+      widget.onInteractionUpdate?.call(
+        ScaleUpdateDetails(
+          focalPoint: global,
+          localFocalPoint: local,
+          scale: scaleChange,
+        ),
+      );
+      widget.onInteractionEnd?.call(ScaleEndDetails());
+      return;
+    }
+
+    final Offset focalPointScene = _transformer.toScene(local);
+    _transformer.value = _matrixScale(_transformer.value, scaleChange);
+
+    // After scaling, translate such that the event's position is at the
+    // same scene point before and after the scale.
+    final Offset focalPointSceneScaled = _transformer.toScene(local);
+    _transformer.value = _matrixTranslate(
+      _transformer.value,
+      focalPointSceneScaled - focalPointScene,
+    );
+
+    widget.onInteractionUpdate?.call(
+      ScaleUpdateDetails(
+        focalPoint: global,
+        localFocalPoint: local,
+        scale: scaleChange,
+      ),
+    );
+    widget.onInteractionEnd?.call(ScaleEndDetails());
+  }
+
+  void _handlePointerScrollEvent(PointerScrollEvent event) {
+    final Offset local = event.localPosition;
+    final Offset global = event.position;
+
+    if (_gestureIsSupported(_GestureType.scale)) {
+      if (HardwareKeyboard.instance.isControlPressed) {
+        _handleMouseWheelScale(event, local, global);
+        return;
+      }
+      final shift = HardwareKeyboard.instance.isShiftPressed;
+      if (shift || HardwareKeyboard.instance.isAltPressed) {
+        _handleMouseWheelPanAsScale(event, local, global, shift);
+        return;
+      }
+      widget.pointerSignalFallback?.call(event);
+    }
+    widget.onInteractionUpdate?.call(
+      ScaleUpdateDetails(
+        focalPoint: global,
+        localFocalPoint: local,
+        scale: math.exp(-event.scrollDelta.dy / widget.scaleFactor),
+      ),
+    );
+    widget.onInteractionEnd?.call(ScaleEndDetails());
+  }
+
+  void _handleMouseWheelScale(
+    PointerScrollEvent event,
+    Offset local,
+    Offset global,
+  ) {
+    final double scaleChange = math.exp(
+      -event.scrollDelta.dy / widget.scaleFactor,
+    );
+    final Offset focalPointScene = _transformer.toScene(local);
+    _transformer.value = _matrixScale(_transformer.value, scaleChange);
+
+    final Offset focalPointSceneScaled = _transformer.toScene(local);
+    _transformer.value = _matrixTranslate(
+      _transformer.value,
+      focalPointSceneScaled - focalPointScene,
+    );
+
+    widget.onInteractionUpdate?.call(
+      ScaleUpdateDetails(
+        focalPoint: global,
+        localFocalPoint: local,
+        scale: scaleChange,
+      ),
+    );
+    widget.onInteractionEnd?.call(ScaleEndDetails());
+  }
+
+  void _handleMouseWheelPanAsScale(
+    PointerScrollEvent event,
+    Offset local,
+    Offset global,
+    bool flip,
+  ) {
+    final Offset translation = flip
+        ? event.scrollDelta.flip
+        : event.scrollDelta;
+
+    final Offset focalPointScene = _transformer.toScene(local);
+    final Offset newFocalPointScene = _transformer.toScene(local - translation);
+
+    _transformer.value = _matrixTranslate(
+      _transformer.value,
+      newFocalPointScene - focalPointScene,
+    );
+  }
+
+  void _handleInertiaAnimation() {
+    if (!_controller.isAnimating) {
+      _currentAxis = null;
+      _animation?.removeListener(_handleInertiaAnimation);
+      _animation = null;
+      _controller.reset();
+      return;
+    }
+    final Vector3 translationVector = _transformer.value.getTranslation();
+    final Offset translation = Offset(translationVector.x, translationVector.y);
+    _transformer.value = _matrixTranslate(
+      _transformer.value,
+      _transformer.toScene(_animation!.value) -
+          _transformer.toScene(translation),
+    );
+  }
+
+  void _handleScaleAnimation() {
+    if (!_scaleController.isAnimating) {
+      _currentAxis = null;
+      _scaleAnimation?.removeListener(_handleScaleAnimation);
+      _scaleAnimation = null;
+      _scaleController.reset();
+      return;
+    }
+    final double desiredScale = _scaleAnimation!.value;
+    final double scaleChange =
+        desiredScale / _transformer.value.getMaxScaleOnAxis();
+    final Offset referenceFocalPoint = _transformer.toScene(
+      _scaleAnimationFocalPoint,
+    );
+    _transformer.value = _matrixScale(_transformer.value, scaleChange);
+
+    final Offset focalPointSceneScaled = _transformer.toScene(
+      _scaleAnimationFocalPoint,
+    );
+    _transformer.value = _matrixTranslate(
+      _transformer.value,
+      focalPointSceneScaled - referenceFocalPoint,
+    );
+  }
+
+  void _handleTransformation() {
+    setState(() {});
+  }
+
+  void _onPointerDown(PointerDownEvent event) {
+    widget.onPointerDown?.call(event);
+    _scaleGestureRecognizer.addPointer(event);
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(vsync: this);
+    _scaleController = AnimationController(vsync: this);
+
+    _transformer.addListener(_handleTransformation);
+  }
+
+  @override
+  void didUpdateWidget(MouseInteractiveViewer oldWidget) {
+    super.didUpdateWidget(oldWidget);
+
+    final TransformationController? newController =
+        widget.transformationController;
+    if (newController == oldWidget.transformationController) {
+      return;
+    }
+    _transformer.removeListener(_handleTransformation);
+    if (oldWidget.transformationController == null) {
+      _transformer.dispose();
+    }
+    _transformer = newController ?? TransformationController();
+    _transformer.addListener(_handleTransformation);
+  }
+
+  @override
+  void dispose() {
+    _scaleGestureRecognizer.dispose();
+    _controller.dispose();
+    _scaleController.dispose();
+    _transformer.removeListener(_handleTransformation);
+    if (widget.transformationController == null) {
+      _transformer.dispose();
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    assert(widget.child.key == widget.childKey);
+
+    return Listener(
+      key: _parentKey,
+      behavior: HitTestBehavior.opaque,
+      onPointerSignal: _receivedPointerSignal,
+      onPointerDown: _onPointerDown,
+      onPointerPanZoomStart: _scaleGestureRecognizer.addPointerPanZoom,
+      onPointerPanZoomUpdate: widget.onPointerPanZoomUpdate,
+      onPointerPanZoomEnd: widget.onPointerPanZoomEnd,
+      child: _InteractiveViewerBuilt(
+        childKey: widget.childKey,
+        clipBehavior: widget.clipBehavior,
+        constrained: widget.constrained,
+        matrix: _transformer.value,
+        alignment: widget.alignment,
+        child: widget.child,
+      ),
+    );
+  }
+}
+
+class _InteractiveViewerBuilt extends StatelessWidget {
+  const _InteractiveViewerBuilt({
+    required this.child,
+    required this.childKey,
+    required this.clipBehavior,
+    required this.constrained,
+    required this.matrix,
+    required this.alignment,
+  });
+
+  final Widget child;
+  final GlobalKey childKey;
+  final Clip clipBehavior;
+  final bool constrained;
+  final Matrix4 matrix;
+  final Alignment? alignment;
+
+  @override
+  Widget build(BuildContext context) {
+    Widget child = Transform(
+      transform: matrix,
+      alignment: alignment,
+      child: this.child,
+    );
+
+    if (!constrained) {
+      child = OverflowBox(
+        alignment: Alignment.topLeft,
+        minWidth: 0.0,
+        minHeight: 0.0,
+        maxWidth: double.infinity,
+        maxHeight: double.infinity,
+        child: child,
+      );
+    }
+
+    if (clipBehavior != Clip.none) {
+      child = ClipRect(clipBehavior: clipBehavior, child: child);
+    }
+
+    return child;
+  }
+}
+
+enum _GestureType { pan, scale, rotate }
+
+double _getFinalTime(
+  double velocity,
+  double drag, {
+  double effectivelyMotionless = 10,
+}) {
+  return math.log(effectivelyMotionless / velocity) / math.log(drag / 100);
+}
+
+Offset _getMatrixTranslation(Matrix4 matrix) {
+  final Vector3 nextTranslation = matrix.getTranslation();
+  return Offset(nextTranslation.x, nextTranslation.y);
+}
+
+Quad _transformViewport(Matrix4 matrix, Rect viewport) {
+  final Matrix4 inverseMatrix = matrix.clone()..invert();
+  return Quad.points(
+    inverseMatrix.transform3(
+      Vector3(viewport.topLeft.dx, viewport.topLeft.dy, 0.0),
+    ),
+    inverseMatrix.transform3(
+      Vector3(viewport.topRight.dx, viewport.topRight.dy, 0.0),
+    ),
+    inverseMatrix.transform3(
+      Vector3(viewport.bottomRight.dx, viewport.bottomRight.dy, 0.0),
+    ),
+    inverseMatrix.transform3(
+      Vector3(viewport.bottomLeft.dx, viewport.bottomLeft.dy, 0.0),
+    ),
+  );
+}
+
+Quad _getAxisAlignedBoundingBoxWithRotation(Rect rect, double rotation) {
+  final Matrix4 rotationMatrix = Matrix4.identity()
+    ..translateByDouble(rect.size.width / 2, rect.size.height / 2, 0, 1)
+    ..rotateZ(rotation)
+    ..translateByDouble(-rect.size.width / 2, -rect.size.height / 2, 0, 1);
+  final Quad boundariesRotated = Quad.points(
+    rotationMatrix.transform3(Vector3(rect.left, rect.top, 0.0)),
+    rotationMatrix.transform3(Vector3(rect.right, rect.top, 0.0)),
+    rotationMatrix.transform3(Vector3(rect.right, rect.bottom, 0.0)),
+    rotationMatrix.transform3(Vector3(rect.left, rect.bottom, 0.0)),
+  );
+  // ignore: invalid_use_of_visible_for_testing_member
+  return InteractiveViewer.getAxisAlignedBoundingBox(boundariesRotated);
+}
+
+Offset _exceedsBy(Quad boundary, Quad viewport) {
+  final List<Vector3> viewportPoints = <Vector3>[
+    viewport.point0,
+    viewport.point1,
+    viewport.point2,
+    viewport.point3,
+  ];
+  Offset largestExcess = Offset.zero;
+  for (final Vector3 point in viewportPoints) {
+    // ignore: invalid_use_of_visible_for_testing_member
+    final Vector3 pointInside = InteractiveViewer.getNearestPointInside(
+      point,
+      boundary,
+    );
+    final Offset excess = Offset(
+      pointInside.x - point.x,
+      pointInside.y - point.y,
+    );
+    if (excess.dx.abs() > largestExcess.dx.abs()) {
+      largestExcess = Offset(excess.dx, largestExcess.dy);
+    }
+    if (excess.dy.abs() > largestExcess.dy.abs()) {
+      largestExcess = Offset(largestExcess.dx, excess.dy);
+    }
+  }
+
+  return _round(largestExcess);
+}
+
+Offset _round(Offset offset) {
+  return Offset(
+    double.parse(offset.dx.toStringAsFixed(9)),
+    double.parse(offset.dy.toStringAsFixed(9)),
+  );
+}
+
+Offset _alignAxis(Offset offset, Axis axis) {
+  return switch (axis) {
+    Axis.horizontal => Offset(offset.dx, 0.0),
+    Axis.vertical => Offset(0.0, offset.dy),
+  };
+}
+
+Axis? _getPanAxis(Offset point1, Offset point2) {
+  if (point1 == point2) {
+    return null;
+  }
+  final double x = point2.dx - point1.dx;
+  final double y = point2.dy - point1.dy;
+  return x.abs() > y.abs() ? Axis.horizontal : Axis.vertical;
+}
+
+extension on Offset {
+  Offset get flip => Offset(dy, dx);
+}

lib/common/widgets/image/cached_network_svg_image.dart

@@ -0,0 +1,223 @@
+// code from cached_network_svg_image;
+
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+import 'package:flutter_cache_manager/flutter_cache_manager.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class CachedNetworkSVGImage extends StatefulWidget {
+  CachedNetworkSVGImage(
+    String url, {
+    Key? key,
+    String? cacheKey,
+    Widget? placeholder,
+    Widget? errorWidget,
+    double? width,
+    double? height,
+    Map<String, String>? headers,
+    BoxFit fit = BoxFit.contain,
+    AlignmentGeometry alignment = Alignment.center,
+    bool matchTextDirection = false,
+    bool allowDrawingOutsideViewBox = false,
+    String? semanticsLabel,
+    bool excludeFromSemantics = false,
+    SvgTheme theme = const SvgTheme(),
+    ColorFilter? colorFilter,
+    WidgetBuilder? placeholderBuilder,
+    BaseCacheManager? cacheManager,
+  }) : _url = url,
+       _cacheKey = cacheKey,
+       _placeholder = placeholder,
+       _errorWidget = errorWidget,
+       _width = width,
+       _height = height,
+       _headers = headers,
+       _fit = fit,
+       _alignment = alignment,
+       _matchTextDirection = matchTextDirection,
+       _allowDrawingOutsideViewBox = allowDrawingOutsideViewBox,
+       _semanticsLabel = semanticsLabel,
+       _excludeFromSemantics = excludeFromSemantics,
+       _theme = theme,
+       _colorFilter = colorFilter,
+       _placeholderBuilder = placeholderBuilder,
+       _cacheManager = cacheManager ?? DefaultCacheManager(),
+       super(key: key ?? ValueKey(cacheKey ?? url));
+
+  final String _url;
+  final String? _cacheKey;
+  final Widget? _placeholder;
+  final Widget? _errorWidget;
+  final double? _width;
+  final double? _height;
+  final Map<String, String>? _headers;
+  final BoxFit _fit;
+  final AlignmentGeometry _alignment;
+  final bool _matchTextDirection;
+  final bool _allowDrawingOutsideViewBox;
+  final String? _semanticsLabel;
+  final bool _excludeFromSemantics;
+  final SvgTheme _theme;
+  final ColorFilter? _colorFilter;
+  final WidgetBuilder? _placeholderBuilder;
+  final BaseCacheManager _cacheManager;
+
+  @override
+  State<CachedNetworkSVGImage> createState() => _CachedNetworkSVGImageState();
+
+  static Future<void> preCache(
+    String imageUrl, {
+    String? cacheKey,
+    BaseCacheManager? cacheManager,
+  }) {
+    final key = cacheKey ?? _generateKeyFromUrl(imageUrl);
+    cacheManager ??= DefaultCacheManager();
+    return cacheManager.downloadFile(key);
+  }
+
+  static Future<void> clearCacheForUrl(
+    String imageUrl, {
+    String? cacheKey,
+    BaseCacheManager? cacheManager,
+  }) {
+    final key = cacheKey ?? _generateKeyFromUrl(imageUrl);
+    cacheManager ??= DefaultCacheManager();
+    return cacheManager.removeFile(key);
+  }
+
+  static Future<void> clearCache({BaseCacheManager? cacheManager}) {
+    cacheManager ??= DefaultCacheManager();
+    return cacheManager.emptyCache();
+  }
+
+  static String _generateKeyFromUrl(String url) => url.split('?').first;
+}
+
+class _CachedNetworkSVGImageState extends State<CachedNetworkSVGImage> {
+  bool _isLoading = false;
+  bool _isError = false;
+  String? _svgString;
+  late final String _cacheKey;
+  double? height;
+  late TextScaler textScaler;
+
+  static final _sizeRegExp = RegExp(
+    r'height="([\d\.]+)([c-x]{2})?"',
+  );
+
+  @override
+  void initState() {
+    super.initState();
+    _cacheKey =
+        widget._cacheKey ??
+        CachedNetworkSVGImage._generateKeyFromUrl(widget._url);
+    _loadImage();
+  }
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    textScaler = MediaQuery.textScalerOf(context);
+  }
+
+  Future<void> _loadImage() async {
+    try {
+      var file = (await widget._cacheManager.getFileFromCache(_cacheKey))?.file;
+
+      file ??= await widget._cacheManager.getSingleFile(
+        widget._url,
+        key: _cacheKey,
+        headers: widget._headers ?? {},
+      );
+      final svg = await file.readAsString();
+      _svgString = svg;
+      if (widget._width == null && widget._height == null) {
+        final match = _sizeRegExp.firstMatch(svg);
+        if (match != null) {
+          double h = double.parse(match.group(1)!);
+          final suffix = match.group(2);
+          if (suffix != null) {
+            h *= switch (suffix) {
+              'em' => textScaler.scale(widget._theme.fontSize),
+              'ex' => textScaler.scale(widget._theme.xHeight),
+              'pt' => 1.25,
+              'pc' => 15.0,
+              'mm' => 3.543307,
+              'cm' => 35.43307,
+              'in' => 90.0,
+              _ => 1.0,
+            };
+          }
+          height = h;
+        }
+      }
+
+      _isLoading = false;
+
+      _setState();
+    } catch (e) {
+      log('CachedNetworkSVGImage: $e');
+
+      _isError = true;
+      _isLoading = false;
+
+      _setState();
+    }
+  }
+
+  void _setState() {
+    if (mounted) {
+      setState(() {});
+    } else {
+      SchedulerBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          setState(() {});
+        }
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: widget._width,
+      height: widget._height,
+      child: _buildImage(),
+    );
+  }
+
+  Widget? _buildImage() {
+    if (_isLoading) return _buildPlaceholderWidget();
+
+    if (_isError) return _buildErrorWidget();
+
+    return _buildSVGImage();
+  }
+
+  Widget _buildPlaceholderWidget() => Center(child: widget._placeholder);
+
+  Widget _buildErrorWidget() => Center(child: widget._errorWidget);
+
+  Widget? _buildSVGImage() {
+    if (_svgString == null) {
+      return Center(child: widget._placeholderBuilder?.call(context));
+    }
+
+    return SvgPicture.string(
+      _svgString!,
+      fit: widget._fit,
+      width: widget._width,
+      height: widget._height ?? height,
+      alignment: widget._alignment,
+      matchTextDirection: widget._matchTextDirection,
+      allowDrawingOutsideViewBox: widget._allowDrawingOutsideViewBox,
+      semanticsLabel: widget._semanticsLabel,
+      excludeFromSemantics: widget._excludeFromSemantics,
+      colorFilter: widget._colorFilter,
+      placeholderBuilder: widget._placeholderBuilder,
+      theme: widget._theme,
+    );
+  }
+}

lib/common/widgets/image/custom_grid_view.dart

@@ -0,0 +1,286 @@
+/*
+ * This file is part of PiliPlus
+ *
+ * PiliPlus 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.
+ *
+ * PiliPlus 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 PiliPlus.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import 'dart:math' show min;
+
+import 'package:PiliPlus/common/constants.dart';
+import 'package:PiliPlus/common/widgets/badge.dart';
+import 'package:PiliPlus/common/widgets/custom_layout.dart';
+import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
+import 'package:PiliPlus/models/common/badge_type.dart';
+import 'package:PiliPlus/models/common/image_preview_type.dart';
+import 'package:PiliPlus/utils/context_ext.dart';
+import 'package:PiliPlus/utils/extension.dart';
+import 'package:PiliPlus/utils/page_utils.dart';
+import 'package:PiliPlus/utils/storage_pref.dart';
+import 'package:flutter/material.dart'
+    hide CustomMultiChildLayout, MultiChildLayoutDelegate;
+
+class ImageModel {
+  ImageModel({
+    required num? width,
+    required num? height,
+    required this.url,
+    this.liveUrl,
+  }) {
+    this.width = width == null || width == 0 ? 1 : width;
+    this.height = height == null || height == 0 ? 1 : height;
+  }
+
+  late num width;
+  late num height;
+  String url;
+  String? liveUrl;
+  bool? _isLongPic;
+  bool? _isLivePhoto;
+
+  bool get isLongPic => _isLongPic ??= (height / width) > _maxRatio;
+  bool get isLivePhoto =>
+      _isLivePhoto ??= enableLivePhoto && liveUrl?.isNotEmpty == true;
+
+  static bool enableLivePhoto = Pref.enableLivePhoto;
+}
+
+const double _maxRatio = 22 / 9;
+
+class CustomGridView extends StatelessWidget {
+  const CustomGridView({
+    super.key,
+    this.space = 5,
+    required this.maxWidth,
+    required this.picArr,
+    this.onViewImage,
+    this.fullScreen = false,
+  });
+
+  final double maxWidth;
+  final double space;
+  final List<ImageModel> picArr;
+  final VoidCallback? onViewImage;
+  final bool fullScreen;
+
+  static bool horizontalPreview = Pref.horizontalPreview;
+
+  void onTap(BuildContext context, int index) {
+    final imgList = picArr.map(
+      (item) {
+        bool isLive = item.isLivePhoto;
+        return SourceModel(
+          sourceType: isLive ? SourceType.livePhoto : SourceType.networkImage,
+          url: item.url,
+          liveUrl: isLive ? item.liveUrl : null,
+          width: isLive ? item.width.toInt() : null,
+          height: isLive ? item.height.toInt() : null,
+        );
+      },
+    ).toList();
+    if (horizontalPreview &&
+        !fullScreen &&
+        !context.mediaQuerySize.isPortrait) {
+      final scaffoldState = Scaffold.maybeOf(context);
+      if (scaffoldState != null) {
+        onViewImage?.call();
+        PageUtils.onHorizontalPreviewState(
+          scaffoldState,
+          imgList,
+          index,
+        );
+        return;
+      }
+    }
+    PageUtils.imageView(
+      initialPage: index,
+      imgList: imgList,
+    );
+  }
+
+  static BorderRadius borderRadius(
+    int col,
+    int length,
+    int index, {
+    Radius r = StyleString.imgRadius,
+  }) {
+    if (length == 1) return StyleString.mdRadius;
+
+    final bool hasUp = index - col >= 0;
+    final bool hasDown = index + col < length;
+
+    final bool isRowStart = (index % col) == 0;
+    final bool isRowEnd = (index % col) == col - 1 || index == length - 1;
+
+    final bool hasLeft = !isRowStart;
+    final bool hasRight = !isRowEnd && (index + 1) < length;
+
+    return BorderRadius.only(
+      topLeft: !hasUp && !hasLeft ? r : Radius.zero,
+      topRight: !hasUp && !hasRight ? r : Radius.zero,
+      bottomLeft: !hasDown && !hasLeft ? r : Radius.zero,
+      bottomRight: !hasDown && !hasRight ? r : Radius.zero,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    double imageWidth;
+    double imageHeight;
+    final length = picArr.length;
+    final isSingle = length == 1;
+    final isFour = length == 4;
+    if (length == 2) {
+      imageWidth = imageHeight = (maxWidth - space) / 2;
+    } else {
+      imageHeight = imageWidth = (maxWidth - 2 * space) / 3;
+      if (isSingle) {
+        final img = picArr.first;
+        final width = img.width;
+        final height = img.height;
+        final ratioWH = width / height;
+        final ratioHW = height / width;
+        imageWidth = ratioWH > 1.5
+            ? maxWidth
+            : (ratioWH >= 1 || (height > width && ratioHW < 1.5))
+            ? 2 * imageWidth
+            : 1.5 * imageWidth;
+        if (width != 1) {
+          imageWidth = min(imageWidth, width.toDouble());
+        }
+        imageHeight = imageWidth * min(ratioHW, _maxRatio);
+      }
+    }
+
+    final int column = isFour ? 2 : 3;
+    final int row = isFour ? 2 : (length / 3).ceil();
+    late final placeHolder = Container(
+      width: imageWidth,
+      height: imageHeight,
+      decoration: BoxDecoration(
+        color: Theme.of(
+          context,
+        ).colorScheme.onInverseSurface.withValues(alpha: 0.4),
+      ),
+      child: Center(
+        child: Image.asset(
+          'assets/images/loading.png',
+          width: imageWidth,
+          height: imageHeight,
+          cacheWidth: imageWidth.cacheSize(context),
+        ),
+      ),
+    );
+
+    return Padding(
+      padding: const EdgeInsets.only(top: 6),
+      child: SizedBox(
+        width: maxWidth,
+        height: imageHeight * row + space * (row - 1),
+        child: CustomMultiChildLayout(
+          delegate: _CustomGridViewDelegate(
+            space: space,
+            itemCount: length,
+            column: column,
+            width: imageWidth,
+            height: imageHeight,
+          ),
+          children: List.generate(length, (index) {
+            final item = picArr[index];
+            final radius = borderRadius(column, length, index);
+            return LayoutId(
+              id: index,
+              child: Hero(
+                tag: item.url,
+                child: GestureDetector(
+                  onTap: () => onTap(context, index),
+                  child: Stack(
+                    clipBehavior: Clip.none,
+                    alignment: Alignment.center,
+                    children: [
+                      ClipRRect(
+                        borderRadius: radius,
+                        child: NetworkImgLayer(
+                          radius: 0,
+                          src: item.url,
+                          width: imageWidth,
+                          height: imageHeight,
+                          isLongPic: item.isLongPic,
+                          forceUseCacheWidth: item.width <= item.height,
+                          getPlaceHolder: () => placeHolder,
+                        ),
+                      ),
+                      if (item.isLivePhoto)
+                        const PBadge(
+                          text: 'Live',
+                          right: 8,
+                          bottom: 8,
+                          type: PBadgeType.gray,
+                        )
+                      else if (item.isLongPic)
+                        const PBadge(
+                          text: '长图',
+                          right: 8,
+                          bottom: 8,
+                        ),
+                    ],
+                  ),
+                ),
+              ),
+            );
+          }),
+        ),
+      ),
+    );
+  }
+}
+
+class _CustomGridViewDelegate extends MultiChildLayoutDelegate {
+  _CustomGridViewDelegate({
+    required this.space,
+    required this.itemCount,
+    required this.column,
+    required this.width,
+    required this.height,
+  });
+
+  final double space;
+  final int itemCount;
+  final int column;
+  final double width;
+  final double height;
+
+  @override
+  void performLayout(Size size) {
+    final constraints = BoxConstraints.expand(width: width, height: height);
+    for (int i = 0; i < itemCount; i++) {
+      layoutChild(i, constraints);
+      positionChild(
+        i,
+        Offset(
+          (space + width) * (i % column),
+          (space + height) * (i ~/ column),
+        ),
+      );
+    }
+  }
+
+  @override
+  bool shouldRelayout(_CustomGridViewDelegate oldDelegate) {
+    return space != oldDelegate.space ||
+        itemCount != oldDelegate.itemCount ||
+        column != oldDelegate.column ||
+        width != oldDelegate.width ||
+        height != oldDelegate.height;
+  }
+}

lib/common/widgets/image/image_save.dart

@@ -2,7 +2,8 @@ import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/common/widgets/button/icon_button.dart';
 import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
 import 'package:PiliPlus/http/user.dart';
-import 'package:PiliPlus/utils/image_util.dart';
+import 'package:PiliPlus/utils/image_utils.dart';
+import 'package:PiliPlus/utils/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
@@ -18,20 +19,17 @@ void imageSaveDialog({
     animationType: SmartAnimationType.centerScale_otherSlide,
     builder: (context) {
       final theme = Theme.of(context);
-      late final iconColor = theme.colorScheme.onSurfaceVariant;
 
       Widget iconBtn({
         String? tooltip,
-        required IconData icon,
+        required Icon icon,
         required VoidCallback? onPressed,
       }) {
         return iconButton(
-          context: context,
-          onPressed: onPressed,
-          iconSize: 20,
           icon: icon,
-          bgColor: Colors.transparent,
-          iconColor: iconColor,
+          iconSize: 20,
+          tooltip: tooltip,
+          onPressed: onPressed,
         );
       }
 
@@ -60,19 +58,19 @@ void imageSaveDialog({
                 Positioned(
                   right: 8,
                   top: 8,
-                  child: Container(
+                  child: SizedBox(
                     width: 30,
                     height: 30,
-                    decoration: BoxDecoration(
-                      color: Colors.black.withValues(alpha: 0.3),
-                      shape: BoxShape.circle,
-                    ),
-                    child: const IconButton(
+                    child: IconButton(
+                      tooltip: '关闭',
                       style: ButtonStyle(
-                        padding: WidgetStatePropertyAll(EdgeInsets.zero),
+                        backgroundColor: WidgetStatePropertyAll(
+                          Colors.black.withValues(alpha: 0.3),
+                        ),
+                        padding: const WidgetStatePropertyAll(EdgeInsets.zero),
                       ),
                       onPressed: SmartDialog.dismiss,
-                      icon: Icon(
+                      icon: const Icon(
                         Icons.close,
                         size: 18,
                         color: Colors.white,
@@ -104,21 +102,22 @@ void imageSaveDialog({
                           (res) => SmartDialog.showToast(res['msg']),
                         ),
                       },
-                      icon: Icons.watch_later_outlined,
+                      icon: const Icon(Icons.watch_later_outlined),
                     ),
                   if (cover?.isNotEmpty == true) ...[
-                    iconBtn(
-                      tooltip: '分享',
-                      onPressed: () {
-                        SmartDialog.dismiss();
-                        ImageUtil.onShareImg(cover!);
-                      },
-                      icon: Icons.share,
-                    ),
+                    if (Utils.isMobile)
+                      iconBtn(
+                        tooltip: '分享',
+                        onPressed: () {
+                          SmartDialog.dismiss();
+                          ImageUtils.onShareImg(cover!);
+                        },
+                        icon: const Icon(Icons.share),
+                      ),
                     iconBtn(
                       tooltip: '保存封面图',
                       onPressed: () async {
-                        bool saveStatus = await ImageUtil.downloadImg(
+                        bool saveStatus = await ImageUtils.downloadImg(
                           context,
                           [cover!],
                         );
@@ -126,7 +125,7 @@ void imageSaveDialog({
                           SmartDialog.dismiss();
                         }
                       },
-                      icon: Icons.download,
+                      icon: const Icon(Icons.download),
                     ),
                   ],
                 ],

lib/common/widgets/image/image_view.dart

@@ -1,200 +0,0 @@
-import 'dart:math';
-
-import 'package:PiliPlus/common/constants.dart';
-import 'package:PiliPlus/common/widgets/badge.dart';
-import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
-import 'package:PiliPlus/common/widgets/image/nine_grid_view.dart';
-import 'package:PiliPlus/models/common/badge_type.dart';
-import 'package:PiliPlus/models/common/image_preview_type.dart';
-import 'package:PiliPlus/utils/extension.dart';
-import 'package:PiliPlus/utils/page_utils.dart';
-import 'package:PiliPlus/utils/storage_pref.dart';
-import 'package:flutter/material.dart';
-
-class ImageModel {
-  ImageModel({
-    required num? width,
-    required num? height,
-    required this.url,
-    this.liveUrl,
-  }) {
-    this.width = width == null || width == 0 ? 1 : width;
-    this.height = height == null || height == 0 ? 1 : height;
-  }
-
-  late num width;
-  late num height;
-  String url;
-  String? liveUrl;
-  bool? _isLongPic;
-  bool? _isLivePhoto;
-
-  bool get isLongPic => _isLongPic ??= (height / width) > _maxRatio;
-  bool get isLivePhoto =>
-      _isLivePhoto ??= enableLivePhoto && liveUrl?.isNotEmpty == true;
-
-  static bool enableLivePhoto = Pref.enableLivePhoto;
-}
-
-const double _maxRatio = 22 / 9;
-
-Widget imageView(
-  double maxWidth,
-  List<ImageModel> picArr, {
-  VoidCallback? onViewImage,
-  ValueChanged<int>? onDismissed,
-  Function(List<String>, int)? callback,
-}) {
-  double imageWidth = (maxWidth - 10) / 3;
-  double imageHeight = imageWidth;
-  if (picArr.length == 1) {
-    num width = picArr[0].width;
-    num height = picArr[0].height;
-    double ratioWH = width / height;
-    double ratioHW = height / width;
-    imageWidth = ratioWH > 1.5
-        ? maxWidth
-        : (ratioWH >= 1 || (height > width && ratioHW < 1.5))
-        ? 2 * imageWidth
-        : 1.5 * imageWidth;
-    if (width != 1) {
-      imageWidth = min(imageWidth, width.toDouble());
-    }
-    imageHeight = imageWidth * min(ratioHW, _maxRatio);
-  } else if (picArr.length == 2) {
-    imageWidth = imageHeight = 2 * imageWidth;
-  }
-  late final int row = picArr.length == 4 ? 2 : 3;
-  BorderRadius borderRadius(index) {
-    if (picArr.length == 1) {
-      return StyleString.mdRadius;
-    }
-    return BorderRadius.only(
-      topLeft:
-          index - row >= 0 ||
-              ((index - 1) >= 0 && (index - 1) % row < index % row)
-          ? Radius.zero
-          : StyleString.imgRadius,
-      topRight:
-          index - row >= 0 ||
-              ((index + 1) < picArr.length && (index + 1) % row > index % row)
-          ? Radius.zero
-          : StyleString.imgRadius,
-      bottomLeft:
-          index + row < picArr.length ||
-              ((index - 1) >= 0 && (index - 1) % row < index % row)
-          ? Radius.zero
-          : StyleString.imgRadius,
-      bottomRight:
-          index + row < picArr.length ||
-              ((index + 1) < picArr.length && (index + 1) % row > index % row)
-          ? Radius.zero
-          : StyleString.imgRadius,
-    );
-  }
-
-  int parseSize(size) {
-    return switch (size) {
-      int() => size,
-      double() => size.round(),
-      String() => int.tryParse(size) ?? 1,
-      _ => 1,
-    };
-  }
-
-  void onTap(int index) {
-    if (callback != null) {
-      callback(picArr.map((item) => item.url).toList(), index);
-    } else {
-      onViewImage?.call();
-      PageUtils.imageView(
-        initialPage: index,
-        imgList: picArr.map(
-          (item) {
-            bool isLive = item.isLivePhoto;
-            return SourceModel(
-              sourceType: isLive
-                  ? SourceType.livePhoto
-                  : SourceType.networkImage,
-              url: item.url,
-              liveUrl: isLive ? item.liveUrl : null,
-              width: isLive ? parseSize(item.width) : null,
-              height: isLive ? parseSize(item.height) : null,
-            );
-          },
-        ).toList(),
-        onDismissed: onDismissed,
-      );
-    }
-  }
-
-  return NineGridView(
-    type: NineGridType.weiBo,
-    margin: const EdgeInsets.only(top: 6),
-    bigImageWidth: imageWidth,
-    bigImageHeight: imageHeight,
-    space: 5,
-    height: picArr.length == 1 ? imageHeight : null,
-    width: picArr.length == 1 ? imageWidth : maxWidth,
-    itemCount: picArr.length,
-    itemBuilder: (context, index) {
-      final item = picArr[index];
-      return Hero(
-        tag: item.url,
-        child: GestureDetector(
-          onTap: () => onTap(index),
-          child: Stack(
-            clipBehavior: Clip.none,
-            alignment: Alignment.center,
-            children: [
-              ClipRRect(
-                borderRadius: borderRadius(index),
-                child: NetworkImgLayer(
-                  radius: 0,
-                  src: item.url,
-                  width: imageWidth,
-                  height: imageHeight,
-                  isLongPic: item.isLongPic,
-                  forceUseCacheWidth: item.width <= item.height,
-                  getPlaceHolder: () {
-                    return Container(
-                      width: imageWidth,
-                      height: imageHeight,
-                      decoration: BoxDecoration(
-                        color: Theme.of(
-                          context,
-                        ).colorScheme.onInverseSurface.withValues(alpha: 0.4),
-                        borderRadius: borderRadius(index),
-                      ),
-                      child: Center(
-                        child: Image.asset(
-                          'assets/images/loading.png',
-                          width: imageWidth,
-                          height: imageHeight,
-                          cacheWidth: imageWidth.cacheSize(context),
-                        ),
-                      ),
-                    );
-                  },
-                ),
-              ),
-              if (item.isLivePhoto)
-                const PBadge(
-                  text: 'Live',
-                  right: 8,
-                  bottom: 8,
-                  type: PBadgeType.gray,
-                )
-              else if (item.isLongPic)
-                const PBadge(
-                  text: '长图',
-                  right: 8,
-                  bottom: 8,
-                ),
-            ],
-          ),
-        ),
-      );
-    },
-  );
-}

lib/common/widgets/image/network_img_layer.dart

@@ -1,7 +1,7 @@
 import 'package:PiliPlus/common/constants.dart';
 import 'package:PiliPlus/models/common/image_type.dart';
 import 'package:PiliPlus/utils/extension.dart';
-import 'package:PiliPlus/utils/image_util.dart';
+import 'package:PiliPlus/utils/image_utils.dart';
 import 'package:PiliPlus/utils/storage_pref.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
@@ -47,24 +47,32 @@ class NetworkImgLayer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final noRadius = type == ImageType.emote || radius == 0;
+    final Widget child;
 
     if (src?.isNotEmpty == true) {
-      Widget child = _buildImage(context, noRadius);
-      if (noRadius) {
-        return child;
-      }
-      if (type == ImageType.avatar) {
-        return ClipOval(child: child);
-      }
-      return ClipRRect(
-        borderRadius: radius != null
-            ? BorderRadius.circular(radius!)
-            : StyleString.mdRadius,
-        child: child,
-      );
+      child = noRadius
+          ? _buildImage(context, noRadius)
+          : type == ImageType.avatar
+          ? ClipOval(child: _buildImage(context, noRadius))
+          : ClipRRect(
+              borderRadius: radius != null
+                  ? BorderRadius.circular(radius!)
+                  : StyleString.mdRadius,
+              child: _buildImage(context, noRadius),
+            );
+    } else {
+      child = getPlaceHolder?.call() ?? _placeholder(context, noRadius);
     }
 
-    return getPlaceHolder?.call() ?? _placeholder(context, noRadius);
+    return semanticsLabel?.isNotEmpty == true
+        ? Semantics(
+            container: true,
+            image: true,
+            excludeSemantics: true,
+            label: semanticsLabel,
+            child: child,
+          )
+        : child;
   }
 
   Widget _buildImage(BuildContext context, bool noRadius) {
@@ -72,10 +80,10 @@ class NetworkImgLayer extends StatelessWidget {
     if (height == null || forceUseCacheWidth || width <= height!) {
       memCacheWidth = width.cacheSize(context);
     } else {
-      memCacheHeight = height.cacheSize(context);
+      memCacheHeight = height?.cacheSize(context);
     }
     return CachedNetworkImage(
-      imageUrl: ImageUtil.thumbnailUrl(src, quality),
+      imageUrl: ImageUtils.thumbnailUrl(src, quality),
       width: width,
       height: height,
       memCacheWidth: memCacheWidth,