JLChen
2021-10-28 e96683081abd5c1a94608dd33d092d8f45371cd6
2021-10-28 1.更新SDK,新增talkType参数
2个文件已添加
9个文件已修改
136 ■■■■■ 已修改文件
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCSDKOnXamarin/README.md 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h
@@ -67,6 +67,8 @@
@property (nonatomic) DEFINITION_MODE  defiMode; /** 流媒体HD/SD模式 */
@property (nonatomic) BOOL             isOpt; /** 是否使用长链接优化 */
/// 码流分辨率
@property (nonatomic , assign) NSInteger imageSize;
@end
@@ -112,6 +114,9 @@
@property (nonatomic) BOOL             isOpt; /** 是否使用长链接优化 */
/// 请求类型,talk对讲,call呼叫,如果不传,默认为talk
@property (nonatomic, copy) NSString *talkType;
@end
NS_ASSUME_NONNULL_END
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h
New file
@@ -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
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/Info.plist
Binary files differ
iOS/Xamarin/LCOnDemo/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic
Binary files differ
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. 对讲请求类型,call呼叫,如果不传,默认为talk */
        param.talkType = @"call";//2021-10-28 新增
        NSInteger result = [self.talker playTalk:param];
        if (result != 0) {
            //错误处理
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Param.h
@@ -67,6 +67,8 @@
@property (nonatomic) DEFINITION_MODE  defiMode; /** 流媒体HD/SD模式 */
@property (nonatomic) BOOL             isOpt; /** 是否使用长链接优化 */
/// 码流分辨率
@property (nonatomic , assign) NSInteger imageSize;
@end
@@ -112,6 +114,9 @@
@property (nonatomic) BOOL             isOpt; /** 是否使用长链接优化 */
/// 请求类型,talk对讲,call呼叫,如果不传,默认为talk
@property (nonatomic, copy) NSString *talkType;
@end
NS_ASSUME_NONNULL_END
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Headers/LCOpenSDK/LCOpenSDK_Player.h
New file
@@ -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
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/Info.plist
Binary files differ
iOS/Xamarin/LCSDKOnXamarin/Depend/LCOpenSDKDynamic.framework/LCOpenSDKDynamic
Binary files differ
iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m
@@ -665,7 +665,8 @@
        param.psk =  [[LCApiKit sharedInstance] currentPsk];
        /** 7. 设置播放密钥,非必传,传了会提升拉流速度 */
        param.playToken = [[LCApiKit sharedInstance] currentDevicePlayToken];;
        /** 8. 对讲请求类型,call呼叫,如果不传,默认为talk */
        param.talkType = @"call";//2021-10-28 新增
        NSInteger result = [self.talker playTalk:param];
        if (result != 0) {
            //错误处理
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