丰林可视对讲SDKDemo
parent: fac61655 | 补丁 | 提交 | show whitespace
JLChen
2020-07-10 ea7dfe09eaed6edbebca1d2d89a135fc0c81695e 
2020-07-10 1.修改UI布局。
11个文件已修改
148 ■■■■■ 已修改文件
ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo.xcodeproj/project.pbxproj 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo.xcodeproj/project.pbxproj 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideo.m 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideo.m 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/GDHDLUtlis.h 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a 补丁 | 查看 | 原始文档 | blame | 历史 
 ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo.xcodeproj/project.pbxproj


@@ -414,7 +414,7 @@


                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;


                GCC_WARN_UNUSED_FUNCTION = YES;


                GCC_WARN_UNUSED_VARIABLE = YES;


                IPHONEOS_DEPLOYMENT_TARGET = 13.0;


                IPHONEOS_DEPLOYMENT_TARGET = 10.0;


                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;


                MTL_FAST_MATH = YES;


                ONLY_ACTIVE_ARCH = YES;


@@ -469,7 +469,7 @@


                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;


                GCC_WARN_UNUSED_FUNCTION = YES;


                GCC_WARN_UNUSED_VARIABLE = YES;


                IPHONEOS_DEPLOYMENT_TARGET = 13.0;


                IPHONEOS_DEPLOYMENT_TARGET = 10.0;


                MTL_ENABLE_DEBUG_INFO = NO;


                MTL_FAST_MATH = YES;


                OTHER_LDFLAGS = "-Wl,-all_load";




 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo.xcodeproj/project.pbxproj


@@ -450,7 +450,7 @@


                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;


                GCC_WARN_UNUSED_FUNCTION = YES;


                GCC_WARN_UNUSED_VARIABLE = YES;


                IPHONEOS_DEPLOYMENT_TARGET = 12.0;


                IPHONEOS_DEPLOYMENT_TARGET = 10.0;


                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;


                MTL_FAST_MATH = YES;


                ONLY_ACTIVE_ARCH = YES;


@@ -505,7 +505,7 @@


                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;


                GCC_WARN_UNUSED_FUNCTION = YES;


                GCC_WARN_UNUSED_VARIABLE = YES;


                IPHONEOS_DEPLOYMENT_TARGET = 12.0;


                IPHONEOS_DEPLOYMENT_TARGET = 10.0;


                MTL_ENABLE_DEBUG_INFO = NO;


                MTL_FAST_MATH = YES;


                OTHER_LDFLAGS = "-Wl,-all_load";




 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideo.m


@@ -7,7 +7,7 @@


//




#import "ESVideo.h"




#import "GDHDLUtlis.h"




#define WEAKSELF_AT __weak __typeof(&*self)weakSelf_AT = self;


@interface ESVideo()


@@ -57,7 +57,7 @@


        }


    };


    //门口机会有视频的长宽高，是固定的（暂时还不确定）


    _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame: CGRectMake(0, 57, [[UIScreen mainScreen] bounds].size.width, 211) delegate:nil imagecallBack:mSnapImageCallback];


    _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame: CGRectMake(0, GetRealHeight(57), [[UIScreen mainScreen] bounds].size.width, GetRealHeight(211)) delegate:nil imagecallBack:mSnapImageCallback];


    


    


    return self;




 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m


@@ -179,7 +179,7 @@


        _centerView.backgroundColor = UIColor.whiteColor;


        [self setRadiusWithView:_centerView];


        


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, 20, APP_SCREEN_WIDTH-160, 24)];


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, GetRealHeight(20), APP_SCREEN_WIDTH-160, GetRealHeight(24))];


        _topUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:15.0];


        _topUILabel.textColor = HEXCOLORA(0x333333, 1.0);


        //        _topUILabel.text = @"二次确认机";


@@ -230,9 +230,9 @@




- (UIView *)homeView{


    if (_homeView == nil) {


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, 268, APP_SCREEN_WIDTH, 36)];


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(268), APP_SCREEN_WIDTH, GetRealHeight(36))];


        _homeView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(20, 4, 28, 28)];


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(GetRealWidth(20), GetRealHeight(4), GetRealHeight(28), GetRealHeight(28))];


        mUIImageView.image = [UIImage imageNamed:@"ic_esvideo_home"];


        [mUIImageView setContentMode:UIViewContentModeScaleAspectFit];


        [_homeView addSubview:mUIImageView];


