From c2b710c9d0c8c12e2e4f3d9d4882e19584eadf14 Mon Sep 17 00:00:00 2001
From: KoolShow <51787949+KoolShow@users.noreply.github.com>
Date: Mon, 8 Jan 2024 12:08:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E6=A1=8C=E9=9D=A2=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
android/app/src/main/AndroidManifest.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 97cef67a4..d82845fea 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -65,11 +65,13 @@
/>
+
+
+
-
From 62b0baff231691aca7a47f184f1c0a50df683112 Mon Sep 17 00:00:00 2001
From: KoolShow <51787949+KoolShow@users.noreply.github.com>
Date: Mon, 8 Jan 2024 13:48:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix=20=E6=89=93=E5=BC=80=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
android/app/src/main/AndroidManifest.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d82845fea..e3d0379b6 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -70,6 +70,7 @@
+
From 43a6f02b0b47ca8506dea866159f038ab8a18e41 Mon Sep 17 00:00:00 2001
From: KoolShow <51787949+KoolShow@users.noreply.github.com>
Date: Tue, 9 Jan 2024 22:24:44 +0800
Subject: [PATCH 3/4] Ci (#20)
* github workflow ci
* ci.yaml add paths-ignore
---
.github/workflows/ci.yml | 99 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 99 insertions(+)
create mode 100644 .github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..938004456
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,99 @@
+name: CI
+
+# action事件触发
+on:
+ push:
+ branches:
+ - '*'
+ paths-ignore:
+ - '**.md'
+ - '**.txt'
+ - '.github/**'
+ - '.vscode/**'
+ - '!.github/workflows/**'
+ pull_request:
+ workflow_dispatch:
+
+# 可以有多个jobs
+jobs:
+ build_apk:
+ # 运行环境 ubuntu-latest window-latest mac-latest
+ runs-on: ubuntu-latest
+
+ # 每个jobs中可以有多个steps
+ steps:
+ - name: 代码迁出
+ uses: actions/checkout@v3
+
+ - name: 构建Java环境
+ uses: actions/setup-java@v3
+ with:
+ distribution: "zulu"
+ java-version: "17"
+ token: ${{secrets.GIT_TOKEN}}
+
+ - name: 检查缓存
+ uses: actions/cache@v2
+ 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:
+ flutter-version: 3.16.5
+ channel: any
+
+ - name: 下载项目依赖
+ run: flutter pub get
+
+ - name: 解码生成 jks
+ run: echo $KEYSTORE_BASE64 | base64 -di > android/app/vvex.jks
+ env:
+ KEYSTORE_BASE64: ${{ secrets.KEYSTORE_BASE64 }}
+
+ - name: flutter build apk
+ # 对应 android/app/build.gradle signingConfigs中的配置项
+ run: flutter build apk --release --split-per-abi
+ env:
+ KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+ KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+ KEY_PASSWORD: ${{ secrets.KEY_PASSWORD}}
+
+ - name: 获取版本号
+ id: version
+ run: echo "version=${GITHUB_SHA::7}" >>$GITHUB_OUTPUT
+
+ # - name: 获取当前日期
+ # id: date
+ # run: echo "date=$(date +'%m%d')" >>$GITHUB_OUTPUT
+
+ - name: 重命名应用 Pili-arm64-v8a-*.apk
+ run: |
+ # DATE=${{ steps.date.outputs.date }}
+ for file in build/app/outputs/flutter-apk/app-*-release.apk; do
+ if [[ $file =~ app-(.*)-release.apk ]]; then
+ new_file_name="build/app/outputs/flutter-apk/Pili-${BASH_REMATCH[1]}-${{ steps.version.outputs.version }}.apk"
+ mv "$file" "$new_file_name"
+ fi
+ done
+
+ - name: Upload ARM64
+ uses: actions/upload-artifact@v3
+ with:
+ name: Pili-arm64-v8a-${{ steps.version.outputs.version }}
+ path: build/app/outputs/flutter-apk/Pili-arm64-v8a-*.apk
+
+ - name: Upload x86_64
+ uses: actions/upload-artifact@v3
+ with:
+ name: Pili-x86_64-${{ steps.version.outputs.version }}
+ path: build/app/outputs/flutter-apk/Pili-x86_64-*.apk
+
+ - name: Upload ARM32
+ uses: actions/upload-artifact@v3
+ with:
+ name: Pili-armeabi-v7a-${{ steps.version.outputs.version }}
+ path: build/app/outputs/flutter-apk/Pili-armeabi-v7a-*.apk
From 70980cdcd7dcd62a2ac459932b929dc23b605713 Mon Sep 17 00:00:00 2001
From: KoolShow <51787949+KoolShow@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:36:07 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=AD=A3=E5=88=99?=
=?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=BB=A5=E5=8C=B9=E9=85=8D=E5=90=AB?=
=?UTF-8?q?=E5=B0=8F=E6=97=B6=E7=9A=84=E6=97=B6=E9=97=B4=20(#21)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
lib/pages/video/detail/reply/widgets/reply_item.dart | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pages/video/detail/reply/widgets/reply_item.dart b/lib/pages/video/detail/reply/widgets/reply_item.dart
index d67782937..7e5823716 100644
--- a/lib/pages/video/detail/reply/widgets/reply_item.dart
+++ b/lib/pages/video/detail/reply/widgets/reply_item.dart
@@ -639,7 +639,7 @@ InlineSpan buildContent(
},
),
);
- } else if (RegExp(r'^\b[0-9]{1,2}[:：][0-9]{2}\b$').hasMatch(matchStr)) {
+ } else if (RegExp(r'^\b(\d+[:：])?[0-5]?[0-9][:：][0-5]?[0-9]\b$').hasMatch(matchStr)) {
spanChilds.add(
TextSpan(
text: ' $matchStr ',