From d2d5878e3e78ec456ba571fd8970eb8403089681 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 22 六月 2020 09:43:26 +0800
Subject: [PATCH] 2020-06-22 1.更新
---
xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
index 6d8b1d5..63df999 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
+++ b/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.
}
@@ -151,7 +152,8 @@
-(void)backAction{
[self.navigationController popViewControllerAnimated:true];
- // [self dismissViewControllerAnimated:YES completion:NULL];
+// [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];
- _calltimeBtn.frame = CGRectMake(0, 0, 100, 30);
+ 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);
}
@@ -662,8 +680,8 @@
[alertController addAction:[UIAlertAction actionWithTitle:okStr style:UIAlertActionStyleCancel handler:nil]];
[self presentViewController:alertController animated:YES completion:nil];
- // UIAlertView *alertView1 = [[UIAlertView alloc] initWithTitle:tipStr message:mes delegate:self cancelButtonTitle:okStr otherButtonTitles:nil, nil];
- // [alertView1 show];
+// UIAlertView *alertView1 = [[UIAlertView alloc] initWithTitle:tipStr message:mes delegate:self cancelButtonTitle:okStr otherButtonTitles:nil, nil];
+// [alertView1 show];
}
--
Gitblit v1.8.0