JLChen
2020-06-22 d2d5878e3e78ec456ba571fd8970eb8403089681
2020-06-22 1.更新
1个文件已添加
6个文件已修改
80 ■■■■ 已修改文件
ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/Shared.IOS.ESVideoPhoneSDK/Shared.IOS.ESVideoPhoneSDK.sln 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm
@@ -60,7 +60,7 @@
//    _mCallOrAccept.enabled = NO;
//    _monitorBtn.enabled = NO;
//    _uIDTextField.text = @"JJY000016YWECG";//@"JJY000007FSEYX" 默认门口机的ID
       _uIDTextField.text = @"JJY000017XLUXX";//@"JJY000007FSEYX" 默认门口机的ID
       _uIDTextField.text = @"JJY000003UYRBK";//@"JJY000007FSEYX" 默认门口机的ID
//           _uIDTextField.text = @"JJY000016YWECG";//@"JJY000016YWECG" 默认门口机的ID
    
    _uIDTextField.delegate = self;    //⚠️这里必须要检查是否已经授权否则会失败,初始化视频音频采集
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m
@@ -164,7 +164,7 @@
- (void)initCentetView {
    [self.view addSubview:self.centerView];
    [self.centerView addSubview:self.collectButton];
    //    [self.centerView addSubview:self.collectButton];
    [self.centerView addSubview:self.homeView];
    [self.centerView addSubview:self.screenshotImgBtn];
    [self.centerView addSubview:self.screenshotTextBtn];
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m
@@ -80,6 +80,7 @@
    NSString * refuseStr;
    NSString * answerStr;
    NSString * unlockSuccessfullyStr;
    NSString * callingStr;
    //    int openDoorTimeout;
    //全局变量
    SystemSoundID sound;
@@ -92,10 +93,11 @@
    [self initTopBarView];
    [self initCentetView];
    [self initData];
    [self setAnswerBtnEnable:NO];
    //    [self setAnswerBtnEnable:NO];
    [self initESVideo];
    //开始反呼
    [self StartReverseCall];
    [self ShowCalltimeBtn:callingStr];
    // Do any additional setup after loading the view.
}
@@ -112,6 +114,7 @@
        refuseStr = @"拒绝";
        answerStr = @"接听";
        unlockSuccessfullyStr = @"开锁成功";
        callingStr = @"来电中...";
    }else{
        tipStr = @"Prompt";
        okStr = @"OK";
@@ -120,6 +123,8 @@
        refuseStr = @"Refuse";
        answerStr = @"Answer";
        unlockSuccessfullyStr = @"Unlock successfully";
        callingStr = @"Incoming call";
    }
}
@@ -173,7 +178,7 @@
- (void)initCentetView {
    [self.view addSubview:self.centerView];
    [self.centerView addSubview:self.collectButton];
    //    [self.centerView addSubview:self.collectButton];
    [self.centerView addSubview:self.homeView];
    [self.centerView addSubview:self.unlockView];
    [self.unlockView addSubview:self.screenshotImgBtn];
@@ -425,18 +430,34 @@
    return _calltimeBtn;
}
-(void)ShowTime:(int)nowTime {
    if(_calltimeBtn.hidden) _calltimeBtn.hidden = NO;
    NSString *timeStr = [self timeFormatted:nowTime];
    [self setCalltimeButtonText:timeStr];
    [self setCalltimeButtonText:timeStr isTime:YES];
}
-(void)ShowCalltimeBtn:(NSString*) mesStr  {
    if(_calltimeBtn.hidden) _calltimeBtn.hidden = NO;
    [self setCalltimeButtonText:mesStr isTime:NO];
}
/*
 根据文字调整按钮宽
 */
-(void)setCalltimeButtonText:(NSString*) mesStr {
-(void)setCalltimeButtonText:(NSString*) mesStr isTime:(BOOL)isTime
{
    [_calltimeBtn setTitle:mesStr forState:UIControlStateNormal];
    _calltimeBtn.frame = CGRectMake(0, 0, 100, 30);
    if(isTime){
        _calltimeBtn.frame = CGRectMake(0, 0, 80, 30);
    }else{
        _calltimeBtn.frame = CGRectMake(0, 0, 115, 30);
    }
    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);
}
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/OpenViewController.m
@@ -40,7 +40,9 @@
    [self.view addSubview:self.monitorBtn];
    [self.view addSubview:self.calledBtn];
    
    DEVICEID = @"JJY000017XLUXX";
    //    DEVICEID = @"JJY000017XLUXX";
    DEVICEID = @"JJY000003UYRBK";
//     DEVICEID = @"JJY000016YWECG";
    
}
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
@@ -92,10 +92,11 @@
    [self initTopBarView];
    [self initCentetView];
    [self initData];
    [self setAnswerBtnEnable:NO];
//    [self setAnswerBtnEnable:NO];
    [self initESVideo];
    //开始反呼
    [self StartReverseCall];
    [self ShowCalltimeBtn:@"室外机来电中..."];
    // Do any additional setup after loading the view.
}
@@ -152,6 +153,7 @@
-(void)backAction{
    [self.navigationController popViewControllerAnimated:true];
    //    [self dismissViewControllerAnimated:YES completion:NULL];
}
- (UIButton *)moreButton{
@@ -424,18 +426,34 @@
    return _calltimeBtn;
}
-(void)ShowTime:(int)nowTime {
    if(_calltimeBtn.hidden) _calltimeBtn.hidden = NO;
    NSString *timeStr = [self timeFormatted:nowTime];
    [self setCalltimeButtonText:timeStr];
    [self setCalltimeButtonText:timeStr isTime:YES];
}
-(void)ShowCalltimeBtn:(NSString*) mesStr  {
    if(_calltimeBtn.hidden) _calltimeBtn.hidden = NO;
    [self setCalltimeButtonText:mesStr isTime:NO];
}
/*
 根据文字调整按钮宽
 */
-(void)setCalltimeButtonText:(NSString*) mesStr {
-(void)setCalltimeButtonText:(NSString*) mesStr isTime:(BOOL)isTime
{
    [_calltimeBtn setTitle:mesStr forState:UIControlStateNormal];
    if(isTime){
    _calltimeBtn.frame = CGRectMake(0, 0, 100, 30);
    }else{
        _calltimeBtn.frame = CGRectMake(0, 0, 150, 30);
    }
    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);
}
xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a
Binary files differ
xamarin/Shared.IOS.ESVideoPhoneSDK/Shared.IOS.ESVideoPhoneSDK.sln
New file
@@ -0,0 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.IOS.ESVideoPhoneSDK", "Shared.IOS.ESVideoPhoneSDK.csproj", "{7953874A-23FD-4619-9F31-D8AE312DAC3C}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU
        Release|Any CPU = Release|Any CPU
    EndGlobalSection
    GlobalSection(ProjectConfigurationPlatforms) = postSolution
        {7953874A-23FD-4619-9F31-D8AE312DAC3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
        {7953874A-23FD-4619-9F31-D8AE312DAC3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
        {7953874A-23FD-4619-9F31-D8AE312DAC3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
        {7953874A-23FD-4619-9F31-D8AE312DAC3C}.Release|Any CPU.Build.0 = Release|Any CPU
    EndGlobalSection
EndGlobal