@@ -244,7 +244,7 @@




- (UILabel *)homeUILabel{


    if (_homeUILabel == nil) {


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(52, 8, APP_SCREEN_WIDTH - 100, 20)];


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(GetRealWidth(52), 0, APP_SCREEN_WIDTH - GetRealWidth(100), _homeView.frame.size.height)];


        _homeUILabel.font = [UIFont fontWithName:APP_UIFont size:12.0];


        _homeUILabel.textColor = [UIColor whiteColor];


        //        _homeUILabel.text = @"1栋203";


@@ -256,7 +256,7 @@




- (UIButton *)screenshotImgBtn{


    if (_screenshotImgBtn == nil) {


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(80, 404, 58, 58)];


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(80), GetRealHeight(404), GetRealHeight(58), GetRealHeight(58))];


        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_unselect"] forState:UIControlStateNormal];


        //        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_select"] forState:UIControlStateSelected];


        [_screenshotImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -285,7 +285,7 @@




- (UIButton *)screenshotTextBtn{


    if (_screenshotTextBtn == nil) {


        _screenshotTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(59, 470, 100, 21)];


        _screenshotTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, GetRealHeight(470), GetRealWidth(100), GetRealHeight(21))];


        [_screenshotTextBtn setTitle:@"截图" forState:UIControlStateNormal];


        _screenshotTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        _screenshotTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


@@ -294,13 +294,14 @@


        [_screenshotTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside];


        [_screenshotTextBtn addTarget:self action:@selector(screenshotDownAction) forControlEvents:UIControlEventTouchDown];


        _screenshotTextBtn.adjustsImageWhenHighlighted = NO;


        _screenshotTextBtn.center = CGPointMake(_screenshotImgBtn.center.x, GetRealHeight(484));


    }


    return _screenshotTextBtn;


}




- (UIButton *)unlockImgBtn{


    if (_unlockImgBtn == nil) {


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_SCREEN_WIDTH-138, 404, 58, 58)];


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_SCREEN_WIDTH-GetRealWidth(80)- GetRealHeight(58), GetRealHeight(404),  GetRealHeight(58),  GetRealHeight(58))];


        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_unselect"] forState:UIControlStateNormal];


        //        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_select"] forState:UIControlStateSelected];


        [_unlockImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -328,7 +329,7 @@




- (UIButton *)unlockTextBtn{


    if (_unlockTextBtn == nil) {


        _unlockTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(216, 470, 100, 21)];


        _unlockTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(216, GetRealHeight(470), GetRealWidth(100), GetRealHeight(21))];


        [_unlockTextBtn setTitle:@"开锁" forState:UIControlStateNormal];


        _unlockTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        _unlockTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


@@ -338,6 +339,8 @@


        //        [_unlockTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_unlockTextBtn addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside];


        [_unlockTextBtn addTarget:self action:@selector(unlockDownAction) forControlEvents:UIControlEventTouchDown];


        _unlockTextBtn.adjustsImageWhenHighlighted = NO;


        _unlockTextBtn.center = CGPointMake(_unlockImgBtn.center.x, GetRealHeight(484));


    }


    return _unlockTextBtn;


}




 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m


@@ -199,7 +199,7 @@


        _centerView.backgroundColor = UIColor.whiteColor;


        [self setRadiusWithView:_centerView];


        


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, 20, APP_SCREEN_WIDTH-160, 24)];


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, GetRealHeight(20), APP_SCREEN_WIDTH-160, GetRealHeight(24))];


        _topUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:15.0];


        _topUILabel.textColor = HEXCOLORA(0x333333, 1.0);


        _topUILabel.text = @"二次确认机";


@@ -248,9 +248,9 @@




- (UIView *)homeView{


    if (_homeView == nil) {


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, 268, APP_SCREEN_WIDTH, 36)];


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(268), APP_SCREEN_WIDTH, GetRealHeight(36))];


        _homeView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(20, 4, 28, 28)];


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(GetRealWidth(20), GetRealHeight(4), GetRealHeight(28), GetRealHeight(28))];


        mUIImageView.image = [UIImage imageNamed:@"ic_esvideo_home"];


        [mUIImageView setContentMode:UIViewContentModeScaleAspectFit];


        [_homeView addSubview:mUIImageView];


@@ -261,7 +261,7 @@




