Skip to content

pidan / FuSiLive

Go to a project
Commit 12a78d60 by ludi
Options

修复一系列bug

parent 734c4258
Inline Side-by-side
Showing with 161 additions and 116 deletions
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_line_dark.imageset/Contents.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "socialPlat_line_dark@3x.png", "filename" : "20250411-160731.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
DevelopmentPods/FUSCommon/FUSCommon/Assets/Asset.xcassets/Setting/socialPlat_twitter_dark.imageset/Contents.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "socialPlat_twitter_dark@3x.png", "filename" : "20250411-160736.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113546; CURRENT_PROJECT_VERSION = 20250402113547;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -753,7 +753,7 @@ ...@@ -753,7 +753,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113546; CURRENT_PROJECT_VERSION = 20250402113547;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -47,30 +47,30 @@ ...@@ -47,30 +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 */; }; 008B916E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_7.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915C2DA8EAE8008755B3 /* 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 */; }; 008B916F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_19.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91682DA8EAE8008755B3 /* 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 */; }; 008B91702DA8EAE8008755B3 /* fusi_home_navi_follow_animate_10.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_10.png */; };
008CDD682D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png */; }; 008B91712DA8EAE8008755B3 /* fusi_home_navi_follow_animate_22.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B916B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_22.png */; };
008CDD692D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png */; }; 008B91722DA8EAE8008755B3 /* fusi_home_navi_follow_animate_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91582DA8EAE8008755B3 /* fusi_home_navi_follow_animate_3.png */; };
008CDD6A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD512D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png */; }; 008B91732DA8EAE8008755B3 /* fusi_home_navi_follow_animate_20.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91692DA8EAE8008755B3 /* fusi_home_navi_follow_animate_20.png */; };
008CDD6B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD612D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png */; }; 008B91742DA8EAE8008755B3 /* fusi_home_navi_follow_animate_11.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91602DA8EAE8008755B3 /* fusi_home_navi_follow_animate_11.png */; };
008CDD6C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD552D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png */; }; 008B91752DA8EAE8008755B3 /* fusi_home_navi_follow_animate_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91562DA8EAE8008755B3 /* fusi_home_navi_follow_animate_1.png */; };
008CDD6D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD602D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png */; }; 008B91762DA8EAE8008755B3 /* fusi_home_navi_follow_animate_17.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91662DA8EAE8008755B3 /* fusi_home_navi_follow_animate_17.png */; };
008CDD6E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD632D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png */; }; 008B91772DA8EAE8008755B3 /* fusi_home_navi_follow_animate_16.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91652DA8EAE8008755B3 /* fusi_home_navi_follow_animate_16.png */; };
008CDD6F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD582D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png */; }; 008B91782DA8EAE8008755B3 /* fusi_home_navi_follow_animate_18.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91672DA8EAE8008755B3 /* fusi_home_navi_follow_animate_18.png */; };
008CDD702D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD502D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png */; }; 008B91792DA8EAE8008755B3 /* fusi_home_navi_follow_animate_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91572DA8EAE8008755B3 /* fusi_home_navi_follow_animate_2.png */; };
008CDD712D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD592D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png */; }; 008B917A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_21.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B916A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_21.png */; };
008CDD722D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD572D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png */; }; 008B917B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_9.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_9.png */; };
008CDD732D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD562D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png */; }; 008B917C2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_6.png */; };
008CDD742D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png */; }; 008B917D2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_14.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91632DA8EAE8008755B3 /* 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 */; }; 008B917E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_5.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_5.png */; };
008CDD762D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png */; }; 008B917F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91552DA8EAE8008755B3 /* fusi_home_navi_follow_animate_0.png */; };
008CDD772D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png */; }; 008B91802DA8EAE8008755B3 /* fusi_home_navi_follow_animate_12.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91612DA8EAE8008755B3 /* fusi_home_navi_follow_animate_12.png */; };
008CDD782D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD4E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png */; }; 008B91812DA8EAE8008755B3 /* fusi_home_navi_follow_animate_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91592DA8EAE8008755B3 /* fusi_home_navi_follow_animate_4.png */; };
008CDD792D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD522D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png */; }; 008B91822DA8EAE8008755B3 /* fusi_home_navi_follow_animate_8.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B915D2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_8.png */; };
008CDD7A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD5C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png */; }; 008B91832DA8EAE8008755B3 /* fusi_home_navi_follow_animate_13.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91622DA8EAE8008755B3 /* fusi_home_navi_follow_animate_13.png */; };
008CDD7B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD622D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png */; }; 008B91842DA8EAE8008755B3 /* fusi_home_navi_follow_animate_15.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B91642DA8EAE8008755B3 /* fusi_home_navi_follow_animate_15.png */; };
008CDD7C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png in Resources */ = {isa = PBXBuildFile; fileRef = 008CDD542D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png */; }; 008B91852DA8EAE8008755B3 /* fusi_home_navi_follow_animate_23.png in Resources */ = {isa = PBXBuildFile; fileRef = 008B916C2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_23.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 */; };
...@@ -1461,30 +1461,30 @@ ...@@ -1461,30 +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>"; }; 008B91552DA8EAE8008755B3 /* 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>"; }; 008B91562DA8EAE8008755B3 /* 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>"; }; 008B91572DA8EAE8008755B3 /* 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>"; }; 008B91582DA8EAE8008755B3 /* 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>"; }; 008B91592DA8EAE8008755B3 /* 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>"; }; 008B915A2DA8EAE8008755B3 /* 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>"; }; 008B915B2DA8EAE8008755B3 /* 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>"; }; 008B915C2DA8EAE8008755B3 /* 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>"; }; 008B915D2DA8EAE8008755B3 /* 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>"; }; 008B915E2DA8EAE8008755B3 /* 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>"; }; 008B915F2DA8EAE8008755B3 /* 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>"; }; 008B91602DA8EAE8008755B3 /* 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>"; }; 008B91612DA8EAE8008755B3 /* 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>"; }; 008B91622DA8EAE8008755B3 /* 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>"; }; 008B91632DA8EAE8008755B3 /* 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>"; }; 008B91642DA8EAE8008755B3 /* 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>"; }; 008B91652DA8EAE8008755B3 /* 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>"; }; 008B91662DA8EAE8008755B3 /* 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>"; }; 008B91672DA8EAE8008755B3 /* 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>"; }; 008B91682DA8EAE8008755B3 /* 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>"; }; 008B91692DA8EAE8008755B3 /* 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>"; }; 008B916A2DA8EAE8008755B3 /* 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>"; }; 008B916B2DA8EAE8008755B3 /* 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>"; }; 008B916C2DA8EAE8008755B3 /* 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>"; };
...@@ -2914,33 +2914,33 @@ ...@@ -2914,33 +2914,33 @@
path = ViewModel; path = ViewModel;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
008CDD642D9AB3F9001C798B /* fusi_home_navi_follow_animation */ = { 008B916D2DA8EAE8008755B3 /* fusi_home_navi_follow_animation */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
008CDD4C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_0.png */, 008B91552DA8EAE8008755B3 /* fusi_home_navi_follow_animate_0.png */,
008CDD4D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_1.png */, 008B91562DA8EAE8008755B3 /* fusi_home_navi_follow_animate_1.png */,
008CDD4E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_2.png */, 008B91572DA8EAE8008755B3 /* fusi_home_navi_follow_animate_2.png */,
008CDD4F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_3.png */, 008B91582DA8EAE8008755B3 /* fusi_home_navi_follow_animate_3.png */,
008CDD502D9AB3F9001C798B /* fusi_home_navi_follow_animate_4.png */, 008B91592DA8EAE8008755B3 /* fusi_home_navi_follow_animate_4.png */,
008CDD512D9AB3F9001C798B /* fusi_home_navi_follow_animate_5.png */, 008B915A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_5.png */,
008CDD522D9AB3F9001C798B /* fusi_home_navi_follow_animate_6.png */, 008B915B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_6.png */,
008CDD532D9AB3F9001C798B /* fusi_home_navi_follow_animate_7.png */, 008B915C2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_7.png */,
008CDD542D9AB3F9001C798B /* fusi_home_navi_follow_animate_8.png */, 008B915D2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_8.png */,
008CDD552D9AB3F9001C798B /* fusi_home_navi_follow_animate_9.png */, 008B915E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_9.png */,
008CDD562D9AB3F9001C798B /* fusi_home_navi_follow_animate_10.png */, 008B915F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_10.png */,
008CDD572D9AB3F9001C798B /* fusi_home_navi_follow_animate_11.png */, 008B91602DA8EAE8008755B3 /* fusi_home_navi_follow_animate_11.png */,
008CDD582D9AB3F9001C798B /* fusi_home_navi_follow_animate_12.png */, 008B91612DA8EAE8008755B3 /* fusi_home_navi_follow_animate_12.png */,
008CDD592D9AB3F9001C798B /* fusi_home_navi_follow_animate_13.png */, 008B91622DA8EAE8008755B3 /* fusi_home_navi_follow_animate_13.png */,
008CDD5A2D9AB3F9001C798B /* fusi_home_navi_follow_animate_14.png */, 008B91632DA8EAE8008755B3 /* fusi_home_navi_follow_animate_14.png */,
008CDD5B2D9AB3F9001C798B /* fusi_home_navi_follow_animate_15.png */, 008B91642DA8EAE8008755B3 /* fusi_home_navi_follow_animate_15.png */,
008CDD5C2D9AB3F9001C798B /* fusi_home_navi_follow_animate_16.png */, 008B91652DA8EAE8008755B3 /* fusi_home_navi_follow_animate_16.png */,
008CDD5D2D9AB3F9001C798B /* fusi_home_navi_follow_animate_17.png */, 008B91662DA8EAE8008755B3 /* fusi_home_navi_follow_animate_17.png */,
008CDD5E2D9AB3F9001C798B /* fusi_home_navi_follow_animate_18.png */, 008B91672DA8EAE8008755B3 /* fusi_home_navi_follow_animate_18.png */,
008CDD5F2D9AB3F9001C798B /* fusi_home_navi_follow_animate_19.png */, 008B91682DA8EAE8008755B3 /* fusi_home_navi_follow_animate_19.png */,
008CDD602D9AB3F9001C798B /* fusi_home_navi_follow_animate_20.png */, 008B91692DA8EAE8008755B3 /* fusi_home_navi_follow_animate_20.png */,
008CDD612D9AB3F9001C798B /* fusi_home_navi_follow_animate_21.png */, 008B916A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_21.png */,
008CDD622D9AB3F9001C798B /* fusi_home_navi_follow_animate_22.png */, 008B916B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_22.png */,
008CDD632D9AB3F9001C798B /* fusi_home_navi_follow_animate_23.png */, 008B916C2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_23.png */,
); );
path = fusi_home_navi_follow_animation; path = fusi_home_navi_follow_animation;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -5291,7 +5291,6 @@ ...@@ -5291,7 +5291,6 @@
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 */,
...@@ -5313,6 +5312,7 @@ ...@@ -5313,6 +5312,7 @@
BEF6757A2C6B156500A670FB /* pk_win_streak */, BEF6757A2C6B156500A670FB /* pk_win_streak */,
BEF6758F2C6B156500A670FB /* PKAnchorPicBorderAnimation */, BEF6758F2C6B156500A670FB /* PKAnchorPicBorderAnimation */,
BEF675A12C6B156500A670FB /* PKBottomBtnBgRotationAnimation */, BEF675A12C6B156500A670FB /* PKBottomBtnBgRotationAnimation */,
008B916D2DA8EAE8008755B3 /* fusi_home_navi_follow_animation */,
); );
path = Anims; path = Anims;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -6134,30 +6134,6 @@ ...@@ -6134,30 +6134,6 @@
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 */,
...@@ -6362,6 +6338,30 @@ ...@@ -6362,6 +6338,30 @@
BEF676B12C6B156600A670FB /* live_treasure_box_light_bg_18@2x.png in Resources */, BEF676B12C6B156600A670FB /* live_treasure_box_light_bg_18@2x.png in Resources */,
BED65B7F2C5CE6B400668116 /* FUSPKSetTableViewCell.xib in Resources */, BED65B7F2C5CE6B400668116 /* FUSPKSetTableViewCell.xib in Resources */,
BEF6770A2C6B156600A670FB /* PK_Lose_Animation_51@2x.png in Resources */, BEF6770A2C6B156600A670FB /* PK_Lose_Animation_51@2x.png in Resources */,
008B916E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_7.png in Resources */,
008B916F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_19.png in Resources */,
008B91702DA8EAE8008755B3 /* fusi_home_navi_follow_animate_10.png in Resources */,
008B91712DA8EAE8008755B3 /* fusi_home_navi_follow_animate_22.png in Resources */,
008B91722DA8EAE8008755B3 /* fusi_home_navi_follow_animate_3.png in Resources */,
008B91732DA8EAE8008755B3 /* fusi_home_navi_follow_animate_20.png in Resources */,
008B91742DA8EAE8008755B3 /* fusi_home_navi_follow_animate_11.png in Resources */,
008B91752DA8EAE8008755B3 /* fusi_home_navi_follow_animate_1.png in Resources */,
008B91762DA8EAE8008755B3 /* fusi_home_navi_follow_animate_17.png in Resources */,
008B91772DA8EAE8008755B3 /* fusi_home_navi_follow_animate_16.png in Resources */,
008B91782DA8EAE8008755B3 /* fusi_home_navi_follow_animate_18.png in Resources */,
008B91792DA8EAE8008755B3 /* fusi_home_navi_follow_animate_2.png in Resources */,
008B917A2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_21.png in Resources */,
008B917B2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_9.png in Resources */,
008B917C2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_6.png in Resources */,
008B917D2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_14.png in Resources */,
008B917E2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_5.png in Resources */,
008B917F2DA8EAE8008755B3 /* fusi_home_navi_follow_animate_0.png in Resources */,
008B91802DA8EAE8008755B3 /* fusi_home_navi_follow_animate_12.png in Resources */,
008B91812DA8EAE8008755B3 /* fusi_home_navi_follow_animate_4.png in Resources */,
008B91822DA8EAE8008755B3 /* fusi_home_navi_follow_animate_8.png in Resources */,
008B91832DA8EAE8008755B3 /* fusi_home_navi_follow_animate_13.png in Resources */,
008B91842DA8EAE8008755B3 /* fusi_home_navi_follow_animate_15.png in Resources */,
008B91852DA8EAE8008755B3 /* fusi_home_navi_follow_animate_23.png in Resources */,
BEF676B22C6B156600A670FB /* live_treasure_box_light_bg_19@2x.png in Resources */, BEF676B22C6B156600A670FB /* live_treasure_box_light_bg_19@2x.png in Resources */,
BEF676BA2C6B156600A670FB /* new_live_userlist_guardian_8@2x.png in Resources */, BEF676BA2C6B156600A670FB /* new_live_userlist_guardian_8@2x.png in Resources */,
BEF676B92C6B156600A670FB /* new_live_userlist_guardian_7@2x.png in Resources */, BEF676B92C6B156600A670FB /* new_live_userlist_guardian_7@2x.png in Resources */,
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/FUSHomeNaviView.m
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
imageView.tag = 1; imageView.tag = 1;
imageView.image = nil; imageView.image = nil;
imageView.animationImages = images; imageView.animationImages = images;
imageView.animationDuration = 2; imageView.animationDuration = 1.5;
if (self.state == state) { if (self.state == state) {
[imageView startAnimating]; [imageView startAnimating];
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteFunctionStepTwoContentView.swift
...@@ -234,7 +234,8 @@ class FUSInviteFunctionStepTwoContentView: FUSInviteFunctionStepContentBaseView ...@@ -234,7 +234,8 @@ class FUSInviteFunctionStepTwoContentView: FUSInviteFunctionStepContentBaseView
} else { } else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
// if let color = levelmodel?.color, // if let color = levelmodel?.color,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardInviteFunctionHeader.swift
...@@ -71,7 +71,7 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView { ...@@ -71,7 +71,7 @@ class FUSInviteRewardInviteFunctionHeader: FUSBaseView {
// MARK: 这个东西有关于layout的报错，其实是没问题的，报错的原因是因为本身FFInviteRewardInviteFunctionHeader一开始的width为0，然后这里又规范了其宽度，所以冲突了，但是显示的时候，给FFInviteRewardInviteFunctionHeader指定了对的宽度后，就没问题了 // MARK: 这个东西有关于layout的报错，其实是没问题的，报错的原因是因为本身FFInviteRewardInviteFunctionHeader一开始的width为0，然后这里又规范了其宽度，所以冲突了，但是显示的时候，给FFInviteRewardInviteFunctionHeader指定了对的宽度后，就没问题了
emissaryLineImageView.isHidden = true emissaryLineImageView.isHidden = true
emissaryLineImageView.contentMode = .scaleAspectFit emissaryLineImageView.contentMode = .left
self.addSubview(emissaryLineImageView) self.addSubview(emissaryLineImageView)
emissaryLineImageView.snp.makeConstraints { make in emissaryLineImageView.snp.makeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(7) make.left.equalTo(titleLabel.snp.right).offset(7)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyClansmanCell.swift
...@@ -53,6 +53,7 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell { ...@@ -53,6 +53,7 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
avatarView.layer.cornerRadius = 24 avatarView.layer.cornerRadius = 24
avatarView.layer.masksToBounds = true avatarView.layer.masksToBounds = true
avatarView.isUserInteractionEnabled = true
bgView.addSubview(avatarView) bgView.addSubview(avatarView)
avatarView.snp.makeConstraints { make in avatarView.snp.makeConstraints { make in
make.left.equalTo(14) make.left.equalTo(14)
...@@ -134,7 +135,8 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell { ...@@ -134,7 +135,8 @@ class FUSInviteRewardMyClansmanCell: UITableViewCell {
// } // }
}else { }else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
// if let color = levelmodel?.color, // if let color = levelmodel?.color,
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/Cell/FUSInviteRewardMyHeaderCell.swift
...@@ -52,7 +52,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -52,7 +52,7 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
let charBgBtn = UIButton(type: .custom) let charBgBtn = UIButton(type: .custom)
let avatarView: UIImageView = .init(frame: CGRectMake(0, 0, 48, 48)) let avatarView: UIImageView = .init(frame: CGRectMake(0, 0, 48, 48))
let nickNameLabel = UILabel() let nickNameLabel = UILabel()
let vipLevelImageView : UIImageView = .init() let vipLevelBtn = UIButton(type: .custom)
let descLabel = UILabel() let descLabel = UILabel()
let emissarySignBtn = UIButton(type: .custom) let emissarySignBtn = UIButton(type: .custom)
let myEmissaryCodeView = FUSInviteRewardMyHeaderTemplateView() let myEmissaryCodeView = FUSInviteRewardMyHeaderTemplateView()
...@@ -99,16 +99,17 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -99,16 +99,17 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
nickNameCenterView.addSubview(vipLevelImageView) charBgBtn.addSubview(vipLevelBtn)
nickNameLabel.font = .fus_themeFont(15) nickNameLabel.font = .fus_themeFont(15)
nickNameLabel.textColor = .fus_textColorMedium() nickNameLabel.textColor = .fus_textColorMedium()
nickNameCenterView.addSubview(nickNameLabel) nickNameCenterView.addSubview(nickNameLabel)
vipLevelImageView.snp.makeConstraints { make in vipLevelBtn.snp.makeConstraints { make in
make.left.equalTo(nickNameLabel.snp.right).offset(2) make.left.equalTo(nickNameLabel.snp.right).offset(2)
// make.size.equalTo(CGSizeMake(32, 13)) // make.size.equalTo(CGSizeMake(32, 13))
make.centerY.equalTo(nickNameLabel.snp.centerY) make.centerY.equalTo(nickNameLabel.snp.centerY)
make.height.equalTo(14) make.height.equalTo(14)
make.width.greaterThanOrEqualTo(20)
} }
nickNameLabel.snp.makeConstraints { make in nickNameLabel.snp.makeConstraints { make in
make.top.equalToSuperview() make.top.equalToSuperview()
...@@ -188,6 +189,12 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -188,6 +189,12 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
self?.clickedHandler?(.charater) self?.clickedHandler?(.charater)
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
vipLevelBtn.rx.tap.subscribe(onNext: {[weak self] in
if self?.vipLevelBtn.tag == 0 {
FUSRouter.userRouter().fus_pushToBuyVIPController(withAnimate: true)
}
})
.disposed(by: disposeBag)
} }
func fus_setup(model: FUSInviteDataMyselfGetInfoModel) { func fus_setup(model: FUSInviteDataMyselfGetInfoModel) {
...@@ -198,7 +205,9 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -198,7 +205,9 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
if model.agentFactor.userInfo.userIsVip == 1 { if model.agentFactor.userInfo.userIsVip == 1 {
// self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level: model.agentFactor.userInfo.userLevel) // self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level: model.agentFactor.userInfo.userLevel)
self.vipLevelImageView.image = UIImage.fus_image(withLevel: model.agentFactor.userInfo.userLevel); let level = model.agentFactor.userInfo.userLevel
self.vipLevelBtn.setImage(UIImage.fus_image(withLevel: level), for: .normal)
self.vipLevelBtn.tag = level <= 0 ? 0 : 1
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:model.agentFactor.userInfo.userLevel) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:model.agentFactor.userInfo.userLevel)
// self.vipLevelImageView.isHidden = false // self.vipLevelImageView.isHidden = false
// self.vipLevelImageView.setWebImageWithSubURLString(levelmodel?.icon) // self.vipLevelImageView.setWebImageWithSubURLString(levelmodel?.icon)
...@@ -210,7 +219,8 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell { ...@@ -210,7 +219,8 @@ class FUSInviteRewardMyHeaderCell: UITableViewCell {
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level:0)
// self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level:0) // self.avatarView.fus_setupIcon(withFacePath: model.agentFactor.userInfo.userFace, level:0)
self.vipLevelImageView.image = UIImage.fus_image(withLevel: 0); self.vipLevelBtn.setImage( UIImage.fus_image(withLevel: 0), for: .normal)
self.vipLevelBtn.tag = 0
// self.vipLevelImageView.isHidden = true // self.vipLevelImageView.isHidden = true
// if let nickNameColor = levelmodel?.color, // if let nickNameColor = levelmodel?.color,
// isValidString(nickNameColor) == false{ // isValidString(nickNameColor) == false{
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSInviteEmissaryConditionAlertView.swift
...@@ -30,6 +30,7 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -30,6 +30,7 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
let contentView = FUSPanGestureAlertView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 335 + UIView.fus_SafeBottom())) let contentView = FUSPanGestureAlertView(frame: CGRectMake(0, 0, UIView.fus_screenW(), 335 + UIView.fus_SafeBottom()))
let avatarBtn = UIButton(type: .custom) let avatarBtn = UIButton(type: .custom)
let nickNameLabel = UILabel() let nickNameLabel = UILabel()
let vipLevelBtn = UIButton(type: .custom)
let emissaryConditionCountLable = UILabel() let emissaryConditionCountLable = UILabel()
let emissarySignBtn = UIButton(type: .custom) let emissarySignBtn = UIButton(type: .custom)
let emissaryConditionTitleLabel = UILabel() let emissaryConditionTitleLabel = UILabel()
...@@ -71,6 +72,8 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -71,6 +72,8 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
make.centerY.equalTo(avatarBtn.snp.centerY) make.centerY.equalTo(avatarBtn.snp.centerY)
} }
contentView.addSubview(vipLevelBtn)
nickNameLabel.font = .fus_themeFont(15) nickNameLabel.font = .fus_themeFont(15)
nickNameLabel.textColor = .fus_textColorRich() nickNameLabel.textColor = .fus_textColorRich()
nickNameLabel.text = " " nickNameLabel.text = " "
...@@ -79,6 +82,13 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -79,6 +82,13 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
make.left.top.equalToSuperview() make.left.top.equalToSuperview()
} }
vipLevelBtn.snp.makeConstraints { make in
make.left.equalTo(nickNameLabel.snp.right).offset(2)
make.centerY.equalTo(nickNameLabel.snp.centerY)
make.height.equalTo(14)
make.width.greaterThanOrEqualTo(20)
}
nickNameCenterView.addSubview(emissaryConditionCountLable) nickNameCenterView.addSubview(emissaryConditionCountLable)
emissaryConditionCountLable.snp.makeConstraints { make in emissaryConditionCountLable.snp.makeConstraints { make in
make.left.bottom.equalToSuperview() make.left.bottom.equalToSuperview()
...@@ -141,6 +151,19 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -141,6 +151,19 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
self.emissaryConditionTitleLabel.text = agentFactor.agentTitle self.emissaryConditionTitleLabel.text = agentFactor.agentTitle
self.emissaryConditionContentLabel.text = agentFactor.agentContent self.emissaryConditionContentLabel.text = agentFactor.agentContent
//vip
let privilege = FUSSwiftCacheDataShare.share.userInfo.value?.privilege
let richPower = (privilege?["richPower"] as? Bool) ?? false
if richPower == true {
let level = FUSSwiftCacheDataShare.share.userInfo.value?.level.intValue ?? 0
self.vipLevelBtn.setImage(.fus_image(withLevel: level), for: .normal)
self.vipLevelBtn.tag = level == 0 ? 0 : 1
} else {
self.vipLevelBtn.setImage(.fus_image(withLevel: 0), for: .normal)
self.vipLevelBtn.tag = 0
}
var topConstain = emissaryConditionContentView.snp.top var topConstain = emissaryConditionContentView.snp.top
var conditionFulfilled: Int = 0 var conditionFulfilled: Int = 0
emissaryConditionContentView.removeAllSubviews() emissaryConditionContentView.removeAllSubviews()
...@@ -196,6 +219,14 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView { ...@@ -196,6 +219,14 @@ class FUSInviteEmissaryConditionAlertView: FUSBaseView {
bgBtn.rx.tap.subscribe(onNext: {[weak self] in bgBtn.rx.tap.subscribe(onNext: {[weak self] in
self?.fus_dismissWithAnimation() self?.fus_dismissWithAnimation()
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
vipLevelBtn.rx.tap.subscribe(onNext: {[weak self] in
if self?.vipLevelBtn.tag == 0 {
self?.fus_dismissWithAnimation()
FUSRouter.userRouter().fus_pushToBuyVIPController(withAnimate: true)
}
})
.disposed(by: disposeBag)
} }
override func layoutSubviews() { override func layoutSubviews() {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/View/FUSMyEmissaryQRCodeView.swift
...@@ -126,7 +126,8 @@ class FUSMyEmissaryQRCodeView: FUSBaseView { ...@@ -126,7 +126,8 @@ class FUSMyEmissaryQRCodeView: FUSBaseView {
} else { } else {
self.vipLevelImageView.image = .fus_image(withLevel: 0) self.vipLevelImageView.isHidden = true
// self.vipLevelImageView.image = .fus_image(withLevel: 0)
// 如果服务器配置了0级，则使用0级的颜色 // 如果服务器配置了0级，则使用0级的颜色
// let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0) // let levelmodel = FUSSwiftCacheDataShare.share.fus_levelModel(level: 0)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/SocialBind/FUSSocialBindSettingViewController.m
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
[weakSelf fus_doBindingThirdPartyWithIndex:3]; [weakSelf fus_doBindingThirdPartyWithIndex:3];
}; };
group.items = @[self.facebookItem, self.googleItem, self.appleItem, self.phoneItem, self.twitterItem]; group.items = @[self.facebookItem, self.googleItem, self.appleItem,self.lineItem, self.phoneItem, self.twitterItem];
[self.tableView.allGroups appendObject:group]; [self.tableView.allGroups appendObject:group];
[self fus_updateSoicials]; [self fus_updateSoicials];
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
// weakSelf.isBindingThirdCount = NO; // weakSelf.isBindingThirdCount = NO;
// }]; // }];
[FUSLoadingView fus_showProgressViewWithMessage:@""]; [FUSLoadingView fus_showProgressViewWithMessage:@""];
[[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:YES viewController:self loadingFinish:^{ [[FUSThirdAccountLoginHelper sharedInstanse] fus_loginWithPlatform:FUSSocializedPlatformLine facebookFromWeb:NO viewController:self loadingFinish:^{
} success:^(NSDictionary *infoDict) { } success:^(NSDictionary *infoDict) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
......
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