微信 SDK 降级 2.0.5 → 1.8.2(与 daoqi msext 同款,避开 UL 强制)

H5 调 accreditlogin 后 sendAuthReq success=false,根因:微信 OpenSDK
2.0.x 强制 Universal Link,传空串被 SDK 拒绝;daoqi msext 用 1.8.x 不强制
UL,多年稳定上线。沿用 1.8.2 避免无谓的 UL 运维负担(HTTPS 域名 + AASA +
微信开放平台审核 30min-1d)。

文件改动:
- 新增 Vendor/WechatSDK/v1.8.2/{WXApi,WXApiObject,WechatAuthSDK}.h +
  libWeChatSDK.a(16MB,fat: i386+armv7+armv7s+x86_64+arm64,从 daoqi
  msext/Class/SDKExport/ 直接拷贝)
- 删除 Vendor/WechatSDK/WechatOpenSDK-NoPay.xcframework(2.0.5)
- 新增 ylgamehall/ylgamehall-Bridging-Header.h(1.x .a 无 Swift module,
  必须通过 Bridging Header 导入 WXApi.h / WXApiObject.h)

代码侧(5 个 Swift 文件):
- WeChatSDK.swift:register() 改为 1.x 单参数 WXApi.registerApp(appID),
  去掉 universalLink 参数;handleOpenURL 不变(1.x/2.x 同款)
- WeChatManager.swift:去掉 #if canImport(WechatOpenSDK) 守卫(Bridging
  Header 直接导入,符号编译期必在);authorize sendAuthReq 改 1.x BOOL
  返回(无 completion);shareLink/shareImage 改 WXApi.sendReq(req)
  (1.x BOOL 返回,无 completion);getVersion → getApiVersion
- AccreditLoginHandler / WechatShare:同样去掉 canImport 守卫和 stub 分支
- BackGameDataHandler:更新注释说明 1.x WXApi delegate 由 sendAuthReq
  逐次传入,WeChatManager singleton 持有不需要清理(1.x 早期 setDelegate:
  API 已废弃)

文档:
- Vendor/WechatSDK/README.md 重写,说明 1.8.2 决策原因 + 文件结构 +
  Xcode 接入 5 步 + M Mac simulator 已知限制
- docs/SDK-Integration-Guide.md §A.1 同步重写

⚠️ **本 commit 后 BuildProject 会失败**,需要用户在 Xcode UI 完成 5 步:
1. 删 Frameworks 里旧 WechatOpenSDK-NoPay.xcframework 引用
2. Add Vendor/WechatSDK/v1.8.2/libWeChatSDK.a(Do Not Embed)
3. Add 4 个系统库:libz.tbd / libsqlite3.tbd / Security.framework /
   CFNetwork.framework(Do Not Embed)
4. Build Settings → Header Search Paths += $(PROJECT_DIR)/Vendor/WechatSDK/v1.8.2
5. Build Settings → Objective-C Bridging Header = ylgamehall/ylgamehall-Bridging-Header.h

