wangguolei

fix

Showing 82 changed files with 61 additions and 19 deletions
1 Pod::Spec.new do |s| 1 Pod::Spec.new do |s|
2 s.name = 'HHDoctor' 2 s.name = 'HHDoctor'
3 -s.version= "1.0.072816" 3 + s.version= "3.1.02"
4 s.summary = 'A short description of hhvDoctorSDK.' 4 s.summary = 'A short description of hhvDoctorSDK.'
5 5
6 s.description = <<-DESC 6 s.description = <<-DESC
@@ -23,7 +23,7 @@ s.version= "1.0.072816" @@ -23,7 +23,7 @@ s.version= "1.0.072816"
23 # s.static_framework = true 23 # s.static_framework = true
24 24
25 s.frameworks = 'SystemConfiguration', 'AVFoundation', 'Accelerate' 25 s.frameworks = 'SystemConfiguration', 'AVFoundation', 'Accelerate'
26 - s.libraries = 'c++', 'stdc++', 'resolv' 26 + s.libraries = 'c++','resolv'
27 27
28 s.ios.deployment_target = '9.0' 28 s.ios.deployment_target = '9.0'
29 29
No preview for this file type
No preview for this file type
No preview for this file type
@@ -65,25 +65,48 @@ typedef NS_ENUM(NSInteger, FailCode) { @@ -65,25 +65,48 @@ typedef NS_ENUM(NSInteger, FailCode) {
65 65
66 - (void) startWithOption : (HHSDKOptions * ) options; 66 - (void) startWithOption : (HHSDKOptions * ) options;
67 67
68 -- (void) loginWithUserToken : (NSString *) token 68 +/**
  69 + * 登录
  70 + * @param userToken token 和缓分配token
  71 + * @param completion 完成回调
  72 +*/
  73 +- (void) loginWithUserToken : (NSString *) userToken
69 completion :(void (^)(NSString *errorMsg))completion; 74 completion :(void (^)(NSString *errorMsg))completion;
70 75
71 --(void)setCallExtension:(NSString *)callExtension; 76 +/**
  77 + * 发起呼叫
  78 + *
  79 + * 本方法不带UI,需要自己实现选择UI
  80 + *
  81 + * userToken 请传咨询人信息 例如 给本人看 就传本人的userToken 给家庭成员看 就传家庭成员userToken
  82 + * @param userToken 咨询人
  83 + * @param delegate 回调
  84 +*/
  85 +- (void) startCallWithUserToken : (NSString *) userToken delegate: (id<HHMVideoDelegate>) delegate;
  86 +
  87 +/**
  88 + * @param ext 自定义参数
  89 +*/
  90 +-(void)setCallExtension:(NSString *)ext;
72 91
  92 +/**
  93 + * 退出登录
  94 +*/
73 - (void) logout; 95 - (void) logout;
74 96
75 - (void) switchToDev: (BOOL) isDevelopment; 97 - (void) switchToDev: (BOOL) isDevelopment;
76 98
77 -- (void) startCallWithUserToken : (NSString *) token;  
78 -  
79 -- (void) add: (id<HHMVideoDelegate>) delegate;  
80 -  
81 -- (void) remove: (id<HHMVideoDelegate>) delegate;  
82 -  
83 - (void) excute: (void (^)(id<HHMVideoDelegate> delegate))block; 99 - (void) excute: (void (^)(id<HHMVideoDelegate> delegate))block;
84 100
85 - (void) remoteMessage: (NSString *) message; 101 - (void) remoteMessage: (NSString *) message;
86 102
  103 +/**
  104 + * 病历详情 地址
  105 + * @param medicId 病历id
  106 + * @param userToken 登录帐号id
  107 + * @param patientUserToken 真实患者id
  108 + * 如果没有成员关系,patientUserToken 和 userToken 可以是一个值
  109 +*/
87 - (NSString *) getMedicDetailUrlWithMedicId : (NSString *) medicId userToken: (NSString *) userToken patientUserToken: (NSString *) patientUserToken; 110 - (NSString *) getMedicDetailUrlWithMedicId : (NSString *) medicId userToken: (NSString *) userToken patientUserToken: (NSString *) patientUserToken;
88 @end 111 @end
89 112
@@ -12,7 +12,9 @@ @@ -12,7 +12,9 @@
12 12
13 #define HHTestBaseURL @"https://test.hh-medic.com/familyapp" 13 #define HHTestBaseURL @"https://test.hh-medic.com/familyapp"
14 14
15 -#define HHMedicDetailBaseURL @"https://e.hh-medic.com" 15 +#define HHTestMedicDetailBaseURL @"https://test.hh-medic.com"
  16 +
  17 +#define HHSecMedicDetailBaseURL @"https://e.hh-medic.com"
16 18
17 19
18 #define HHFamilyUpload @"https://sec.hh-medic.com/orderapp/file/file_upload_family" 20 #define HHFamilyUpload @"https://sec.hh-medic.com/orderapp/file/file_upload_family"
@@ -12,22 +12,38 @@ @@ -12,22 +12,38 @@
12 @end 12 @end
13 13
14 @interface HHSDKOptions : NSObject 14 @interface HHSDKOptions : NSObject
15 - 15 +/**
  16 + * 是否开启debug
  17 +*/
16 @property (nonatomic, assign) BOOL isDebug; 18 @property (nonatomic, assign) BOOL isDebug;
17 - 19 +/**
  20 + * isDevelopment 是测试环境 还是 生产环境 true 为 测试环境 false 为生产
  21 + */
18 @property (nonatomic, assign) BOOL isDevelopment; 22 @property (nonatomic, assign) BOOL isDevelopment;
  23 +/**
  24 + * 和缓分配的唯一id
  25 + */
  26 +@property (nonatomic, strong) NSString * sdkProductId;
19 27
20 -@property (nonatomic, strong) NSString * productId; 28 +@property (nonatomic , weak) id <HHImageEngine> mImageEngine;
21 29
22 -@property (nonatomic, strong) NSString * callExtension; 30 +/**
  31 + * sdk 扩展统计字段
  32 +*/
  33 +@property (nonatomic, strong) NSString * mExtensionString;
23 34
24 @property (nonatomic, strong) NSString * sdkVersion; 35 @property (nonatomic, strong) NSString * sdkVersion;
25 36
26 -@property (nonatomic , weak) id <HHImageEngine> hhImageEngine;  
27 -  
28 + (HHSDKOptions *)sharedInstance; 37 + (HHSDKOptions *)sharedInstance;
29 38
30 -- (HHSDKOptions *) initWithProductId : (NSString *) productId isDebug : (BOOL) debug isDevelop : (BOOL) develop imageEngine : (id <HHImageEngine>) imageEngine; 39 +/**
  40 + * 初始化
  41 + *
  42 + * @param sdkProductId 和缓分配的唯一id
  43 + * @param develop 是测试环境 还是 生产环境 true 为 测试环境 false 为生产
  44 + * @param imageEngine 网络图片加载代理
  45 + */
  46 +- (HHSDKOptions *) initWithSdkProductId : (NSString *) sdkProductId isDevelop : (BOOL) develop imageEngine : (id <HHImageEngine>) imageEngine;
31 47
32 - (void) loadConfig : (HHSDKOptions *) options; 48 - (void) loadConfig : (HHSDKOptions *) options;
33 49
No preview for this file type
@@ -3,5 +3,6 @@ @@ -3,5 +3,6 @@
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
5 <key>HHBundleVersion</key> 5 <key>HHBundleVersion</key>
6 -<string>1.0.072813</string></dict> 6 + <string>07.18.1924</string>
  7 +</dict>
7 </plist> 8 </plist>