Skip to content

pidan / FuSiLive

Go to a project
Commit 4b42693e by pierce
Options

将开播页面的v2 去掉

parent 60b9453c
Inline Side-by-side
Showing with 190 additions and 190 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -318,20 +318,6 @@ ...@@ -318,20 +318,6 @@
BEB504742D2E8FEC00EA6E6F /* FUSLiveThemeView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB504722D2E8FEC00EA6E6F /* FUSLiveThemeView.h */; }; BEB504742D2E8FEC00EA6E6F /* FUSLiveThemeView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEB504722D2E8FEC00EA6E6F /* FUSLiveThemeView.h */; };
BEB504752D2E8FEC00EA6E6F /* FUSLiveThemeView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB504732D2E8FEC00EA6E6F /* FUSLiveThemeView.m */; }; BEB504752D2E8FEC00EA6E6F /* FUSLiveThemeView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEB504732D2E8FEC00EA6E6F /* FUSLiveThemeView.m */; };
BECF741B2D2F826B00F5ABBC /* FUSMidpointSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */; }; BECF741B2D2F826B00F5ABBC /* FUSMidpointSlider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */; };
BECF741C2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF740C2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesEditView.swift */; };
BECF741D2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetSliderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74102D2F826B00F5ABBC /* FUSLiveStartV2BeautySetSliderView.swift */; };
BECF741E2D2F826B00F5ABBC /* FUSLiveStartV2ContentWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74172D2F826B00F5ABBC /* FUSLiveStartV2ContentWarningView.swift */; };
BECF741F2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF740D2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesView.swift */; };
BECF74202D2F826B00F5ABBC /* FUSLiveStartV2ContentPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74142D2F826B00F5ABBC /* FUSLiveStartV2ContentPrivacyView.swift */; };
BECF74212D2F826B00F5ABBC /* FUSLiveStartV2SetPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74182D2F826B00F5ABBC /* FUSLiveStartV2SetPrivacyView.swift */; };
BECF74222D2F826B00F5ABBC /* FUSLiveStartV2View.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74192D2F826B00F5ABBC /* FUSLiveStartV2View.swift */; };
BECF74232D2F826B00F5ABBC /* FUSLiveStartV2ContentShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74152D2F826B00F5ABBC /* FUSLiveStartV2ContentShareView.swift */; };
BECF74242D2F826B00F5ABBC /* FUSLiveStartV2BeautySetItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF740E2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetItemView.swift */; };
BECF74252D2F826B00F5ABBC /* FUSLiveStartV2ContentThemeEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74162D2F826B00F5ABBC /* FUSLiveStartV2ContentThemeEditView.swift */; };
BECF74262D2F826B00F5ABBC /* FUSLiveStartV2ContentBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74122D2F826B00F5ABBC /* FUSLiveStartV2ContentBottomView.swift */; };
BECF74272D2F826B00F5ABBC /* FUSLiveStartV2BeautySetLevelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF740F2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetLevelView.swift */; };
BECF74282D2F826B00F5ABBC /* FUSLiveStartV2BeautySetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74112D2F826B00F5ABBC /* FUSLiveStartV2BeautySetView.swift */; };
BECF74292D2F826B00F5ABBC /* FUSLiveStartV2ContentLiveActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74132D2F826B00F5ABBC /* FUSLiveStartV2ContentLiveActivityView.swift */; };
BECF74392D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74352D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift */; }; BECF74392D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF74352D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift */; };
BECF743D2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF743C2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift */; }; BECF743D2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF743C2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift */; };
BECF743F2D2FBC4500F5ABBC /* FUSLiveBitrateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF743E2D2FBC4500F5ABBC /* FUSLiveBitrateModel.swift */; }; BECF743F2D2FBC4500F5ABBC /* FUSLiveBitrateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BECF743E2D2FBC4500F5ABBC /* FUSLiveBitrateModel.swift */; };
...@@ -842,6 +828,20 @@ ...@@ -842,6 +828,20 @@
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; }; BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; };
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; }; BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; };
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */; }; BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */; };
BEEAB2632D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */; };
BEEAB2642D34CC60008CD059 /* FUSLiveStartContentWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */; };
BEEAB2652D34CC60008CD059 /* FUSLiveStartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */; };
BEEAB2662D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2552D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift */; };
BEEAB2672D34CC60008CD059 /* FUSLiveStartBeautySetSliderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2592D34CC60008CD059 /* FUSLiveStartBeautySetSliderView.swift */; };
BEEAB2682D34CC60008CD059 /* FUSLiveStartContentPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25D2D34CC60008CD059 /* FUSLiveStartContentPrivacyView.swift */; };
BEEAB2692D34CC60008CD059 /* FUSLiveStartContentLiveActivityView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25C2D34CC60008CD059 /* FUSLiveStartContentLiveActivityView.swift */; };
BEEAB26A2D34CC60008CD059 /* FUSLiveStartContentShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25E2D34CC60008CD059 /* FUSLiveStartContentShareView.swift */; };
BEEAB26B2D34CC60008CD059 /* FUSLiveStartBeautySetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25A2D34CC60008CD059 /* FUSLiveStartBeautySetView.swift */; };
BEEAB26C2D34CC60008CD059 /* FUSLiveStartContentBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25B2D34CC60008CD059 /* FUSLiveStartContentBottomView.swift */; };
BEEAB26D2D34CC60008CD059 /* FUSLiveStartBeautySetLevelView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2582D34CC60008CD059 /* FUSLiveStartBeautySetLevelView.swift */; };
BEEAB26E2D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2562D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift */; };
BEEAB26F2D34CC60008CD059 /* FUSLiveStartContentThemeEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB25F2D34CC60008CD059 /* FUSLiveStartContentThemeEditView.swift */; };
BEEAB2702D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2572D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift */; };
BEF675F12C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B22C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png */; }; BEF675F12C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B22C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png */; };
BEF675F22C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B32C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png */; }; BEF675F22C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B32C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png */; };
BEF675F32C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B42C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png */; }; BEF675F32C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = BEF673B42C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png */; };
...@@ -1712,20 +1712,6 @@ ...@@ -1712,20 +1712,6 @@
BEB5046E2D2E8C2E00EA6E6F /* FUSLiveThemeModel+FUSRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FUSLiveThemeModel+FUSRequest.m"; sourceTree = "<group>"; }; BEB5046E2D2E8C2E00EA6E6F /* FUSLiveThemeModel+FUSRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FUSLiveThemeModel+FUSRequest.m"; sourceTree = "<group>"; };
BEB504722D2E8FEC00EA6E6F /* FUSLiveThemeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveThemeView.h; sourceTree = "<group>"; }; BEB504722D2E8FEC00EA6E6F /* FUSLiveThemeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveThemeView.h; sourceTree = "<group>"; };
BEB504732D2E8FEC00EA6E6F /* FUSLiveThemeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveThemeView.m; sourceTree = "<group>"; }; BEB504732D2E8FEC00EA6E6F /* FUSLiveThemeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveThemeView.m; sourceTree = "<group>"; };
BECF740C2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautyFavoritesEditView.swift; sourceTree = "<group>"; };
BECF740D2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautyFavoritesView.swift; sourceTree = "<group>"; };
BECF740E2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautySetItemView.swift; sourceTree = "<group>"; };
BECF740F2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetLevelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautySetLevelView.swift; sourceTree = "<group>"; };
BECF74102D2F826B00F5ABBC /* FUSLiveStartV2BeautySetSliderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautySetSliderView.swift; sourceTree = "<group>"; };
BECF74112D2F826B00F5ABBC /* FUSLiveStartV2BeautySetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2BeautySetView.swift; sourceTree = "<group>"; };
BECF74122D2F826B00F5ABBC /* FUSLiveStartV2ContentBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentBottomView.swift; sourceTree = "<group>"; };
BECF74132D2F826B00F5ABBC /* FUSLiveStartV2ContentLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentLiveActivityView.swift; sourceTree = "<group>"; };
BECF74142D2F826B00F5ABBC /* FUSLiveStartV2ContentPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentPrivacyView.swift; sourceTree = "<group>"; };
BECF74152D2F826B00F5ABBC /* FUSLiveStartV2ContentShareView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentShareView.swift; sourceTree = "<group>"; };
BECF74162D2F826B00F5ABBC /* FUSLiveStartV2ContentThemeEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentThemeEditView.swift; sourceTree = "<group>"; };
BECF74172D2F826B00F5ABBC /* FUSLiveStartV2ContentWarningView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2ContentWarningView.swift; sourceTree = "<group>"; };
BECF74182D2F826B00F5ABBC /* FUSLiveStartV2SetPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2SetPrivacyView.swift; sourceTree = "<group>"; };
BECF74192D2F826B00F5ABBC /* FUSLiveStartV2View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartV2View.swift; sourceTree = "<group>"; };
BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSMidpointSlider.swift; sourceTree = "<group>"; }; BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSMidpointSlider.swift; sourceTree = "<group>"; };
BECF74352D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLivePushQualitySettingView.swift; sourceTree = "<group>"; }; BECF74352D2FB19100F5ABBC /* FUSLivePushQualitySettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLivePushQualitySettingView.swift; sourceTree = "<group>"; };
BECF743C2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLivePushQualityItemCell.swift; sourceTree = "<group>"; }; BECF743C2D2FB21B00F5ABBC /* FUSLivePushQualityItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLivePushQualityItemCell.swift; sourceTree = "<group>"; };
...@@ -2239,6 +2225,20 @@ ...@@ -2239,6 +2225,20 @@
BED65CFE2C62148700668116 /* TTSDKLisenceFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; }; BED65CFE2C62148700668116 /* TTSDKLisenceFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; };
BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FusAnchorRewardView.h; sourceTree = "<group>"; }; BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FusAnchorRewardView.h; sourceTree = "<group>"; };
BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FusAnchorRewardView.m; sourceTree = "<group>"; }; BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FusAnchorRewardView.m; sourceTree = "<group>"; };
BEEAB2552D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautyFavoritesEditView.swift; sourceTree = "<group>"; };
BEEAB2562D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautyFavoritesView.swift; sourceTree = "<group>"; };
BEEAB2572D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetItemView.swift; sourceTree = "<group>"; };
BEEAB2582D34CC60008CD059 /* FUSLiveStartBeautySetLevelView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetLevelView.swift; sourceTree = "<group>"; };
BEEAB2592D34CC60008CD059 /* FUSLiveStartBeautySetSliderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetSliderView.swift; sourceTree = "<group>"; };
BEEAB25A2D34CC60008CD059 /* FUSLiveStartBeautySetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetView.swift; sourceTree = "<group>"; };
BEEAB25B2D34CC60008CD059 /* FUSLiveStartContentBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentBottomView.swift; sourceTree = "<group>"; };
BEEAB25C2D34CC60008CD059 /* FUSLiveStartContentLiveActivityView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentLiveActivityView.swift; sourceTree = "<group>"; };
BEEAB25D2D34CC60008CD059 /* FUSLiveStartContentPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentPrivacyView.swift; sourceTree = "<group>"; };
BEEAB25E2D34CC60008CD059 /* FUSLiveStartContentShareView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentShareView.swift; sourceTree = "<group>"; };
BEEAB25F2D34CC60008CD059 /* FUSLiveStartContentThemeEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentThemeEditView.swift; sourceTree = "<group>"; };
BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartContentWarningView.swift; sourceTree = "<group>"; };
BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartSetPrivacyView.swift; sourceTree = "<group>"; };
BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartView.swift; sourceTree = "<group>"; };
BEF673B22C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_1@3x.png"; sourceTree = "<group>"; }; BEF673B22C6B156500A670FB /* 1_First_Kill_Animation_1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_1@3x.png"; sourceTree = "<group>"; };
BEF673B32C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_2@3x.png"; sourceTree = "<group>"; }; BEF673B32C6B156500A670FB /* 1_First_Kill_Animation_2@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_2@3x.png"; sourceTree = "<group>"; };
BEF673B42C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_3@3x.png"; sourceTree = "<group>"; }; BEF673B42C6B156500A670FB /* 1_First_Kill_Animation_3@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "1_First_Kill_Animation_3@3x.png"; sourceTree = "<group>"; };
...@@ -3283,21 +3283,21 @@ ...@@ -3283,21 +3283,21 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
BECF74372D2FB19100F5ABBC /* LiveQuality */, BECF74372D2FB19100F5ABBC /* LiveQuality */,
BECF740C2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesEditView.swift */,
BECF740D2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesView.swift */,
BECF740E2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetItemView.swift */,
BECF740F2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetLevelView.swift */,
BECF74102D2F826B00F5ABBC /* FUSLiveStartV2BeautySetSliderView.swift */,
BECF74112D2F826B00F5ABBC /* FUSLiveStartV2BeautySetView.swift */,
BECF74122D2F826B00F5ABBC /* FUSLiveStartV2ContentBottomView.swift */,
BECF74132D2F826B00F5ABBC /* FUSLiveStartV2ContentLiveActivityView.swift */,
BECF74142D2F826B00F5ABBC /* FUSLiveStartV2ContentPrivacyView.swift */,
BECF74152D2F826B00F5ABBC /* FUSLiveStartV2ContentShareView.swift */,
BECF74162D2F826B00F5ABBC /* FUSLiveStartV2ContentThemeEditView.swift */,
BECF74172D2F826B00F5ABBC /* FUSLiveStartV2ContentWarningView.swift */,
BECF74182D2F826B00F5ABBC /* FUSLiveStartV2SetPrivacyView.swift */,
BECF74192D2F826B00F5ABBC /* FUSLiveStartV2View.swift */,
BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */, BECF741A2D2F826B00F5ABBC /* FUSMidpointSlider.swift */,
BEEAB2552D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift */,
BEEAB2562D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift */,
BEEAB2572D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift */,
BEEAB2582D34CC60008CD059 /* FUSLiveStartBeautySetLevelView.swift */,
BEEAB2592D34CC60008CD059 /* FUSLiveStartBeautySetSliderView.swift */,
BEEAB25A2D34CC60008CD059 /* FUSLiveStartBeautySetView.swift */,
BEEAB25B2D34CC60008CD059 /* FUSLiveStartContentBottomView.swift */,
BEEAB25C2D34CC60008CD059 /* FUSLiveStartContentLiveActivityView.swift */,
BEEAB25D2D34CC60008CD059 /* FUSLiveStartContentPrivacyView.swift */,
BEEAB25E2D34CC60008CD059 /* FUSLiveStartContentShareView.swift */,
BEEAB25F2D34CC60008CD059 /* FUSLiveStartContentThemeEditView.swift */,
BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */,
BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */,
BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */,
BEB5043C2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.h */, BEB5043C2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.h */,
BEB5043D2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.m */, BEB5043D2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.m */,
BEB5043E2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.xib */, BEB5043E2D2E53E300EA6E6F /* FUSVideoStartSetThemeItemCell.xib */,
...@@ -6574,20 +6574,6 @@ ...@@ -6574,20 +6574,6 @@
BED65A222C5B745F00668116 /* FUSPopularListView.m in Sources */, BED65A222C5B745F00668116 /* FUSPopularListView.m in Sources */,
BE189DDE2C733B460008418B /* FSRRoomManagerShowRoomViewController.m in Sources */, BE189DDE2C733B460008418B /* FSRRoomManagerShowRoomViewController.m in Sources */,
BECF741B2D2F826B00F5ABBC /* FUSMidpointSlider.swift in Sources */, BECF741B2D2F826B00F5ABBC /* FUSMidpointSlider.swift in Sources */,
BECF741C2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesEditView.swift in Sources */,
BECF741D2D2F826B00F5ABBC /* FUSLiveStartV2BeautySetSliderView.swift in Sources */,
BECF741E2D2F826B00F5ABBC /* FUSLiveStartV2ContentWarningView.swift in Sources */,
BECF741F2D2F826B00F5ABBC /* FUSLiveStartV2BeautyFavoritesView.swift in Sources */,
BECF74202D2F826B00F5ABBC /* FUSLiveStartV2ContentPrivacyView.swift in Sources */,
BECF74212D2F826B00F5ABBC /* FUSLiveStartV2SetPrivacyView.swift in Sources */,
BECF74222D2F826B00F5ABBC /* FUSLiveStartV2View.swift in Sources */,
BECF74232D2F826B00F5ABBC /* FUSLiveStartV2ContentShareView.swift in Sources */,
BECF74242D2F826B00F5ABBC /* FUSLiveStartV2BeautySetItemView.swift in Sources */,
BECF74252D2F826B00F5ABBC /* FUSLiveStartV2ContentThemeEditView.swift in Sources */,
BECF74262D2F826B00F5ABBC /* FUSLiveStartV2ContentBottomView.swift in Sources */,
BECF74272D2F826B00F5ABBC /* FUSLiveStartV2BeautySetLevelView.swift in Sources */,
BECF74282D2F826B00F5ABBC /* FUSLiveStartV2BeautySetView.swift in Sources */,
BECF74292D2F826B00F5ABBC /* FUSLiveStartV2ContentLiveActivityView.swift in Sources */,
BED6589C2C5B745E00668116 /* FUSLiveHttpHelper.m in Sources */, BED6589C2C5B745E00668116 /* FUSLiveHttpHelper.m in Sources */,
BE189E0A2C733B460008418B /* FSRBackpackdictRoomGuarderPKLinkMicView.m in Sources */, BE189E0A2C733B460008418B /* FSRBackpackdictRoomGuarderPKLinkMicView.m in Sources */,
BE189DAC2C733B450008418B /* FSRMotorEffectSettingBackpackModel.m in Sources */, BE189DAC2C733B450008418B /* FSRMotorEffectSettingBackpackModel.m in Sources */,
...@@ -6679,6 +6665,20 @@ ...@@ -6679,6 +6665,20 @@
BEB504752D2E8FEC00EA6E6F /* FUSLiveThemeView.m in Sources */, BEB504752D2E8FEC00EA6E6F /* FUSLiveThemeView.m in Sources */,
0089FD9D2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift in Sources */, 0089FD9D2D13F5340030DAA7 /* FUSLiveExchangeDiamondViewModel.swift in Sources */,
BED658B32C5B745E00668116 /* FUSVideoOfficialEndV2View.m in Sources */, BED658B32C5B745E00668116 /* FUSVideoOfficialEndV2View.m in Sources */,
BEEAB2632D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift in Sources */,
BEEAB2642D34CC60008CD059 /* FUSLiveStartContentWarningView.swift in Sources */,
BEEAB2652D34CC60008CD059 /* FUSLiveStartView.swift in Sources */,
BEEAB2662D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift in Sources */,
BEEAB2672D34CC60008CD059 /* FUSLiveStartBeautySetSliderView.swift in Sources */,
BEEAB2682D34CC60008CD059 /* FUSLiveStartContentPrivacyView.swift in Sources */,
BEEAB2692D34CC60008CD059 /* FUSLiveStartContentLiveActivityView.swift in Sources */,
BEEAB26A2D34CC60008CD059 /* FUSLiveStartContentShareView.swift in Sources */,
BEEAB26B2D34CC60008CD059 /* FUSLiveStartBeautySetView.swift in Sources */,
BEEAB26C2D34CC60008CD059 /* FUSLiveStartContentBottomView.swift in Sources */,
BEEAB26D2D34CC60008CD059 /* FUSLiveStartBeautySetLevelView.swift in Sources */,
BEEAB26E2D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift in Sources */,
BEEAB26F2D34CC60008CD059 /* FUSLiveStartContentThemeEditView.swift in Sources */,
BEEAB2702D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift in Sources */,
BED659982C5B745E00668116 /* FUSLinkMicroModel.m in Sources */, BED659982C5B745E00668116 /* FUSLinkMicroModel.m in Sources */,
BE189E062C733B460008418B /* FSRActivedictRoomGuarderPKLinkMicView.m in Sources */, BE189E062C733B460008418B /* FSRActivedictRoomGuarderPKLinkMicView.m in Sources */,
BE189DEA2C733B460008418B /* FSREffectShowRoomPKTableViewCell.m in Sources */, BE189DEA2C733B460008418B /* FSREffectShowRoomPKTableViewCell.m in Sources */,
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSLivePushPrepareView.m
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
@interface FUSLivePushPrepareView () @interface FUSLivePushPrepareView ()
@property (nonatomic, strong) FUSVideoAuthorizationView *authView; @property (nonatomic, strong) FUSVideoAuthorizationView *authView;
@property (nonatomic, strong) FUSLiveStartV2View *startView; @property (nonatomic, strong) FUSLiveStartView *startView;
// 是否进行了开播line分享、由于line分享之后不会自动返回。所以如果跳转到line分享。需要记录一下这个状态，然后重新回到app时自动开播 // 是否进行了开播line分享、由于line分享之后不会自动返回。所以如果跳转到line分享。需要记录一下这个状态，然后重新回到app时自动开播
@property (nonatomic, assign) BOOL isStartWithLineShare; @property (nonatomic, assign) BOOL isStartWithLineShare;
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
初始化推流开始的View 初始化推流开始的View
*/ */
- (void)initPushStartView { - (void)initPushStartView {
_startView = [[FUSLiveStartV2View alloc] initWithFrame:UIView.fus_screenFrame]; _startView = [[FUSLiveStartView alloc] initWithFrame:UIView.fus_screenFrame];
[self addSubview:_startView]; [self addSubview:_startView];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
}]; }];
}; };
_startView.startLiveHandler = ^(FUSLiveStartV2StartModel * _Nonnull model) { _startView.startLiveHandler = ^(FUSLiveStartStartModel * _Nonnull model) {
[FUSLoadingView fus_dismissProgressViewWithView:weakSelf]; [FUSLoadingView fus_dismissProgressViewWithView:weakSelf];
[FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:weakSelf]; [FUSLoadingView fus_showProgressViewWithContentMessage:nil withView:weakSelf];
...@@ -124,32 +124,32 @@ ...@@ -124,32 +124,32 @@
[weakSelf.startView endEditing:YES]; [weakSelf.startView endEditing:YES];
switch (model.shareType) { switch (model.shareType) {
case FUSLiveStartV2ShareTypeNone: case FUSLiveStartShareTypeNone:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"none"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"none"}];
} }
break; break;
case FUSLiveStartV2ShareTypeFacebook: case FUSLiveStartShareTypeFacebook:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"facebook"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"facebook"}];
} }
break; break;
case FUSLiveStartV2ShareTypeTwitter: case FUSLiveStartShareTypeTwitter:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"twitter"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"twitter"}];
} }
break; break;
case FUSLiveStartV2ShareTypeWechat: case FUSLiveStartShareTypeWechat:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"wechat"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"wechat"}];
} }
break; break;
case FUSLiveStartV2ShareTypeWcCircle: case FUSLiveStartShareTypeWcCircle:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"wechat_moment"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"wechat_moment"}];
} }
break; break;
case FUSLiveStartV2ShareTypeLine: case FUSLiveStartShareTypeLine:
{ {
[FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"line"}]; [FUSTalkingData fus_trackEvent:FUSLiveEventTrackParams.fus_EVENT_STARTSTREAM_START label:nil parameters:@{@"startstream_share_name":@"line"}];
} }
...@@ -173,21 +173,21 @@ ...@@ -173,21 +173,21 @@
[[FUSLiveHelper shareInstance] setStreamModel:streamModel]; [[FUSLiveHelper shareInstance] setStreamModel:streamModel];
// 开播前分享 // 开播前分享
SocialSharePlatform sType; SocialSharePlatform sType;
if (model.shareType == FUSLiveStartV2ShareTypeNone) { if (model.shareType == FUSLiveStartShareTypeNone) {
[FUSLoadingView fus_dismissProgressViewWithView:weakSelf]; [FUSLoadingView fus_dismissProgressViewWithView:weakSelf];
if (weakSelf.pushSuccessBlock){ if (weakSelf.pushSuccessBlock){
weakSelf.pushSuccessBlock(); weakSelf.pushSuccessBlock();
} }
} else { } else {
if (model.shareType == FUSLiveStartV2ShareTypeFacebook) { if (model.shareType == FUSLiveStartShareTypeFacebook) {
sType = FacebookPlatform; sType = FacebookPlatform;
} else if (model.shareType == FUSLiveStartV2ShareTypeTwitter) { } else if (model.shareType == FUSLiveStartShareTypeTwitter) {
sType = TwitterPlatform; sType = TwitterPlatform;
// [FUSLoadingView fus_dismissProgressView]; // [FUSLoadingView fus_dismissProgressView];
} else if (model.shareType == FUSLiveStartV2ShareTypeWechat) { } else if (model.shareType == FUSLiveStartShareTypeWechat) {
sType = WechatFriendPlatform; sType = WechatFriendPlatform;
} else if (model.shareType == FUSLiveStartV2ShareTypeLine) { } else if (model.shareType == FUSLiveStartShareTypeLine) {
sType = LineSharePlatform; sType = LineSharePlatform;
weakSelf.isStartWithLineShare = YES; weakSelf.isStartWithLineShare = YES;
} else { } else {
...@@ -228,18 +228,18 @@ ...@@ -228,18 +228,18 @@
if (buttonIndex == 0) { if (buttonIndex == 0) {
// 开播 // 开播
SocialSharePlatform sType; SocialSharePlatform sType;
if (model.shareType == FUSLiveStartV2ShareTypeNone) { if (model.shareType == FUSLiveStartShareTypeNone) {
[FUSLoadingView fus_dismissProgressViewWithView:weakSelf]; [FUSLoadingView fus_dismissProgressViewWithView:weakSelf];
if (weakSelf.pushSuccessBlock) weakSelf.pushSuccessBlock(); if (weakSelf.pushSuccessBlock) weakSelf.pushSuccessBlock();
} else { } else {
if (model.shareType == FUSLiveStartV2ShareTypeFacebook) { if (model.shareType == FUSLiveStartShareTypeFacebook) {
sType = FacebookPlatform; sType = FacebookPlatform;
} else if (model.shareType == FUSLiveStartV2ShareTypeTwitter) { } else if (model.shareType == FUSLiveStartShareTypeTwitter) {
sType = TwitterPlatform; sType = TwitterPlatform;
// [FUSLoadingView fus_dismissProgressView]; // [FUSLoadingView fus_dismissProgressView];
} else if (model.shareType == FUSLiveStartV2ShareTypeWcCircle) { } else if (model.shareType == FUSLiveStartShareTypeWcCircle) {
sType = WechatFriendPlatform; sType = WechatFriendPlatform;
} else if (model.shareType == FUSLiveStartV2ShareTypeLine) { } else if (model.shareType == FUSLiveStartShareTypeLine) {
sType = LineSharePlatform; sType = LineSharePlatform;
} else { } else {
sType = WechatCirclePaltform; sType = WechatCirclePaltform;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautyFavoritesEditView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautyFavoritesEditView.swift
// //
// FUSLiveStartV2BeautyFavoritesEditView.swift // FUSLiveStartBeautyFavoritesEditView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/9. // Created by aaa on 2023/11/9.
...@@ -11,7 +11,7 @@ import RxSwift ...@@ -11,7 +11,7 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2BeautyFavoritesEditView: UIView { class FUSLiveStartBeautyFavoritesEditView: UIView {
static public func fus_createWithAnimation(showOn: UIView? = nil, title: String, placeholder: String, text: String, clickHandler: @escaping ((_ text: String) -> Void)){ static public func fus_createWithAnimation(showOn: UIView? = nil, title: String, placeholder: String, text: String, clickHandler: @escaping ((_ text: String) -> Void)){
guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return } guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
...@@ -22,7 +22,7 @@ class FUSLiveStartV2BeautyFavoritesEditView: UIView { ...@@ -22,7 +22,7 @@ class FUSLiveStartV2BeautyFavoritesEditView: UIView {
] ]
let attributedString = NSAttributedString(string: placeholder, attributes: attributes) let attributedString = NSAttributedString(string: placeholder, attributes: attributes)
let view = FUSLiveStartV2BeautyFavoritesEditView(frame: showOnView.bounds) let view = FUSLiveStartBeautyFavoritesEditView(frame: showOnView.bounds)
view.textField.attributedPlaceholder = attributedString view.textField.attributedPlaceholder = attributedString
view.textField.text = text view.textField.text = text
view.titleLabel.text = title view.titleLabel.text = title
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautyFavoritesView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautyFavoritesView.swift
// //
// FUSLiveStartV2BeautyFavoritesView.swift // FUSLiveStartBeautyFavoritesView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/9. // Created by aaa on 2023/11/9.
...@@ -11,12 +11,12 @@ import RxSwift ...@@ -11,12 +11,12 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2BeautyFavoritesView: UIView { class FUSLiveStartBeautyFavoritesView: UIView {
static public func fus_createWithAnimation(showOn: UIView? = nil, dismissHandler: @escaping (() -> Void)){ static public func fus_createWithAnimation(showOn: UIView? = nil, dismissHandler: @escaping (() -> Void)){
guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return } guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
let view = FUSLiveStartV2BeautyFavoritesView(frame: showOnView.bounds) let view = FUSLiveStartBeautyFavoritesView(frame: showOnView.bounds)
view.clickHandler = { view.clickHandler = {
dismissHandler() dismissHandler()
} }
...@@ -47,7 +47,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView { ...@@ -47,7 +47,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView {
var clickHandler: (() -> Void)? var clickHandler: (() -> Void)?
let cellID = "FUSLiveStartV2BeautyFavoritesCell" let cellID = "FUSLiveStartBeautyFavoritesCell"
func createUI(){ func createUI(){
self.addSubview(bgBtn) self.addSubview(bgBtn)
...@@ -70,7 +70,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView { ...@@ -70,7 +70,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView {
make.top.equalToSuperview().offset(28.5) make.top.equalToSuperview().offset(28.5)
} }
addBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_favorites_add"), for: .normal) addBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_beauty_favorites_add"), for: .normal)
contentView.addSubview(addBtn) contentView.addSubview(addBtn)
addBtn.snp.makeConstraints { make in addBtn.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-10) make.right.equalToSuperview().offset(-10)
...@@ -81,7 +81,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView { ...@@ -81,7 +81,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView {
tableView.backgroundColor = .clear tableView.backgroundColor = .clear
tableView.showsVerticalScrollIndicator = false tableView.showsVerticalScrollIndicator = false
tableView.showsHorizontalScrollIndicator = false tableView.showsHorizontalScrollIndicator = false
tableView.register(FUSLiveStartV2BeautyFavoritesCell.self, forCellReuseIdentifier: cellID) tableView.register(FUSLiveStartBeautyFavoritesCell.self, forCellReuseIdentifier: cellID)
tableView.separatorStyle = .none tableView.separatorStyle = .none
contentView.addSubview(tableView) contentView.addSubview(tableView)
tableView.snp.makeConstraints { make in tableView.snp.makeConstraints { make in
...@@ -106,7 +106,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView { ...@@ -106,7 +106,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView {
return return
} }
FUSLiveStartV2BeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("新增收藏"), placeholder: .fus_localString("输入你的收藏名称"), text: "") {[weak self] keyName in FUSLiveStartBeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("新增收藏"), placeholder: .fus_localString("输入你的收藏名称"), text: "") {[weak self] keyName in
FUSBeautyFavoritesHelper.shared.fus_createNewBeautyFavoritesItem(keyName: keyName) FUSBeautyFavoritesHelper.shared.fus_createNewBeautyFavoritesItem(keyName: keyName)
self?.tableView.reloadData() self?.tableView.reloadData()
} }
...@@ -145,7 +145,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView { ...@@ -145,7 +145,7 @@ class FUSLiveStartV2BeautyFavoritesView: UIView {
} }
} }
extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDataSource { extension FUSLiveStartBeautyFavoritesView: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 44 return 44
...@@ -156,7 +156,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat ...@@ -156,7 +156,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if let cell = tableView.dequeueReusableCell(withIdentifier: cellID, for: indexPath) as? FUSLiveStartV2BeautyFavoritesCell { if let cell = tableView.dequeueReusableCell(withIdentifier: cellID, for: indexPath) as? FUSLiveStartBeautyFavoritesCell {
let model = FUSBeautyFavoritesHelper.shared.beautyFavorites[indexPath.row] let model = FUSBeautyFavoritesHelper.shared.beautyFavorites[indexPath.row]
cell.titleLabel.text = model.keyName cell.titleLabel.text = model.keyName
...@@ -183,7 +183,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat ...@@ -183,7 +183,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat
FUSActionSheetView.showAcionSheet(withCancelTitle: .fus_localString("取消"), otherTitles: [String.fus_localString("修改名称")]) { index, title in FUSActionSheetView.showAcionSheet(withCancelTitle: .fus_localString("取消"), otherTitles: [String.fus_localString("修改名称")]) { index, title in
if title == .fus_localString("修改名称") { if title == .fus_localString("修改名称") {
FUSLiveStartV2BeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("修改收藏名称"), placeholder: .fus_localString("输入你的收藏名称"), text: model.keyName) { text in FUSLiveStartBeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("修改收藏名称"), placeholder: .fus_localString("输入你的收藏名称"), text: model.keyName) { text in
FUSBeautyFavoritesHelper.shared.fus_editBeautyName(keyName: model.keyName, newName: text) FUSBeautyFavoritesHelper.shared.fus_editBeautyName(keyName: model.keyName, newName: text)
tableView.reloadData() tableView.reloadData()
} }
...@@ -194,7 +194,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat ...@@ -194,7 +194,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat
FUSActionSheetView.showAcionSheet(withCancelTitle: .fus_localString("取消"), otherTitles: [String.fus_localString("加载收藏"), String.fus_localString("修改名称"), String.fus_localString("删除")], buttonColors: [String.fus_localString("删除"):UIColor.init(hex:"#E94F4C")]) { index, title in FUSActionSheetView.showAcionSheet(withCancelTitle: .fus_localString("取消"), otherTitles: [String.fus_localString("加载收藏"), String.fus_localString("修改名称"), String.fus_localString("删除")], buttonColors: [String.fus_localString("删除"):UIColor.init(hex:"#E94F4C")]) { index, title in
if title == .fus_localString("修改名称") { if title == .fus_localString("修改名称") {
FUSLiveStartV2BeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("修改收藏名称"), placeholder: .fus_localString("输入你的收藏名称"), text: model.keyName) { text in FUSLiveStartBeautyFavoritesEditView.fus_createWithAnimation(showOn: self, title: .fus_localString("修改收藏名称"), placeholder: .fus_localString("输入你的收藏名称"), text: model.keyName) { text in
FUSBeautyFavoritesHelper.shared.fus_editBeautyName(keyName: model.keyName, newName: text) FUSBeautyFavoritesHelper.shared.fus_editBeautyName(keyName: model.keyName, newName: text)
tableView.reloadData() tableView.reloadData()
} }
...@@ -221,7 +221,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat ...@@ -221,7 +221,7 @@ extension FUSLiveStartV2BeautyFavoritesView: UITableViewDelegate, UITableViewDat
} }
class FUSLiveStartV2BeautyFavoritesCell: UITableViewCell { class FUSLiveStartBeautyFavoritesCell: UITableViewCell {
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier) super.init(style: style, reuseIdentifier: reuseIdentifier)
self.selectionStyle = .none self.selectionStyle = .none
...@@ -235,7 +235,7 @@ class FUSLiveStartV2BeautyFavoritesCell: UITableViewCell { ...@@ -235,7 +235,7 @@ class FUSLiveStartV2BeautyFavoritesCell: UITableViewCell {
// let selectedImageView = UIImageView(image: .fus_selectedIcon()) // let selectedImageView = UIImageView(image: .fus_selectedIcon())
let titleLabel = UILabel() let titleLabel = UILabel()
let rightArrow = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_favorites_rightArrow")) let rightArrow = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_beauty_favorites_rightArrow"))
let lineView = UIView() let lineView = UIView()
func createUI() { func createUI() {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautySetItemView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetItemView.swift
// //
// FUSLiveStartV2BeautySetItemView.swift // FUSLiveStartBeautySetItemView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/8. // Created by aaa on 2023/11/8.
...@@ -11,7 +11,7 @@ import RxSwift ...@@ -11,7 +11,7 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2BeautySetItemView: UIView { class FUSLiveStartBeautySetItemView: UIView {
///当前状态 ///当前状态
enum BeautySetItemViewState: Int { enum BeautySetItemViewState: Int {
case normal = 0 case normal = 0
...@@ -32,7 +32,7 @@ class FUSLiveStartV2BeautySetItemView: UIView { ...@@ -32,7 +32,7 @@ class FUSLiveStartV2BeautySetItemView: UIView {
} }
/// 设置样式 /// 设置样式
public var itemType: FUSLiveStartV2BeautySetView.BeautySetViewItemType = .none{ public var itemType: FUSLiveStartBeautySetView.BeautySetViewItemType = .none{
didSet{ didSet{
fus_reloadUI() fus_reloadUI()
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautySetLevelView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetLevelView.swift
// //
// FUSLiveStartV2BeautySetLevelView.swift // FUSLiveStartBeautySetLevelView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/8. // Created by aaa on 2023/11/8.
...@@ -11,7 +11,7 @@ import RxSwift ...@@ -11,7 +11,7 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2BeautySetLevelView: UIView { class FUSLiveStartBeautySetLevelView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -79,7 +79,7 @@ class FUSLiveStartV2BeautySetLevelView: UIView { ...@@ -79,7 +79,7 @@ class FUSLiveStartV2BeautySetLevelView: UIView {
resetBtn.titleLabel?.font = resetFont resetBtn.titleLabel?.font = resetFont
resetBtn.setTitleColor(.fus_textColorRich(), for: .normal) resetBtn.setTitleColor(.fus_textColorRich(), for: .normal)
resetBtn.setTitle(" " + resetTitle, for: .normal) resetBtn.setTitle(" " + resetTitle, for: .normal)
resetBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_beautyReset_img"), for: .normal) resetBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_beautyReset_img"), for: .normal)
resetBtn.backgroundColor = btnNormalBgColor resetBtn.backgroundColor = btnNormalBgColor
resetBtn.layer.cornerRadius = 20.0 / 2.0 resetBtn.layer.cornerRadius = 20.0 / 2.0
resetBtn.layer.masksToBounds = true resetBtn.layer.masksToBounds = true
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautySetSliderView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetSliderView.swift
// //
// FUSLiveStartV2BeautySetSliderView.swift // FUSLiveStartBeautySetSliderView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/8. // Created by aaa on 2023/11/8.
...@@ -15,13 +15,13 @@ enum BeautySetSliderViewType: Int { ...@@ -15,13 +15,13 @@ enum BeautySetSliderViewType: Int {
case midPoint = 1 case midPoint = 1
} }
class FUSLiveStartV2BeautySetSliderView: UIView { class FUSLiveStartBeautySetSliderView: UIView {
public var sliderDidChangeHandler: ((_ value: Float) -> Void)? public var sliderDidChangeHandler: ((_ value: Float) -> Void)?
private let slider = BeautySetCustomSlider() private let slider = BeautySetCustomSlider()
private let midPointSlider = FUSMidpointSlider() private let midPointSlider = FUSMidpointSlider()
private let valueBgImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_slider_numBg")) private let valueBgImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_beauty_slider_numBg"))
private let valueLabel = UILabel() private let valueLabel = UILabel()
private var timer: Timer? private var timer: Timer?
...@@ -88,7 +88,7 @@ class FUSLiveStartV2BeautySetSliderView: UIView { ...@@ -88,7 +88,7 @@ class FUSLiveStartV2BeautySetSliderView: UIView {
midPointSlider.addTarget(self, action: #selector(midPointSliderTouchUp), for: [.touchUpInside, .touchUpOutside]) midPointSlider.addTarget(self, action: #selector(midPointSliderTouchUp), for: [.touchUpInside, .touchUpOutside])
midPointSlider.isHidden = true midPointSlider.isHidden = true
// slider.setThumbImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_thumb_normal"), for: .normal) // slider.setThumbImage(FUSShowRoomCenterBunble.imageNamed("live_start_beauty_thumb_normal"), for: .normal)
slider.setThumbImage(self.generateCircularImage(size: CGSizeMake(12, 12), color: .fus_theme()), for: .normal) slider.setThumbImage(self.generateCircularImage(size: CGSizeMake(12, 12), color: .fus_theme()), for: .normal)
// 数值背景 // 数值背景
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2BeautySetView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartBeautySetView.swift
// //
// FUSLiveStartV2BeautySetView.swift // FUSLiveStartBeautySetView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/8. // Created by aaa on 2023/11/8.
...@@ -12,13 +12,13 @@ import FUSFoundation ...@@ -12,13 +12,13 @@ import FUSFoundation
import FUSCommon import FUSCommon
import Bifrost import Bifrost
@objcMembers public class FUSLiveStartV2BeautySetView: UIView { @objcMembers public class FUSLiveStartBeautySetView: UIView {
//TODO:暴露出去给视频通话用: added By Pidan //TODO:暴露出去给视频通话用: added By Pidan
// static public func swiftLoad(){ // static public func swiftLoad(){
// Bifrost.bindURL(LiveRoute.beautySetView) { parm in // Bifrost.bindURL(LiveRoute.beautySetView) { parm in
// //
// let beautySetView = FUSLiveStartV2BeautySetView(frame: CGRectZero) // let beautySetView = FUSLiveStartBeautySetView(frame: CGRectZero)
// beautySetView.dismissHandler = { // beautySetView.dismissHandler = {
// if let handler = parm?[LiveRoute.viewDismissWithBifrostRouteCompletion] as? BifrostRouteCompletion { // if let handler = parm?[LiveRoute.viewDismissWithBifrostRouteCompletion] as? BifrostRouteCompletion {
// handler(nil) // handler(nil)
...@@ -31,7 +31,7 @@ import Bifrost ...@@ -31,7 +31,7 @@ import Bifrost
static public func fus_createWithAnimation(showOn: UIView? = nil, dismiss: @escaping (() -> Void)){ static public func fus_createWithAnimation(showOn: UIView? = nil, dismiss: @escaping (() -> Void)){
guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return } guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
let beautySetView = FUSLiveStartV2BeautySetView(frame: showOnView.bounds) let beautySetView = FUSLiveStartBeautySetView(frame: showOnView.bounds)
beautySetView.dismissHandler = { beautySetView.dismissHandler = {
dismiss() dismiss()
} }
...@@ -73,7 +73,7 @@ import Bifrost ...@@ -73,7 +73,7 @@ import Bifrost
/// 白牙 /// 白牙
case whitenTeeth case whitenTeeth
// let iconImageList =,,,,,,"live_startv2_beauty_forehead",] // let iconImageList =,,,,,,"live_start_beauty_forehead",]
public var iconImageName: String { public var iconImageName: String {
switch self { switch self {
...@@ -81,35 +81,35 @@ import Bifrost ...@@ -81,35 +81,35 @@ import Bifrost
case .none: case .none:
return "" return ""
case .close: case .close:
return "live_startv2_beauty_close" return "live_start_beauty_close"
case .preset: case .preset:
return "live_startv2_beauty_preset" return "live_start_beauty_preset"
case .whiten: case .whiten:
return "live_startv2_beauty_whiten" return "live_start_beauty_whiten"
case .soften: case .soften:
return "live_startv2_beauty_soften" return "live_start_beauty_soften"
case .bigEye: case .bigEye:
return "live_startv2_beauty_bigEye" return "live_start_beauty_bigEye"
case .thinFace: case .thinFace:
return "live_startv2_beauty_thinFace" return "live_start_beauty_thinFace"
case .sharp: case .sharp:
return "live_startv2_beauty_sharp" return "live_start_beauty_sharp"
case .chin: case .chin:
return "live_startv2_beauty_chin" return "live_start_beauty_chin"
case .forehead: case .forehead:
return "live_startv2_beauty_forehead" return "live_start_beauty_forehead"
case .nose: case .nose:
return "live_startv2_beauty_nose" return "live_start_beauty_nose"
case .clear: case .clear:
return "live_startv2_beauty_clear" return "live_start_beauty_clear"
case .brightenEyes: case .brightenEyes:
return "live_startv2_beauty_brighten_eyes" return "live_start_beauty_brighten_eyes"
case .zoomMouth: case .zoomMouth:
return "live_startv2_beauty_zoom_mouth" return "live_start_beauty_zoom_mouth"
case .whitenTeeth: case .whitenTeeth:
return "live_startv2_beauty_whiten_teeth" return "live_start_beauty_whiten_teeth"
case .narrowFace: case .narrowFace:
return "live_startv2_beauty_narrowFace" return "live_start_beauty_narrowFace"
} }
} }
...@@ -191,12 +191,12 @@ import Bifrost ...@@ -191,12 +191,12 @@ import Bifrost
let filterBtn = UIButton(type: .custom) let filterBtn = UIButton(type: .custom)
let favoritesBtn = UIButton(type: .custom) let favoritesBtn = UIButton(type: .custom)
let closeBeautyBgView = UIView() let closeBeautyBgView = UIView()
let closeBeautyBtn = FUSLiveStartV2BeautySetItemView() let closeBeautyBtn = FUSLiveStartBeautySetItemView()
let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout()) let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
/// 等级的view /// 等级的view
let levelView = FUSLiveStartV2BeautySetLevelView() let levelView = FUSLiveStartBeautySetLevelView()
/// 滑块 /// 滑块
let levelSlider = FUSLiveStartV2BeautySetSliderView() let levelSlider = FUSLiveStartBeautySetSliderView()
// 这些选择处理要小心点，0虽然是关闭，但是设计图的原因0并不在collectionview里面，所以每个collectionview的indexpath的row都得+1才是特指每一个的实际选择 // 这些选择处理要小心点，0虽然是关闭，但是设计图的原因0并不在collectionview里面，所以每个collectionview的indexpath的row都得+1才是特指每一个的实际选择
// ui图从左到右的结构依次是 关闭btn-|-collectionview // ui图从左到右的结构依次是 关闭btn-|-collectionview
...@@ -229,7 +229,7 @@ import Bifrost ...@@ -229,7 +229,7 @@ import Bifrost
let contentViewHeight = 152.0 + UIView.fus_SafeBottom() let contentViewHeight = 152.0 + UIView.fus_SafeBottom()
private let collectionviewCellId = "FUSLiveStartV2BeautySetItemCell" private let collectionviewCellId = "FUSLiveStartBeautySetItemCell"
func createUI(){ func createUI(){
self.addSubview(bgView) self.addSubview(bgView)
...@@ -328,7 +328,7 @@ import Bifrost ...@@ -328,7 +328,7 @@ import Bifrost
make.width.equalTo(70) make.width.equalTo(70)
} }
let lineImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_line_vertical")) let lineImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_beauty_line_vertical"))
closeBeautyBgView.addSubview(lineImageView) closeBeautyBgView.addSubview(lineImageView)
lineImageView.snp.makeConstraints { make in lineImageView.snp.makeConstraints { make in
make.left.equalTo(closeBeautyBtn.snp.right) make.left.equalTo(closeBeautyBtn.snp.right)
...@@ -341,7 +341,7 @@ import Bifrost ...@@ -341,7 +341,7 @@ import Bifrost
collectionView.backgroundColor = .clear collectionView.backgroundColor = .clear
collectionView.showsVerticalScrollIndicator = false collectionView.showsVerticalScrollIndicator = false
collectionView.showsHorizontalScrollIndicator = false collectionView.showsHorizontalScrollIndicator = false
collectionView.register(FUSLiveStartV2BeautySetItemCell.self, forCellWithReuseIdentifier: collectionviewCellId) collectionView.register(FUSLiveStartBeautySetItemCell.self, forCellWithReuseIdentifier: collectionviewCellId)
collectionView.delegate = self collectionView.delegate = self
collectionView.dataSource = self collectionView.dataSource = self
...@@ -412,7 +412,7 @@ import Bifrost ...@@ -412,7 +412,7 @@ import Bifrost
// 我的收藏点击 // 我的收藏点击
favoritesBtn.rx.tap.subscribe(onNext: { favoritesBtn.rx.tap.subscribe(onNext: {
FUSLiveStartV2BeautyFavoritesView.fus_createWithAnimation(showOn: self) {[weak self] in FUSLiveStartBeautyFavoritesView.fus_createWithAnimation(showOn: self) {[weak self] in
self?.fus_setupDataSource() self?.fus_setupDataSource()
} }
}).disposed(by: disposedBag) }).disposed(by: disposedBag)
...@@ -657,7 +657,7 @@ import Bifrost ...@@ -657,7 +657,7 @@ import Bifrost
} }
//MARK: 管理两个collectionview //MARK: 管理两个collectionview
extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionViewDataSource { extension FUSLiveStartBeautySetView: UICollectionViewDelegate, UICollectionViewDataSource {
public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
if isBeautySet { if isBeautySet {
return BeautySetViewItemType.whitenTeeth.rawValue return BeautySetViewItemType.whitenTeeth.rawValue
...@@ -667,7 +667,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie ...@@ -667,7 +667,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie
} }
public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
if let cell = collectionView.dequeueReusableCell(withReuseIdentifier: collectionviewCellId, for: indexPath) as? FUSLiveStartV2BeautySetItemCell { if let cell = collectionView.dequeueReusableCell(withReuseIdentifier: collectionviewCellId, for: indexPath) as? FUSLiveStartBeautySetItemCell {
if isBeautySet { if isBeautySet {
//美颜的卡片 //美颜的卡片
...@@ -705,7 +705,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie ...@@ -705,7 +705,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie
if indexPath.row == 0 { if indexPath.row == 0 {
cell.itemView.nameLabel.text = .fus_localString("关闭") cell.itemView.nameLabel.text = .fus_localString("关闭")
cell.itemView.iconBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_filterClose_normal"), for: .normal) cell.itemView.iconBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_beauty_filterClose_normal"), for: .normal)
cell.itemView.iconBtn.backgroundColor = .init(hex:"#8B8B8C") cell.itemView.iconBtn.backgroundColor = .init(hex:"#8B8B8C")
} }
...@@ -727,7 +727,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie ...@@ -727,7 +727,7 @@ extension FUSLiveStartV2BeautySetView: UICollectionViewDelegate, UICollectionVie
} }
class FUSLiveStartV2BeautySetItemCell: UICollectionViewCell { class FUSLiveStartBeautySetItemCell: UICollectionViewCell {
override init(frame: CGRect) { override init(frame: CGRect) {
super.init(frame: frame) super.init(frame: frame)
...@@ -738,7 +738,7 @@ class FUSLiveStartV2BeautySetItemCell: UICollectionViewCell { ...@@ -738,7 +738,7 @@ class FUSLiveStartV2BeautySetItemCell: UICollectionViewCell {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
let itemView = FUSLiveStartV2BeautySetItemView() let itemView = FUSLiveStartBeautySetItemView()
func makeUI(){ func makeUI(){
contentView.addSubview(itemView) contentView.addSubview(itemView)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentBottomView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentBottomView.swift
// //
// FUSLiveStartV2ContentBottomView.swift // FUSLiveStartContentBottomView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/3. // Created by aaa on 2023/11/3.
...@@ -10,7 +10,7 @@ import RxSwift ...@@ -10,7 +10,7 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2ContentBottomView: UIView { class FUSLiveStartContentBottomView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -76,7 +76,7 @@ class FUSLiveStartV2ContentBottomView: UIView { ...@@ -76,7 +76,7 @@ class FUSLiveStartV2ContentBottomView: UIView {
make.bottom.equalTo(protocolBtn.snp.top).offset(-10) make.bottom.equalTo(protocolBtn.snp.top).offset(-10)
} }
definitionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_definition_img"), for: .normal) definitionBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_definition_img"), for: .normal)
self.addSubview(definitionBtn) self.addSubview(definitionBtn)
definitionBtn.snp.makeConstraints { make in definitionBtn.snp.makeConstraints { make in
make.right.equalTo(startLiveBtn.snp.left).offset(-10) make.right.equalTo(startLiveBtn.snp.left).offset(-10)
...@@ -84,7 +84,7 @@ class FUSLiveStartV2ContentBottomView: UIView { ...@@ -84,7 +84,7 @@ class FUSLiveStartV2ContentBottomView: UIView {
make.centerY.equalTo(startLiveBtn.snp.centerY) make.centerY.equalTo(startLiveBtn.snp.centerY)
} }
beautyBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_beauty_img"), for: .normal) beautyBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_beauty_img"), for: .normal)
self.addSubview(beautyBtn) self.addSubview(beautyBtn)
beautyBtn.snp.makeConstraints { make in beautyBtn.snp.makeConstraints { make in
make.left.equalTo(startLiveBtn.snp.right).offset(10) make.left.equalTo(startLiveBtn.snp.right).offset(10)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentLiveActivityView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentLiveActivityView.swift
// //
// FUSLiveStartV2ContentLiveActivityView.swift // FUSLiveStartContentLiveActivityView.swift
// LiveRoom // LiveRoom
// //
// Created by aaa on 2023/11/7. // Created by aaa on 2023/11/7.
...@@ -13,7 +13,7 @@ import SnapKit ...@@ -13,7 +13,7 @@ import SnapKit
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2ContentLiveActivityView: UIView { class FUSLiveStartContentLiveActivityView: UIView {
/// 监听ishidden /// 监听ishidden
public let isHiddenObserver: BehaviorRelay<Bool> = .init(value: false) public let isHiddenObserver: BehaviorRelay<Bool> = .init(value: false)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentPrivacyView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentPrivacyView.swift
...@@ -12,7 +12,7 @@ import FUSFoundation ...@@ -12,7 +12,7 @@ import FUSFoundation
import FUSCommon import FUSCommon
///如果不设置宽度，自己也有宽度 ///如果不设置宽度，自己也有宽度
@objcMembers public class FUSLiveStartV2ContentPrivacyView: UIView { @objcMembers public class FUSLiveStartContentPrivacyView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -33,7 +33,7 @@ import FUSCommon ...@@ -33,7 +33,7 @@ import FUSCommon
///是否选择 ///是否选择
public var isSelected: Bool = false{ public var isSelected: Bool = false{
didSet{ didSet{
privacyArrowImageView.image = (isSelected ? FUSShowRoomCenterBunble.imageNamed("live_startv2_upArrow_img") : FUSShowRoomCenterBunble.imageNamed("live_startv2_downArrow_img")) privacyArrowImageView.image = (isSelected ? FUSShowRoomCenterBunble.imageNamed("live_start_upArrow_img") : FUSShowRoomCenterBunble.imageNamed("live_start_downArrow_img"))
} }
} }
///类型 ///类型
...@@ -41,15 +41,15 @@ import FUSCommon ...@@ -41,15 +41,15 @@ import FUSCommon
didSet { didSet {
switch type{ switch type{
case .open: case .open:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_startv2_openScope_img") self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_openScope_img")
self.privacyLabel.text = .fus_localString("全公开") self.privacyLabel.text = .fus_localString("全公开")
case .follow: case .follow:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_startv2_followScope_img") self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_followScope_img")
self.privacyLabel.text = .fus_localString("关注圈") self.privacyLabel.text = .fus_localString("关注圈")
case .intimacy: case .intimacy:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_startv2_intimacyScope_img") self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_intimacyScope_img")
self.privacyLabel.text = .fus_localString("私密圈") self.privacyLabel.text = .fus_localString("私密圈")
@unknown default: @unknown default:
break break
...@@ -63,7 +63,7 @@ import FUSCommon ...@@ -63,7 +63,7 @@ import FUSCommon
let privacyBtn = UIButton(type: .custom) let privacyBtn = UIButton(type: .custom)
let privacyImageView = UIImageView() let privacyImageView = UIImageView()
let privacyLabel = UILabel() let privacyLabel = UILabel()
let privacyArrowImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_downArrow_img")) let privacyArrowImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_downArrow_img"))
func createUI(){ func createUI(){
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentShareView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentShareView.swift
// //
// FUSLiveStartV2ShareView.swift // FUSLiveStartShareView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/3. // Created by aaa on 2023/11/3.
...@@ -11,7 +11,7 @@ import RxSwift ...@@ -11,7 +11,7 @@ import RxSwift
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
@objcMembers public class FUSLiveStartV2ContentShareView: UIView { @objcMembers public class FUSLiveStartContentShareView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -34,7 +34,7 @@ import FUSCommon ...@@ -34,7 +34,7 @@ import FUSCommon
// let wcCircleShareBtn = UIButton(type: .custom) // let wcCircleShareBtn = UIButton(type: .custom)
var btnList:[UIButton] = [] var btnList:[UIButton] = []
public var type:FUSLiveStartV2ShareType = .facebook { public var type:FUSLiveStartShareType = .facebook {
didSet { didSet {
self.setCurrentShareType(type: self.type) self.setCurrentShareType(type: self.type)
} }
...@@ -79,8 +79,8 @@ import FUSCommon ...@@ -79,8 +79,8 @@ import FUSCommon
} }
func buttonDidClicked(btn: UIButton) { func buttonDidClicked(btn: UIButton) {
var shareType = FUSLiveStartV2ShareType.none var shareType = FUSLiveStartShareType.none
if let selectType = FUSLiveStartV2ShareType(rawValue: btn.tag) { if let selectType = FUSLiveStartShareType(rawValue: btn.tag) {
shareType = selectType shareType = selectType
} }
if type == shareType { if type == shareType {
...@@ -91,7 +91,7 @@ import FUSCommon ...@@ -91,7 +91,7 @@ import FUSCommon
} }
public func setCurrentShareType(type: FUSLiveStartV2ShareType) { public func setCurrentShareType(type: FUSLiveStartShareType) {
for btn in self.btnList { for btn in self.btnList {
if btn.tag == type.rawValue { if btn.tag == type.rawValue {
btn.isSelected = true btn.isSelected = true
...@@ -102,8 +102,8 @@ import FUSCommon ...@@ -102,8 +102,8 @@ import FUSCommon
} }
} }
extension FUSLiveStartV2ContentShareView { extension FUSLiveStartContentShareView {
@objc public enum FUSLiveStartV2ShareType: Int { @objc public enum FUSLiveStartShareType: Int {
///不分享 ///不分享
case none = 0 case none = 0
case facebook = 1 case facebook = 1
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentThemeEditView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentThemeEditView.swift
...@@ -11,7 +11,7 @@ import RxCocoa ...@@ -11,7 +11,7 @@ import RxCocoa
import FUSFoundation import FUSFoundation
import FUSCommon import FUSCommon
class FUSLiveStartV2ContentThemeEditView: UIView { class FUSLiveStartContentThemeEditView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -34,7 +34,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView { ...@@ -34,7 +34,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView {
// public var liveTitle = "" // public var liveTitle = ""
let LiveTitleTextFiled = UITextField() let LiveTitleTextFiled = UITextField()
let themeImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_themeicon_img")) let themeImageView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_themeicon_img"))
let themeSubLabel = UILabel() let themeSubLabel = UILabel()
let closeBtn = UIButton(type: .custom) let closeBtn = UIButton(type: .custom)
...@@ -92,7 +92,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView { ...@@ -92,7 +92,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView {
make.top.equalToSuperview() make.top.equalToSuperview()
} }
let lineView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_startv2_themeLine_img")) let lineView = UIImageView(image: FUSShowRoomCenterBunble.imageNamed("live_start_themeLine_img"))
self.addSubview(lineView) self.addSubview(lineView)
lineView.snp.makeConstraints { make in lineView.snp.makeConstraints { make in
make.left.equalTo(16) make.left.equalTo(16)
...@@ -128,7 +128,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView { ...@@ -128,7 +128,7 @@ class FUSLiveStartV2ContentThemeEditView: UIView {
make.right.lessThanOrEqualToSuperview().offset(-40) make.right.lessThanOrEqualToSuperview().offset(-40)
} }
closeBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_themeEdit_close_img"), for: .normal) closeBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_themeEdit_close_img"), for: .normal)
bottomView.addSubview(closeBtn) bottomView.addSubview(closeBtn)
closeBtn.snp.makeConstraints { make in closeBtn.snp.makeConstraints { make in
make.right.top.bottom.equalToSuperview() make.right.top.bottom.equalToSuperview()
...@@ -171,11 +171,11 @@ class FUSLiveStartV2ContentThemeEditView: UIView { ...@@ -171,11 +171,11 @@ class FUSLiveStartV2ContentThemeEditView: UIView {
func reloadUI() { func reloadUI() {
if let model = self.selectModel, model.themeId != 0 { if let model = self.selectModel, model.themeId != 0 {
self.themeSubLabel.text = themeTitle self.themeSubLabel.text = themeTitle
self.themeImageView.setImageWith(.init(string: FUSConfig.sharedInstanced().pathConfigs.bigDownloadPath(model.icon)), placeholder: FUSShowRoomCenterBunble.imageNamed("live_startv2_themeicon_img")) self.themeImageView.setImageWith(.init(string: FUSConfig.sharedInstanced().pathConfigs.bigDownloadPath(model.icon)), placeholder: FUSShowRoomCenterBunble.imageNamed("live_start_themeicon_img"))
self.closeBtn.isHidden = false self.closeBtn.isHidden = false
}else { }else {
self.themeSubLabel.text = themeSubString self.themeSubLabel.text = themeSubString
self.themeImageView.image = FUSShowRoomCenterBunble.imageNamed("live_startv2_themeicon_img") self.themeImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_themeicon_img")
self.closeBtn.isHidden = true self.closeBtn.isHidden = true
} }
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2ContentWarningView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartContentWarningView.swift
// //
// FUSLiveStartV2ContentWarningView.swift // FUSLiveStartContentWarningView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/3. // Created by aaa on 2023/11/3.
...@@ -10,7 +10,7 @@ import RxSwift ...@@ -10,7 +10,7 @@ import RxSwift
import RxCocoa import RxCocoa
import SnapKit import SnapKit
class FUSLiveStartV2ContentWarningView: UIView { class FUSLiveStartContentWarningView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
...@@ -46,7 +46,7 @@ class FUSLiveStartV2ContentWarningView: UIView { ...@@ -46,7 +46,7 @@ class FUSLiveStartV2ContentWarningView: UIView {
///回调 ///回调
public var clickHandler: ((_ model: FUSBeforeLiveCondModel, _ index: Int) -> Void)? public var clickHandler: ((_ model: FUSBeforeLiveCondModel, _ index: Int) -> Void)?
private var itemViewList: [FUSLiveStartV2WarningItemView] = [] private var itemViewList: [FUSLiveStartWarningItemView] = []
let bgStackView = UIStackView() let bgStackView = UIStackView()
...@@ -127,7 +127,7 @@ class FUSLiveStartV2ContentWarningView: UIView { ...@@ -127,7 +127,7 @@ class FUSLiveStartV2ContentWarningView: UIView {
itemViewList.removeAll() itemViewList.removeAll()
for (index, model) in dataSourceList.enumerated() { for (index, model) in dataSourceList.enumerated() {
let subView = FUSLiveStartV2WarningItemView() let subView = FUSLiveStartWarningItemView()
subView.fus_setModel(model: model) subView.fus_setModel(model: model)
bgStackView.addArrangedSubview(subView) bgStackView.addArrangedSubview(subView)
itemViewList.append(subView) itemViewList.append(subView)
...@@ -149,7 +149,7 @@ class FUSLiveStartV2ContentWarningView: UIView { ...@@ -149,7 +149,7 @@ class FUSLiveStartV2ContentWarningView: UIView {
///每一个卡片的view ///每一个卡片的view
class FUSLiveStartV2WarningItemView: UIView { class FUSLiveStartWarningItemView: UIView {
let disposedBag = DisposeBag() let disposedBag = DisposeBag()
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2SetPrivacyView.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
// //
// FUSLiveStartV2SetPrivacyView.swift // FUSLiveStartSetPrivacyView.swift
// LiveRoom // LiveRoom
// //
// Created by aaa on 2023/11/6. // Created by aaa on 2023/11/6.
...@@ -12,14 +12,14 @@ import FUSFoundation ...@@ -12,14 +12,14 @@ import FUSFoundation
import FUSCommon import FUSCommon
///这个是用来选择私密程度的view ///这个是用来选择私密程度的view
@objcMembers public class FUSLiveStartV2SetPrivacyView: UIView { @objcMembers public class FUSLiveStartSetPrivacyView: UIView {
///可以用这个快速创建，本身内部不请求改变房间类型，用于开播前 ///可以用这个快速创建，本身内部不请求改变房间类型，用于开播前
static public func fus_create(defaultScopeType: FUSLiveRoomScopeType, clickHandler: @escaping (_ scopeType: FUSLiveRoomScopeType) -> Void){ static public func fus_create(defaultScopeType: FUSLiveRoomScopeType, clickHandler: @escaping (_ scopeType: FUSLiveRoomScopeType) -> Void){
guard let showVC = UINavigationController.fus_top() else { return } guard let showVC = UINavigationController.fus_top() else { return }
let view = FUSLiveStartV2SetPrivacyView(frame: showVC.view.bounds) let view = FUSLiveStartSetPrivacyView(frame: showVC.view.bounds)
view.scopeType = defaultScopeType view.scopeType = defaultScopeType
view.fus_reloadSelectedUI() view.fus_reloadSelectedUI()
view.clickHandler = { scopeType in view.clickHandler = { scopeType in
...@@ -33,7 +33,7 @@ import FUSCommon ...@@ -33,7 +33,7 @@ import FUSCommon
static public func fus_createInLive() { static public func fus_createInLive() {
guard let showVC = UINavigationController.fus_top() else { return } guard let showVC = UINavigationController.fus_top() else { return }
let view = FUSLiveStartV2SetPrivacyView(frame: showVC.view.bounds) let view = FUSLiveStartSetPrivacyView(frame: showVC.view.bounds)
view.scopeType = FUSLiveHelper.shareInstance().roomScopeType view.scopeType = FUSLiveHelper.shareInstance().roomScopeType
view.requestType = 1 view.requestType = 1
view.fus_reloadSelectedUI() view.fus_reloadSelectedUI()
...@@ -54,7 +54,7 @@ import FUSCommon ...@@ -54,7 +54,7 @@ import FUSCommon
let privacyContentView = UIStackView() let privacyContentView = UIStackView()
let submitBtn = UIButton(type: .custom) let submitBtn = UIButton(type: .custom)
var itemViewList:[FUSLiveStartV2SetPrivacyItemView] = [] var itemViewList:[FUSLiveStartSetPrivacyItemView] = []
var clickHandler:((FUSLiveRoomScopeType) -> Void)? var clickHandler:((FUSLiveRoomScopeType) -> Void)?
...@@ -106,14 +106,14 @@ import FUSCommon ...@@ -106,14 +106,14 @@ import FUSCommon
} }
//这里特殊用户有不一样的逻辑 //这里特殊用户有不一样的逻辑
let iconImagesList = ["live_startv2_openScope_cell","live_startv2_followScope_cell","live_startv2_intimacyScope_cell"] let iconImagesList = ["live_start_openScope_cell","live_start_followScope_cell","live_start_intimacyScope_cell"]
let titlesList = [String.fus_localString("全公开"), .fus_localString("关注圈"), .fus_localString("亲密圈")] let titlesList = [String.fus_localString("全公开"), .fus_localString("关注圈"), .fus_localString("亲密圈")]
let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_localString("仅关注主播超过24小的粉丝可进入房间"), .fus_localString("仅亲密好友可进入房间")] let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_localString("仅关注主播超过24小的粉丝可进入房间"), .fus_localString("仅亲密好友可进入房间")]
let selectIndex = fus_getIndexWithScopeType() let selectIndex = fus_getIndexWithScopeType()
for (index, iconStr) in iconImagesList.enumerated() { for (index, iconStr) in iconImagesList.enumerated() {
let itemView = FUSLiveStartV2SetPrivacyItemView.fus_create(icon: iconStr, title: titlesList[index], subTitle: subTitlesList[index]) let itemView = FUSLiveStartSetPrivacyItemView.fus_create(icon: iconStr, title: titlesList[index], subTitle: subTitlesList[index])
itemView.selected = selectIndex == index itemView.selected = selectIndex == index
self.privacyContentView.addArrangedSubview(itemView) self.privacyContentView.addArrangedSubview(itemView)
itemView.snp.makeConstraints { make in itemView.snp.makeConstraints { make in
...@@ -240,7 +240,7 @@ import FUSCommon ...@@ -240,7 +240,7 @@ import FUSCommon
///每一个卡片 ///每一个卡片
class FUSLiveStartV2SetPrivacyItemView: UIView { class FUSLiveStartSetPrivacyItemView: UIView {
public var selected = false { public var selected = false {
didSet{ didSet{
...@@ -322,9 +322,9 @@ class FUSLiveStartV2SetPrivacyItemView: UIView { ...@@ -322,9 +322,9 @@ class FUSLiveStartV2SetPrivacyItemView: UIView {
} }
///这个创建 ///这个创建
static func fus_create(icon: String, title: String, subTitle: String) -> FUSLiveStartV2SetPrivacyItemView{ static func fus_create(icon: String, title: String, subTitle: String) -> FUSLiveStartSetPrivacyItemView{
let subView = FUSLiveStartV2SetPrivacyItemView(frame: .zero) let subView = FUSLiveStartSetPrivacyItemView(frame: .zero)
subView.iconImageView.image = FUSShowRoomCenterBunble.imageNamed(icon) subView.iconImageView.image = FUSShowRoomCenterBunble.imageNamed(icon)
subView.titleLabel.text = title subView.titleLabel.text = title
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartV2View.swift → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartView.swift
// //
// FUSLiveStartV2View.swift // FUSLiveStartView.swift
// LudyUITestDemo // LudyUITestDemo
// //
// Created by aaa on 2023/11/3. // Created by aaa on 2023/11/3.
...@@ -12,7 +12,7 @@ import FUSFoundation ...@@ -12,7 +12,7 @@ import FUSFoundation
import FUSCommon import FUSCommon
///开播的回传模型 ///开播的回传模型
@objcMembers public class FUSLiveStartV2StartModel: NSObject { @objcMembers public class FUSLiveStartStartModel: NSObject {
///标题 ///标题
public var title = "" public var title = ""
///主题id ///主题id
...@@ -21,7 +21,7 @@ import FUSCommon ...@@ -21,7 +21,7 @@ import FUSCommon
public var themeTitle = "" public var themeTitle = ""
///分享 ///分享
public var shareType = FUSLiveStartV2ContentShareView.FUSLiveStartV2ShareType.none public var shareType = FUSLiveStartContentShareView.FUSLiveStartShareType.none
//下面三个在私密哪一块获得，自动获取 //下面三个在私密哪一块获得，自动获取
///私密程度 ///私密程度
...@@ -32,7 +32,7 @@ import FUSCommon ...@@ -32,7 +32,7 @@ import FUSCommon
} }
@objcMembers public class FUSLiveStartV2View: UIView { @objcMembers public class FUSLiveStartView: UIView {
let disposeBag = DisposeBag() let disposeBag = DisposeBag()
...@@ -53,20 +53,20 @@ import FUSCommon ...@@ -53,20 +53,20 @@ import FUSCommon
///关闭的handler ///关闭的handler
@objc public var clickCloseBtnActionHandler: ((_: UIButton?) -> Void)? @objc public var clickCloseBtnActionHandler: ((_: UIButton?) -> Void)?
// @property (nonatomic, copy) void(^startLiveHandler)(NSString *title, NSInteger themeId, NSString *themeTitle,FUSVideoStartShareType shareType, FUSLiveRoomScopeType scopeType, NSString *toToll, NSString *password); // @property (nonatomic, copy) void(^startLiveHandler)(NSString *title, NSInteger themeId, NSString *themeTitle,FUSVideoStartShareType shareType, FUSLiveRoomScopeType scopeType, NSString *toToll, NSString *password);
@objc public var startLiveHandler: ((_: FUSLiveStartV2StartModel) -> Void)? @objc public var startLiveHandler: ((_: FUSLiveStartStartModel) -> Void)?
///全局回调模型 ///全局回调模型
var startLiveModel = BehaviorRelay(value: FUSLiveStartV2StartModel()) var startLiveModel = BehaviorRelay(value: FUSLiveStartStartModel())
let contentView = UIView() let contentView = UIView()
let closeBtn = UIButton(type: .custom) let closeBtn = UIButton(type: .custom)
let privacyView = FUSLiveStartV2ContentPrivacyView() let privacyView = FUSLiveStartContentPrivacyView()
let themeView = FUSLiveStartV2ContentThemeEditView() let themeView = FUSLiveStartContentThemeEditView()
let shareView = FUSLiveStartV2ContentShareView() let shareView = FUSLiveStartContentShareView()
let bottomView = FUSLiveStartV2ContentBottomView() let bottomView = FUSLiveStartContentBottomView()
let warningView = FUSLiveStartV2ContentWarningView() let warningView = FUSLiveStartContentWarningView()
// let liveStartPreviewEnterButton = FUSLiveStartPreviewEntranceButton(type: .custom) // let liveStartPreviewEnterButton = FUSLiveStartPreviewEntranceButton(type: .custom)
let liveActivityView = FUSLiveStartV2ContentLiveActivityView(frame: CGRectZero) let liveActivityView = FUSLiveStartContentLiveActivityView(frame: CGRectZero)
// let novaBuildBtn = UIButton(type: .custom) // let novaBuildBtn = UIButton(type: .custom)
private func createUI(){ private func createUI(){
...@@ -84,7 +84,7 @@ import FUSCommon ...@@ -84,7 +84,7 @@ import FUSCommon
make.height.equalTo(30) make.height.equalTo(30)
} }
closeBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_startv2_close_img"), for: .normal) closeBtn.setImage(FUSShowRoomCenterBunble.imageNamed("live_start_close_img"), for: .normal)
headerView.addSubview(closeBtn) headerView.addSubview(closeBtn)
closeBtn.snp.makeConstraints { make in closeBtn.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-10) make.right.equalToSuperview().offset(-10)
...@@ -171,7 +171,7 @@ import FUSCommon ...@@ -171,7 +171,7 @@ import FUSCommon
privacyView.clickHandler = {[weak self] in privacyView.clickHandler = {[weak self] in
guard let model = self?.startLiveModel.value else { return } guard let model = self?.startLiveModel.value else { return }
FUSLiveStartV2SetPrivacyView.fus_create(defaultScopeType: model.scopeType) {[weak self] scopeType in FUSLiveStartSetPrivacyView.fus_create(defaultScopeType: model.scopeType) {[weak self] scopeType in
model.scopeType = scopeType model.scopeType = scopeType
self?.startLiveModel.accept(model) self?.startLiveModel.accept(model)
} }
...@@ -218,7 +218,7 @@ import FUSCommon ...@@ -218,7 +218,7 @@ import FUSCommon
UIView.animate(withDuration: 0.3) { UIView.animate(withDuration: 0.3) {
self?.contentView.alpha = 0 self?.contentView.alpha = 0
} }
FUSLiveStartV2BeautySetView.fus_createWithAnimation { FUSLiveStartBeautySetView.fus_createWithAnimation {
UIView.animate(withDuration: 0.3) { UIView.animate(withDuration: 0.3) {
self?.contentView.alpha = 1 self?.contentView.alpha = 1
} }
...@@ -370,6 +370,6 @@ import FUSCommon ...@@ -370,6 +370,6 @@ import FUSCommon
} }
deinit { deinit {
FUSLog.info("FUSLiveStartV2View --- dealloc") FUSLog.info("FUSLiveStartView --- dealloc")
} }
} }
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