Skip to content

pidan / FuSiLive

Go to a project
Commit 9300913a by ludi
Options

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

parent dcdea2da
Inline Side-by-side
Showing with 241 additions and 16 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/Refresh/FUSRefreshHeader.m
...@@ -54,11 +54,11 @@ ...@@ -54,11 +54,11 @@
// } // }
for (NSInteger i = 0; i < 9; i++) { 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++) { 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++) { for (NSInteger i = 0; i < 14; i++) {
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
self.mj_h = 80; self.mj_h = 80;
// _loadingImageView = [[UIImageView alloc] initWithImage:[UIImage fus_ImageNamed:@"pull_down00"]]; // _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; _loadingImageView.contentMode = UIViewContentModeScaleAspectFill;
_freshBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width,300)]; _freshBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width,300)];
...@@ -171,11 +171,12 @@ ...@@ -171,11 +171,12 @@
// fusi_loading_animate_ // fusi_loading_animate_
// fusi_loading_animate_black_
if (pullingPercent - lastPullingPercent > 0) { 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) { if (pullingPercent >= 1) {
_loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_7"]; _loadingImageView.image = [UIImage fus_ImageNamed:@"fusi_loading_animate_black_7"];
} }
} }
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>75</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>76</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -47,6 +47,30 @@ ...@@ -47,6 +47,30 @@
0089FD992D13F3460030DAA7 /* FUSLiveGiftSendCountdownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD562D13F3460030DAA7 /* FUSLiveGiftSendCountdownView.m */; }; 0089FD992D13F3460030DAA7 /* FUSLiveGiftSendCountdownView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD562D13F3460030DAA7 /* FUSLiveGiftSendCountdownView.m */; };
0089FD9D2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD9C2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift */; }; 0089FD9D2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD9C2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift */; };
0089FD9F2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD9E2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift */; }; 0089FD9F2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0089FD9E2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift */; };
008CDD652D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD532D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png */; };
008CDD662D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png */; };
008CDD672D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png */; };
008CDD682D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png */; };
008CDD692D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png */; };
008CDD6A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD512D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png */; };
008CDD6B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD612D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png */; };
008CDD6C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD552D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png */; };
008CDD6D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD602D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png */; };
008CDD6E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD632D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png */; };
008CDD6F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD582D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png */; };
008CDD702D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD502D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png */; };
008CDD712D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD592D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png */; };
008CDD722D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD572D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png */; };
008CDD732D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD562D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png */; };
008CDD742D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png */; };
008CDD752D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png */; };
008CDD762D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png */; };
008CDD772D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png */; };
008CDD782D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png */; };
008CDD792D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD522D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png */; };
008CDD7A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png */; };
008CDD7B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD622D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png */; };
008CDD7C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD542D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png */; };
00A1DCF72CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */; }; 00A1DCF72CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */; };
00A3AB6C2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A3AB6B2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m */; }; 00A3AB6C2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A3AB6B2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m */; };
00A3AB6D2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A3AB6A2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h */; }; 00A3AB6D2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A3AB6A2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h */; };
...@@ -1437,6 +1461,30 @@ ...@@ -1437,6 +1461,30 @@
0089FD712D13F3460030DAA7 /* FUSSliderPageControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSSliderPageControlView.swift; sourceTree = "<group>"; }; 0089FD712D13F3460030DAA7 /* FUSSliderPageControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSSliderPageControlView.swift; sourceTree = "<group>"; };
0089FD9C2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveExchangeDiamondViewModel.swift; sourceTree = "<group>"; }; 0089FD9C2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveExchangeDiamondViewModel.swift; sourceTree = "<group>"; };
0089FD9E2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRoomRechargeViewModel.swift; sourceTree = "<group>"; }; 0089FD9E2D13FC4A0030DAA7 /* FUSLiveRoomRechargeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRoomRechargeViewModel.swift; sourceTree = "<group>"; };
008CDD4C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_0.png; sourceTree = "<group>"; };
008CDD4D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_1.png; sourceTree = "<group>"; };
008CDD4E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_2.png; sourceTree = "<group>"; };
008CDD4F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_3.png; sourceTree = "<group>"; };
008CDD502D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_4.png; sourceTree = "<group>"; };
008CDD512D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_5.png; sourceTree = "<group>"; };
008CDD522D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_6.png; sourceTree = "<group>"; };
008CDD532D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_7.png; sourceTree = "<group>"; };
008CDD542D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_8.png; sourceTree = "<group>"; };
008CDD552D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_9.png; sourceTree = "<group>"; };
008CDD562D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_10.png; sourceTree = "<group>"; };
008CDD572D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_11.png; sourceTree = "<group>"; };
008CDD582D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_12.png; sourceTree = "<group>"; };
008CDD592D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_13.png; sourceTree = "<group>"; };
008CDD5A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_14.png; sourceTree = "<group>"; };
008CDD5B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_15.png; sourceTree = "<group>"; };
008CDD5C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_16.png; sourceTree = "<group>"; };
008CDD5D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_17.png; sourceTree = "<group>"; };
008CDD5E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_18.png; sourceTree = "<group>"; };
008CDD5F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_19.png; sourceTree = "<group>"; };
008CDD602D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_20.png; sourceTree = "<group>"; };
008CDD612D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_21.png; sourceTree = "<group>"; };
008CDD622D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_22.png; sourceTree = "<group>"; };
008CDD632D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fusi_home_navi_follow_animate_23.png; sourceTree = "<group>"; };
00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = liveRoom_patAudience_pat_animate.webp; sourceTree = "<group>"; }; 00A1DCF62CA6B2C50000541F /* liveRoom_patAudience_pat_animate.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = liveRoom_patAudience_pat_animate.webp; sourceTree = "<group>"; };
00A3AB6A2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveQuickChatSetAlertView.h; sourceTree = "<group>"; }; 00A3AB6A2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveQuickChatSetAlertView.h; sourceTree = "<group>"; };
00A3AB6B2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveQuickChatSetAlertView.m; sourceTree = "<group>"; }; 00A3AB6B2CB63129007646E1 /* FUSLiveQuickChatSetAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveQuickChatSetAlertView.m; sourceTree = "<group>"; };
...@@ -2866,6 +2914,37 @@ ...@@ -2866,6 +2914,37 @@
path = ViewModel; path = ViewModel;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
008CDD642D9AB3F9001C798B /* fusi_home_navi_follow_animation */ = {
isa = PBXGroup;
children = (
008CDD4C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png */,
008CDD4D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png */,
008CDD4E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png */,
008CDD4F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png */,
008CDD502D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png */,
008CDD512D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png */,
008CDD522D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png */,
008CDD532D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png */,
008CDD542D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png */,
008CDD552D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png */,
008CDD562D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png */,
008CDD572D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png */,
008CDD582D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png */,
008CDD592D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png */,
008CDD5A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png */,
008CDD5B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png */,
008CDD5C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png */,
008CDD5D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png */,
008CDD5E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png */,
008CDD5F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png */,
008CDD602D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png */,
008CDD612D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png */,
008CDD622D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png */,
008CDD632D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png */,
);
path = fusi_home_navi_follow_animation;
sourceTree = "<group>";
};
00A516B12CA2976F0022DE40 /* View */ = { 00A516B12CA2976F0022DE40 /* View */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -5212,6 +5291,7 @@ ...@@ -5212,6 +5291,7 @@
BEF675A22C6B156500A670FB /* Anims */ = { BEF675A22C6B156500A670FB /* Anims */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
008CDD642D9AB3F9001C798B /* fusi_home_navi_follow_animation */,
00A66C322CCA21F500F366E9 /* PK_Cover_Animation */, 00A66C322CCA21F500F366E9 /* PK_Cover_Animation */,
BEF675EA2C6B156500A670FB /* welcomeEnterRoom */, BEF675EA2C6B156500A670FB /* welcomeEnterRoom */,
BEF675DC2C6B156500A670FB /* Live_minimize_bg_anim */, BEF675DC2C6B156500A670FB /* Live_minimize_bg_anim */,
...@@ -6054,6 +6134,30 @@ ...@@ -6054,6 +6134,30 @@
BEF676682C6B156500A670FB /* live_bullet_fluorescence_anim_15@2x.png in Resources */, BEF676682C6B156500A670FB /* live_bullet_fluorescence_anim_15@2x.png in Resources */,
BEF675FE2C6B156500A670FB /* 1_First_Kill_Animation_14@3x.png in Resources */, BEF675FE2C6B156500A670FB /* 1_First_Kill_Animation_14@3x.png in Resources */,
BEF6773A2C6B156600A670FB /* PK_Start_Animation_7@2x.png in Resources */, BEF6773A2C6B156600A670FB /* PK_Start_Animation_7@2x.png in Resources */,
008CDD652D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png in Resources */,
008CDD662D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png in Resources */,
008CDD672D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png in Resources */,
008CDD682D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png in Resources */,
008CDD692D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png in Resources */,
008CDD6A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png in Resources */,
008CDD6B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png in Resources */,
008CDD6C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png in Resources */,
008CDD6D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png in Resources */,
008CDD6E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png in Resources */,
008CDD6F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png in Resources */,
008CDD702D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png in Resources */,
008CDD712D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png in Resources */,
008CDD722D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png in Resources */,
008CDD732D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png in Resources */,
008CDD742D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png in Resources */,
008CDD752D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png in Resources */,
008CDD762D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png in Resources */,
008CDD772D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png in Resources */,
008CDD782D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png in Resources */,
008CDD792D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png in Resources */,
008CDD7A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png in Resources */,
008CDD7B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png in Resources */,
008CDD7C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png in Resources */,
BEF677FE2C6B156600A670FB /* live_minimize_anim_16@2x.png in Resources */, BEF677FE2C6B156600A670FB /* live_minimize_anim_16@2x.png in Resources */,
BEF6774B2C6B156600A670FB /* PK_Start_Animation_24@2x.png in Resources */, BEF6774B2C6B156600A670FB /* PK_Start_Animation_24@2x.png in Resources */,
BEF676A02C6B156600A670FB /* live_treasure_box_light_bg_1@2x.png in Resources */, BEF676A02C6B156600A670FB /* live_treasure_box_light_bg_1@2x.png in Resources */,
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>72</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>78</integer> <integer>74</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeNaviView.h
...@@ -38,4 +38,12 @@ typedef enum :NSInteger{ ...@@ -38,4 +38,12 @@ typedef enum :NSInteger{
@end @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 NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeNaviView.m
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
@interface FUSHomeNaviView () @interface FUSHomeNaviView ()
@property (nonatomic, strong) NSMutableArray<FUSTopRightBadgeButton *> *btnList; @property (nonatomic, strong) NSMutableArray<FUSHomeNaviButton *> *btnList;
@end @end
...@@ -45,11 +45,24 @@ ...@@ -45,11 +45,24 @@
NSString *imgName = imageNamesList[i]; NSString *imgName = imageNamesList[i];
NSString *selectImgName = selectImageNamesList[i]; NSString *selectImgName = selectImageNamesList[i];
FUSTopRightBadgeButton *tempBtn = [FUSTopRightBadgeButton buttonWithType:UIButtonTypeCustom]; FUSHomeNaviButton *tempBtn = [FUSHomeNaviButton buttonWithType:UIButtonTypeCustom];
[tempBtn setImage:[FUSShowRoomCenterBunble imageNamed:imgName] forState:UIControlStateNormal]; [tempBtn fus_setImage:[FUSShowRoomCenterBunble imageNamed:imgName] forState:UIControlStateNormal];
[tempBtn setImage:[FUSShowRoomCenterBunble imageNamed:selectImgName] forState:UIControlStateSelected]; [tempBtn fus_setImage:[FUSShowRoomCenterBunble imageNamed:selectImgName] forState:UIControlStateSelected];
[bgView addSubview:tempBtn]; [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.tag = i;
[tempBtn addTarget:self action:@selector(naviBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [tempBtn addTarget:self action:@selector(naviBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
...@@ -94,3 +107,102 @@ ...@@ -94,3 +107,102 @@
} }
@end @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
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>78</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>77</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
<key>SSZipArchive.xcscheme_^#shared#^_</key> <key>SSZipArchive.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>73</integer>
</dict> </dict>
<key>SnapKit-SnapKit_Privacy.xcscheme</key> <key>SnapKit-SnapKit_Privacy.xcscheme</key>
<dict> <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