Commit 9300913a by ludi

完成重新认定,ui调整的需求

parent dcdea2da
Showing with 137 additions and 16 deletions
......@@ -54,11 +54,11 @@
// }
for (NSInteger i = 0; i < 9; i++) {
[pullDownArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",i + 7]]];
[pullDownArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",i + 7]]];
}
for (NSInteger i = 0; i <= 39; i++) {
[releaseArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",i]]];
[releaseArray addObject:[UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",i]]];
}
for (NSInteger i = 0; i < 14; i++) {
......@@ -68,7 +68,7 @@
self.mj_h = 80;
// _loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"pull_down00"]];
_loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"fusi_loading_animate_7"]];
_loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"fusi_loading_animate_black_7"]];
_loadingImageView.contentMode = UIViewContentModeScaleAspectFill;
_freshBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width,300)];
......@@ -171,11 +171,12 @@
// fusi_loading_animate_
// fusi_loading_animate_black_
if (pullingPercent - lastPullingPercent > 0) {
_loadingImageView.image = [UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_%ld",(NSInteger)floor(7 + 9*pullingPercent)]];
_loadingImageView.image = [UIImage fus_ImageNamed:[NSString stringWithFormat:@"fusi_loading_animate_black_%ld",(NSInteger)floor(7 + 9*pullingPercent)]];
if (pullingPercent >= 1) {
_loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_7"];
_loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_black_7"];
}
}
}
......
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
<integer>75</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
<integer>76</integer>
</dict>
</dict>
</dict>
......
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
<integer>72</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>78</integer>
<integer>74</integer>
</dict>
</dict>
</dict>
......
......@@ -38,4 +38,12 @@ typedef enum :NSInteger{
@end
@interface FUSHomeNaviButton : FUSTopRightBadgeButton
-(void)fus_setImage:(UIImage *)image forState:(UIControlState)state;
-(void)fus_setImages:(NSArray<UIImage *> *)images forState:(UIControlState)state;
@end
NS_ASSUME_NONNULL_END
......@@ -13,7 +13,7 @@
@interface FUSHomeNaviView ()
@property (nonatomic, strong) NSMutableArray<FUSTopRightBadgeButton *> *btnList;
@property (nonatomic, strong) NSMutableArray<FUSHomeNaviButton *> *btnList;
@end
......@@ -45,11 +45,24 @@
NSString *imgName = imageNamesList[i];
NSString *selectImgName = selectImageNamesList[i];
FUSTopRightBadgeButton *tempBtn = [FUSTopRightBadgeButton buttonWithType:UIButtonTypeCustom];
[tempBtn setImage:[FUSShowRoomCenterBunble imageNamed:imgName] forState:UIControlStateNormal];
[tempBtn setImage:[FUSShowRoomCenterBunble imageNamed:selectImgName] forState:UIControlStateSelected];
FUSHomeNaviButton *tempBtn = [FUSHomeNaviButton buttonWithType:UIButtonTypeCustom];
[tempBtn fus_setImage:[FUSShowRoomCenterBunble imageNamed:imgName] forState:UIControlStateNormal];
[tempBtn fus_setImage:[FUSShowRoomCenterBunble imageNamed:selectImgName] forState:UIControlStateSelected];
[bgView addSubview:tempBtn];
if (i == 0) {
NSMutableArray *animationIamgesList = [[NSMutableArray alloc] init];
for (int i = 0; i < 99; i++) {
UIImage *tempImage = [FUSShowRoomCenterBunble imageNamed:[NSString stringWithFormat:@"fusi_home_navi_follow_animate_%d",i]];
if (tempImage == nil) {
break;
}
UIImage *scaleImage = [UIImage imageWithCGImage:tempImage.CGImage scale:2 orientation:UIImageOrientationUp];
[animationIamgesList addObject:scaleImage];
}
[tempBtn fus_setImages:animationIamgesList forState:UIControlStateSelected];
}
tempBtn.tag = i;
[tempBtn addTarget:self action:@selector(naviBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
......@@ -94,3 +107,102 @@
}
@end
/// 用于兼容帧动画的按钮
@interface FUSHomeNaviButton()
@property (nonatomic, strong) UIImageView *selectImageView;
@property (nonatomic, strong) UIImageView *normalImageView;
@end
@implementation FUSHomeNaviButton
+ (instancetype)buttonWithType:(UIButtonType)buttonType{
FUSHomeNaviButton *btn =[super buttonWithType:buttonType];
[btn makeUI];
return btn;
}
- (instancetype)init
{
self = [super init];
if (self) {
[self makeUI];
}
return self;
}
-(void)makeUI{
self.selectImageView = [[UIImageView alloc] init];
self.normalImageView = [[UIImageView alloc] init];
[self addSubview:self.selectImageView];
[self addSubview:self.normalImageView];
self.selectImageView.tag = 0;
self.selectImageView.hidden = YES;
self.normalImageView.tag = 0;
self.normalImageView.hidden = NO;
[self.selectImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.equalTo(self);
// make.size.mas_equalTo(CGSizeMake(24, 24));
}];
[self.normalImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.center.equalTo(self);
// make.size.mas_equalTo(CGSizeMake(24, 24));
}];
}
- (void)setSelected:(BOOL)selected{
[super setSelected:selected];
UIImageView *displayImageView = selected == YES ? self.selectImageView : self.normalImageView;
UIImageView *hiddenImageView = selected == YES ? self.normalImageView : self.selectImageView;
displayImageView.hidden = NO;
hiddenImageView.hidden = YES;
if (hiddenImageView.tag == 1) {
[hiddenImageView stopAnimating];
}
if (displayImageView.tag == 1) {
[displayImageView startAnimating];
}
}
- (void)fus_setImage:(UIImage *)image forState:(UIControlState)state{
UIImageView *imageView = [self fus_getImageViewWithState:state];
imageView.tag = 0;
imageView.animationImages = nil;
imageView.image = image;
}
- (void)fus_setImages:(NSArray<UIImage *> *)images forState:(UIControlState)state{
UIImageView *imageView = [self fus_getImageViewWithState:state];
imageView.tag = 1;
imageView.image = nil;
imageView.animationImages = images;
imageView.animationDuration = 2;
if (self.state == state) {
[imageView startAnimating];
}
}
-(UIImageView *)fus_getImageViewWithState:(UIControlState)state{
switch (state) {
case UIControlStateNormal:
return self.normalImageView;
break;
case UIControlStateSelected:
return self.selectImageView;
break;
default:
return self.normalImageView;
break;
}
}
@end
......@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
<integer>78</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
<integer>77</integer>
</dict>
</dict>
</dict>
......
......@@ -399,7 +399,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>77</integer>
<integer>73</integer>
</dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict>
......
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 sign in to comment