- (UILabel *)homeUILabel{


    if (_homeUILabel == nil) {


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(52, 8, APP_SCREEN_WIDTH - 100, 20)];


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(GetRealWidth(52), 0, APP_SCREEN_WIDTH - GetRealWidth(100), _homeView.frame.size.height)];


        _homeUILabel.font = [UIFont fontWithName:APP_UIFont size:12.0];


        _homeUILabel.textColor = [UIColor whiteColor];


        _homeUILabel.text = @"1栋203";


@@ -272,7 +272,7 @@




- (UIView *)unlockView{


    if (_unlockView == nil) {


        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, 304, APP_SCREEN_WIDTH, 48)];


        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(304), APP_SCREEN_WIDTH, GetRealHeight(48))];


        _unlockView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        _unlockView.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0].CGColor;


        _unlockView.layer.shadowColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0 alpha:0.4].CGColor;


@@ -285,7 +285,7 @@




- (UIButton *)screenshotImgBtn{


    if (_screenshotImgBtn == nil) {


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(65, 6, 36, 36)];


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(65), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];


        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_unselect"] forState:UIControlStateNormal];


        //        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_select"] forState:UIControlStateSelected];


        [_screenshotImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -310,7 +310,7 @@




- (UIButton *)unlockImgBtn{


    if (_unlockImgBtn == nil) {


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(274, 6, 36, 36)];


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(65)-GetRealHeight(36), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];


        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_unselect"] forState:UIControlStateNormal];


        //        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_select"] forState:UIControlStateSelected];


        [_unlockImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -338,7 +338,7 @@


#pragma 挂断和开锁


- (UIButton *)hangUpImgBtn{


    if (_hangUpImgBtn == nil) {


        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(54, 448, 58, 58)];


        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(54), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];


        [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateNormal];


        //        [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateSelected];


        [_hangUpImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -354,20 +354,22 @@




- (UIButton *)hangUpTextBtn{


    if (_hangUpTextBtn == nil) {


        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, 100, 21)];


        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, GetRealWidth(100), GetRealHeight(21))];


        [_hangUpTextBtn setTitle:@"拒绝" forState:UIControlStateNormal];


        _hangUpTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        _hangUpTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        [_hangUpTextBtn setTitleColor:TextColor forState:UIControlStateNormal];


        [_hangUpTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_hangUpTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside];


        _hangUpTextBtn.center = CGPointMake(_hangUpImgBtn.center.x, GetRealHeight(525));


        


    }


    return _hangUpTextBtn;


}




- (UIButton *)answerImgBtn{


    if (_answerImgBtn == nil) {


        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(263, 448, 58, 58)];


        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(54)-GetRealHeight(58), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];


        [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateNormal];


        //        [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateSelected];


        [_answerImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -389,8 +391,11 @@


    _answerTextBtn.hidden = YES;


    


    //挂断按钮移动中间


    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);


    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);


    //    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);


    //    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);


    _hangUpImgBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpImgBtn.center.y);


    _hangUpTextBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpTextBtn.center.y);


    


    [_hangUpTextBtn setTitle:hangUpStr forState:UIControlStateNormal];


    //开始计时


    _callTimeout = 0;


@@ -405,7 +410,7 @@




- (UIButton *)answerTextBtn{


    if (_answerTextBtn == nil) {


        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, 100, 21)];


        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, GetRealWidth(100), GetRealHeight(21))];


        [_answerTextBtn setTitle:@"接听" forState:UIControlStateNormal];


        _answerTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        _answerTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


@@ -414,21 +419,22 @@


        [_answerTextBtn setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];


        [_answerTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_answerTextBtn addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside];


        _answerTextBtn.center = CGPointMake(_answerImgBtn.center.x, GetRealHeight(525));


    }


    return _answerTextBtn;


}




- (UIButton *)calltimeBtn{


    if (_calltimeBtn == nil) {


        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 382, 100, 30)];


        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, GetRealHeight(382), GetRealWidth(100), GetRealHeight(30))];


        _calltimeBtn.backgroundColor = HEXCOLORA(0x000000, 0.4);


        [_calltimeBtn setTitle:@"00:00" forState:UIControlStateNormal];


        _calltimeBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];


        _calltimeBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        [_calltimeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];


        _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);


        _calltimeBtn.hidden = YES;


        _calltimeBtn.layer.cornerRadius = 15;


        _calltimeBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, GetRealHeight(397));


    }


    return _calltimeBtn;


}


