Commit fa862857 authored by 汪洋's avatar 汪洋

Merge branch 'jinzhu/master' into 'master'

修改emptyView 筛选器被覆盖情况



See merge request !5
parents b9ada965 04fe3824
...@@ -15,7 +15,7 @@ PODS: ...@@ -15,7 +15,7 @@ PODS:
- AFNetworking/UIKit (3.1.0): - AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession - AFNetworking/NSURLSession
- Base64nl (1.2) - Base64nl (1.2)
- GMBase (0.0.25): - GMBase (0.1.0):
- GMHud - GMHud
- GMKit - GMKit
- GMNetService - GMNetService
...@@ -89,7 +89,7 @@ EXTERNAL SOURCES: ...@@ -89,7 +89,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95 Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
GMBase: 05e9455c6f41f34462d2d2091427bbdb214779ca GMBase: 2e52cee3cab338dc00361b11bf12375c5284de56
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04 GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMFoundation: 395f1083c40aa38e9fb031726991dbc20247e2f9 GMFoundation: 395f1083c40aa38e9fb031726991dbc20247e2f9
GMHud: 67c24abb83777c61e43741d4a803f7b6d8ad4e1e GMHud: 67c24abb83777c61e43741d4a803f7b6d8ad4e1e
......
...@@ -200,6 +200,22 @@ ...@@ -200,6 +200,22 @@
} }
} }
- (void)showEmptyView:(GMEmptyViewType)type {
[super showEmptyView:type];
if (self.emptyView.superview != nil) {
[self.emptyView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(0);
make.right.mas_equalTo(0);
if (_table != nil) {
make.top.equalTo(_table.mas_top);
} else {
make.top.mas_equalTo(0);
}
make.bottom.mas_equalTo(0);
}];
}
}
#pragma mark - GMEmptyView #pragma mark - GMEmptyView
- (void)emptyViewDidClickReload { - (void)emptyViewDidClickReload {
[self loadRemoteData]; [self loadRemoteData];
......
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