chengyanfang

fix

  1 +<<<<<<< HEAD
1 // Generated by Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 2 // Generated by Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  3 +=======
  4 +// Generated by Apple Swift version 5.3.1 effective-4.1.50 (swiftlang-1200.0.41 clang-1200.0.32.8)
  5 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
2 #ifndef HHMEDICSDK_SWIFT_H 6 #ifndef HHMEDICSDK_SWIFT_H
3 #define HHMEDICSDK_SWIFT_H 7 #define HHMEDICSDK_SWIFT_H
4 #pragma clang diagnostic push 8 #pragma clang diagnostic push
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 effective-4.1.50 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 4 -enforce-exclusivity=checked -O -module-name HHMedicSDK 7 // swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 4 -enforce-exclusivity=checked -O -module-name HHMedicSDK
4 import Foundation 8 import Foundation
5 @_exported import HHMedicSDK 9 @_exported import HHMedicSDK
@@ -12,8 +16,13 @@ import TXLiteAVSDK_TRTC @@ -12,8 +16,13 @@ import TXLiteAVSDK_TRTC
12 @objc public static let `default`: HHMedicSDK.HHLocation 16 @objc public static let `default`: HHMedicSDK.HHLocation
13 @objc public func startLocation(lng: Swift.String, lat: Swift.String) 17 @objc public func startLocation(lng: Swift.String, lat: Swift.String)
14 @objc public func closeLocation() 18 @objc public func closeLocation()
  19 +<<<<<<< HEAD
15 @objc override dynamic public init() 20 @objc override dynamic public init()
16 @objc deinit 21 @objc deinit
  22 +=======
  23 + @objc deinit
  24 + @objc override dynamic public init()
  25 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
