Skip to content

pidan / FuSiLive

Go to a project
Commit ff509071 by ludi
Options

修复一系列bug

parent 7d632915
Inline Side-by-side
Showing with 264 additions and 65 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/FUSWebShareView.m
......@@ -262,9 +262,9 @@
{
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3];
if (_from == FUSFromInvitShare) {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
self.btnArr = @[@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
} else {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
self.btnArr = @[@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
}
if (_from == FUSFromInvitShare) {
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
<integer>72</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
<integer>71</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
......@@ -23,6 +23,27 @@
00A51A5B2CAA4B9F00B26212 /* FUSLiveChatEasySendView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00A51A5A2CAA4B9F00B26212 /* FUSLiveChatEasySendView.swift */; };
00A51A5E2CAA5AA700B26212 /* FUSRoomQuickChatListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A51A5D2CAA5AA700B26212 /* FUSRoomQuickChatListModel.m */; };
00A51A5F2CAA5AA700B26212 /* FUSRoomQuickChatListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A51A5C2CAA5AA700B26212 /* FUSRoomQuickChatListModel.h */; };
00A66C332CCA21F600F366E9 /* PK_Cover_Animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C1F2CCA21F500F366E9 /* PK_Cover_Animation_1.png */; };
00A66C342CCA21F600F366E9 /* PK_Cover_Animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C202CCA21F500F366E9 /* PK_Cover_Animation_2.png */; };
00A66C352CCA21F600F366E9 /* PK_Cover_Animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C212CCA21F500F366E9 /* PK_Cover_Animation_3.png */; };
00A66C362CCA21F600F366E9 /* PK_Cover_Animation_4.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C222CCA21F500F366E9 /* PK_Cover_Animation_4.png */; };
00A66C372CCA21F600F366E9 /* PK_Cover_Animation_5.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C232CCA21F500F366E9 /* PK_Cover_Animation_5.png */; };
00A66C382CCA21F600F366E9 /* PK_Cover_Animation_6.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C242CCA21F500F366E9 /* PK_Cover_Animation_6.png */; };
00A66C392CCA21F600F366E9 /* PK_Cover_Animation_7.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C252CCA21F500F366E9 /* PK_Cover_Animation_7.png */; };
00A66C3A2CCA21F600F366E9 /* PK_Cover_Animation_8.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C262CCA21F500F366E9 /* PK_Cover_Animation_8.png */; };
00A66C3B2CCA21F600F366E9 /* PK_Cover_Animation_9.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C272CCA21F500F366E9 /* PK_Cover_Animation_9.png */; };
00A66C3C2CCA21F600F366E9 /* PK_Cover_Animation_10.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C282CCA21F500F366E9 /* PK_Cover_Animation_10.png */; };
00A66C3D2CCA21F600F366E9 /* PK_Cover_Animation_11.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C292CCA21F500F366E9 /* PK_Cover_Animation_11.png */; };
00A66C3E2CCA21F600F366E9 /* PK_Cover_Animation_12.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2A2CCA21F500F366E9 /* PK_Cover_Animation_12.png */; };
00A66C3F2CCA21F600F366E9 /* PK_Cover_Animation_13.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2B2CCA21F500F366E9 /* PK_Cover_Animation_13.png */; };
00A66C402CCA21F600F366E9 /* PK_Cover_Animation_14.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2C2CCA21F500F366E9 /* PK_Cover_Animation_14.png */; };
00A66C412CCA21F600F366E9 /* PK_Cover_Animation_15.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2D2CCA21F500F366E9 /* PK_Cover_Animation_15.png */; };
00A66C422CCA21F600F366E9 /* PK_Cover_Animation_16.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2E2CCA21F500F366E9 /* PK_Cover_Animation_16.png */; };
00A66C432CCA21F600F366E9 /* PK_Cover_Animation_17.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C2F2CCA21F500F366E9 /* PK_Cover_Animation_17.png */; };
00A66C442CCA21F600F366E9 /* PK_Cover_Animation_18.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C302CCA21F500F366E9 /* PK_Cover_Animation_18.png */; };
00A66C452CCA21F600F366E9 /* PK_Cover_Animation_19.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A66C312CCA21F500F366E9 /* PK_Cover_Animation_19.png */; };
00A66C482CCA229400F366E9 /* FUSPKLiveAnimateImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A66C472CCA229400F366E9 /* FUSPKLiveAnimateImageView.m */; };
00A66C492CCA229400F366E9 /* FUSPKLiveAnimateImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A66C462CCA229400F366E9 /* FUSPKLiveAnimateImageView.h */; };
00A84DC32CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00A84DC12CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.h */; };
00A84DC42CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A84DC22CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.m */; };
00AD7DF42CA1626B00E02376 /* FUSSevenDayCheckinAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00AD7DF32CA1626B00E02376 /* FUSSevenDayCheckinAlertView.m */; };
......@@ -1311,6 +1332,27 @@
00A51A5A2CAA4B9F00B26212 /* FUSLiveChatEasySendView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSLiveChatEasySendView.swift; sourceTree = "<group>"; };
00A51A5C2CAA5AA700B26212 /* FUSRoomQuickChatListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSRoomQuickChatListModel.h; sourceTree = "<group>"; };
00A51A5D2CAA5AA700B26212 /* FUSRoomQuickChatListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSRoomQuickChatListModel.m; sourceTree = "<group>"; };
00A66C1F2CCA21F500F366E9 /* PK_Cover_Animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_1.png; sourceTree = "<group>"; };
00A66C202CCA21F500F366E9 /* PK_Cover_Animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_2.png; sourceTree = "<group>"; };
00A66C212CCA21F500F366E9 /* PK_Cover_Animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_3.png; sourceTree = "<group>"; };
00A66C222CCA21F500F366E9 /* PK_Cover_Animation_4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_4.png; sourceTree = "<group>"; };
00A66C232CCA21F500F366E9 /* PK_Cover_Animation_5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_5.png; sourceTree = "<group>"; };
00A66C242CCA21F500F366E9 /* PK_Cover_Animation_6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_6.png; sourceTree = "<group>"; };
00A66C252CCA21F500F366E9 /* PK_Cover_Animation_7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_7.png; sourceTree = "<group>"; };
00A66C262CCA21F500F366E9 /* PK_Cover_Animation_8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_8.png; sourceTree = "<group>"; };
00A66C272CCA21F500F366E9 /* PK_Cover_Animation_9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_9.png; sourceTree = "<group>"; };
00A66C282CCA21F500F366E9 /* PK_Cover_Animation_10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_10.png; sourceTree = "<group>"; };
00A66C292CCA21F500F366E9 /* PK_Cover_Animation_11.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_11.png; sourceTree = "<group>"; };
00A66C2A2CCA21F500F366E9 /* PK_Cover_Animation_12.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_12.png; sourceTree = "<group>"; };
00A66C2B2CCA21F500F366E9 /* PK_Cover_Animation_13.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_13.png; sourceTree = "<group>"; };
00A66C2C2CCA21F500F366E9 /* PK_Cover_Animation_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_14.png; sourceTree = "<group>"; };
00A66C2D2CCA21F500F366E9 /* PK_Cover_Animation_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_15.png; sourceTree = "<group>"; };
00A66C2E2CCA21F500F366E9 /* PK_Cover_Animation_16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_16.png; sourceTree = "<group>"; };
00A66C2F2CCA21F500F366E9 /* PK_Cover_Animation_17.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_17.png; sourceTree = "<group>"; };
00A66C302CCA21F500F366E9 /* PK_Cover_Animation_18.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_18.png; sourceTree = "<group>"; };
00A66C312CCA21F500F366E9 /* PK_Cover_Animation_19.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PK_Cover_Animation_19.png; sourceTree = "<group>"; };
00A66C462CCA229400F366E9 /* FUSPKLiveAnimateImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSPKLiveAnimateImageView.h; sourceTree = "<group>"; };
00A66C472CCA229400F366E9 /* FUSPKLiveAnimateImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSPKLiveAnimateImageView.m; sourceTree = "<group>"; };
00A84DC12CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSPatAudiencePromptAlertView.h; sourceTree = "<group>"; };
00A84DC22CA41D0C000A3BED /* FUSPatAudiencePromptAlertView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSPatAudiencePromptAlertView.m; sourceTree = "<group>"; };
00AD7DF22CA1626B00E02376 /* FUSSevenDayCheckinAlertView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSevenDayCheckinAlertView.h; sourceTree = "<group>"; };
......@@ -2616,6 +2658,32 @@
path = View;
sourceTree = "<group>";
};
00A66C322CCA21F500F366E9 /* PK_Cover_Animation */ = {
isa = PBXGroup;
children = (
00A66C1F2CCA21F500F366E9 /* PK_Cover_Animation_1.png */,
00A66C202CCA21F500F366E9 /* PK_Cover_Animation_2.png */,
00A66C212CCA21F500F366E9 /* PK_Cover_Animation_3.png */,
00A66C222CCA21F500F366E9 /* PK_Cover_Animation_4.png */,
00A66C232CCA21F500F366E9 /* PK_Cover_Animation_5.png */,
00A66C242CCA21F500F366E9 /* PK_Cover_Animation_6.png */,
00A66C252CCA21F500F366E9 /* PK_Cover_Animation_7.png */,
00A66C262CCA21F500F366E9 /* PK_Cover_Animation_8.png */,
00A66C272CCA21F500F366E9 /* PK_Cover_Animation_9.png */,
00A66C282CCA21F500F366E9 /* PK_Cover_Animation_10.png */,
00A66C292CCA21F500F366E9 /* PK_Cover_Animation_11.png */,
00A66C2A2CCA21F500F366E9 /* PK_Cover_Animation_12.png */,
00A66C2B2CCA21F500F366E9 /* PK_Cover_Animation_13.png */,
00A66C2C2CCA21F500F366E9 /* PK_Cover_Animation_14.png */,
00A66C2D2CCA21F500F366E9 /* PK_Cover_Animation_15.png */,
00A66C2E2CCA21F500F366E9 /* PK_Cover_Animation_16.png */,
00A66C2F2CCA21F500F366E9 /* PK_Cover_Animation_17.png */,
00A66C302CCA21F500F366E9 /* PK_Cover_Animation_18.png */,
00A66C312CCA21F500F366E9 /* PK_Cover_Animation_19.png */,
);
path = PK_Cover_Animation;
sourceTree = "<group>";
};
00AD7DF12CA1623100E02376 /* AlertView */ = {
isa = PBXGroup;
children = (
......@@ -3912,6 +3980,8 @@
children = (
BED657D62C5B745D00668116 /* FUSHomeAnchorListSmallCell.h */,
BED657D72C5B745D00668116 /* FUSHomeAnchorListSmallCell.m */,
00A66C462CCA229400F366E9 /* FUSPKLiveAnimateImageView.h */,
00A66C472CCA229400F366E9 /* FUSPKLiveAnimateImageView.m */,
);
path = cell;
sourceTree = "<group>";
......@@ -4779,6 +4849,7 @@
BEF675A22C6B156500A670FB /* Anims */ = {
isa = PBXGroup;
children = (
00A66C322CCA21F500F366E9 /* PK_Cover_Animation */,
BEF675EA2C6B156500A670FB /* welcomeEnterRoom */,
BEF675DC2C6B156500A670FB /* Live_minimize_bg_anim */,
BEF675C32C6B156500A670FB /* live_link_micro_request */,
......@@ -5046,6 +5117,7 @@
BED65A112C5B745F00668116 /* FUSPKRuleView.h in Headers */,
BED658D62C5B745E00668116 /* FUSLiveContributeView.h in Headers */,
BE189E372C733B460008418B /* FSRRoomguarderdictGiftShowRoomRoomGuarderView.h in Headers */,
00A66C492CCA229400F366E9 /* FUSPKLiveAnimateImageView.h in Headers */,
00AD7DF52CA1626B00E02376 /* FUSSevenDayCheckinAlertView.h in Headers */,
BED658CF2C5B745E00668116 /* FUSLiveContributeDefine.h in Headers */,
BED65A7B2C5B745F00668116 /* FUSLiveLoadingView.h in Headers */,
......@@ -5410,6 +5482,7 @@
BEF677F92C6B156600A670FB /* live_minimize_anim_11@2x.png in Resources */,
BEF676AA2C6B156600A670FB /* live_treasure_box_light_bg_11@2x.png in Resources */,
BEF6767C2C6B156600A670FB /* live_gift_item_selected_anim_12@2x.png in Resources */,
00A66C432CCA21F600F366E9 /* PK_Cover_Animation_17.png in Resources */,
BEF6778A2C6B156600A670FB /* PK_Win_Animation_61@2x.png in Resources */,
BEF676F12C6B156600A670FB /* PK_Lose_Animation_26@2x.png in Resources */,
BEF677822C6B156600A670FB /* PK_Win_Animation_53@2x.png in Resources */,
......@@ -5418,6 +5491,7 @@
BEF677752C6B156600A670FB /* PK_Win_Animation_40@2x.png in Resources */,
BEF676152C6B156500A670FB /* 1_live_activity_first_charge_bg_10.png in Resources */,
BEF6773B2C6B156600A670FB /* PK_Start_Animation_8@2x.png in Resources */,
00A66C392CCA21F600F366E9 /* PK_Cover_Animation_7.png in Resources */,
BEF676372C6B156500A670FB /* 2_live_activity_first_charge_bg_14.png in Resources */,
BEF677AE2C6B156600A670FB /* PKAnchorPicBorderAnimation_3@2x.png in Resources */,
BEF6773D2C6B156600A670FB /* PK_Start_Animation_10@2x.png in Resources */,
......@@ -5496,7 +5570,9 @@
BEF677A52C6B156600A670FB /* pk_win_streak_6@3x.png in Resources */,
BEF676832C6B156600A670FB /* live_gift_item_selected_anim_19@2x.png in Resources */,
BEF676B62C6B156600A670FB /* new_live_userlist_guardian_4@2x.png in Resources */,
00A66C332CCA21F600F366E9 /* PK_Cover_Animation_1.png in Resources */,
BEF677602C6B156600A670FB /* PK_Win_Animation_19@2x.png in Resources */,
00A66C352CCA21F600F366E9 /* PK_Cover_Animation_3.png in Resources */,
BEF6761D2C6B156500A670FB /* 1_live_activity_first_charge_bg_18.png in Resources */,
BEF676502C6B156500A670FB /* common_broadcast_purple_type_bg_8@2x.png in Resources */,
BEF677862C6B156600A670FB /* PK_Win_Animation_57@2x.png in Resources */,
......@@ -5537,6 +5613,7 @@
BEF677E92C6B156600A670FB /* live_link_micro_request_10.png in Resources */,
BEF677CD2C6B156600A670FB /* PKBottomBtnBgRotationAnimation_14@3x.png in Resources */,
BEF678022C6B156600A670FB /* live_minimize_anim_20@2x.png in Resources */,
00A66C3B2CCA21F600F366E9 /* PK_Cover_Animation_9.png in Resources */,
BEF676FF2C6B156600A670FB /* PK_Lose_Animation_40@2x.png in Resources */,
BEF677542C6B156600A670FB /* PK_Win_Animation_07@2x.png in Resources */,
BEF6765A2C6B156500A670FB /* live_bullet_fluorescence_anim_1@2x.png in Resources */,
......@@ -5548,6 +5625,7 @@
BED65B952C5CE70800668116 /* FUSRoomGuideSlideNoticeView.xib in Resources */,
BED65B6B2C5CE66000668116 /* FUSRecommendedCell.xib in Resources */,
BEF677E62C6B156600A670FB /* live_link_micro_request_7.png in Resources */,
00A66C442CCA21F600F366E9 /* PK_Cover_Animation_18.png in Resources */,
BEF676772C6B156600A670FB /* live_gift_item_selected_anim_7@2x.png in Resources */,
BEF676072C6B156500A670FB /* 1_First_Kill_Animation_23@3x.png in Resources */,
BEF6772D2C6B156600A670FB /* PK_Progress_Bar_Light_Spot_Animation_12@2x.png in Resources */,
......@@ -5559,6 +5637,7 @@
BEF676712C6B156600A670FB /* live_gift_item_selected_anim_1@2x.png in Resources */,
BEF6780A2C6B156600A670FB /* box_00004.png in Resources */,
BEF677782C6B156600A670FB /* PK_Win_Animation_43@2x.png in Resources */,
00A66C3C2CCA21F600F366E9 /* PK_Cover_Animation_10.png in Resources */,
BEF6776F2C6B156600A670FB /* PK_Win_Animation_34@2x.png in Resources */,
BEF677702C6B156600A670FB /* PK_Win_Animation_35@2x.png in Resources */,
BEF677252C6B156600A670FB /* PK_Progress_Bar_Light_Spot_Animation_4@2x.png in Resources */,
......@@ -5574,6 +5653,7 @@
BEF677552C6B156600A670FB /* PK_Win_Animation_08@2x.png in Resources */,
BEF676982C6B156600A670FB /* live_guide_first_top_up_tips_anim_20@2x.png in Resources */,
BEF677BE2C6B156600A670FB /* PKAnchorPicBorderAnimation_19@2x.png in Resources */,
00A66C382CCA21F600F366E9 /* PK_Cover_Animation_6.png in Resources */,
BEF676A42C6B156600A670FB /* live_treasure_box_light_bg_5@2x.png in Resources */,
BED65B6F2C5CE67100668116 /* FUSVideoEndView.xib in Resources */,
BEF677392C6B156600A670FB /* PK_Start_Animation_6@2x.png in Resources */,
......@@ -5584,10 +5664,12 @@
BEF677D72C6B156600A670FB /* 3_live_first_recharge_package_detail_placeholder.png in Resources */,
BEF677132C6B156600A670FB /* PK_Lose_Animation_60@2x.png in Resources */,
BEF676BF2C6B156600A670FB /* new_live_userlist_guardian_13@2x.png in Resources */,
00A66C402CCA21F600F366E9 /* PK_Cover_Animation_14.png in Resources */,
BEF6777E2C6B156600A670FB /* PK_Win_Animation_49@2x.png in Resources */,
BEF676FC2C6B156600A670FB /* PK_Lose_Animation_37@2x.png in Resources */,
BEF677A32C6B156600A670FB /* pk_win_streak_5@3x.png in Resources */,
BEF676952C6B156600A670FB /* live_guide_first_top_up_tips_anim_17@2x.png in Resources */,
00A66C372CCA21F600F366E9 /* PK_Cover_Animation_5.png in Resources */,
BEF676682C6B156500A670FB /* live_bullet_fluorescence_anim_15@2x.png in Resources */,
BEF675FE2C6B156500A670FB /* 1_First_Kill_Animation_14@3x.png in Resources */,
BEF6773A2C6B156600A670FB /* PK_Start_Animation_7@2x.png in Resources */,
......@@ -5670,6 +5752,7 @@
BEF6765B2C6B156500A670FB /* live_bullet_fluorescence_anim_2@2x.png in Resources */,
BEF6772B2C6B156600A670FB /* PK_Progress_Bar_Light_Spot_Animation_10@2x.png in Resources */,
BEF677C72C6B156600A670FB /* PKBottomBtnBgRotationAnimation_8@3x.png in Resources */,
00A66C412CCA21F600F366E9 /* PK_Cover_Animation_15.png in Resources */,
BEF676B72C6B156600A670FB /* new_live_userlist_guardian_5@2x.png in Resources */,
BEF677422C6B156600A670FB /* PK_Start_Animation_15@2x.png in Resources */,
BEF677B02C6B156600A670FB /* PKAnchorPicBorderAnimation_5@2x.png in Resources */,
......@@ -5707,6 +5790,7 @@
BEF676122C6B156500A670FB /* 1_live_activity_first_charge_bg_7.png in Resources */,
BEF677EB2C6B156600A670FB /* live_link_micro_request_12.png in Resources */,
BEF676452C6B156500A670FB /* 2_live_activity_first_charge_bg_28.png in Resources */,
00A66C3D2CCA21F600F366E9 /* PK_Cover_Animation_11.png in Resources */,
BEF676C12C6B156600A670FB /* new_live_userlist_guardian_15@2x.png in Resources */,
BEF6763D2C6B156500A670FB /* 2_live_activity_first_charge_bg_20.png in Resources */,
BEF676992C6B156600A670FB /* live_guide_first_top_up_tips_anim_21@2x.png in Resources */,
......@@ -5731,8 +5815,10 @@
BEF677382C6B156600A670FB /* PK_Start_Animation_5@2x.png in Resources */,
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */,
BEF6774A2C6B156600A670FB /* PK_Start_Animation_23@2x.png in Resources */,
00A66C3A2CCA21F600F366E9 /* PK_Cover_Animation_8.png in Resources */,
BEF676672C6B156500A670FB /* live_bullet_fluorescence_anim_14@2x.png in Resources */,
BEF6764E2C6B156500A670FB /* common_broadcast_purple_type_bg_6@2x.png in Resources */,
00A66C452CCA21F600F366E9 /* PK_Cover_Animation_19.png in Resources */,
BED65B8B2C5CE6E300668116 /* FUSLiveBoxNumSettingCollectionViewCell.xib in Resources */,
BED65B782C5CE69600668116 /* FUSLiveChatGiftSuspendTipView.xib in Resources */,
BEF678062C6B156600A670FB /* box_00000.png in Resources */,
......@@ -5779,6 +5865,7 @@
BEF677632C6B156600A670FB /* PK_Win_Animation_22@2x.png in Resources */,
BEF677FC2C6B156600A670FB /* live_minimize_anim_14@2x.png in Resources */,
BEF677462C6B156600A670FB /* PK_Start_Animation_19@2x.png in Resources */,
00A66C3F2CCA21F600F366E9 /* PK_Cover_Animation_13.png in Resources */,
BED65B812C5CE6BB00668116 /* FUSPKAnchorListView.xib in Resources */,
BEF677672C6B156600A670FB /* PK_Win_Animation_26@2x.png in Resources */,
BEF677642C6B156600A670FB /* PK_Win_Animation_23@2x.png in Resources */,
......@@ -5853,12 +5940,14 @@
BEF6775D2C6B156600A670FB /* PK_Win_Animation_16@2x.png in Resources */,
BEF6763B2C6B156500A670FB /* 2_live_activity_first_charge_bg_18.png in Resources */,
BEF6777D2C6B156600A670FB /* PK_Win_Animation_48@2x.png in Resources */,
00A66C3E2CCA21F600F366E9 /* PK_Cover_Animation_12.png in Resources */,
BEF677622C6B156600A670FB /* PK_Win_Animation_21@2x.png in Resources */,
BEF676182C6B156500A670FB /* 1_live_activity_first_charge_bg_13.png in Resources */,
BEF677582C6B156600A670FB /* PK_Win_Animation_11@2x.png in Resources */,
BEF676972C6B156600A670FB /* live_guide_first_top_up_tips_anim_19@2x.png in Resources */,
BEF675F62C6B156500A670FB /* 1_First_Kill_Animation_6@3x.png in Resources */,
BED65B8C2C5CE6E600668116 /* FUSLiveTreasureBoxGrabUserListCell.xib in Resources */,
00A66C422CCA21F600F366E9 /* PK_Cover_Animation_16.png in Resources */,
BED65B982C5CE71500668116 /* FUSLiveStartView.xib in Resources */,
BEF677192C6B156600A670FB /* PK_Lose_Animation_66@2x.png in Resources */,
BEF677232C6B156600A670FB /* PK_Progress_Bar_Light_Spot_Animation_2@2x.png in Resources */,
......@@ -5898,6 +5987,7 @@
BEF677B32C6B156600A670FB /* PKAnchorPicBorderAnimation_8@2x.png in Resources */,
BEF676722C6B156600A670FB /* live_gift_item_selected_anim_2@2x.png in Resources */,
BEF677F52C6B156600A670FB /* live_minimize_anim_7@2x.png in Resources */,
00A66C342CCA21F600F366E9 /* PK_Cover_Animation_2.png in Resources */,
BEF677A82C6B156600A670FB /* pk_win_streak_8@2x.png in Resources */,
BEF676922C6B156600A670FB /* live_guide_first_top_up_tips_anim_14@2x.png in Resources */,
BEF676D92C6B156600A670FB /* PK_Lose_Animation_02@2x.png in Resources */,
......@@ -5967,6 +6057,7 @@
BEF676242C6B156500A670FB /* 1_live_activity_first_charge_bg_25.png in Resources */,
BEF676EA2C6B156600A670FB /* PK_Lose_Animation_19@2x.png in Resources */,
BED65B762C5CE68E00668116 /* FUSLiveBeautyStickerItemCell.xib in Resources */,
00A66C362CCA21F600F366E9 /* PK_Cover_Animation_4.png in Resources */,
BEF676E22C6B156600A670FB /* PK_Lose_Animation_11@2x.png in Resources */,
BEF677502C6B156600A670FB /* PK_Win_Animation_03@2x.png in Resources */,
BED65B902C5CE6F400668116 /* FUSLiveGuideSendGiftView.xib in Resources */,
......@@ -6360,6 +6451,7 @@
BE189E3A2C733B460008418B /* FSRRoomguarderdictGiftView.m in Sources */,
BED65A032C5B745F00668116 /* FUSPKAnchorListView.m in Sources */,
BE189E2A2C733B460008418B /* FSRLivedictPKView.m in Sources */,
00A66C482CCA229400F366E9 /* FUSPKLiveAnimateImageView.m in Sources */,
BED65A1E2C5B745F00668116 /* FUSPopularProgressView.m in Sources */,
BED659F02C5B745F00668116 /* FUSSendGiftUserListCollectionViewCell.m in Sources */,
BE189E122C733B460008418B /* FSREffectdictActiveMotorEffectView.m in Sources */,
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
<integer>73</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
<integer>74</integer>
</dict>
</dict>
</dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
......@@ -7,6 +7,7 @@
#import "FUSHomeAnchorListSmallCell.h"
#import "FUSBaoFangTagView.h"
#import "FUSPKLiveAnimateImageView.h"
#import <Masonry/Masonry.h>
......@@ -22,6 +23,8 @@
@property (nonatomic, strong) UILabel *nickNameLabel;
/// 这个是龟龟左上角new的那个图标，找了一万年没找到
@property (nonatomic, strong) FUSBaoFangTagView *tagView;
///pk标识动画
@property (nonatomic, strong) FUSPKLiveAnimateImageView *PKAnimationImageView;
///底部的阴影View
@property (nonatomic, strong) UIImageView *bottomAlphaBgView;
......@@ -98,6 +101,15 @@
self.tagView.itemSpace = 4;
[self.contentView addSubview:self.tagView];
self.PKAnimationImageView = [[FUSPKLiveAnimateImageView alloc] init];
[self.contentView addSubview:self.PKAnimationImageView];
[self.PKAnimationImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.hotNumBtn.mas_left).offset(-4);
make.height.equalTo(self.hotNumBtn.mas_height);
make.width.equalTo(self.hotNumBtn.mas_height).multipliedBy(43.0 / 22.0);
make.top.equalTo(self.hotNumBtn.mas_top);
}];
self.hotNumBtn.hidden = YES;
self.locationBtn.hidden = YES;
}
......@@ -109,11 +121,22 @@
#pragma mark --- notification
- (void)fus_enterLiveRoom {
[self.tagView fus_stopAllTagsAnim];
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
}
- (void)fus_quickLiveRoom {
//pk动画
[self.tagView fus_startAllTagsAnim];
//pk动画
if (self.model.isPk.boolValue) {
self.PKAnimationImageView.hidden = NO;
[self.PKAnimationImageView startAnimating];
} else {
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
}
}
#pragma mark --- getter and setter
......@@ -161,6 +184,14 @@
self.tagView.hidden = NO;
[self.tagView fus_refreshTagImagesWithModel:model];
if (model.isPk.boolValue) {
self.PKAnimationImageView.hidden = NO;
[self.PKAnimationImageView startAnimating];
} else {
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
}
__weak typeof(self) weakSelf = self;
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
// 防止下载到图片的时候，cell已经被重用了
......@@ -185,6 +216,8 @@
self.hotNumBtn.hidden = YES;
self.tagView.hidden = YES;
self.bottomAlphaBgView.hidden = YES;
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
__weak typeof(self) weakSelf = self;;
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSPKLiveAnimateImageView.h 0 → 100644
//
// FUSPKLiveAnimateImageView.h
// FUSShowRoomModule
//
// Created by aaa on 2024/10/24.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSPKLiveAnimateImageView : UIImageView
/// 高亮时开始播放动画
@property (nonatomic, assign) BOOL startAnimWhenHighlighted;
@end
NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSPKLiveAnimateImageView.m 0 → 100644
//
// FUSPKLiveAnimateImageView.m
// FUSShowRoomModule
//
// Created by aaa on 2024/10/24.
//
#import "FUSPKLiveAnimateImageView.h"
@implementation FUSPKLiveAnimateImageView
- (instancetype)init {
if (self = [super init]) {
[self fus_initial];
}
return self;
}
- (instancetype)initWithCoder:(NSCoder *)aDecoder {
if (self = [super initWithCoder:aDecoder]) {
[self fus_initial];
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self fus_initial];
}
return self;
}
- (void)setHighlighted:(BOOL)highlighted
{
[super setHighlighted:highlighted];
if (self.startAnimWhenHighlighted) {
[self startAnimating];
}
}
- (void)fus_initial {
self.startAnimWhenHighlighted = YES;
NSMutableArray *imageArr = [NSMutableArray array];
for (int i = 1; i <= 19; i++) {
UIImage *image = [FUSShowRoomCenterBunble imageNamed:[NSString stringWithFormat:@"PK_Cover_Animation_%d",i]];
if (image) {
[imageArr addObject:image];
}
}
for (int i = 0; i < (NSInteger)(12 * 2); i++) {
UIImage *image = [FUSShowRoomCenterBunble imageNamed:@"PK_Cover_Animation_19"];
if (image) {
[imageArr addObject:image];
}
}
self.animationImages = imageArr;
self.animationDuration = imageArr.count / 12;
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
......@@ -1625,14 +1625,17 @@
model.nickname = [NSString fus_localString:@"直播消息"];
// 取本地数据
NSDictionary *dict = [[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_ROOM_TIP_MESSAGE];
NSString *message;
NSMutableString *message;
if ([dict isKindOfClass:[NSDictionary class]]) {
message = [dict objectForKey:@"content"];
message = [[NSMutableString alloc] initWithString:[dict objectForKey:@"content"]];
}else if ([dict isKindOfClass:[NSString class]]){
message = (NSString *)dict;
message = [[NSMutableString alloc] initWithString:(NSString *)dict];
}
if ([message containsString:@"fusi："]) {
[message replaceCharactersInRange:[message rangeOfString:@"fusi："] withString:@"Fusi Club："];
}
if (!message || FUSConfig.sharedInstanced.devConfigs.appStatus) {
message = [NSString fus_localString:@"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。"];
message = [[NSMutableString alloc] initWithString:[NSString fus_localString:@"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。"]];
}
model.msg = message;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/BlurImageView/FUSBlurImageView.m
......@@ -65,7 +65,7 @@
- (void)fus_setImageWithName:(NSString *)imageName blur:(BOOL)isBlur{
self.blurView.hidden = (imageName.length == 0)||!isBlur;
UIImage *image = [UIImage imageNamed:imageName];
UIImage *image = [FUSShowRoomCenterBunble imageNamed:imageName];
// 取消上一次的下载任务，预防修改了图片以后，图片才下载到
[self.imageView cancelCurrentImageRequest];
self.imageView.image = image;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShareView.m
......@@ -113,7 +113,7 @@
{
self.bgViewHeightConstraint.constant = 130 + UIView.fus_SafeBottom;
self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
[self initShareBtn];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
......@@ -16,7 +16,7 @@
#import "FUSRadarAnimImageViewView.h"
#import <SJAttributesFactory/SJAttributesFactory.h>
#define LIKE_BTN_MARGIN 4
#define LIKE_BTN_MARGIN 0
#define MAX_NICKNAME_WIDTH 70
@interface FUSLivePortraitView ()
......@@ -84,7 +84,7 @@
minXDistance = 0;
toleranceSpace = 4;
bgXPosition = 0;
rightSpace = 8;
rightSpace = 4;
_faceAnimFinished = YES;
[self initUI];
......@@ -218,10 +218,10 @@
[_likeBtn addTarget:self action:@selector(fus_onClickLikeButton:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:_likeBtn];
}
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_room_card_followed_btn"] forState:UIControlStateNormal];
// 红心是live_room_card_followed_btn
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_btn"] forState:UIControlStateNormal];
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateSelected];
_likeBtn.hidden = NO;
_likeBtn.hidden = YES;
CGRect frame = CGRectMake(CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_wordLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_wordLabel.frame) + LIKE_BTN_MARGIN, 5, self.height - 10, self.height - 10);
_likeBtn.frame = frame;
......@@ -288,6 +288,9 @@
#pragma mark - Method
- (void)fus_setLike:(BOOL)isLike{
if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) {
return;
}
_likeBtn.hidden = NO;
_likeBtn.selected = isLike;
}
......@@ -355,14 +358,23 @@
[_autoScrollNicknameLabel sizeToFit];
_autoScrollNicknameLabel.height = 13;
CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width;
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width;
// NSLog(@"_autoScrollNicknameLabel.width :%f _autoScrollMsgLabel.width: %f",nickNameLabelWidth, msgLabelWidth);
if (![model.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid] &&
model.liked) {
[self fus_setLike:[model.liked boolValue]];
}
CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width + 4;
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width + 4;
// 兼容如果自己开播，没有关注按钮的时候，最长可以加一个关注按钮的长度
CGFloat maxNickNameWidth = MAX_NICKNAME_WIDTH;
if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) {
maxNickNameWidth += (LIKE_BTN_MARGIN + _likeBtn.width + rightSpace);
}
// 如果超过最大长度，
if (MAX(nickNameLabelWidth, msgLabelWidth) > MAX_NICKNAME_WIDTH) {
_autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
_autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH;
if (MAX(nickNameLabelWidth, msgLabelWidth) > maxNickNameWidth) {
_autoScrollNicknameLabel.width = maxNickNameWidth;
_autoScrollMsgLabel.width = maxNickNameWidth;
}else if (nickNameLabelWidth < msgLabelWidth) {
_autoScrollNicknameLabel.width = msgLabelWidth;
_autoScrollMsgLabel.width = msgLabelWidth;
......@@ -370,12 +382,6 @@
_autoScrollNicknameLabel.width = nickNameLabelWidth;
_autoScrollMsgLabel.width = nickNameLabelWidth;
}
// if (MAX(_autoScrollNicknameLabel.width, _autoScrollMsgLabel.width) > MAX_NICKNAME_WIDTH) {
// _autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
// _autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH;
// }else if (_autoScrollNicknameLabel.width < _autoScrollMsgLabel.width) {
// _autoScrollNicknameLabel.width = _autoScrollMsgLabel.width;
// }
// 更新 View
[self updateFrameWithAnimate:animate];
......@@ -387,10 +393,6 @@
// // 未追踪
// [self fus_setLike:NO];
// }
if (![model.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid] &&
model.liked) {
[self fus_setLike:[model.liked boolValue]];
}
// // 设置富豪等级 头像边框
// if (model.level.integerValue == 0) {
......@@ -628,7 +630,8 @@
[self.layer removeAllAnimations];
// 是否有追踪按钮
if (self.likeBtn && _likeBtn.superview) {
// if (self.likeBtn && _likeBtn.superview) {
if (self.likeBtn.isHidden == NO) {
// 增加按钮长度
maxX += _likeBtn.width;
......@@ -640,7 +643,7 @@
if (animate) {
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction animations:^{
self.likeBtn.x = CGRectGetMaxX(self.autoScrollNicknameLabel.frame) > CGRectGetMaxX(self.autoScrollMsgLabel.frame) ? CGRectGetMaxX(self.autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(self.autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN;
self.width = (maxX + self->rightSpace + 5) > 80 ? (maxX + self->rightSpace + 5) : 80;
self.width = (maxX + self->rightSpace + 3) > 80 ? (maxX + self->rightSpace + 3) : 80;
self.bgView.width = self.width - self->bgXPosition;
// self.bgImageView.frame = self.bgView.frame;
self.grayView.frame = self.bgView.bounds;
......@@ -649,7 +652,7 @@
}];
}else{
_likeBtn.x = CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_autoScrollMsgLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN;
self.width = (maxX + rightSpace + 5) > 80 ? (maxX + rightSpace + 5) : 80;
self.width = (maxX + rightSpace + 3) > 80 ? (maxX + rightSpace + 3) : 80;
self.bgView.width = self.width - bgXPosition;
// _bgImageView.frame = _bgView.frame;
_grayView.frame = _bgView.bounds;
......@@ -671,7 +674,7 @@
if (animate) {
[UIView animateWithDuration:.35 animations:^{
self.width = (maxX + self->rightSpace + 5) > 80 ? (maxX + self->rightSpace + 5) : 80;
self.width = (maxX + self->rightSpace + 3) > 80 ? (maxX + self->rightSpace + 3) : 80;
self.bgView.width = self.width - self->bgXPosition;
// self.bgImageView.frame = self.bgView.frame;
self.grayView.frame = self.bgView.bounds;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSVideoStartSetScopeBtnView.m
......@@ -17,7 +17,7 @@
@interface FUSVideoStartSetScopeBtnView ()
@property (strong, nonatomic) IBOutlet UIButton *facebookShareBtn;
@property (strong, nonatomic) IBOutlet UIButton *twitterShareBtn;
//@property (strong, nonatomic) IBOutlet UIButton *twitterShareBtn;
@property (strong, nonatomic) IBOutlet UIButton *lineShareBtn;
//@property (strong, nonatomic) IBOutlet UIButton *wechatShareBtn;
//@property (strong, nonatomic) IBOutlet UIButton *wcCircleShareBtn;
......@@ -93,8 +93,8 @@
[self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook"] forState:UIControlStateNormal];
[self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook_selected"] forState:UIControlStateSelected];
[self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter"] forState:UIControlStateNormal];
[self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter_selected"] forState:UIControlStateSelected];
// [self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter"] forState:UIControlStateNormal];
// [self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter_selected"] forState:UIControlStateSelected];
[self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line"] forState:UIControlStateNormal];
[self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line_selected"] forState:UIControlStateSelected];
......@@ -115,9 +115,11 @@
FUSVideoStartShareType shareType = FUSVideoStartShareTypeNone;
if (self.facebookShareBtn.isSelected) {
shareType = FUSVideoStartShareTypeFacebook;
} else if (self.twitterShareBtn.isSelected) {
shareType = FUSVideoStartShareTypeTwitter;
} else if (self.lineShareBtn.isSelected) {
}
// else if (self.twitterShareBtn.isSelected) {
// shareType = FUSVideoStartShareTypeTwitter;
// }
else if (self.lineShareBtn.isSelected) {
shareType = FUSVideoStartShareTypeLine;
}
// else if (self.wechatShareBtn.isSelected) {
......@@ -165,7 +167,7 @@
self.facebookShareBtn.selected = NO;
self.lineShareBtn.selected = NO;
// self.wechatShareBtn.selected = NO;
self.twitterShareBtn.selected = NO;
// self.twitterShareBtn.selected = NO;
// self.wcCircleShareBtn.selected = NO;
sender.selected = selected;
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
......@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>71</integer>
<integer>75</integer>
</dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
<integer>76</integer>
</dict>
</dict>
</dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/View/FUSNewsFeedDetailToolView.xib
......@@ -88,23 +88,15 @@
<rect key="frame" x="0.0" y="0.0" width="364" height="81"/>
<subviews>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xco-Ox-50v">
<rect key="frame" x="10" y="0.0" width="69" height="81"/>
<rect key="frame" x="10" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_Facebook"/>
<state key="highlighted" image="newsfeed_share_Facebook_preesed"/>
<connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="6ds-Wa-vM6"/>
</connections>
</button>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c9B-ub-ur8">
<rect key="frame" x="79" y="0.0" width="68.5" height="81"/>
<state key="normal" image="newsfeed_share_twitter"/>
<state key="highlighted" image="newsfeed_share_twitter_preesed"/>
<connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="MaD-wT-ofU"/>
</connections>
</button>
<button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cnY-pD-KW8">
<rect key="frame" x="216.5" y="0.0" width="68.5" height="81"/>
<rect key="frame" x="182" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_whatsapp"/>
<state key="highlighted" image="newsfeed_share_whatsapp_preesed"/>
<connections>
......@@ -112,7 +104,7 @@
</connections>
</button>
<button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1h0-RP-Gur">
<rect key="frame" x="285" y="0.0" width="69" height="81"/>
<rect key="frame" x="268" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_link"/>
<state key="highlighted" image="newsfeed_share_link_preesed"/>
<connections>
......@@ -120,7 +112,7 @@
</connections>
</button>
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VSI-D8-5bU">
<rect key="frame" x="147.5" y="0.0" width="69" height="81"/>
<rect key="frame" x="96" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_line"/>
<state key="highlighted" image="newsfeed_share_line_preesed"/>
<connections>
......@@ -132,21 +124,17 @@
<constraints>
<constraint firstItem="Xco-Ox-50v" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="4jV-Fo-22D"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="5si-nT-Yzh"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="9az-QO-4vC"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="AUN-Xn-W0v"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="J81-5e-ONf"/>
<constraint firstItem="Xco-Ox-50v" firstAttribute="leading" secondItem="OYo-U4-EF2" secondAttribute="leading" constant="10" id="LGz-od-NsO"/>
<constraint firstAttribute="height" constant="81" id="Sl7-Nc-BdK"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="TG9-N8-B30"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="leading" secondItem="c9B-ub-ur8" secondAttribute="trailing" id="W2x-6v-hYF"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="leading" secondItem="VSI-D8-5bU" secondAttribute="trailing" id="XD5-8d-8HA"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="YAr-7D-Wth"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="YEl-JJ-u3v"/>
<constraint firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="aqS-B3-sKY"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="eib-VB-jwR"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="leading" secondItem="Xco-Ox-50v" secondAttribute="trailing" id="bCi-VZ-7gt"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="gOu-2o-Ok3"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="gj3-Ee-GnR"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="leading" secondItem="Xco-Ox-50v" secondAttribute="trailing" id="i4K-WP-dcz"/>
<constraint firstAttribute="trailing" secondItem="1h0-RP-Gur" secondAttribute="trailing" constant="10" id="o5J-Bp-fpW"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="oTT-ZO-cKa"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="leading" secondItem="cnY-pD-KW8" secondAttribute="trailing" id="rme-Ul-V4q"/>
......@@ -207,8 +195,6 @@
<image name="newsfeed_share_line_preesed" width="45" height="45"/>
<image name="newsfeed_share_link" width="45" height="45"/>
<image name="newsfeed_share_link_preesed" width="45" height="45"/>
<image name="newsfeed_share_twitter" width="45" height="45"/>
<image name="newsfeed_share_twitter_preesed" width="45" height="45"/>
<image name="newsfeed_share_whatsapp" width="45" height="45"/>
<image name="newsfeed_share_whatsapp_preesed" width="45" height="45"/>
</resources>
......
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