iOS Team / CNLiveQrCodeModule · Commits

Commit 5e5e5748eea7a03e5b7b8a679d917f9ef628d27b

Authored by zhangxiaowen
1 parent 9f0398bd

no message

Inline Side-by-side
Showing 1 changed file with 5 additions and 4 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.m
  View file @5e5e574
@@ -151,10 +151,9 @@ static const CGFloat timeValue = 1.5; @@ -151,10 +151,9 @@ static const CGFloat timeValue = 1.5;
151 151
152 [obtain establishQRCodeObtainScanWithController:self configure:configure]; 152 [obtain establishQRCodeObtainScanWithController:self configure:configure];
153 [obtain startRunningWithBefore:^{ 153 [obtain startRunningWithBefore:^{
154 - [QMUITips showInfo:@"正在加载..."];  
155 154
156 } completion:^{ 155 } completion:^{
157 - [QMUITips hideAllTips]; 156 +
158 }]; 157 }];
159 [obtain setBlockWithQRCodeObtainScanResult:^(SGQRCodeObtain *obtain, NSString *result) { 158 [obtain setBlockWithQRCodeObtainScanResult:^(SGQRCodeObtain *obtain, NSString *result) {
160 __strong typeof(weakSelf) strongSelf = weakSelf; 159 __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -303,8 +302,10 @@ static const CGFloat timeValue = 1.5; @@ -303,8 +302,10 @@ static const CGFloat timeValue = 1.5;
303 [_flashlightBtn setImage:image1 forState:UIControlStateNormal]; 302 [_flashlightBtn setImage:image1 forState:UIControlStateNormal];
304 [_flashlightBtn setImage:image2 forState:UIControlStateSelected]; 303 [_flashlightBtn setImage:image2 forState:UIControlStateSelected];
305 [_flashlightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; 304 [_flashlightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
306 - [_flashlightBtn setTitleColor:[UIColor greenColor] forState:UIControlStateSelected]; 305 + [_flashlightBtn setTitleColor:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateHighlighted];
  306 + [_flashlightBtn setTitleColor:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateSelected];
307 [_flashlightBtn setTitle:@"轻触点亮" forState:UIControlStateNormal]; 307 [_flashlightBtn setTitle:@"轻触点亮" forState:UIControlStateNormal];
  308 + [_flashlightBtn setTitle:@"轻触关闭" forState:UIControlStateHighlighted];
308 [_flashlightBtn setTitle:@"轻触关闭" forState:UIControlStateSelected]; 309 [_flashlightBtn setTitle:@"轻触关闭" forState:UIControlStateSelected];
309 _flashlightBtn.titleLabel.font = [UIFont systemFontOfSize:13]; 310 _flashlightBtn.titleLabel.font = [UIFont systemFontOfSize:13];
310 [_flashlightBtn addTarget:self action:@selector(flashlightButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside]; 311 [_flashlightBtn addTarget:self action:@selector(flashlightButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -343,7 +344,7 @@ static const CGFloat timeValue = 1.5; @@ -343,7 +344,7 @@ static const CGFloat timeValue = 1.5;
343 [_codeButton setImage:image forState:UIControlStateNormal]; 344 [_codeButton setImage:image forState:UIControlStateNormal];
344 [_codeButton setTitle:@"我的二维码" forState:UIControlStateNormal]; 345 [_codeButton setTitle:@"我的二维码" forState:UIControlStateNormal];
345 _codeButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:15.0f]; 346 _codeButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:15.0f];
346 - [_codeButton setTitleColor:[UIColor colorWithRed:26/255.0 green:161/255.0 blue:45/255.0 alpha:1.0] forState:UIControlStateNormal]; 347 + [_codeButton setTitleColor:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] forState:UIControlStateNormal];
347 [_codeButton addTarget:self action:@selector(codeButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside]; 348 [_codeButton addTarget:self action:@selector(codeButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside];
348 [_codeButton setAdjustsImageWhenHighlighted:NO]; 349 [_codeButton setAdjustsImageWhenHighlighted:NO];
349 _codeButton.titleEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 20); 350 _codeButton.titleEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 20);