Chore: Sync Upstream, Bump To 2.0.9.2 , And resolve conflicts by furrybluelan · Pull Request #99 · FRBLanApps/PiliSuper

furrybluelan · 2026-06-22T08:19:19Z

（巨量更改）

Tips: 由于我们已被上游拉黑，我们无法与上游仓库交互。

我们始终认为被拉黑这事纯属误会。希望我们与上游能够早日解除这个误会。

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

Closes #1901 Signed-off-by: dom <githubaccount56556@proton.me>

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

Closes #1908 Signed-off-by: dom <githubaccount56556@proton.me>

This reverts commit d6bce6a.

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

related #1906 Signed-off-by: dom <githubaccount56556@proton.me>

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

Closes #1910 Signed-off-by: dom <githubaccount56556@proton.me>

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

* opt: danmaku weight * opt: cache clean * opt: level img * opt: play icon * opt: svg big-vip * opt: webview ua * opt: simple dialog * feat: export vtt * tweak * opt: mapIndexed * feat: more subtitle * refa: settings page * feat: codec list options * drawPath Signed-off-by: dom <githubaccount56556@proton.me> * custom dialog option Signed-off-by: dom <githubaccount56556@proton.me> * update Signed-off-by: dom <githubaccount56556@proton.me> * Revert "drawPath" This reverts commit e8a4b19. * opt: _initStreamIndex * fix: avoid gap * fix: scale [skip ci] * fix: hide repost menu not login * tweaks Signed-off-by: dom <githubaccount56556@proton.me> --------- Co-authored-by: dom <githubaccount56556@proton.me>

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

???

Li2548 · 2026-06-30T08:13:57Z

+    "ios": (
        make_flutter_patch_action("scroll_view.patch"),
+        make_flutter_patch_action("bottom_sheet_ios_flutter.patch"),
+        make_flutter_patch_action("navigator.patch"),
    ),
-    "ios": (make_flutter_patch_action("scroll_view.patch"),),
-    "linux": (TOOLTIP_FIX_ACTION,),
-    "macos": (TOOLTIP_FIX_ACTION,),
-    "windows": (TOOLTIP_FIX_ACTION,),
+    "linux": (),
+    "macos": (),
+    "windows": (),
 }

+# 直接作用于项目仓库（而非 Flutter SDK）的 iOS patch，对应 patch.ps1 中
+# `if ($platform.ToLower() -eq "ios")` 分支，须在 Set-Location 到 Flutter SDK 之前应用
+IOS_PROJECT_PATCH_ACTIONS = (
+    make_flutter_patch_action("bottom_sheet_ios_piliplus.patch"),
+    make_flutter_patch_action("geetest_ios.patch"),
+)
+


真的不想合并一下吗？

1.patch里头也有package:old_name/ 2.patch晚于rename生效 3.rename未覆盖patch 4.名字必须一致所以iOS反复爆炸

Li2548

本次重新申请审查，焦点在我新提交的build.py更改身上。通过在rename阶段包含patch这个会对“package:old_name/”动手脚的家伙，iOS编译器终于能够找到正确的文件了。
改用强制推送是撤回了对上游的攻击。本质上这是咱的疏忽。

furrybluelan

ok

Li2548 · 2026-06-30T11:40:07Z

ok

等别人审查完的

bggRGjQaUbCoE and others added 30 commits April 27, 2026 13:58

opt follow item

b9ce4ba

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

create fav tag from fav panel

dccb5d4

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

disable blank issue

fae0cfe

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

disable auto reset brightness on iOS

60801f9

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

get real-time video duration in post panel

6755b7f

Closes #1901 Signed-off-by: dom <githubaccount56556@proton.me>

opt audio normalization

b406a00

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

auto add to created fav/follow

89fdc28

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

sort follow tag

80ecd35

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

unify horizontal video models

524b6bc

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

fix fav sort

47e3a47

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

fix #1904

f7a2be1

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

feat: add to filter (bggRGjQaUbCoE#1903)

9ed8b14

improve handling video pop

88c01ff

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

opt reorder

11b6f24

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

improve handling android window mode

7b51b69

Closes #1908 Signed-off-by: dom <githubaccount56556@proton.me>

Reapply "hide systembar when preview"

c7864ff

This reverts commit d6bce6a.

tweaks

cd26cf6

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

upgrade deps

57c683d

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

tweak

6feb1c1

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

ios bottom sheet patch

5937d83

related #1906 Signed-off-by: dom <githubaccount56556@proton.me>

handle foldable screen size

3a9cafa

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

refresh live msg if needed

9752ae2

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

do not exit onDestroy

5d87361

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

custom fullscreen sc width

74c389b

Closes #1910 Signed-off-by: dom <githubaccount56556@proton.me>

fix #1917

c0b5876

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

upgrade deps

3a46ce2

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

fix #1917

887c352

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

tweak

a2b54e5

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

Release 2.0.6

7b6d8be

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

fix: orientation (bggRGjQaUbCoE#1935)

3f34d1a

My-Responsitories and others added 17 commits June 26, 2026 10:51

opt set dyn react count

735bb0a

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

upgrade deps

c23518d

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

flutter 3.44.4

2ba6f0d

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

refactor progress bar

a623cee

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

opt ui

7049e5c

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

opt HeartBeat

840f8d5

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

refactor dyn uplist

5d15bf5

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

tweaks

d33d2a1

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

upgrade deps

37c7d1f

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

opt dyn desktop ctr

aac4524

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

lazy init dyn refreshctrl

add6dfc

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

opt nested scroll

ace9404

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

popup menu patch

0df637f

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

小小的改点issues

1320046

update

aba3b1f

Update build.py

48fa676

???

Li2548 requested changes Jun 30, 2026

View reviewed changes

Comment thread build.py

Comment thread lib/scripts/geetest_ios.patch

Li2548 added 2 commits June 30, 2026 19:20

修正编译问题

5eb553c

1.patch里头也有package:old_name/ 2.patch晚于rename生效 3.rename未覆盖patch 4.名字必须一致所以iOS反复爆炸

小改动

dd88bb6

Li2548 force-pushed the main branch from 41a02c4 to dd88bb6 Compare June 30, 2026 11:20

Li2548 approved these changes Jun 30, 2026

View reviewed changes

Li2548 requested review from XiaoTong6666 and ZhaoymOvO June 30, 2026 11:34

Li2548 reviewed Jun 30, 2026

View reviewed changes

furrybluelan commented Jun 30, 2026

View reviewed changes

Li2548 merged commit 122115d into FRBLanApps:main Jun 30, 2026
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

Chore: Sync Upstream, Bump To 2.0.9.2 , And resolve conflicts#99
Li2548 merged 205 commits into
FRBLanApps:mainfrom
furrybluelan:main

furrybluelan commented Jun 22, 2026 •

edited by Li2548

Loading

Uh oh!

Li2548 Jun 30, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Li2548 left a comment •

edited

Loading

Uh oh!

furrybluelan left a comment

Uh oh!

Li2548 commented Jun 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

furrybluelan commented Jun 22, 2026 • edited by Li2548 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Li2548 Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Li2548 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

furrybluelan left a comment

Choose a reason for hiding this comment

Uh oh!

Li2548 commented Jun 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

furrybluelan commented Jun 22, 2026 •

edited by Li2548

Loading

Li2548 left a comment •

edited

Loading