fix

 Pod::Spec.new do |s|
   s.name             = 'HHDoctor'
-<<<<<<< HEAD
   s.version= "3.1.02"
-=======
-s.version= "3.1.0081213"
->>>>>>> 8e36928fcf36fa846a2a402a9efc0ae36d01efcf
+
   s.summary          = 'A short description of hhvDoctorSDK.'
 
   s.description      = <<-DESC

+#ifdef __OBJC__
+#import <UIKit/UIKit.h>
+#else
+#ifndef FOUNDATION_EXPORT
+#if defined(__cplusplus)
+#define FOUNDATION_EXPORT extern "C"
+#else
+#define FOUNDATION_EXPORT extern
+#endif
+#endif
+#endif
+
+#import "HHDoctor.h"
+#import "HHPublicHeader.h"
+#import "HHSDKOptions.h"
+
+FOUNDATION_EXPORT double HHDoctorVersionNumber;
+FOUNDATION_EXPORT const unsigned char HHDoctorVersionString[];
+

+//
+//  HHDoctor.h
+//  HHDoctor
+//
+//  Created by 程言方 on 2021/1/27.
+//
+
+#import "HHSDKOptions.h"
+
+typedef NS_ENUM(NSInteger, HHMCallingState) {
+    onStart = 0,
+    waitingDoctor,
+    callFreeDoctor,
+    callConnect,
+    didRing,
+};
+
+typedef NS_ENUM(NSInteger, FailCode) {
+    loginFail = -6,
+    notLogin = -5,
+    permision = -4,
+    netError = -3,
+    fail = -2,
+    callMessageFail = -100002,
+};
+
+@protocol HHMVideoDelegate<NSObject>
+
+/**
+ * 启动呼叫
+ */
+- (void) onStart: (NSString*) orderId;
+
+/**
+ * 通话结束
+ *
+ * @param time  视频时长  单位秒
+ */
+- (void) onFinish: (long) time;
+
+/**
+ * 呼叫成功，等待医生接受
+ */
+- (void) onCallSuccess;
+
+/**
+ * 呼叫失败
+ * @param code 错误码
+ */
+- (void) onFail: (NSInteger) code;
+
+/**
+ * 取消呼叫  含 取消排队
+ */
+- (void) onCancel;
+
+
+
+@end
+
+
+@interface HHDoctor : NSObject
+
++ (HHDoctor *) sharedInstance;
+
+- (void) startWithOption : (HHSDKOptions * ) options;
+
+/**
+ * 登录
+ * @param userToken token   和缓分配token
+ * @param completion  完成回调
+*/
+- (void) loginWithUserToken : (NSString *) userToken
+                 completion :(void (^)(NSString *errorMsg))completion;
+
+/**
+ * 发起呼叫
+ *
+ * 本方法不带UI，需要自己实现选择UI
+ *
+ *   userToken 请传咨询人信息 例如 给本人看 就传本人的userToken 给家庭成员看 就传家庭成员userToken
+ *   @param userToken 咨询人
+ *   @param delegate 回调
+*/
+- (void) startCallWithUserToken : (NSString *) userToken delegate: (id<HHMVideoDelegate>) delegate;
+
+/**
+ * @param ext 自定义参数
+*/
+-(void)setCallExtension:(NSString *)ext;
+
+/**
+ * 退出登录
+*/
+- (void) logout;
+
+- (void) switchToDev: (BOOL) isDevelopment;
+
+- (void) excute: (void (^)(id<HHMVideoDelegate> delegate))block;
+
+- (void) remoteMessage: (NSString *) message;
+
+/**
+ * 病历详情 地址
+ * @param medicId   病历id
+ * @param userToken 登录帐号id
+ * @param patientUserToken  真实患者id
+ * 如果没有成员关系，patientUserToken 和     userToken 可以是一个值
+*/
+- (NSString *) getMedicDetailUrlWithMedicId : (NSString *) medicId userToken: (NSString *) userToken patientUserToken: (NSString *) patientUserToken;
+@end
+
+
+

+//
+//  PublicHeader.h
+//  hhvDoctorSDK_OC
+//
+//  Created by 程言方 on 2021/1/27.
+//
+
+#ifndef PublicHeader_h
+#define PublicHeader_h
+
+#define HHSecBaseURL             @"https://sec.hh-medic.com/familyapp"
+
+#define HHTestBaseURL            @"https://test.hh-medic.com/familyapp"
+
+#define HHTestMedicDetailBaseURL     @"https://test.hh-medic.com"
+
+#define HHSecMedicDetailBaseURL     @"https://e.hh-medic.com"
+
+
+#define HHFamilyUpload    @"https://sec.hh-medic.com/orderapp/file/file_upload_family"
+
+#define HHScreenWidth                     [[UIScreen mainScreen] bounds].size.width
+#define HHScreenHeight                    [[UIScreen mainScreen] bounds].size.height
+
+
+#define HHStatusBarHeight   [UIApplication sharedApplication].statusBarFrame.size.height
+
+#endif /* PublicHeader_h */

+//
+//  HHSDKOptions.h
+//  hhvDoctorSDK_OC
+//
+//  Created by 程言方 on 2021/1/27.
+//
+
+@protocol HHImageEngine <NSObject>
+
+- (void) loadImageView : (UIImageView *) imageView placeholder : (UIImage *) placeholder url : (NSString *) url;
+
+@end
+
+@interface HHSDKOptions : NSObject
+/**
+ * 是否开启debug
+*/
+@property (nonatomic, assign) BOOL isDebug;
+/**
+ * isDevelopment  是测试环境 还是 生产环境  true 为 测试环境  false 为生产
+ */
+@property (nonatomic, assign) BOOL isDevelopment;
+/**
+ * 和缓分配的唯一id
+ */
+@property (nonatomic, strong) NSString * sdkProductId;
+
+@property (nonatomic , weak) id <HHImageEngine> mImageEngine;
+
+/**
+ * sdk 扩展统计字段
+*/
+@property (nonatomic, strong) NSString * mExtensionString;
+
+@property (nonatomic, strong) NSString * sdkVersion;
+
++ (HHSDKOptions *)sharedInstance;
+
+/**
+ * 初始化
+ *
+ * @param sdkProductId  和缓分配的唯一id
+ * @param develop  是测试环境 还是 生产环境  true 为 测试环境  false 为生产
+ * @param imageEngine 网络图片加载代理
+ */
+- (HHSDKOptions *) initWithSdkProductId : (NSString *) sdkProductId isDevelop : (BOOL) develop imageEngine : (id <HHImageEngine>) imageEngine;
+
+- (void) loadConfig : (HHSDKOptions *) options;
+
+@end

+framework module HHDoctor {
+  umbrella header "HHDoctor-umbrella.h"
+
+  export *
+  module * { export * }
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>HHBundleVersion</key>
+	<string>07.18.1924</string>
+</dict>
+</plist>