Commit 587b3ecd authored by 朱璇's avatar 朱璇

Merge branch 'zx/faceTest' into 'master'

Zx/face test

See merge request !14
parents d6c0a55e d087ff4b
...@@ -272,7 +272,7 @@ SPEC CHECKSUMS: ...@@ -272,7 +272,7 @@ SPEC CHECKSUMS:
DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b DouyinOpenSDK: 5ba83de22963ba7a3ba70c8ff11dfcb2885ecc2b
EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728 EVReflection: 1abc1a81927ab0d30170238cf9b79bff489e9728
GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595 GM-Swift-Observable: 756d8fc13638b9faa68cb10266b2ffb47a911595
GMAILab: b9a8af2ea2ddf9e5b167573eeaa7746d65cefdf8 GMAILab: c900b10ce5ceba6b5d24b2787b6661bbd766fa0e
GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192 GMAlbum: d667396a6dab574a45af71dfebd1a75257c80192
GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b GMBase: 358e72062cb0f64a57ff34ec181b20ad9973d79b
GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5 GMBaseSwift: 8f327883b33ac24d0dcdb648ac3f9d6c57949ad5
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
[self.collectView performBatchUpdates:^{ [self.collectView performBatchUpdates:^{
[weakSelf.collectView layoutIfNeeded]; [weakSelf.collectView layoutIfNeeded];
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
if (finished) { if (finished && dataArray.count > 0) {
NSIndexPath *firstIndexPath = [NSIndexPath indexPathForItem: 0 inSection:0]; NSIndexPath *firstIndexPath = [NSIndexPath indexPathForItem: 0 inSection:0];
[self.collectView scrollToItemAtIndexPath:firstIndexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES]; [self.collectView scrollToItemAtIndexPath:firstIndexPath atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:YES];
_layout.currentIndex = 0; _layout.currentIndex = 0;
......
...@@ -33,10 +33,12 @@ ...@@ -33,10 +33,12 @@
- (void)excuteToFacePayCompleteBlock:(HttpSuccessBlock)successBlock failedBlock:(HttpFailedBlock)failedBlock { - (void)excuteToFacePayCompleteBlock:(HttpSuccessBlock)successBlock failedBlock:(HttpFailedBlock)failedBlock {
if (self.payType == GMToFacePayTypeAlipay && ![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipay://"]]) { if (self.payType == GMToFacePayTypeAlipay && ![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"alipay://"]]) {
[[GMBaseTool getCurrentViewController] toast:@"请安装支付宝"]; [[GMBaseTool getCurrentViewController] toast:@"请安装支付宝"];
failedBlock(@"");
return; return;
} }
if (self.payType == GMToFacePayTypeWechat && ![WXApi isWXAppInstalled]) { if (self.payType == GMToFacePayTypeWechat && ![WXApi isWXAppInstalled]) {
[[GMBaseTool getCurrentViewController] toast:@"请安装微信"]; [[GMBaseTool getCurrentViewController] toast:@"请安装微信"];
failedBlock(@"");
return; return;
} }
NSString *channel; NSString *channel;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment