diff --git a/README.md b/README.md index 193ecc9..f8ca048 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,11 @@ dependencies: [ ```swift let sdk = DuooomiBleSDK(config: .init( apiKey: "your-api-key" // 必填 - // apiHost: URL(...)!, // 默认 https://api.mixvideo.bowong.cc + // apiHost: URL(...)!, // 默认 https://api.duooomi.com // cdnHost: "https://cdn.bowong.cc/", // 默认 + // aniWidth: 360, // ANI 转换宽度,默认 360 + // aniHeight: 360, // ANI 转换高度,默认 360 + // aniFps: "24", // ANI 转换帧率,默认 24 // firmwareIdentifier: "duomi", // 默认 // firmwareStatus: "DRAFT" // 默认 )) diff --git a/Sources/DuooomiBleSDK/DuooomiBleConfig.swift b/Sources/DuooomiBleSDK/DuooomiBleConfig.swift index babd9ea..a7264cb 100644 --- a/Sources/DuooomiBleSDK/DuooomiBleConfig.swift +++ b/Sources/DuooomiBleSDK/DuooomiBleConfig.swift @@ -12,18 +12,30 @@ public struct DuooomiBleConfig: Sendable { public let firmwareIdentifier: String /// 固件查询状态,如 "DRAFT" / "PUBLISHED" public let firmwareStatus: String + /// ANI 转换宽度(像素) + public let aniWidth: Int + /// ANI 转换高度(像素) + public let aniHeight: Int + /// ANI 转换帧率 + public let aniFps: String public init( - apiHost: URL = URL(string: "https://api.mixvideo.bowong.cc")!, + apiHost: URL = URL(string: "https://api.duooomi.com")!, apiKey: String, cdnHost: String = "https://cdn.bowong.cc/", firmwareIdentifier: String = "duomi", - firmwareStatus: String = "DRAFT" + firmwareStatus: String = "DRAFT", + aniWidth: Int = 360, + aniHeight: Int = 360, + aniFps: String = "24" ) { self.apiHost = apiHost self.apiKey = apiKey self.cdnHost = cdnHost.hasSuffix("/") ? cdnHost : cdnHost + "/" self.firmwareIdentifier = firmwareIdentifier self.firmwareStatus = firmwareStatus + self.aniWidth = aniWidth + self.aniHeight = aniHeight + self.aniFps = aniFps } } diff --git a/Sources/DuooomiBleSDK/Services/AniConverter.swift b/Sources/DuooomiBleSDK/Services/AniConverter.swift index 542a246..77ee4a7 100644 --- a/Sources/DuooomiBleSDK/Services/AniConverter.swift +++ b/Sources/DuooomiBleSDK/Services/AniConverter.swift @@ -43,9 +43,9 @@ final class AniConverter { let body: [String: Any] = [ "videoUrl": fileUrl, - "width": 360, - "height": 360, - "fps": "24", + "width": config.aniWidth, + "height": config.aniHeight, + "fps": config.aniFps, ] request.httpBody = try JSONSerialization.data(withJSONObject: body) diff --git a/demo/Info.plist b/demo/Info.plist index dccd364..5823441 100644 --- a/demo/Info.plist +++ b/demo/Info.plist @@ -33,7 +33,7 @@ NSExceptionDomains - api.mixvideo.bowong.cc + api.duooomi.com NSExceptionAllowsInsecureHTTPLoads diff --git a/project.yml b/project.yml index 624989f..e2d19a1 100644 --- a/project.yml +++ b/project.yml @@ -15,17 +15,6 @@ settings: packages: {} targets: - DuooomiBleSDK: - type: framework - platform: iOS - sources: - - path: Sources/DuooomiBleSDK - settings: - base: - PRODUCT_BUNDLE_IDENTIFIER: com.duooomi.sdk - PRODUCT_NAME: DuooomiBleSDK - LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @loader_path/Frameworks" - GENERATE_INFOPLIST_FILE: YES demo: type: application platform: iOS @@ -40,7 +29,7 @@ targets: NSBluetoothAlwaysUsageDescription: "This app needs Bluetooth to communicate with your device" NSAppTransportSecurity: NSExceptionDomains: - api.mixvideo.bowong.cc: + api.duooomi.com: NSIncludesSubdomains: true NSExceptionAllowsInsecureHTTPLoads: true NSExceptionMinimumTLSVersion: TLSv1.0 @@ -59,5 +48,4 @@ targets: PRODUCT_BUNDLE_IDENTIFIER: com.duooomi.demo PRODUCT_NAME: demo LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" - dependencies: - - target: DuooomiBleSDK + dependencies: []