V5.0.0正式版:
1、加热棒内容修改; 2、首页商品删除,更改为行业资讯; 3、绚多设备更名显示; 4、bugly更换为新版本; 5、摄像头显示bug修复; 6、开屏广告显示不全修复;
This commit is contained in:
+9
-7
@@ -294,18 +294,20 @@ Strong UIImage *screenShotImage;//截图
|
||||
_isconnecting = YES;//正在连接中
|
||||
[[GWP2PClient sharedClient] getMultipleDeviceStatusWithDeviceID:self.contact.cameraId password:self.contact.cameraPass completionBlock:^(GWP2PClient *client, BOOL success, NSDictionary<NSString *,id> *dataDictionary) {
|
||||
_isconnecting = NO;
|
||||
//获取成功,打印设备信息,之后连接设备
|
||||
//获取设备信息,无论是否成功,都直接连接摄像头add V5.0.0
|
||||
if (success) {
|
||||
_isConnectCamera = YES;
|
||||
[self monitorP2PCall];
|
||||
NSLog(@"当前连接设备信息:%@",dataDictionary);
|
||||
}else{
|
||||
_isConnectCamera = NO;
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
[self.view makeToast:@"连接设备失败"];
|
||||
[self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:NO];
|
||||
});
|
||||
return;
|
||||
_isConnectCamera = YES;
|
||||
[self monitorP2PCall];
|
||||
// _isConnectCamera = NO;
|
||||
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
// [self.view makeToast:@"连接设备失败"];
|
||||
// [self hiddenMonitoringUI:NO callWithErrorType:100 isReCall:NO];
|
||||
// });
|
||||
// return;
|
||||
}
|
||||
}];
|
||||
}else{
|
||||
|
||||
@@ -60,6 +60,9 @@
|
||||
#define kSizeFrom750(x) ((x) * ([UIScreen mainScreen].bounds.size.width/750.f))
|
||||
|
||||
#define SYSTEMSIZE(x) [UIFont systemFontOfSize:kSizeFrom750(x)]
|
||||
|
||||
#define FontSize(x) [UIFont systemFontOfSize:x]
|
||||
|
||||
//设置图片
|
||||
#define IMAGEBYENAME(name) [UIImage imageNamed:name]
|
||||
//alloc
|
||||
|
||||
Reference in New Issue
Block a user