Skip to content

更新到上游2.1.0 - #134

Merged
cnoim merged 303 commits into
dev4harmony:ohosfrom
cnoim:ohos
Jul 29, 2026
Merged

更新到上游2.1.0#134
cnoim merged 303 commits into
dev4harmony:ohosfrom
cnoim:ohos

Conversation

@cnoim

@cnoim cnoim commented Jul 29, 2026

Copy link
Copy Markdown

No description provided.

bggRGjQaUbCoE and others added 30 commits April 20, 2026 12:49
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
* fix: 定时关闭退出APP前同步视频进度

* update

---------

Co-authored-by: dom <githubaccount56556@proton.me>
…E#1897)

New Opus format uses font_level string instead of numeric font_size,
causing font size to fall back to Flutter theme default (14px) instead
of the expected 16px. Added Word.effectiveFontSize: small→13px,
others→16px (consistent with legacy HTML article format).
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
…GjQaUbCoE#1899)

When using AAudio output on Android, the system notifies the app to
manually handle ducking instead of silently lowering volume itself.
This caused the in-app volume indicator to pop up on every notification.

Pass showIndicator: false for duck begin/end calls so volume is adjusted
silently, consistent with other audio output modes.
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Closes #1901

Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
bggRGjQaUbCoE and others added 29 commits July 4, 2026 18:02
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
This reverts commit c63fe38.
…gRGjQaUbCoE#2441)

The following pkgs are already pre-installed in ubuntu-24.04 runner: clang, cmake, ninja-build, unzip, rpm, patchelf.
Others are completely unrelated packages.
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
…QaUbCoE#2444)

* fix(player): preserve default codec preferences after upgrade

* update

---------

Co-authored-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
Signed-off-by: dom <githubaccount56556@proton.me>
将 ohos 分支从上游 2.0.2 (8ad1305) 跟进到 2.1.0 (c1aeaca),共 295 个上游提交、912 个改动文件。采用三方合并(merge-base 恰为 2.0.2),834 个文件自动合并,
78 个冲突逐个按"只保证鸿蒙可编译运行"的原则裁决。

跨 SDK 版本的适配(鸿蒙 fork 为 Flutter 3.41.10 / Dart 3.11.5,上游已到 3.44.6 / 3.12):
- 降级 33 个文件约 100 处 private-named-parameters 为等价写法
- 7 个 vendored Flutter 源码副本回退到 3.41 兼容版本;vertical_slider 补 TargetPlatform.ohos
- ReorderableListView 由 onReorderItem 改回 onReorder

依赖一律保留鸿蒙适配版本,并在共享层做 API 适配:
share_plus 10 / connectivity_plus 5 / file_picker ohos fork / cached_network_image_ce 4.9.0 / saver_gallery 4 / catcher_2 2.1.9 / media_kit (Predidit fork)

按原则跳过:各平台原生层与 CI、SDK 补丁流程、Android JNI(桩化 android_helper,不引入 jni 依赖)、Linux 极验、native_device_orientation 转屏重构。

找回被上游重写冲掉的鸿蒙适配:聊天面板冻结、floating 画中画、播放器后台/亮度/音量/画中画竞态处理、手势 touchSlop、液态玻璃导航栏、音频上下集控件等。
@cnoim
cnoim merged commit 1c0ef3a into dev4harmony:ohos Jul 29, 2026
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants