From ebf2bfe439801bcc0331ed67b10ab6df0816fc57 Mon Sep 17 00:00:00 2001
From: lanterngamescn <lanterngamescn@gmail.com>
Date: Sat, 27 Jun 2026 16:02:52 +0800
Subject: [PATCH] =?UTF-8?q?fix(share):=20=E6=9C=8B=E5=8F=8B=E5=9C=88(share?=
 =?UTF-8?q?friend=3D2)=E5=A7=8B=E7=BB=88=E8=B5=B0=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=BC=95=E5=AF=BC=E7=AA=97,=E5=8D=B3?=
 =?UTF-8?q?=E4=BD=BFtype=3D2=E4=B9=9F=E4=B8=8D=E8=B5=B0=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整 onShare 路由顺序: sharefriend==2 判断提到图片type判断之前,
使朋友圈分享一律弹引导窗(朋友圈步骤)而非系统分享面板。好友(sharefriend=1)图片仍走系统分享。
---
 .../src/main/ets/providers/ShareProvider.ets         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/feature_capabilities/src/main/ets/providers/ShareProvider.ets b/feature_capabilities/src/main/ets/providers/ShareProvider.ets
index 69e6dad..b1710db 100644
--- a/feature_capabilities/src/main/ets/providers/ShareProvider.ets
+++ b/feature_capabilities/src/main/ets/providers/ShareProvider.ets
@@ -98,14 +98,14 @@ export class ShareProvider implements CapabilityProvider {
     this.log.i(`onShare bean sharefriend=${bean.sharefriend} type=${bean.type} `
       + `sharetype=${bean.sharetype} url=${bean.webpageUrl} `
       + `titleLen=${bean.title.length} descLen=${bean.description.length}`);
-    if (bean.type === '2' || bean.type === '3') {
-      // 图片：截图/下载 → 直接拉系统分享面板（剪贴板对图片不可靠 §R-19），不走面板/指引。
-      this.startImageShare(bean);
+    if (bean.sharefriend === '2') {
+      // 朋友圈（直发微信）：始终走文本分享引导窗（朋友圈步骤），即使 type==2/3 也不走系统分享。
+      this.startTextShare(bean, 'wechat');
       return;
     }
-    if (bean.sharefriend === '2') {
-      // 文本·朋友圈语义：不弹面板，直接微信指引窗（契约 §10.1）。
-      this.startTextShare(bean, 'wechat');
+    if (bean.type === '2' || bean.type === '3') {
+      // 好友·图片：截图/下载 → 直接拉系统分享面板（剪贴板对图片不可靠 §R-19）。
+      this.startImageShare(bean);
       return;
     }
     this.seq += 1;