From a616abd9b740e74eb7aea29cb692ca86ba1f7d7a Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 27 八月 2024 15:24:54 +0800
Subject: [PATCH] 增加铃声功能
---
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinphoneCallDelegate.h | 4
/dev/null | 0
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj | 11 -
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinPhoneSDK.h | 6
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m | 66 +++++++++-
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/ApiDefinition.cs | 191 +++++++++++++++++--------------
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinphoneManager.m | 8
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/libHDLLinPhoneSDK.a | 0
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a | 0
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs | 2
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinphoneManager.h | 2
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinPhoneSDK.m | 16 ++
12 files changed, 194 insertions(+), 112 deletions(-)
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.h" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.h"
index 391205c..e739361 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.h"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.h"
@@ -33,7 +33,8 @@
* @param pwd 瀵嗙爜
* @param domain 鍩熷悕
*/
--(void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain;
+-(void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain connectType:(NSString*)connectType;
+
/**
* 鍒濆鍖杔inphone
@@ -73,6 +74,9 @@
*/
-(void)gotoHDLSRLinphoneIntercomVC:(NSString*)titleName userName:(NSString*)username;
+-(void)hideIntercomeVC;
+
+
/**
* 娉ㄩ攢鐧诲綍
*
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.m" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.m"
index e6d66dc..54e503e 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.m"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinPhoneSDK.m"
@@ -42,8 +42,12 @@
// [NSNotificationCenter.defaultCenter remo];
}
--(void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain{
- [HDLLinphoneManager.instance login:username password:pwd domain:domain];
+//-(void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain{
+// [HDLLinphoneManager.instance login:username password:pwd domain:domain];
+//}
+
+-(void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain connectType:(NSString*)connectType{
+ [HDLLinphoneManager.instance login:username password:pwd domain:domain connectType:connectType];
}
- (void)registrationUpdate:(NSNotification *)notif {
@@ -225,6 +229,14 @@
[self toLinphoneIntercomVC:titleName deviceType:HDLLPType_HDLSR userName:username];
}
+-(void)hideIntercomeVC{
+ if ([[HDLLinPhoneCommon topMostController] isKindOfClass:[HDLLinphoneIntercomVC class]]) {
+ [[HDLLinPhoneCommon topMostController] dismissViewControllerAnimated:YES completion:^{
+
+ }];
+ }
+}
+
-(void)toLinphoneIntercomVC:(NSString*)titleName deviceType:(HDLLPType)deviceType userName:(NSString *)userName{
HDLLinphoneIntercomVC *vc=[[HDLLinphoneIntercomVC alloc]init];
// vc.CallId=callId;
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneCallDelegate.h" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneCallDelegate.h"
index aa05a96..41640cc 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneCallDelegate.h"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneCallDelegate.h"
@@ -20,6 +20,9 @@
//鎷掓帴鏉ョ數鍥炶皟
-(void)onRejectCallAction;
+//鍏ㄩ儴鎷掓帴鏉ョ數鍥炶皟
+-(void)onRejectAllCallAction;
+
//寮�閿佸洖璋�
-(void)onUnlockAction;
@@ -38,3 +41,4 @@
@end
NS_ASSUME_NONNULL_END
+
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
index ef51c36..939ee47 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
@@ -27,6 +27,8 @@
@property (nonatomic, strong) UIButton *unlockImgBtn; //寮�閿�
@property (nonatomic, strong) UIButton *hangUpImgBtn;//鎸傛柇鎸夐挳
@property (nonatomic, strong) UIButton *hangUpTextBtn;
+@property (nonatomic, strong) UIButton *hangUpAllImgBtn;//鍏ㄩ儴鎸傛柇鎸夐挳
+@property (nonatomic, strong) UIButton *hangUpAllTextBtn;
@property (nonatomic, strong) UIButton *answerImgBtn;//鎺ュ惉鎸夐挳
@property (nonatomic, strong) UIButton *answerTextBtn;
@property (nonatomic, strong) UIButton *calltimeBtn; //閫氳瘽鏃堕棿鎸夐挳
@@ -51,7 +53,9 @@
NSString * answerStr;
NSString * unlockSuccessfullyStr;
NSString * callingStr;
- NSString * hangUpStr;
+ NSString * hangUpStr;;
+ NSString * hangUpPhoneStr;
+ NSString * hangUpAllStr;
NSString * endOfCallStr;
@@ -123,6 +127,8 @@
refuseStr = @"鎷掔粷";
answerStr = @"鎺ュ惉";
hangUpStr = @"鎸傛柇";
+ hangUpPhoneStr = @"鎸傛柇鎵嬫満";
+ hangUpAllStr = @"鎸傛柇鍏ㄩ儴";
unlockSuccessfullyStr = @"寮�閿佹垚鍔�";
callingStr = @"鏉ョ數涓�...";
endOfCallStr = @"閫氳瘽缁撴潫";
@@ -136,6 +142,8 @@
refuseStr = @"Refuse";
answerStr = @"Answer";
hangUpStr = @"Hang up";
+ hangUpPhoneStr = @"Hang up";
+ hangUpAllStr = @"hang up all";
unlockSuccessfullyStr = @"Unlock successfully";
callingStr = @"Incoming call";
endOfCallStr = @"End of call";
@@ -195,6 +203,8 @@
[self.unlockView addSubview:self.unlockImgBtn];
[self.centerView addSubview:self.hangUpImgBtn];
[self.centerView addSubview:self.hangUpTextBtn];
+ [self.centerView addSubview:self.hangUpAllImgBtn];
+ [self.centerView addSubview:self.hangUpAllTextBtn];
[self.centerView addSubview:self.answerImgBtn];
[self.centerView addSubview:self.answerTextBtn];
[self.centerView addSubview:self.calltimeBtn];
@@ -330,10 +340,10 @@
if (_hangUpImgBtn == nil) {
_hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, Height66, Height66)];
[_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_hangup"] forState:UIControlStateNormal];
- // [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_hangup"] forState:UIControlStateSelected];
[_hangUpImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
[_hangUpImgBtn addTarget:self action:@selector(hangUpAction) forControlEvents:UIControlEventTouchUpInside];
- _hangUpImgBtn.center = CGPointMake(APP_SCREEN_WIDTH/4, GetRealHeight(452) + Height66/2);
+
+ _hangUpImgBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, GetRealHeight(452) + Height66/2);
}
return _hangUpImgBtn;
}
@@ -353,11 +363,34 @@
//2.椤甸潰鍏抽棴
[self backAction];
}
+
+//鍏ㄩ儴鎸傛柇 鍥炬爣鎸夐挳
+- (UIButton *)hangUpAllImgBtn{
+ if (_hangUpAllImgBtn == nil) {
+ _hangUpAllImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, Height66, Height66)];
+ [_hangUpAllImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_hangup_all"] forState:UIControlStateNormal];
+ [_hangUpAllImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
+ [_hangUpAllImgBtn addTarget:self action:@selector(hangUpAllAction) forControlEvents:UIControlEventTouchUpInside];
+
+ _hangUpAllImgBtn.center = CGPointMake(GetRealWidth(77.5), GetRealHeight(452) + Height66/2);
+ }
+ return _hangUpAllImgBtn;
+}
+
+//鍏ㄩ儴鎸傛柇鎸夐挳浜嬩欢
+-(void)hangUpAllAction{
+ //1.鍥炶皟浜嬩欢
+ if(self.hdlLinphoneCallDelegate != NULL){
+ [self.hdlLinphoneCallDelegate onRejectAllCallAction];
+ }
+ //2.椤甸潰鍏抽棴
+ [self backAction];
+}
//鎷掓帴 鏂囨湰鎸夐挳
- (UIButton *)hangUpTextBtn{
if (_hangUpTextBtn == nil) {
_hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, GetRealWidth(100), GetRealWidth(20))];
- [_hangUpTextBtn setTitle:@"鎷掔粷" forState:UIControlStateNormal];
+ [_hangUpTextBtn setTitle:hangUpPhoneStr forState:UIControlStateNormal];
_hangUpTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
_hangUpTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
[_hangUpTextBtn setTitleColor:TextColor forState:UIControlStateNormal];
@@ -368,17 +401,31 @@
}
return _hangUpTextBtn;
}
+//鍏ㄩ儴鎸傛柇 鏂囨湰鎸夐挳
+- (UIButton *)hangUpAllTextBtn{
+ if (_hangUpAllTextBtn == nil) {
+ _hangUpAllTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, GetRealWidth(100), GetRealWidth(20))];
+ [_hangUpAllTextBtn setTitle:hangUpAllStr forState:UIControlStateNormal];
+ _hangUpAllTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
+ _hangUpAllTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
+ [_hangUpAllTextBtn setTitleColor:TextColor forState:UIControlStateNormal];
+ [_hangUpAllTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];
+ [_hangUpAllTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside];
+ _hangUpAllTextBtn.center = CGPointMake(_hangUpAllImgBtn.center.x, GetRealHeight(530));
+
+ }
+ return _hangUpAllTextBtn;
+}
//鎺ュ惉 鍥炬爣鎸夐挳
- (UIButton *)answerImgBtn{
if (_answerImgBtn == nil) {
_answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, Height66, Height66)];
[_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_answer"] forState:UIControlStateNormal];
- // [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_answer"] forState:UIControlStateSelected];
[_answerImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
[_answerImgBtn addTarget:self action:@selector(answerIAction) forControlEvents:UIControlEventTouchUpInside];
- _answerImgBtn.center = CGPointMake((APP_SCREEN_WIDTH/4)*3, GetRealHeight(452) + Height66/2);
+ _answerImgBtn.center = CGPointMake(APP_SCREEN_WIDTH-GetRealWidth(77.5), GetRealHeight(452) + Height66/2);
}
return _answerImgBtn;
}
@@ -401,6 +448,8 @@
_answerImgBtn.hidden = YES;
_answerTextBtn.hidden = YES;
+ _hangUpAllImgBtn.hidden = YES;
+ _hangUpAllTextBtn.hidden = YES;
//鎸傛柇鎸夐挳绉诲姩涓棿
_hangUpImgBtn.center = CGPointMake(APP_CONTENT_WIDTH / 2, _hangUpImgBtn.center.y);
@@ -437,7 +486,7 @@
- (UIButton *)answerTextBtn{
if (_answerTextBtn == nil) {
_answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, GetRealWidth(100), GetRealWidth(20))];
- [_answerTextBtn setTitle:@"鎺ュ惉" forState:UIControlStateNormal];
+ [_answerTextBtn setTitle:answerStr forState:UIControlStateNormal];
_answerTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
_answerTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
// _unlockTextBtn.titleLabel.textColor = TextColor;
@@ -618,7 +667,8 @@
//鍒濆鍖栧弬鏁�
-(void)initData{
// _titleUILabel.text = [[LCApiKit sharedInstance] currentDeviceName];
- [_hangUpTextBtn setTitle:refuseStr forState:UIControlStateNormal];
+ [_hangUpTextBtn setTitle:hangUpPhoneStr forState:UIControlStateNormal];
+ [_hangUpAllTextBtn setTitle:hangUpAllStr forState:UIControlStateNormal];
[_answerTextBtn setTitle:answerStr forState:UIControlStateNormal];
}
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.h" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.h"
index 2da1e27..61a9089 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.h"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.h"
@@ -209,7 +209,7 @@
- (void)loadAvatar;
- (void)migrationPerAccount;
-- (void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain;
+- (void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain connectType:(NSString*)connectType;
-(void)initalLinPhonal;
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.m" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.m"
index 2420719..f4a77b3 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.m"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneManager.m"
@@ -689,7 +689,7 @@
// linphone_core_enable_mic(LC, false);
}
-- (void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain{
+- (void)login:(NSString*)username password:(NSString*)pwd domain:(NSString*) domain connectType:(NSString*)connectType{
// NSString *domain = [self findTextField:ViewElement_Domain].text;
// NSString *username = username;
NSString *displayName = @"";
@@ -711,15 +711,15 @@
linphone_proxy_config_set_identity_address(config, addr);
// set transport
- NSString *type = @"UDP";
+// NSString *type = @"UDP";
// NSString *type = @"TCP";
linphone_proxy_config_set_route(
config,
- [NSString stringWithFormat:@"%s;transport=%s", domain.UTF8String, type.lowercaseString.UTF8String]
+ [NSString stringWithFormat:@"%s;transport=%s", domain.UTF8String, connectType.lowercaseString.UTF8String]
.UTF8String);
linphone_proxy_config_set_server_addr(
config,
- [NSString stringWithFormat:@"%s;transport=%s", domain.UTF8String, type.lowercaseString.UTF8String]
+ [NSString stringWithFormat:@"%s;transport=%s", domain.UTF8String, connectType.lowercaseString.UTF8String]
.UTF8String);
linphone_proxy_config_enable_publish(config, FALSE);
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/ApiDefinition.cs b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/ApiDefinition.cs
index eaff90e..5ba2cd0 100644
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/ApiDefinition.cs
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/ApiDefinition.cs
@@ -4,111 +4,132 @@
namespace Shared.IOS.HDLLinphoneSDK
{
- [Static]
+ [Static]
//[Verify(ConstantsInterfaceAssociation)]
partial interface Constants
- {
- // extern NSString *const _Nonnull HDLLPCallDelegateOpenDoorSuccess;
- [Field("HDLLPCallDelegateOpenDoorSuccess", "__Internal")]
- NSString HDLLPCallDelegateOpenDoorSuccess { get; }
- }
+ {
+ // extern NSString *const _Nonnull HDLLPCallDelegateOpenDoorSuccess;
+ [Field("HDLLPCallDelegateOpenDoorSuccess", "__Internal")]
+ NSString HDLLPCallDelegateOpenDoorSuccess { get; }
+ }
- // @protocol HDLLinphoneCallDelegate <NSObject>
- [Protocol, Model(AutoGeneratedName = true)]
- [BaseType(typeof(NSObject))]
- interface HDLLinphoneCallDelegate
- {
- // @required -(void)onAnswerAction;
- [Abstract]
- [Export("onAnswerAction")]
- void OnAnswerAction();
+ // @protocol HDLLinphoneCallDelegate <NSObject>
+ [Protocol, Model(AutoGeneratedName = true)]
+ [BaseType(typeof(NSObject))]
+ interface HDLLinphoneCallDelegate
+ {
+ // @required -(void)onAnswerAction;
+ [Abstract]
+ [Export("onAnswerAction")]
+ void OnAnswerAction();
- // @required -(void)onRejectCallAction;
- [Abstract]
- [Export("onRejectCallAction")]
- void OnRejectCallAction();
+ // @required -(void)onRejectCallAction;
+ [Abstract]
+ [Export("onRejectCallAction")]
+ void OnRejectCallAction();
- // @required -(void)onUnlockAction;
- [Abstract]
- [Export("onUnlockAction")]
- void OnUnlockAction();
+ // @required -(void)onRejectAllCallAction;
+ [Abstract]
+ [Export("onRejectAllCallAction")]
+ void OnRejectAllCallAction();
- // @required -(void)onHangUpAction:(int)callDuration;
- [Abstract]
- [Export("onHangUpAction:")]
- void OnHangUpAction(int callDuration);
+ // @required -(void)onUnlockAction;
+ [Abstract]
+ [Export("onUnlockAction")]
+ void OnUnlockAction();
- // @required -(void)onScreenshotSuccessfulAction:(UIImage * _Nonnull)image;
- //[Abstract]
- //[Export("onScreenshotSuccessfulAction:")]
- //void OnScreenshotSuccessfulAction(UIImage image);
+ // @required -(void)onHangUpAction:(int)callDuration;
+ [Abstract]
+ [Export("onHangUpAction:")]
+ void OnHangUpAction(int callDuration);
- // @required -(void)onIncomingCall:(NSString * _Nonnull)userName;
- [Abstract]
- [Export("onIncomingCall:")]
- void OnIncomingCall(string userName);
- }
+ // @required -(void)onScreenshotSuccessfulAction:(UIImage * _Nonnull)image;
+ [Abstract]
+ [Export("onScreenshotSuccessfulAction:")]
+ void OnScreenshotSuccessfulAction(UIImage image);
- // @interface HDLLinphoneCallDelegate : NSObject
- //[BaseType(typeof(NSObject))]
- //interface HDLLinphoneCallDelegate
- //{
- //}
+ // @required -(void)onIncomingCall:(NSString * _Nonnull)userName;
+ [Abstract]
+ [Export("onIncomingCall:")]
+ void OnIncomingCall(string userName);
+ }
- // @interface HDLLinPhoneSDK : NSObject
- [BaseType(typeof(NSObject))]
- interface HDLLinPhoneSDK
- {
- [Wrap("WeakHdlLinphoneCallDelegate")]
- HDLLinphoneCallDelegate HdlLinphoneCallDelegate { get; set; }
+ // @interface HDLLinphoneCallDelegate : NSObject
+ //[BaseType(typeof(NSObject))]
+ //interface HDLLinphoneCallDelegate
+ //{
+ //}
- // @property (nonatomic, weak) id<HDLLinphoneCallDelegate> hdlLinphoneCallDelegate;
- [NullAllowed, Export("hdlLinphoneCallDelegate", ArgumentSemantic.Weak)]
- NSObject WeakHdlLinphoneCallDelegate { get; set; }
+ // @interface HDLLinPhoneSDK : NSObject
+ [BaseType(typeof(NSObject))]
+ interface HDLLinPhoneSDK
+ {
+ [Wrap("WeakHdlLinphoneCallDelegate")]
+ HDLLinphoneCallDelegate HdlLinphoneCallDelegate { get; set; }
- // @property (assign, nonatomic) BOOL IsAutoJumpCallView;
- [Export("IsAutoJumpCallView")]
- bool IsAutoJumpCallView { get; set; }
+ // @property (nonatomic, weak) id<HDLLinphoneCallDelegate> hdlLinphoneCallDelegate;
+ [NullAllowed, Export("hdlLinphoneCallDelegate", ArgumentSemantic.Weak)]
+ NSObject WeakHdlLinphoneCallDelegate { get; set; }
- // @property (assign, nonatomic) BOOL IsIncomingReceivedCallState;
- [Export("IsIncomingReceivedCallState")]
- bool IsIncomingReceivedCallState { get; set; }
+ // @property (assign, nonatomic) BOOL IsAutoJumpCallView;
+ [Export("IsAutoJumpCallView")]
+ bool IsAutoJumpCallView { get; set; }
- // +(instancetype)instance;
- [Static]
- [Export("instance")]
- HDLLinPhoneSDK Instance();
+ // @property (assign, nonatomic) BOOL IsIncomingReceivedCallState;
+ [Export("IsIncomingReceivedCallState")]
+ bool IsIncomingReceivedCallState { get; set; }
- // -(void)login:(NSString *)username password:(NSString *)pwd domain:(NSString *)domain;
- [Export("login:password:domain:")]
- void Login(string username, string pwd, string domain);
+ // +(instancetype)instance;
+ [Static]
+ [Export("instance")]
+ HDLLinPhoneSDK Instance();
- // -(void)initalLinPhone;
- [Export("initalLinPhone")]
- void InitalLinPhone();
+ // -(void)login:(NSString *)username password:(NSString *)pwd domain:(NSString *)domain connectType:(NSString *)connectType;
+ [Export("login:password:domain:connectType:")]
+ void Login(string username, string pwd, string domain, string connectType);
- // -(void)callWithUserName:(NSString *)username title:(NSString *)title;
- [Export("callWithUserName:title:")]
- void CallWithUserName(string username, string title);
+ // -(void)initalLinPhone;
+ [Export("initalLinPhone")]
+ void InitalLinPhone();
- // -(void)callHDLSRWithUserName:(NSString*)username title:(NSString *)title;
- [Export("callHDLSRWithUserName:title:")]
- void CallHDLSRWithUserName(string username, string title);
+ // -(void)callWithUserName:(NSString *)username title:(NSString *)title;
+ [Export("callWithUserName:title:")]
+ void CallWithUserName(string username, string title);
- // -(void)gotoHDLLinphoneIntercomVC:(NSString *)titleName;
- [Export("gotoHDLLinphoneIntercomVC:")]
- void GotoHDLLinphoneIntercomVC(string titleName);
+ // -(void)callHDLSRWithUserName:(NSString *)username title:(NSString *)title;
+ [Export("callHDLSRWithUserName:title:")]
+ void CallHDLSRWithUserName(string username, string title);
- // -(void)gotoHDLSRLinphoneIntercomVC:(NSString *)titleName userName:(NSString *)username;
- [Export("gotoHDLSRLinphoneIntercomVC:userName:")]
- void GotoHDLSRLinphoneIntercomVC(string titleName, string username);
+ // -(void)gotoHDLLinphoneIntercomVC:(NSString *)titleName;
+ [Export("gotoHDLLinphoneIntercomVC:")]
+ void GotoHDLLinphoneIntercomVC(string titleName);
- // -(void)logoutAllLinphoneUser;
- [Export("logoutAllLinphoneUser")]
- void LogoutAllLinphoneUser();
+ // -(void)gotoHDLSRLinphoneIntercomVC:(NSString *)titleName userName:(NSString *)username;
+ [Export("gotoHDLSRLinphoneIntercomVC:userName:")]
+ void GotoHDLSRLinphoneIntercomVC(string titleName, string username);
- // -(void)clearAllConfigs;
- [Export("clearAllConfigs")]
- void ClearAllConfigs();
- }
+ // -(void)hideIntercomeVC;
+ [Export("hideIntercomeVC")]
+ void HideIntercomeVC();
+
+ // -(void)logoutAllLinphoneUser;
+ [Export("logoutAllLinphoneUser")]
+ void LogoutAllLinphoneUser();
+
+ // -(void)clearAllConfigs;
+ [Export("clearAllConfigs")]
+ void ClearAllConfigs();
+
+ // -(void)enterBackground;
+ [Export("enterBackground")]
+ void EnterBackground();
+
+ // -(void)becomactive;
+ [Export("becomactive")]
+ void Becomactive();
+
+ // -(void)willResignActive;
+ [Export("willResignActive")]
+ void WillResignActive();
+ }
}
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a
index e968dcc..a044784 100644
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs
index cd6281f..0f8eb9d 100644
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.23.9.05")]
+[assembly: AssemblyVersion("1.24.08.07")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_answer.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_answer.png
deleted file mode 100644
index 173927f..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_answer.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_back.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_back.png
deleted file mode 100644
index c14f703..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_back.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_hangup.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_hangup.png
deleted file mode 100644
index 01258fc..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_hangup.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_select.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_select.png
deleted file mode 100644
index 2cb103f..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_select.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_unselect.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_unselect.png
deleted file mode 100644
index e4a4555..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_takephoto_unselect.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_select.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_select.png
deleted file mode 100644
index 8f5af24..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_select.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_unselect.png b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_unselect.png
deleted file mode 100644
index e84d330..0000000
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Resources/ic_esvideo_on_unlock_unselect.png
+++ /dev/null
Binary files differ
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj
index 51e6e85..b7d3bf2 100644
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj
@@ -47,15 +47,6 @@
<ObjcBindingCoreSource Include="Structs.cs" />
</ItemGroup>
<ItemGroup>
- <BundleResource Include="Resources\ic_esvideo_on_answer.png" />
- <BundleResource Include="Resources\ic_esvideo_on_back.png" />
- <BundleResource Include="Resources\ic_esvideo_on_hangup.png" />
- <BundleResource Include="Resources\ic_esvideo_on_takephoto_select.png" />
- <BundleResource Include="Resources\ic_esvideo_on_takephoto_unselect.png" />
- <BundleResource Include="Resources\ic_esvideo_on_unlock_select.png" />
- <BundleResource Include="Resources\ic_esvideo_on_unlock_unselect.png" />
- </ItemGroup>
- <ItemGroup>
<NativeReference Include="Library\bctoolbox.framework">
<Kind>Framework</Kind>
</NativeReference>
@@ -106,7 +97,7 @@
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
- <NativeReference Include="Library\libHDLLinPhoneSDK.a">
+ <NativeReference Include="libHDLLinPhoneSDK.a">
<Kind>Static</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/libHDLLinPhoneSDK.a b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/libHDLLinPhoneSDK.a
new file mode 100644
index 0000000..f54dae7
--- /dev/null
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/libHDLLinPhoneSDK.a
Binary files differ
--
Gitblit v1.8.0