Phase 4.E + Phase 5 + Phase 3.C 七牛上传:代码侧 SDK 接入(SPM 优先 / Vendor 兜底)
选型(CLAUDE.md ADR-006「SPM 优先 + Vendor xcframework 兜底」): - 微信 → SPM(Tencent 官方 https://github.com/Tencent/WechatOpenSDK-XCFramework); 项目方下载的 WechatOpenSDK-NoPay.xcframework 已撤出 Vendor,docs/res 内副本作离线备份 - 高德 → Vendor 手动(官方未提供 SPM;Vendor/AMap/{AMapFoundationKit,AMapLocationKit}.framework 随仓库分发,fat .framework 同时含 x86_64 + arm64,Do Not Embed) - 七牛 → SPM(https://github.com/qiniu/objc-sdk v8.9.x) 代码侧(全部 #if canImport 守卫,Xcode 加 SDK 前编译为 no-op): - Source/SDK/WeChat/WeChatSDK.swift:WXApi.registerApp + handleOpenURL(沿用 msext AppID wx586a9b321e56efb7,universalLink 空字符串走非 ULAPI 路径) - Source/SDK/WeChat/WeChatManager.swift:WXApiDelegate + state UUID 配对的 authorize + FIFO 串行 share async/await wrapper - Source/Login/WeChatAuth.swift:客户端直拼 sns/oauth2/access_token + sns/userinfo → 7 字段(Province 大写 P / city 经 danbian 去单引号),沿用 msext 同款路径 - Source/SDK/AMap/AMapWrapper.swift:iOS 14+ 隐私合规 3 步 + apiKey 注入 - Source/Location/LocationService.swift:actor + AMapLocationManager 异步包装 + 9 字段 - Source/Network/QiniuConfig.swift:4 项常量沿用 msext(AccessKey/SecretKey/Bucket/Domain) - Source/Network/QiniuTokenSigner.swift:纯 Swift CryptoKit HMAC-SHA1 + Base64URL 自签 token(与 msext QiniuManager.m:200-230 等价,不依赖 Qiniu SDK 工作) - Source/Network/QiniuUploader.swift:actor 包 QNUploadManager async/await Handler 升级: - AccreditLoginHandler:拉起授权 → 反向 callback sharelogin 7 字段 - WechatShare:真实链接分享(type=2/3 截图待 Phase 4.F) - StartLocationHandler:真实定位 → 9 字段(latitude/longitude string, province 小写 p) 生命周期: - AppDelegate.didFinishLaunchingWithOptions:WeChatSDK.register + AMapWrapper.bootstrap - SceneDelegate.openURLContexts:WeChatSDK.handleOpenURL 接入回调 - BackGameDataHandler:子游戏 backgameData pop 时 WXApi.delegate=nil + LocationService.stop() Info.plist:CFBundleURLTypes 加 wx586a9b321e56efb7;LSApplicationQueriesSchemes 追加 weixin/weixinULAPI/weixinURLParamsAPI;NSLocationWhenInUseUsageDescription + NSMicrophoneUsageDescription(gamehallname 中文文案)。 .gitignore:排除 docs/res/{AMap_iOS_Loc_ALL,objc-sdk-8.9.2}/(235MB 项目方下载副本, 已走 SPM/Vendor 接入不需要副本)。 文档:docs/SDK-Integration-Guide.md 重写 §A 用户手动 Xcode UI 三步(SPM × 2 + Add Files × 2);Vendor/{AMap,WechatSDK}/README.md 记录各自接入路径选型。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.7
parent
a2baf742b6
commit
1d7e258130
@@ -2,15 +2,18 @@
|
||||
// StartLocationHandler.swift
|
||||
// ylgamehall
|
||||
//
|
||||
// H5 → Native handler:startlocation — 定位(Phase 5 完整实现,本期为 stub)
|
||||
// H5 → Native handler:startlocation — 定位(Phase 5 接入高德 SDK 后激活真实路径)
|
||||
// 契约:docs/H5-Native-Contract.md §3.1 [20] + §3.2 [6]
|
||||
//
|
||||
// Stub 行为:
|
||||
// - 接收 startlocation 调用,cb "startlocation"(响应不为 undefined,H5 不卡)
|
||||
// - **不触发** getlocationinfo 反向 callback(暂无高德 SDK,做不到真实定位)
|
||||
// - H5 业务侧若强依赖 getlocationinfo,需等 Phase 5 完整接入 AMapLocationKit
|
||||
// 完整链路:
|
||||
// 1. LocationService.shared.requestOnce()(actor,包 AMapLocationManager 异步)
|
||||
// 2. bridge.call("getlocationinfo", 9 字段) 反向 callback
|
||||
// - latitude / longitude 是 **string**(`String(format: "%f")`)
|
||||
// - province 小写 p(与 sharelogin.Province 大写不同)
|
||||
// 3. 失败 → getlocationinfo({errorCode:12, errorMsg:"缺少定位权限"})
|
||||
//
|
||||
// 按 CLAUDE.md 原则 A 第一准则:H5 调啥就得有人接,即使没真实业务也要注册。
|
||||
// ⚠️ canImport(AMapLocationKit) 守卫:SDK 未链接时 LocationService 抛 sdkNotLinked,
|
||||
// 此处兜底走 stub(与 Phase 2 一致),仅响应 callback 不触发反向 getlocationinfo。
|
||||
//
|
||||
|
||||
import Foundation
|
||||
@@ -19,9 +22,41 @@ public enum StartLocationHandler {
|
||||
|
||||
public static func register(on bridge: any BridgeProtocol) {
|
||||
bridge.register("startlocation") { _, callback in
|
||||
// Phase 2 stub:仅响应 callback,不真实定位
|
||||
// Phase 5 接入 LocationKit + 高德 AMapLocationKit.xcframework 时升级为完整实现
|
||||
// 与 msext 行为一致:先回 cb 字面,不等定位完成
|
||||
callback?(.string("startlocation"))
|
||||
|
||||
#if canImport(AMapLocationKit)
|
||||
// SDK 已链接:拉起一次性定位 → 反向 callback 9 字段
|
||||
// (持续定位 data == 1 暂未实现,业务实际只调一次性 — Phase 5.4 再扩展)
|
||||
Task { @MainActor in
|
||||
do {
|
||||
let payload = try await LocationService.shared.requestOnce()
|
||||
bridge.call("getlocationinfo", data: .object([
|
||||
"address": .string(payload.address),
|
||||
"city": .string(payload.city),
|
||||
"cityCode": .string(payload.cityCode),
|
||||
"country": .string(payload.country),
|
||||
"district": .string(payload.district),
|
||||
"latitude": .string(payload.latitude), // ← string
|
||||
"longitude": .string(payload.longitude), // ← string
|
||||
"province": .string(payload.province), // ← 小写 p
|
||||
"street": .string(payload.street)
|
||||
]), callback: nil)
|
||||
} catch LocationError.authorizationDenied {
|
||||
// 契约失败回包(msext gameController.m:2507 等价)
|
||||
bridge.call("getlocationinfo", data: .object([
|
||||
"errorCode": .number(12),
|
||||
"errorMsg": .string("缺少定位权限")
|
||||
]), callback: nil)
|
||||
} catch {
|
||||
// 其它失败也归一到 12(msext 行为)
|
||||
bridge.call("getlocationinfo", data: .object([
|
||||
"errorCode": .number(12),
|
||||
"errorMsg": .string("缺少定位权限")
|
||||
]), callback: nil)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user