详细操作步骤见 Vendor/WechatSDK/README.md「Xcode 接入步骤」。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
joywayer
2026-06-23 08:27:40 +08:00
co-authored by Claude Opus 4.7
parent a060f29070
commit 05f1396645
26 changed files with 1076 additions and 3530 deletions
@@ -11,9 +11,7 @@
import Foundation
import UIKit
#if canImport(WechatOpenSDK)
import WechatOpenSDK
#endif
// SDK 1.8.2 daoqi msext Bridging Header import
@MainActor
public final class WeChatManager: NSObject {
@@ -41,10 +39,9 @@ public final class WeChatManager: NSObject {
/// openURL SDK delegate
/// 1.x `WXApi.send(req)` deprecated vc/delegate H5
public func authorize() async throws -> WXAuthCodePayload {
#if canImport(WechatOpenSDK)
print("[WeChat] authorize() 开始")
print("[WeChat] - WXApi.isWXAppInstalled = \(WXApi.isWXAppInstalled())")
print("[WeChat] - WXApi.getVersion = \(WXApi.getVersion() ?? "nil")")
print("[WeChat] - WXApi.getApiVersion = \(WXApi.getApiVersion() ?? "nil")")
let state = UUID().uuidString
return try await withCheckedThrowingContinuation { cont in
authPending[state] = cont
@@ -59,23 +56,16 @@ public final class WeChatManager: NSObject {
return
}
print("[WeChat] 调 sendAuthReq vc=\(type(of: vc)) scope=\(Self.authScope) state=\(state)")
WXApi.sendAuthReq(req, viewController: vc, delegate: self) { [weak self] success in
print("[WeChat] sendAuthReq completion success=\(success)")
// success = SDK app fail
// URL Scheme onResp
guard !success else { return }
Task { @MainActor in
guard let self else { return }
if let pending = self.authPending.removeValue(forKey: state) {
pending.resume(throwing: WeChatError.authFailed(-3))
}
// 1.x sendAuthReq BOOL completion
let success = WXApi.sendAuthReq(req, viewController: vc, delegate: self)
print("[WeChat] sendAuthReq 返回 success=\(success)")
if !success {
if let pending = authPending.removeValue(forKey: state) {
pending.resume(throwing: WeChatError.authFailed(-3))
}
}
// success=true WXApiDelegate.onResp SceneDelegate openURL
}
#else
print("[WeChat] ⚠️ canImport(WechatOpenSDK)=false")
throw WeChatError.sdkNotLinked
#endif
}
/// ViewController presented / nav.visible SDK
@@ -133,7 +123,6 @@ public final class WeChatManager: NSObject {
/// FIFO ID
public func shareLink(_ link: ShareLink, scene: ShareScene) async throws {
#if canImport(WechatOpenSDK)
try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
sharePending.append(cont)
@@ -152,22 +141,15 @@ public final class WeChatManager: NSObject {
case .session: req.scene = Int32(WXSceneSession.rawValue)
case .timeline: req.scene = Int32(WXSceneTimeline.rawValue)
}
// SceneDelegate.openURLContexts
// WXApi.handleOpen(url:delegate:WeChatManager.shared) onResp
// sendReq delegatecompletion=nil
// sharePending onResp FIFO
// SDK 2.x `sendReq:completion:` `send:` deprecated
WXApi.send(req, completion: nil)
// 1.x: sendReq BOOL SceneDelegate.openURLContexts
// WXApi.handleOpen(url:delegate:WeChatManager.shared) onResp
WXApi.sendReq(req)
}
#else
throw WeChatError.sdkNotLinked
#endif
}
/// FIFO sharePendingmsext gameController.m:637-678
/// type=2 / type= WXImageObject + setThumbImage
public func shareImage(_ img: ShareImage, scene: ShareScene) async throws {
#if canImport(WechatOpenSDK)
try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
sharePending.append(cont)
@@ -186,16 +168,8 @@ public final class WeChatManager: NSObject {
case .session: req.scene = Int32(WXSceneSession.rawValue)
case .timeline: req.scene = Int32(WXSceneTimeline.rawValue)
}
// SceneDelegate.openURLContexts
// WXApi.handleOpen(url:delegate:WeChatManager.shared) onResp
// sendReq delegatecompletion=nil
// sharePending onResp FIFO
// SDK 2.x `sendReq:completion:` `send:` deprecated
WXApi.send(req, completion: nil)
WXApi.sendReq(req)
}
#else
throw WeChatError.sdkNotLinked
#endif
}
// MARK: - Internal: resolve callbacks
@@ -222,7 +196,6 @@ public final class WeChatManager: NSObject {
// MARK: - WXApiDelegate
#if canImport(WechatOpenSDK)
extension WeChatManager: WXApiDelegate {
public nonisolated func onReq(_ req: BaseReq) {
@@ -245,9 +218,8 @@ extension WeChatManager: WXApiDelegate {
}
}
}
#endif
// MARK: - Public payload / error types SDK canImport 使
// MARK: - Public payload / error types
public struct WXAuthCodePayload: Sendable {
public let code: String