@@ -457,11 +463,11 @@


{


    [_calltimeBtn setTitle:mesStr forState:UIControlStateNormal];


    if(isTime){


        _calltimeBtn.frame = CGRectMake(0, 0, 80, 30);


        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(80), GetRealHeight(30));


    }else{


        _calltimeBtn.frame = CGRectMake(0, 0, 115, 30);


        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(115), GetRealHeight(30));


    }


    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);


    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, GetRealHeight(397));


}








 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/GDHDLUtlis.h


@@ -40,6 +40,11 @@


#define APP_UIFont_BOLD       @"PingFangSC-Semibold"






#define DesignWidth 375


#define DesignHeight 667


#define GetRealWidth(W)  W / (DesignWidth * 1.0f / APP_SCREEN_WIDTH)


#define GetRealHeight(H)  H / (DesignHeight * 1.0f / APP_SCREEN_HEIGHT)






#define TextColor    HEXCOLORA(0x333333, 1.0)


#define TextSelectColor    HEXCOLORA(0xFB744A, 1.0)




 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideo.m


@@ -7,7 +7,7 @@


//




#import "ESVideo.h"




#import "GDHDLUtlis.h"




#define WEAKSELF_AT __weak __typeof(&*self)weakSelf_AT = self;


@interface ESVideo()


@@ -57,7 +57,7 @@


        }


    };


    //门口机会有视频的长宽高，是固定的（暂时还不确定）


    _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame: CGRectMake(0, 57, [[UIScreen mainScreen] bounds].size.width, 211) delegate:nil imagecallBack:mSnapImageCallback];


    _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame: CGRectMake(0, GetRealHeight(57), [[UIScreen mainScreen] bounds].size.width, GetRealHeight(211)) delegate:nil imagecallBack:mSnapImageCallback];


    


    


    return self;




 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m


@@ -179,7 +179,7 @@


        _centerView.backgroundColor = UIColor.whiteColor;


        [self setRadiusWithView:_centerView];


        


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, 20, APP_SCREEN_WIDTH-160, 24)];


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, GetRealHeight(20), APP_SCREEN_WIDTH-160, GetRealHeight(24))];


        _topUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:15.0];


        _topUILabel.textColor = HEXCOLORA(0x333333, 1.0);


        //        _topUILabel.text = @"二次确认机";


@@ -230,9 +230,9 @@




- (UIView *)homeView{


    if (_homeView == nil) {


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, 268, APP_SCREEN_WIDTH, 36)];


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(268), APP_SCREEN_WIDTH, GetRealHeight(36))];


        _homeView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(20, 4, 28, 28)];


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(GetRealWidth(20), GetRealHeight(4), GetRealHeight(28), GetRealHeight(28))];


        mUIImageView.image = [UIImage imageNamed:@"ic_esvideo_home"];


        [mUIImageView setContentMode:UIViewContentModeScaleAspectFit];


        [_homeView addSubview:mUIImageView];


@@ -244,7 +244,7 @@




- (UILabel *)homeUILabel{


    if (_homeUILabel == nil) {


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(52, 8, APP_SCREEN_WIDTH - 100, 20)];


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(GetRealWidth(52), 0, APP_SCREEN_WIDTH - GetRealWidth(100), _homeView.frame.size.height)];


        _homeUILabel.font = [UIFont fontWithName:APP_UIFont size:12.0];


        _homeUILabel.textColor = [UIColor whiteColor];


        //        _homeUILabel.text = @"1栋203";


@@ -256,7 +256,7 @@




- (UIButton *)screenshotImgBtn{


    if (_screenshotImgBtn == nil) {


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(80, 404, 58, 58)];


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(80), GetRealHeight(404), GetRealHeight(58), GetRealHeight(58))];


        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_unselect"] forState:UIControlStateNormal];


        //        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_select"] forState:UIControlStateSelected];


        [_screenshotImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -285,7 +285,7 @@




- (UIButton *)screenshotTextBtn{


    if (_screenshotTextBtn == nil) {


        _screenshotTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(59, 470, 100, 21)];


        _screenshotTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, GetRealHeight(470), GetRealWidth(100), GetRealHeight(21))];


        [_screenshotTextBtn setTitle:@"截图" forState:UIControlStateNormal];


        _screenshotTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        _screenshotTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