17 } 26 }
18 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class HHMSDK : ObjectiveC.NSObject { 27 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class HHMSDK : ObjectiveC.NSObject {
19 @objc public static let `default`: HHMedicSDK.HHMSDK 28 @objc public static let `default`: HHMedicSDK.HHMSDK
@@ -93,8 +102,13 @@ extension HHMSDK : HHSDKVideo.HHBaseVideoDelegate { @@ -93,8 +102,13 @@ extension HHMSDK : HHSDKVideo.HHBaseVideoDelegate {
93 case callFreeDoctor 102 case callFreeDoctor
94 case callConnect 103 case callConnect
95 case didRing 104 case didRing
  105 +<<<<<<< HEAD
96 public init?(rawValue: Swift.Int) 106 public init?(rawValue: Swift.Int)
97 public typealias RawValue = Swift.Int 107 public typealias RawValue = Swift.Int
  108 +=======
  109 + public typealias RawValue = Swift.Int
  110 + public init?(rawValue: Swift.Int)
  111 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
98 public var rawValue: Swift.Int { 112 public var rawValue: Swift.Int {
99 get 113 get
100 } 114 }
@@ -145,6 +159,32 @@ extension PermissionType : Swift.CustomStringConvertible { @@ -145,6 +159,32 @@ extension PermissionType : Swift.CustomStringConvertible {
145 get 159 get
146 } 160 }
147 } 161 }
  162 +@_hasMissingDesignatedInitializers public class HHVideoMessage {
  163 + public static let instance: HHMedicSDK.HHVideoMessage
  164 + open func addListener(listener: HHMedicSDK.HHVideoMessageProtocol)
  165 + open func clearListener()
  166 + @objc deinit
  167 +}
  168 +public protocol HHVideoMessageProtocol : ObjectiveC.NSObjectProtocol {
  169 + func onMessage(message: Foundation.Data)
  170 +}
  171 +@objc public enum PermissionType : Swift.Int {
  172 + case locationAlways
  173 + case locationWhenInUse
  174 + case microphone
  175 + case camera
  176 + case photos
  177 + public typealias RawValue = Swift.Int
  178 + public init?(rawValue: Swift.Int)
  179 + public var rawValue: Swift.Int {
  180 + get
  181 + }
  182 +}
  183 +extension PermissionType : Swift.CustomStringConvertible {
  184 + public var description: Swift.String {
  185 + get
  186 + }
  187 +}
148 @objc @_inheritsConvenienceInitializers public class TIM : ObjectiveC.NSObject, HHSDKVideo.HHIM { 188 @objc @_inheritsConvenienceInitializers public class TIM : ObjectiveC.NSObject, HHSDKVideo.HHIM {
149 public static let `default`: HHMedicSDK.TIM 189 public static let `default`: HHMedicSDK.TIM
150 @objc public func register(_ cerName: Swift.String?) 190 @objc public func register(_ cerName: Swift.String?)
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 effective-4.1.50 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 effective-4.1.50 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 4 -enforce-exclusivity=checked -O -module-name HHMedicSDK 7 // swift-module-flags: -target arm64-apple-ios9.0 -enable-objc-interop -enable-library-evolution -swift-version 4 -enforce-exclusivity=checked -O -module-name HHMedicSDK
4 import Foundation 8 import Foundation
5 @_exported import HHMedicSDK 9 @_exported import HHMedicSDK
@@ -12,8 +16,13 @@ import TXLiteAVSDK_TRTC @@ -12,8 +16,13 @@ import TXLiteAVSDK_TRTC
12 @objc public static let `default`: HHMedicSDK.HHLocation 16 @objc public static let `default`: HHMedicSDK.HHLocation
13 @objc public func startLocation(lng: Swift.String, lat: Swift.String) 17 @objc public func startLocation(lng: Swift.String, lat: Swift.String)
14 @objc public func closeLocation() 18 @objc public func closeLocation()
  19 +<<<<<<< HEAD
15 @objc override dynamic public init() 20 @objc override dynamic public init()
16 @objc deinit 21 @objc deinit
  22 +=======
  23 + @objc deinit
  24 + @objc override dynamic public init()
  25 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
17 } 26 }
18 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class HHMSDK : ObjectiveC.NSObject { 27 @_inheritsConvenienceInitializers @_hasMissingDesignatedInitializers @objc public class HHMSDK : ObjectiveC.NSObject {
19 @objc public static let `default`: HHMedicSDK.HHMSDK 28 @objc public static let `default`: HHMedicSDK.HHMSDK
@@ -93,8 +102,13 @@ extension HHMSDK : HHSDKVideo.HHBaseVideoDelegate { @@ -93,8 +102,13 @@ extension HHMSDK : HHSDKVideo.HHBaseVideoDelegate {
93 case callFreeDoctor 102 case callFreeDoctor
94 case callConnect 103 case callConnect
95 case didRing 104 case didRing
  105 +<<<<<<< HEAD
96 public init?(rawValue: Swift.Int) 106 public init?(rawValue: Swift.Int)
97 public typealias RawValue = Swift.Int 107 public typealias RawValue = Swift.Int
  108 +=======
  109 + public typealias RawValue = Swift.Int
  110 + public init?(rawValue: Swift.Int)
  111 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
98 public var rawValue: Swift.Int { 112 public var rawValue: Swift.Int {
99 get 113 get
100 } 114 }
@@ -145,6 +159,32 @@ extension PermissionType : Swift.CustomStringConvertible { @@ -145,6 +159,32 @@ extension PermissionType : Swift.CustomStringConvertible {
145 get 159 get
146 } 160 }
147 } 161 }
  162 +@_hasMissingDesignatedInitializers public class HHVideoMessage {
  163 + public static let instance: HHMedicSDK.HHVideoMessage
  164 + open func addListener(listener: HHMedicSDK.HHVideoMessageProtocol)
  165 + open func clearListener()
  166 + @objc deinit
  167 +}
  168 +public protocol HHVideoMessageProtocol : ObjectiveC.NSObjectProtocol {
  169 + func onMessage(message: Foundation.Data)
  170 +}
  171 +@objc public enum PermissionType : Swift.Int {
  172 + case locationAlways
  173 + case locationWhenInUse
  174 + case microphone
  175 + case camera
  176 + case photos
  177 + public typealias RawValue = Swift.Int
  178 + public init?(rawValue: Swift.Int)
  179 + public var rawValue: Swift.Int {
  180 + get
  181 + }
  182 +}
  183 +extension PermissionType : Swift.CustomStringConvertible {
  184 + public var description: Swift.String {
  185 + get
  186 + }
  187 +}
148 @objc @_inheritsConvenienceInitializers public class TIM : ObjectiveC.NSObject, HHSDKVideo.HHIM { 188 @objc @_inheritsConvenienceInitializers public class TIM : ObjectiveC.NSObject, HHSDKVideo.HHIM {
149 public static let `default`: HHMedicSDK.TIM 189 public static let `default`: HHMedicSDK.TIM
150 @objc public func register(_ cerName: Swift.String?) 190 @objc public func register(_ cerName: Swift.String?)
  1 +<<<<<<< HEAD
1 // Generated by Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 2 // Generated by Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  3 +=======
  4 +// Generated by Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  5 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
2 #ifndef HHSDKBASE_SWIFT_H 6 #ifndef HHSDKBASE_SWIFT_H
3 #define HHSDKBASE_SWIFT_H 7 #define HHSDKBASE_SWIFT_H
4 #pragma clang diagnostic push 8 #pragma clang diagnostic push
@@ -211,7 +215,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @@ -211,7 +215,10 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
211 215
212 216
213 217
  218 +<<<<<<< HEAD
214 @class NSString; 219 @class NSString;
  220 +=======
  221 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
215 222
216 SWIFT_CLASS("_TtC9HHSDKBase9HHBaseSDK") 223 SWIFT_CLASS("_TtC9HHSDKBase9HHBaseSDK")
217 @interface HHBaseSDK : NSObject 224 @interface HHBaseSDK : NSObject
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKBase 7 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKBase
4 import AVFoundation 8 import AVFoundation
5 import Darwin 9 import Darwin
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKBase 7 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKBase
4 import AVFoundation 8 import AVFoundation
5 import Darwin 9 import Darwin
  1 +<<<<<<< HEAD
1 // Generated by Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 2 // Generated by Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  3 +=======
  4 +// Generated by Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  5 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
2 #ifndef HHSDKVIDEO_SWIFT_H 6 #ifndef HHSDKVIDEO_SWIFT_H
3 #define HHSDKVIDEO_SWIFT_H 7 #define HHSDKVIDEO_SWIFT_H
4 #pragma clang diagnostic push 8 #pragma clang diagnostic push
@@ -213,8 +217,11 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); @@ -213,8 +217,11 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
213 217
214 218
215 219
  220 +<<<<<<< HEAD
216 @class NSNumber; 221 @class NSNumber;
217 @class NSString; 222 @class NSString;
  223 +=======
  224 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
218 @class NSBundle; 225 @class NSBundle;
219 @class NSCoder; 226 @class NSCoder;
220 227
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKVideo 7 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKVideo
4 import AVFoundation 8 import AVFoundation
5 import AVKit 9 import AVKit
1 // swift-interface-format-version: 1.0 1 // swift-interface-format-version: 1.0
  2 +<<<<<<< HEAD
2 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55) 3 // swift-compiler-version: Apple Swift version 5.4 (swiftlang-1205.0.26.9 clang-1205.0.19.55)
  4 +=======
  5 +// swift-compiler-version: Apple Swift version 5.3.1 (swiftlang-1200.0.41 clang-1200.0.32.8)
  6 +>>>>>>> fb04c99dd04fb790fcf5767ec6bb6fa9ab96fff1
3 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKVideo 7 // swift-module-flags: -target arm64-apple-ios10.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -O -module-name HHSDKVideo
4 import AVFoundation 8 import AVFoundation
5 import AVKit 9 import AVKit