From e96683081abd5c1a94608dd33d092d8f45371cd6 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 28 十月 2021 16:25:38 +0800 Subject: [PATCH] 2021-10-28 1.更新SDK,新增talkType参数 --- iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic | 0 iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m | 5 + iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h | 58 +++++++++++++++++++ iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h | 58 +++++++++++++++++++ iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m | 3 iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist | 0 iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist | 0 iOS/Xamarin/LCSDKOnXamarin/README.md | 2 iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h | 5 + iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h | 5 + iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic | 0 11 files changed, 133 insertions(+), 3 deletions(-) diff --git a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h index a61eb37..4fab2e5 100644 --- a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h +++ b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h @@ -67,6 +67,8 @@ @property (nonatomic) DEFINITION_MODE defiMode; /** 娴佸獟浣揌D/SD妯″紡 */ @property (nonatomic) BOOL isOpt; /** 鏄惁浣跨敤闀块摼鎺ヤ紭鍖� */ +/// 鐮佹祦鍒嗚鲸鐜� +@property (nonatomic , assign) NSInteger imageSize; @end @@ -112,6 +114,9 @@ @property (nonatomic) BOOL isOpt; /** 鏄惁浣跨敤闀块摼鎺ヤ紭鍖� */ +/// 璇锋眰绫诲瀷锛宼alk瀵硅锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk +@property (nonatomic, copy) NSString *talkType; + @end NS_ASSUME_NONNULL_END diff --git a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h new file mode 100644 index 0000000..527ff40 --- /dev/null +++ b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h @@ -0,0 +1,58 @@ +// +// LCOpenSDK_Player.h +// LCOpenSDK +// +// Created by bzy on 5/9/17. +// Copyright 漏 2017 lechange. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import "LCOpenSDK_Stream.h" +#import "LCOpenSDK_Record.h" +#import "LCOpenSDK_Device.h" +#import "LCOpenSDK_StreamManager.h" +#import "LCOpenSDK_DeviceListManager.h" +#import "LCOpenSDK_Param.h" +#import "LoginComponent/iOS/OCLoginManager.h" +#import "LoginComponent/iOS/OCReporterManager.h" +#import "LCOpenSDK_LoginManager_Inside.h" +#import "VideoComponent/TimeInfo.h" +#import "VideoComponent/PlayerParam.h" +#import "VideoComponent/PlayWindow.h" +#import "GestureListener.h" + +@interface LCOpenSDK_Player : NSObject +@property (nonatomic, assign) NSInteger index; +@property (nonatomic, assign) int tag; +@property (nonatomic, assign) NSInteger timeOut; +@property (nonatomic, assign) BOOL isPlaying; +@property (nonatomic, assign) BOOL isOpt; +@property (nonatomic, assign) BOOL isRePlay;/** TCM鏍¢獙瀵嗙爜鍚庡啀娆℃挱鏀� */ +@property (nonatomic, assign) BOOL isAh;/** 鏄惁璧板畨鎭掑姞瀵� */ +@property (nonatomic, assign) LCOpenSDK_EnhanceMode mEnhanceMode; +@property (nonatomic, copy) NSString *playToken; /** 鎾斁鐮� */ +@property (nonatomic, strong) PlayWindow *playWindow; +@property (nonatomic, strong) LCOpenSDK_Record *record; +@property (nonatomic, strong) LCOpenSDK_Stream *stream; +@property (nonatomic, strong) LCOpenSDK_Device *device; +@property (nonatomic, strong) LCOpenSDK_StreamManager *streamManager; +@property (nonatomic, strong) LCOpenSDK_DeviceListManager *deviceListManager; +@property (nonatomic, strong) LCOpenSDK_LoginManager_Inside *loginManager; + +- (instancetype)initWithFrame:(CGRect)frame parent:(LCOpenSDK_PlayWindow *)parent index:(NSInteger)index; +- (void)setPlayWindowListener:(id<LCOpenSDK_EventListener>)listener; +- (void)reloadDeviceInfo:(NSString *)token deviceID:(NSString *)deviceID optimize:(BOOL)isOpt + failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)verifyPasswordInner:(NSString *)token deviceID:(NSString *)deviceID password:(NSString *)password failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)getUrlWithStream:(NSString *)token failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)getEncryptDetailInnner:(NSString*)token deviceID:(NSString*)deviceId channelId:(NSString*)channelId failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)play; +- (void)stopPlay:(BOOL)isKeepLastFrame; +- (void)setPlaySpeed:(float)speed; +- (void)getPlayStatus:(int &)status; +/** + * 璁剧疆鍘诲櫔妯″紡绛夌骇 + */ +- (void)setSEnhanceMode:(LCOpenSDK_EnhanceMode)mode; + +@end diff --git a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist index dd709d9..8f0a0da 100644 --- a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist +++ b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist Binary files differ diff --git a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic index 6f1dbbf..440fbd5 100755 --- a/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic +++ b/iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic Binary files differ diff --git a/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m b/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m index b493663..b77c995 100644 --- a/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m +++ b/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m @@ -664,8 +664,9 @@ /** 6. 璁剧疆瀵嗛挜锛屽鏋滀负鐢ㄦ埛鑷畾涔夊瘑閽ヤ负鍏蜂綋瀵嗛挜锛� 闈炵敤鎴疯嚜瀹氬瘑閽ュ彲涓鸿澶囧簭鍒楀彿*/ param.psk = [[LCApiKit sharedInstance] currentPsk]; /** 7. 璁剧疆鎾斁瀵嗛挜锛岄潪蹇呬紶锛屼紶浜嗕細鎻愬崌鎷夋祦閫熷害 */ - param.playToken = [[LCApiKit sharedInstance] currentDevicePlayToken];; - + param.playToken = [[LCApiKit sharedInstance] currentDevicePlayToken]; + /** 8. 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk */ + param.talkType = @"call";//2021-10-28 鏂板 NSInteger result = [self.talker playTalk:param]; if (result != 0) { //閿欒澶勭悊 diff --git a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h index a61eb37..4fab2e5 100644 --- a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h +++ b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h @@ -67,6 +67,8 @@ @property (nonatomic) DEFINITION_MODE defiMode; /** 娴佸獟浣揌D/SD妯″紡 */ @property (nonatomic) BOOL isOpt; /** 鏄惁浣跨敤闀块摼鎺ヤ紭鍖� */ +/// 鐮佹祦鍒嗚鲸鐜� +@property (nonatomic , assign) NSInteger imageSize; @end @@ -112,6 +114,9 @@ @property (nonatomic) BOOL isOpt; /** 鏄惁浣跨敤闀块摼鎺ヤ紭鍖� */ +/// 璇锋眰绫诲瀷锛宼alk瀵硅锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk +@property (nonatomic, copy) NSString *talkType; + @end NS_ASSUME_NONNULL_END diff --git a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h new file mode 100644 index 0000000..527ff40 --- /dev/null +++ b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h @@ -0,0 +1,58 @@ +// +// LCOpenSDK_Player.h +// LCOpenSDK +// +// Created by bzy on 5/9/17. +// Copyright 漏 2017 lechange. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import "LCOpenSDK_Stream.h" +#import "LCOpenSDK_Record.h" +#import "LCOpenSDK_Device.h" +#import "LCOpenSDK_StreamManager.h" +#import "LCOpenSDK_DeviceListManager.h" +#import "LCOpenSDK_Param.h" +#import "LoginComponent/iOS/OCLoginManager.h" +#import "LoginComponent/iOS/OCReporterManager.h" +#import "LCOpenSDK_LoginManager_Inside.h" +#import "VideoComponent/TimeInfo.h" +#import "VideoComponent/PlayerParam.h" +#import "VideoComponent/PlayWindow.h" +#import "GestureListener.h" + +@interface LCOpenSDK_Player : NSObject +@property (nonatomic, assign) NSInteger index; +@property (nonatomic, assign) int tag; +@property (nonatomic, assign) NSInteger timeOut; +@property (nonatomic, assign) BOOL isPlaying; +@property (nonatomic, assign) BOOL isOpt; +@property (nonatomic, assign) BOOL isRePlay;/** TCM鏍¢獙瀵嗙爜鍚庡啀娆℃挱鏀� */ +@property (nonatomic, assign) BOOL isAh;/** 鏄惁璧板畨鎭掑姞瀵� */ +@property (nonatomic, assign) LCOpenSDK_EnhanceMode mEnhanceMode; +@property (nonatomic, copy) NSString *playToken; /** 鎾斁鐮� */ +@property (nonatomic, strong) PlayWindow *playWindow; +@property (nonatomic, strong) LCOpenSDK_Record *record; +@property (nonatomic, strong) LCOpenSDK_Stream *stream; +@property (nonatomic, strong) LCOpenSDK_Device *device; +@property (nonatomic, strong) LCOpenSDK_StreamManager *streamManager; +@property (nonatomic, strong) LCOpenSDK_DeviceListManager *deviceListManager; +@property (nonatomic, strong) LCOpenSDK_LoginManager_Inside *loginManager; + +- (instancetype)initWithFrame:(CGRect)frame parent:(LCOpenSDK_PlayWindow *)parent index:(NSInteger)index; +- (void)setPlayWindowListener:(id<LCOpenSDK_EventListener>)listener; +- (void)reloadDeviceInfo:(NSString *)token deviceID:(NSString *)deviceID optimize:(BOOL)isOpt + failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)verifyPasswordInner:(NSString *)token deviceID:(NSString *)deviceID password:(NSString *)password failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)getUrlWithStream:(NSString *)token failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)getEncryptDetailInnner:(NSString*)token deviceID:(NSString*)deviceId channelId:(NSString*)channelId failure:(void(^)(LCOpenSDK_Err *err))failure; +- (void)play; +- (void)stopPlay:(BOOL)isKeepLastFrame; +- (void)setPlaySpeed:(float)speed; +- (void)getPlayStatus:(int &)status; +/** + * 璁剧疆鍘诲櫔妯″紡绛夌骇 + */ +- (void)setSEnhanceMode:(LCOpenSDK_EnhanceMode)mode; + +@end diff --git a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist index dd709d9..8f0a0da 100644 --- a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist +++ b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist Binary files differ diff --git a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic index 6f1dbbf..440fbd5 100755 --- a/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic +++ b/iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic Binary files differ diff --git a/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m b/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m index b493663..efa1afe 100644 --- a/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m +++ b/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m @@ -665,7 +665,8 @@ param.psk = [[LCApiKit sharedInstance] currentPsk]; /** 7. 璁剧疆鎾斁瀵嗛挜锛岄潪蹇呬紶锛屼紶浜嗕細鎻愬崌鎷夋祦閫熷害 */ param.playToken = [[LCApiKit sharedInstance] currentDevicePlayToken];; - + /** 8. 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk */ + param.talkType = @"call";//2021-10-28 鏂板 NSInteger result = [self.talker playTalk:param]; if (result != 0) { //閿欒澶勭悊 diff --git a/iOS/Xamarin/LCSDKOnXamarin/README.md b/iOS/Xamarin/LCSDKOnXamarin/README.md index f4be878..a1ad7a6 100644 --- a/iOS/Xamarin/LCSDKOnXamarin/README.md +++ b/iOS/Xamarin/LCSDKOnXamarin/README.md @@ -1,5 +1,7 @@ ## ON+涔愭鐩戣鍜屽懠鍙潤鎬佸簱 +##2021-10-28 鏇存柊SDK锛岄�傞厤鍗曞厓鏈哄懠鍙棶棰� + 涔愭SDK闆嗘垚鏂规硶璇︽儏鐪� https://open.imoulife.com/book/zh/opensdk/sdk/ios.html -- Gitblit v1.8.0