@@ -294,13 +294,14 @@


        [_screenshotTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside];


        [_screenshotTextBtn addTarget:self action:@selector(screenshotDownAction) forControlEvents:UIControlEventTouchDown];


        _screenshotTextBtn.adjustsImageWhenHighlighted = NO;


        _screenshotTextBtn.center = CGPointMake(_screenshotImgBtn.center.x, GetRealHeight(484));


    }


    return _screenshotTextBtn;


}




- (UIButton *)unlockImgBtn{


    if (_unlockImgBtn == nil) {


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_SCREEN_WIDTH-138, 404, 58, 58)];


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_SCREEN_WIDTH-GetRealWidth(80)- GetRealHeight(58), GetRealHeight(404),  GetRealHeight(58),  GetRealHeight(58))];


        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_unselect"] forState:UIControlStateNormal];


        //        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_select"] forState:UIControlStateSelected];


        [_unlockImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -328,7 +329,7 @@




- (UIButton *)unlockTextBtn{


    if (_unlockTextBtn == nil) {


        _unlockTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(216, 470, 100, 21)];


        _unlockTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(216, GetRealHeight(470), GetRealWidth(100), GetRealHeight(21))];


        [_unlockTextBtn setTitle:@"开锁" forState:UIControlStateNormal];


        _unlockTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        _unlockTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


@@ -338,6 +339,8 @@


        //        [_unlockTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_unlockTextBtn addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside];


        [_unlockTextBtn addTarget:self action:@selector(unlockDownAction) forControlEvents:UIControlEventTouchDown];


        _unlockTextBtn.adjustsImageWhenHighlighted = NO;


        _unlockTextBtn.center = CGPointMake(_unlockImgBtn.center.x, GetRealHeight(484));


    }


    return _unlockTextBtn;


}




 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m


@@ -199,7 +199,7 @@


        _centerView.backgroundColor = UIColor.whiteColor;


        [self setRadiusWithView:_centerView];


        


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, 20, APP_SCREEN_WIDTH-160, 24)];


        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, GetRealHeight(20), APP_SCREEN_WIDTH-160, GetRealHeight(24))];


        _topUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:15.0];


        _topUILabel.textColor = HEXCOLORA(0x333333, 1.0);


        _topUILabel.text = @"二次确认机";


@@ -248,9 +248,9 @@




- (UIView *)homeView{


    if (_homeView == nil) {


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, 268, APP_SCREEN_WIDTH, 36)];


        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(268), APP_SCREEN_WIDTH, GetRealHeight(36))];


        _homeView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(20, 4, 28, 28)];


        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(GetRealWidth(20), GetRealHeight(4), GetRealHeight(28), GetRealHeight(28))];


        mUIImageView.image = [UIImage imageNamed:@"ic_esvideo_home"];


        [mUIImageView setContentMode:UIViewContentModeScaleAspectFit];


        [_homeView addSubview:mUIImageView];


@@ -261,7 +261,7 @@




- (UILabel *)homeUILabel{


    if (_homeUILabel == nil) {


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(52, 8, APP_SCREEN_WIDTH - 100, 20)];


        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(GetRealWidth(52), 0, APP_SCREEN_WIDTH - GetRealWidth(100), _homeView.frame.size.height)];


        _homeUILabel.font = [UIFont fontWithName:APP_UIFont size:12.0];


        _homeUILabel.textColor = [UIColor whiteColor];


        _homeUILabel.text = @"1栋203";


@@ -272,7 +272,7 @@




- (UIView *)unlockView{


    if (_unlockView == nil) {


        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, 304, APP_SCREEN_WIDTH, 48)];


        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(304), APP_SCREEN_WIDTH, GetRealHeight(48))];


        _unlockView.backgroundColor = HEXCOLORA(0x232323, 1.0);


        _unlockView.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0].CGColor;


        _unlockView.layer.shadowColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0 alpha:0.4].CGColor;


@@ -285,7 +285,7 @@




