HDLLinPhoneSDK/HDLLinPhoneSDK.xcodeproj/project.pbxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDLLinPhoneSDK/HDLLinPhoneSDK/HDLLPOnMonitorViewController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDLLinPhoneSDK/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDLLinPhoneSDK(OC)/HDLLinPhoneSDK.xcodeproj/project.pbxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDLLinPhoneSDK(OC)/HDLLinPhoneSDK/HDLLPOnMonitorViewController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
HDLLinPhoneSDK(OC)/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.a | 补丁 | 查看 | 原始文档 | blame | 历史 | |
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Properties/AssemblyInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
HDLLinPhoneSDK/HDLLinPhoneSDK.xcodeproj/project.pbxproj
@@ -698,7 +698,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -750,7 +750,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -770,7 +770,7 @@ "$(PROJECT_DIR)/HDLLinPhoneSDK/apple-darwin/Frameworks", ); GCC_C_LANGUAGE_STANDARD = gnu11; IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; @@ -794,7 +794,7 @@ "$(PROJECT_DIR)/HDLLinPhoneSDK/apple-darwin/Frameworks", ); GCC_C_LANGUAGE_STANDARD = gnu11; IPHONEOS_DEPLOYMENT_TARGET = 10.0; IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = ""; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; HDLLinPhoneSDK/HDLLinPhoneSDK/HDLLPOnMonitorViewController.m
@@ -59,6 +59,10 @@ NSString * LCSdkToken; NSString * LCHostApi; NSString * cancelStr; NSString * tipMsgStr; CGFloat Height66; bool isShowErrorAlert; // int _openDoorTimeout; @@ -114,6 +118,8 @@ unlockStr = @"å¼é"; endOfMonitoringStr = @"çè§ç»æ"; unlockSuccessfullyStr = @"å¼éæå"; cancelStr = @"åæ¶"; tipMsgStr = @"ç¡®å®å¼éå?"; }else{ tipStr = @"Prompt"; @@ -124,6 +130,8 @@ unlockStr = @"Unlock"; endOfMonitoringStr = @"End of monitoring"; unlockSuccessfullyStr = @"Unlock successfully"; cancelStr = @"Cancel"; tipMsgStr = @"Are you sure to unlock?"; } @@ -298,7 +306,26 @@ [_unlockTextBtn setTitleColor:TextColor forState:UIControlStateNormal]; //å¼é if(self.hdlLinphoneCallDelegate != NULL){ [self.hdlLinphoneCallDelegate onUnlockAction]; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:tipStr message:tipMsgStr preferredStyle:UIAlertControllerStyleAlert]; // æ·»å åæ¶æé® UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelStr style:UIAlertActionStyleCancel handler:nil]; [alertController addAction:cancelAction]; // æ·»å 确认æé® WEAKSELF_AT UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:okStr style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [weakSelf_AT.hdlLinphoneCallDelegate onUnlockAction]; }]; [alertController addAction:confirmAction]; // è·åå½åè§å¾æ§å¶å¨ UIViewController *currentViewController = [UIApplication sharedApplication].keyWindow.rootViewController; // æ¾ç¤ºå¼¹çª [currentViewController presentViewController:alertController animated:YES completion:nil]; } } HDLLinPhoneSDK/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m
@@ -50,6 +50,10 @@ NSString * callingStr; NSString * hangUpStr; NSString * endOfCallStr; NSString * cancelStr; NSString * tipMsgStr; // int openDoorTimeout; //å ¨å±åé SystemSoundID sound; @@ -109,6 +113,8 @@ unlockSuccessfullyStr = @"å¼éæå"; callingStr = @"æ¥çµä¸..."; endOfCallStr = @"éè¯ç»æ"; cancelStr = @"åæ¶"; tipMsgStr = @"ç¡®å®å¼éå?"; }else{ tipStr = @"Prompt"; okStr = @"OK"; @@ -120,6 +126,8 @@ unlockSuccessfullyStr = @"Unlock successfully"; callingStr = @"Incoming call"; endOfCallStr = @"End of call"; cancelStr = @"Cancel"; tipMsgStr = @"Are you sure to unlock?"; } } @@ -279,7 +287,26 @@ [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_unlock_unselect"] forState:UIControlStateNormal]; //å¼é if(self.hdlLinphoneCallDelegate != NULL){ [self.hdlLinphoneCallDelegate onUnlockAction]; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:tipStr message:tipMsgStr preferredStyle:UIAlertControllerStyleAlert]; // æ·»å åæ¶æé® UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelStr style:UIAlertActionStyleCancel handler:nil]; [alertController addAction:cancelAction]; // æ·»å 确认æé® WEAKSELF_AT UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:okStr style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [weakSelf_AT.hdlLinphoneCallDelegate onUnlockAction]; }]; [alertController addAction:confirmAction]; // è·åå½åè§å¾æ§å¶å¨ UIViewController *currentViewController = [UIApplication sharedApplication].keyWindow.rootViewController; // æ¾ç¤ºå¼¹çª [currentViewController presentViewController:alertController animated:YES completion:nil]; } } HDLLinPhoneSDK£¨OC£©/HDLLinPhoneSDK.xcodeproj/project.pbxproj
@@ -36,6 +36,7 @@ AEC00E13287403E80009221E /* limetester.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEC00E12287403E80009221E /* limetester.framework */; }; AEC00E15287403F90009221E /* linphonetester.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEC00E14287403F90009221E /* linphonetester.framework */; }; AEF6AC05282B8E9B00C9FD36 /* bctoolbox-ios.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEF6AC04282B8E9B00C9FD36 /* bctoolbox-ios.framework */; }; DB3B5BB12A247868000AD34E /* libHDLLinPhoneSDK.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = AE9CC92F26B8DD3F00FD514C /* libHDLLinPhoneSDK.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -45,6 +46,7 @@ dstPath = "include/$(PRODUCT_NAME)"; dstSubfolderSpec = 16; files = ( DB3B5BB12A247868000AD34E /* libHDLLinPhoneSDK.a in CopyFiles */, AE7718EE26BD250C00C9FD1B /* HDLLinphoneCallDelegate.h in CopyFiles */, AEB4A76626BBF57B005641ED /* HDLLinPhoneSDK.h in CopyFiles */, ); HDLLinPhoneSDK£¨OC£©/HDLLinPhoneSDK/HDLLPOnMonitorViewController.m
@@ -58,6 +58,8 @@ NSString * LCSdkToken; NSString * LCHostApi; NSString * cancelStr; NSString * tipMsgStr; CGFloat Height66; bool isShowErrorAlert; @@ -120,6 +122,8 @@ unlockStr = @"å¼é"; endOfMonitoringStr = @"çè§ç»æ"; unlockSuccessfullyStr = @"å¼éæå"; cancelStr = @"åæ¶"; tipMsgStr = @"ç¡®å®å¼éå?"; }else{ tipStr = @"Prompt"; @@ -130,6 +134,8 @@ unlockStr = @"Unlock"; endOfMonitoringStr = @"End of monitoring"; unlockSuccessfullyStr = @"Unlock successfully"; cancelStr = @"Cancel"; tipMsgStr = @"Are you sure to unlock?"; } @@ -304,7 +310,26 @@ [_unlockTextBtn setTitleColor:TextColor forState:UIControlStateNormal]; //å¼é if(self.hdlLinphoneCallDelegate != NULL){ [self.hdlLinphoneCallDelegate onUnlockAction]; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:tipStr message:tipMsgStr preferredStyle:UIAlertControllerStyleAlert]; // æ·»å åæ¶æé® UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelStr style:UIAlertActionStyleCancel handler:nil]; [alertController addAction:cancelAction]; // æ·»å 确认æé® WEAKSELF_AT UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:okStr style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [weakSelf_AT.hdlLinphoneCallDelegate onUnlockAction]; }]; [alertController addAction:confirmAction]; // è·åå½åè§å¾æ§å¶å¨ UIViewController *currentViewController = [UIApplication sharedApplication].keyWindow.rootViewController; // æ¾ç¤ºå¼¹çª [self presentViewController:alertController animated:YES completion:nil]; } } HDLLinPhoneSDK£¨OC£©/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m
@@ -53,6 +53,11 @@ NSString * callingStr; NSString * hangUpStr; NSString * endOfCallStr; NSString * cancelStr; NSString * tipMsgStr; // int openDoorTimeout; //å ¨å±åé SystemSoundID sound; @@ -121,6 +126,8 @@ unlockSuccessfullyStr = @"å¼éæå"; callingStr = @"æ¥çµä¸..."; endOfCallStr = @"éè¯ç»æ"; cancelStr = @"åæ¶"; tipMsgStr = @"ç¡®å®å¼éå?"; }else{ tipStr = @"Prompt"; okStr = @"OK"; @@ -132,6 +139,8 @@ unlockSuccessfullyStr = @"Unlock successfully"; callingStr = @"Incoming call"; endOfCallStr = @"End of call"; cancelStr = @"Cancel"; tipMsgStr = @"Are you sure to unlock?"; } } @@ -290,7 +299,27 @@ [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_on_unlock_unselect"] forState:UIControlStateNormal]; //å¼é if(self.hdlLinphoneCallDelegate != NULL){ [self.hdlLinphoneCallDelegate onUnlockAction]; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:tipStr message:tipMsgStr preferredStyle:UIAlertControllerStyleAlert]; // æ·»å åæ¶æé® UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelStr style:UIAlertActionStyleCancel handler:nil]; [alertController addAction:cancelAction]; // æ·»å 确认æé® WEAKSELF_AT UIAlertAction *confirmAction = [UIAlertAction actionWithTitle:okStr style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [weakSelf_AT.hdlLinphoneCallDelegate onUnlockAction]; }]; [alertController addAction:confirmAction]; // è·åå½åè§å¾æ§å¶å¨ UIViewController *currentViewController = [UIApplication sharedApplication].keyWindow.rootViewController; // æ¾ç¤ºå¼¹çª [self presentViewController:alertController animated:YES completion:nil]; } } Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/libHDLLinPhoneSDK.aBinary files differ
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.0.1.8")] [assembly: AssemblyVersion("1.23.5.30")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK.csproj
@@ -68,9 +68,6 @@ <NativeReference Include="Library\belr.framework"> <Kind>Framework</Kind> </NativeReference> <NativeReference Include="Library\libHDLLinPhoneSDK.a"> <Kind>Static</Kind> </NativeReference> <NativeReference Include="Library\lime.framework"> <Kind>Framework</Kind> </NativeReference> @@ -109,6 +106,10 @@ <Kind>Framework</Kind> <SmartLink>False</SmartLink> </NativeReference> <NativeReference Include="..\..\..\..\libHDLLinPhoneSDK.a"> <Kind>Static</Kind> <SmartLink>False</SmartLink> </NativeReference> </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.ObjCBinding.CSharp.targets" /> </Project>