Pull Request已成功合入, 合并人@openharmony_ci
（感谢 LyBbq 的贡献）
感谢提交 Pull Requests！如果您提交的PR已经开发完毕，请评论 "start build" 触发门禁，更多交互操作，请访问OpenHarmony社区支持命令清单。如果需要调整订阅PR、Issue的变更状态，请访问订阅链接。
Thanks for submitting the pull request. If your Pull Request has already been developed, you can leave a "start build" comment to trigger the gated system. For more commands, please visit OpenHarmony Command List. If you need to change the subscription of a Pull Request or Issue, please visit the link.
首次触发
门禁构建开始,包含静态检查、代码编译和测试【ohos-mini编译, dayu200编译, part_compile编译, hap_build编译, ohos-sdk编译, master_inner_build编译, dayu200测试, dayu200_tdd编译, mac-sdk编译】,预计在60分钟内完成,门禁结果会同步发送到注册邮箱。您可以通过如下链接跟踪门禁进展:http://dcp.openharmony.cn/workbench/cicd/detail/6a462abf64650f998b0280e2/runlist
代码门禁未通过
您可以通过如下链接查看门禁报告:http://dcp.openharmony.cn/workbench/cicd/detail/6a462abf64650f998b0280e2/runlist
静态检查:
| # | check type | result | report |
|---|---|---|---|
| 1 | codeCheck | pass | >>> |
编译测试:
| # | Device | build result | test result | package |
|---|---|---|---|---|
| 1 | ohos-sdk | success | NA | >>> |
| 2 | dayu200 | success | success | >>> |
| 3 | dayu200_tdd | success | NA | >>> |
| 4 | hap_build | success | NA | >>> |
| 5 | part_compile | success(IGNORE) | NA | >>> |
| 6 | master_inner_build | success(IGNORE) | NA | >>> |
| 7 | mac-sdk | success | NA | >>> |
| 8 | ohos-mini | failed(trigger pipeline failed) | NA | >>> |
代码有更新,重置PR验证状态
感谢提交 Pull Requests！如果您提交的PR已经开发完毕，请评论 "start build" 触发门禁，更多交互操作，请访问OpenHarmony社区支持命令清单。如果需要调整订阅PR、Issue的变更状态，请访问订阅链接。
Thanks for submitting the pull request. If your Pull Request has already been developed, you can leave a "start build" comment to trigger the gated system. For more commands, please visit OpenHarmony Command List. If you need to change the subscription of a Pull Request or Issue, please visit the link.
本地或库上代码有更新,全量重新构建,重置所有关联PR的验证状态
门禁构建开始,包含静态检查、代码编译和测试【part_compile编译, dayu200编译, hap_build编译, ohos-host_mini_tdd编译, mac-sdk编译, ohos-sdk编译, x86_64_virt编译, dayu200_tdd编译, master_inner_build编译, dayu200测试】,预计在60分钟内完成,门禁结果会同步发送到注册邮箱。您可以通过如下链接跟踪门禁进展:http://dcp.openharmony.cn/workbench/cicd/detail/6a54b8fa64650f998b7cde88/runlist
代码门禁通过
您可以通过如下链接查看门禁报告:http://dcp.openharmony.cn/workbench/cicd/detail/6a54b8fa64650f998b7cde88/runlist
静态检查:
| # | check type | result | report |
|---|---|---|---|
| 1 | codeCheck | pass | >>> |
编译测试:
| # | Device | build result | test result | package |
|---|---|---|---|---|
| 1 | ohos-sdk | success | NA | >>> |
| 2 | dayu200 | success | success | >>> |
| 3 | dayu200_tdd | success | NA | >>> |
| 4 | hap_build | success | NA | >>> |
| 5 | part_compile | success(IGNORE) | NA | >>> |
| 6 | master_inner_build | failed(IGNORE)(联合门禁失败) | NA | >>> |
| 7 | mac-sdk | success | NA | >>> |
| 8 | ohos-host_mini_tdd | success | NA | >>> |
| 9 | x86_64_virt | failed(IGNORE)(compile failed) | NA | >>> |
您好，Committer @liumingxiang1 @comicchang @aslklw @wang-luyu4 @lijj01 @stonesxd @xuyuqiong @kroswang @djnash @gmiao522 @wh_qwe @liuchao-huawei @BruceXu @liuchuan666 @gaoweihua ，请分配检视人员检视该PR，可以通过命令"assign [@someone_id]"分配检视人员，也可以直接评论"assign"分配给自己进行检视。
Hello, Committer @liumingxiang1 @comicchang @aslklw @wang-luyu4 @lijj01 @stonesxd @xuyuqiong @kroswang @djnash @gmiao522 @wh_qwe @liuchao-huawei @BruceXu @liuchuan666 @gaoweihua . Please assign someone to review the PR. You can assign a reviewer by using the command "assign [@someone_id]", or you can comment "assign" to review the PR by yourself.
验证结果已超过12小时，之前验证结果无效，自动重新触发构建，请关注最新验证结果
start build
本地或库上代码有更新,全量重新构建,重置所有关联PR的验证状态
门禁构建开始,包含静态检查、代码编译和测试【ohos-host_mini_tdd编译, dayu200测试, part_compile编译, ohos-sdk编译, hap_build编译, dayu200编译, x86_64_virt编译, dayu200_tdd编译, master_inner_build编译, mac-sdk编译】,预计在60分钟内完成,门禁结果会同步发送到注册邮箱。您可以通过如下链接跟踪门禁进展:http://dcp.openharmony.cn/workbench/cicd/detail/6a55a8d164650f998bc05fb6/runlist
代码门禁通过
您可以通过如下链接查看门禁报告:http://dcp.openharmony.cn/workbench/cicd/detail/6a55a8d164650f998bc05fb6/runlist
静态检查:
| # | check type | result | report |
|---|---|---|---|
| 1 | codeCheck | pass | >>> |
编译测试:
| # | Device | build result | test result | package |
|---|---|---|---|---|
| 1 | ohos-sdk | success | NA | >>> |
| 2 | dayu200 | success | success | >>> |
| 3 | dayu200_tdd | success | NA | >>> |
| 4 | hap_build | success | NA | >>> |
| 5 | part_compile | success(IGNORE) | NA | >>> |
| 6 | master_inner_build | success(IGNORE) | NA | >>> |
| 7 | mac-sdk | success | NA | >>> |
| 8 | ohos-host_mini_tdd | success | NA | >>> |
| 9 | x86_64_virt | failed(IGNORE)(compile failed) | NA | >>> |
您好，Committer @liumingxiang1 @comicchang @aslklw @wang-luyu4 @lijj01 @stonesxd @xuyuqiong @kroswang @djnash @gmiao522 @wh_qwe @liuchao-huawei @BruceXu @liuchuan666 @gaoweihua ，请分配检视人员检视该PR，可以通过命令"assign [@someone_id]"分配检视人员，也可以直接评论"assign"分配给自己进行检视。
Hello, Committer @liumingxiang1 @comicchang @aslklw @wang-luyu4 @lijj01 @stonesxd @xuyuqiong @kroswang @djnash @gmiao522 @wh_qwe @liuchao-huawei @BruceXu @liuchuan666 @gaoweihua . Please assign someone to review the PR. You can assign a reviewer by using the command "assign [@someone_id]", or you can comment "assign" to review the PR by yourself.
Description:
问题背景：
SurfaceNodeCommandHelper::SetWatermarkEnabled(name, false)只是向systemWatermarkHandles_写入 false，条目本身仍保留在 map 中，水印关闭后关联资源无法释放（issue：水印清理资源）。修复方案：
关闭水印时改调
RSSurfaceRenderNode::ClearWatermarkEnabled(name, SYSTEM_WATER_MARK)真正擦除 map 条目，使关联资源可被回收；新增GetWatermarksEnabledMap()访问器，并在单测中断言 enable 后条目存在、disable 后条目被移除（rs_surface_node_command.cpp、rs_surface_render_params.cpp）。Issue number:https://gitcode.com/openharmony/graphic_graphic_2d/issues/24707
Test & Result:
GetWatermarksEnabledMap()中对应条目被清除，资源正常释放CodeCheck:
L0新增用例自检结果