- (UIButton *)screenshotImgBtn{


    if (_screenshotImgBtn == nil) {


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(65, 6, 36, 36)];


        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(65), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];


        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_unselect"] forState:UIControlStateNormal];


        //        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_select"] forState:UIControlStateSelected];


        [_screenshotImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -310,7 +310,7 @@




- (UIButton *)unlockImgBtn{


    if (_unlockImgBtn == nil) {


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(274, 6, 36, 36)];


        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(65)-GetRealHeight(36), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];


        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_unselect"] forState:UIControlStateNormal];


        //        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_select"] forState:UIControlStateSelected];


        [_unlockImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -338,7 +338,7 @@


#pragma 挂断和开锁


- (UIButton *)hangUpImgBtn{


    if (_hangUpImgBtn == nil) {


        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(54, 448, 58, 58)];


        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(54), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];


        [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateNormal];


        //        [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateSelected];


        [_hangUpImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -354,20 +354,22 @@




- (UIButton *)hangUpTextBtn{


    if (_hangUpTextBtn == nil) {


        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, 100, 21)];


        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, GetRealWidth(100), GetRealHeight(21))];


        [_hangUpTextBtn setTitle:@"拒绝" forState:UIControlStateNormal];


        _hangUpTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        _hangUpTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        [_hangUpTextBtn setTitleColor:TextColor forState:UIControlStateNormal];


        [_hangUpTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_hangUpTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside];


        _hangUpTextBtn.center = CGPointMake(_hangUpImgBtn.center.x, GetRealHeight(525));


        


    }


    return _hangUpTextBtn;


}




- (UIButton *)answerImgBtn{


    if (_answerImgBtn == nil) {


        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(263, 448, 58, 58)];


        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(54)-GetRealHeight(58), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];


        [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateNormal];


        //        [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateSelected];


        [_answerImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];


@@ -389,8 +391,11 @@


    _answerTextBtn.hidden = YES;


    


    //挂断按钮移动中间


    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);


    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);


    //    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);


    //    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);


    _hangUpImgBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpImgBtn.center.y);


    _hangUpTextBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpTextBtn.center.y);


    


    [_hangUpTextBtn setTitle:hangUpStr forState:UIControlStateNormal];


    //开始计时


    _callTimeout = 0;


@@ -405,7 +410,7 @@




- (UIButton *)answerTextBtn{


    if (_answerTextBtn == nil) {


        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, 100, 21)];


        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, GetRealWidth(100), GetRealHeight(21))];


        [_answerTextBtn setTitle:@"接听" forState:UIControlStateNormal];


        _answerTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];


        _answerTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


@@ -414,21 +419,22 @@


        [_answerTextBtn setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];


        [_answerTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];


        [_answerTextBtn addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside];


        _answerTextBtn.center = CGPointMake(_answerImgBtn.center.x, GetRealHeight(525));


    }


    return _answerTextBtn;


}




- (UIButton *)calltimeBtn{


    if (_calltimeBtn == nil) {


        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 382, 100, 30)];


        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, GetRealHeight(382), GetRealWidth(100), GetRealHeight(30))];


        _calltimeBtn.backgroundColor = HEXCOLORA(0x000000, 0.4);


        [_calltimeBtn setTitle:@"00:00" forState:UIControlStateNormal];


        _calltimeBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];


        _calltimeBtn.titleLabel.textAlignment = NSTextAlignmentCenter;


        [_calltimeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];


        _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);


        _calltimeBtn.hidden = YES;


        _calltimeBtn.layer.cornerRadius = 15;


        _calltimeBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, GetRealHeight(397));


    }


    return _calltimeBtn;


}


@@ -457,11 +463,11 @@


{


    [_calltimeBtn setTitle:mesStr forState:UIControlStateNormal];


    if(isTime){


        _calltimeBtn.frame = CGRectMake(0, 0, 80, 30);


        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(80), GetRealHeight(30));


    }else{


        _calltimeBtn.frame = CGRectMake(0, 0, 115, 30);


        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(115), GetRealHeight(30));


    }


    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);


    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, GetRealHeight(397));


}








 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/GDHDLUtlis.h


@@ -40,6 +40,11 @@


#define APP_UIFont_BOLD       @"PingFangSC-Semibold"






#define DesignWidth 375


#define DesignHeight 667


#define GetRealWidth(W)  W / (DesignWidth * 1.0f / APP_SCREEN_WIDTH)


#define GetRealHeight(H)  H / (DesignHeight * 1.0f / APP_SCREEN_HEIGHT)






#define TextColor    HEXCOLORA(0x333333, 1.0)


#define TextSelectColor    HEXCOLORA(0xFB744A, 1.0)




 xamarin/Shared.IOS.ESVideoPhoneSDK/Library/libESVideoPhoneSDKXamarin.a

Binary files differ