diff --git a/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj b/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj index c63181a..229cb58 100644 --- a/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj +++ b/KuaiCunShiPin/KuaiCunShiPin.xcodeproj/project.pbxproj @@ -336,6 +336,18 @@ 044898B12DBC84A0006C7493 /* PGGMoviePlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A22DBC84A0006C7493 /* PGGMoviePlayer.m */; }; 044898B22DBC84A0006C7493 /* ListAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A42DBC84A0006C7493 /* ListAlterView.m */; }; 044898B32DBC84A0006C7493 /* MDBwebVIew.m in Sources */ = {isa = PBXBuildFile; fileRef = 044898A52DBC84A0006C7493 /* MDBwebVIew.m */; }; + CA787DBD2DBF192300F97762 /* TongZhiTSView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA787DBC2DBF192300F97762 /* TongZhiTSView.m */; }; + CA7883F02DBF200600F97762 /* UserNoticeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA7883EF2DBF200600F97762 /* UserNoticeModel.m */; }; + CA788A552DBF685F00F97762 /* ZhiNengShiPingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A542DBF685F00F97762 /* ZhiNengShiPingViewController.m */; }; + CA788A592DBF698800F97762 /* ZhiNengShiPingView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A582DBF698800F97762 /* ZhiNengShiPingView.m */; }; + CA788A5C2DBF69E300F97762 /* ZhiNengShiPingNomoView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A5B2DBF69E300F97762 /* ZhiNengShiPingNomoView.m */; }; + CA788A602DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A5F2DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.m */; }; + CA788A632DBF6D4E00F97762 /* ZhiNengShiPingBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A622DBF6D4E00F97762 /* ZhiNengShiPingBottomView.m */; }; + CA788A662DBF771500F97762 /* ZhiNengShiPingBottomSetView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A652DBF771500F97762 /* ZhiNengShiPingBottomSetView.m */; }; + CA788A6F2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A6E2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.m */; }; + CA788A722DBF842400F97762 /* ZhiNengShiPingVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A712DBF842400F97762 /* ZhiNengShiPingVideoView.m */; }; + CA788A752DBF871700F97762 /* VideoGenModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A742DBF871700F97762 /* VideoGenModel.m */; }; + CA788A782DBF903A00F97762 /* VideoGenDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA788A772DBF903A00F97762 /* VideoGenDetailModel.m */; }; F50841F4764C7ADD8D165098 /* Pods_KuaiCunShiPin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C87A8E9DF89F6450BFA48B3 /* Pods_KuaiCunShiPin.framework */; }; /* End PBXBuildFile section */ @@ -1094,6 +1106,30 @@ 330EDDAE347162C82BDFA7DB /* Pods-KuaiCunShiPin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KuaiCunShiPin.debug.xcconfig"; path = "Target Support Files/Pods-KuaiCunShiPin/Pods-KuaiCunShiPin.debug.xcconfig"; sourceTree = ""; }; 712D49EE9138DEB1CB6E17B0 /* Pods-KuaiCunShiPin.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-KuaiCunShiPin.release.xcconfig"; path = "Target Support Files/Pods-KuaiCunShiPin/Pods-KuaiCunShiPin.release.xcconfig"; sourceTree = ""; }; 7C87A8E9DF89F6450BFA48B3 /* Pods_KuaiCunShiPin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_KuaiCunShiPin.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CA787DBB2DBF192300F97762 /* TongZhiTSView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TongZhiTSView.h; sourceTree = ""; }; + CA787DBC2DBF192300F97762 /* TongZhiTSView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TongZhiTSView.m; sourceTree = ""; }; + CA7883EE2DBF200600F97762 /* UserNoticeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserNoticeModel.h; sourceTree = ""; }; + CA7883EF2DBF200600F97762 /* UserNoticeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserNoticeModel.m; sourceTree = ""; }; + CA788A532DBF685F00F97762 /* ZhiNengShiPingViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingViewController.h; sourceTree = ""; }; + CA788A542DBF685F00F97762 /* ZhiNengShiPingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingViewController.m; sourceTree = ""; }; + CA788A572DBF698800F97762 /* ZhiNengShiPingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingView.h; sourceTree = ""; }; + CA788A582DBF698800F97762 /* ZhiNengShiPingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingView.m; sourceTree = ""; }; + CA788A5A2DBF69E300F97762 /* ZhiNengShiPingNomoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingNomoView.h; sourceTree = ""; }; + CA788A5B2DBF69E300F97762 /* ZhiNengShiPingNomoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingNomoView.m; sourceTree = ""; }; + CA788A5E2DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingNomoCollectionViewCell.h; sourceTree = ""; }; + CA788A5F2DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingNomoCollectionViewCell.m; sourceTree = ""; }; + CA788A612DBF6D4E00F97762 /* ZhiNengShiPingBottomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingBottomView.h; sourceTree = ""; }; + CA788A622DBF6D4E00F97762 /* ZhiNengShiPingBottomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingBottomView.m; sourceTree = ""; }; + CA788A642DBF771500F97762 /* ZhiNengShiPingBottomSetView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingBottomSetView.h; sourceTree = ""; }; + CA788A652DBF771500F97762 /* ZhiNengShiPingBottomSetView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingBottomSetView.m; sourceTree = ""; }; + CA788A6D2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingBottomSetCollectionViewCell.h; sourceTree = ""; }; + CA788A6E2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingBottomSetCollectionViewCell.m; sourceTree = ""; }; + CA788A702DBF842400F97762 /* ZhiNengShiPingVideoView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiNengShiPingVideoView.h; sourceTree = ""; }; + CA788A712DBF842400F97762 /* ZhiNengShiPingVideoView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiNengShiPingVideoView.m; sourceTree = ""; }; + CA788A732DBF871700F97762 /* VideoGenModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoGenModel.h; sourceTree = ""; }; + CA788A742DBF871700F97762 /* VideoGenModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoGenModel.m; sourceTree = ""; }; + CA788A762DBF903A00F97762 /* VideoGenDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoGenDetailModel.h; sourceTree = ""; }; + CA788A772DBF903A00F97762 /* VideoGenDetailModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoGenDetailModel.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1702,14 +1738,14 @@ 044894F22DBC8491006C7493 /* view */ = { isa = PBXGroup; children = ( - 044894F32DBC8491006C7493 /* HuiYuanZXView.h */, - 044894F42DBC8491006C7493 /* HuiYuanZXUserView.m */, + 044894F92DBC8491006C7493 /* HuiYuanZXGoodsView.h */, 044894F52DBC8491006C7493 /* HuiYuanZXGoodsView.m */, 044894F62DBC8491006C7493 /* HuiYuanZXQuanYiView.h */, - 044894F72DBC8491006C7493 /* HuiYuanZXView.m */, - 044894F82DBC8491006C7493 /* HuiYuanZXUserView.h */, - 044894F92DBC8491006C7493 /* HuiYuanZXGoodsView.h */, 044894FA2DBC8491006C7493 /* HuiYuanZXQuanYiView.m */, + 044894F82DBC8491006C7493 /* HuiYuanZXUserView.h */, + 044894F42DBC8491006C7493 /* HuiYuanZXUserView.m */, + 044894F32DBC8491006C7493 /* HuiYuanZXView.h */, + 044894F72DBC8491006C7493 /* HuiYuanZXView.m */, ); path = view; sourceTree = ""; @@ -1772,6 +1808,7 @@ 044895142DBC8491006C7493 /* 首页 */ = { isa = PBXGroup; children = ( + CA788A522DBF684C00F97762 /* 智能视频 */, 044895472DBC8491006C7493 /* saveManger */, 044895252DBC8491006C7493 /* LianJiTiQu */, 044895512DBC8491006C7493 /* ShiPingHao */, @@ -1921,10 +1958,10 @@ 044895422DBC8491006C7493 /* cell */ = { isa = PBXGroup; children = ( - 044895432DBC8491006C7493 /* ShouYeViewCollectionViewCell.m */, - 044895442DBC8491006C7493 /* ShouYeBigCollectionViewCell.m */, 044895452DBC8491006C7493 /* ShouYeBigCollectionViewCell.h */, + 044895442DBC8491006C7493 /* ShouYeBigCollectionViewCell.m */, 044895462DBC8491006C7493 /* ShouYeViewCollectionViewCell.h */, + 044895432DBC8491006C7493 /* ShouYeViewCollectionViewCell.m */, ); path = cell; sourceTree = ""; @@ -1947,6 +1984,8 @@ children = ( 0448954F2DBC8491006C7493 /* ShouYeView.h */, 044895502DBC8491006C7493 /* ShouYeView.m */, + CA787DBB2DBF192300F97762 /* TongZhiTSView.h */, + CA787DBC2DBF192300F97762 /* TongZhiTSView.m */, ); path = view; sourceTree = ""; @@ -2161,6 +2200,10 @@ 044895C82DBC8492006C7493 /* UserMaterialModel.m */, 044895C92DBC8492006C7493 /* KCSPCheckActivesModelOModel.swift */, 044895CA2DBC8492006C7493 /* KCSPUserMenusModel.m */, + CA788A732DBF871700F97762 /* VideoGenModel.h */, + CA788A742DBF871700F97762 /* VideoGenModel.m */, + CA788A762DBF903A00F97762 /* VideoGenDetailModel.h */, + CA788A772DBF903A00F97762 /* VideoGenDetailModel.m */, ); path = model; sourceTree = ""; @@ -2209,6 +2252,8 @@ 044895F42DBC8492006C7493 /* KCSPOrderInfosModelOModel.swift */, 044895F52DBC8492006C7493 /* KCSPActivityExchangesModel.m */, 044895F62DBC8492006C7493 /* KCSPActivityCsModel.h */, + CA7883EE2DBF200600F97762 /* UserNoticeModel.h */, + CA7883EF2DBF200600F97762 /* UserNoticeModel.m */, ); path = PublicModel; sourceTree = ""; @@ -2313,13 +2358,13 @@ isa = PBXGroup; children = ( 0448961D2DBC8492006C7493 /* ShuCaiKuSonListCollectionViewCell.h */, - 0448961E2DBC8492006C7493 /* WaterFallLayout.h */, - 0448961F2DBC8492006C7493 /* ShuCaiKuViewLayout.h */, - 044896202DBC8492006C7493 /* ShuCaiKuViewCollectionViewCell.m */, 044896212DBC8492006C7493 /* ShuCaiKuSonListCollectionViewCell.m */, - 044896222DBC8492006C7493 /* WaterFallLayout.m */, 044896232DBC8492006C7493 /* ShuCaiKuViewCollectionViewCell.h */, + 044896202DBC8492006C7493 /* ShuCaiKuViewCollectionViewCell.m */, + 0448961F2DBC8492006C7493 /* ShuCaiKuViewLayout.h */, 044896242DBC8492006C7493 /* ShuCaiKuViewLayout.m */, + 0448961E2DBC8492006C7493 /* WaterFallLayout.h */, + 044896222DBC8492006C7493 /* WaterFallLayout.m */, ); path = cell; sourceTree = ""; @@ -2988,6 +3033,45 @@ name = Frameworks; sourceTree = ""; }; + CA788A522DBF684C00F97762 /* 智能视频 */ = { + isa = PBXGroup; + children = ( + CA788A5D2DBF6AB000F97762 /* cell */, + CA788A562DBF697B00F97762 /* view */, + CA788A532DBF685F00F97762 /* ZhiNengShiPingViewController.h */, + CA788A542DBF685F00F97762 /* ZhiNengShiPingViewController.m */, + ); + path = "智能视频"; + sourceTree = ""; + }; + CA788A562DBF697B00F97762 /* view */ = { + isa = PBXGroup; + children = ( + CA788A572DBF698800F97762 /* ZhiNengShiPingView.h */, + CA788A582DBF698800F97762 /* ZhiNengShiPingView.m */, + CA788A5A2DBF69E300F97762 /* ZhiNengShiPingNomoView.h */, + CA788A5B2DBF69E300F97762 /* ZhiNengShiPingNomoView.m */, + CA788A702DBF842400F97762 /* ZhiNengShiPingVideoView.h */, + CA788A712DBF842400F97762 /* ZhiNengShiPingVideoView.m */, + CA788A612DBF6D4E00F97762 /* ZhiNengShiPingBottomView.h */, + CA788A622DBF6D4E00F97762 /* ZhiNengShiPingBottomView.m */, + CA788A642DBF771500F97762 /* ZhiNengShiPingBottomSetView.h */, + CA788A652DBF771500F97762 /* ZhiNengShiPingBottomSetView.m */, + ); + path = view; + sourceTree = ""; + }; + CA788A5D2DBF6AB000F97762 /* cell */ = { + isa = PBXGroup; + children = ( + CA788A5E2DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.h */, + CA788A5F2DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.m */, + CA788A6D2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.h */, + CA788A6E2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; DF12729A55B170C3E1A30EC9 /* Pods */ = { isa = PBXGroup; children = ( @@ -3178,6 +3262,7 @@ 044898582DBC849C006C7493 /* IndexGetNewsModel.m in Sources */, 0448964D2DBC8493006C7493 /* MyFaBuShiPinSonViewController.m in Sources */, 044896522DBC8493006C7493 /* ShareAlterView.m in Sources */, + CA788A602DBF6ABC00F97762 /* ZhiNengShiPingNomoCollectionViewCell.m in Sources */, 0448949F2DBC8487006C7493 /* cmdutils.c in Sources */, 044898602DBC849C006C7493 /* baseInfoModel.m in Sources */, 044896DD2DBC8494006C7493 /* LoginViewController.m in Sources */, @@ -3230,6 +3315,7 @@ 044896E22DBC8494006C7493 /* ShuCaiKuViewCollectionViewCell.m in Sources */, 044896C22DBC8494006C7493 /* KCSPUserDengLuModelOModel.swift in Sources */, 044896A32DBC8493006C7493 /* KCSPNetManager.m in Sources */, + CA788A592DBF698800F97762 /* ZhiNengShiPingView.m in Sources */, 0448986D2DBC849C006C7493 /* XLZoomingScrollView.m in Sources */, 044896582DBC8493006C7493 /* HuiYuanZXView.m in Sources */, 044894042DBC847D006C7493 /* ConfigManager.m in Sources */, @@ -3273,6 +3359,7 @@ 044896AC2DBC8494006C7493 /* KCSPWXVideoLogsModel.m in Sources */, 0448986A2DBC849C006C7493 /* XLProgressView.m in Sources */, 0448968D2DBC8493006C7493 /* ShiPingEditHomeViewOModel.swift in Sources */, + CA788A662DBF771500F97762 /* ZhiNengShiPingBottomSetView.m in Sources */, 0448986B2DBC849C006C7493 /* UIView+XLExtension.m in Sources */, 044896452DBC8493006C7493 /* MainMySetTableViewCell.m in Sources */, 044896B62DBC8494006C7493 /* KCSPCheckActivesModelOModel.swift in Sources */, @@ -3295,10 +3382,12 @@ 0448964C2DBC8493006C7493 /* ZhangHuGuanLiTableViewCell.m in Sources */, 044896592DBC8493006C7493 /* HuiYuanZXQuanYiView.m in Sources */, 044896892DBC8493006C7493 /* VideoDaoFangManager.m in Sources */, + CA7883F02DBF200600F97762 /* UserNoticeModel.m in Sources */, 044898A82DBC84A0006C7493 /* UIDevice+PGJ.m in Sources */, 0448966D2DBC8493006C7493 /* UrlXiaZaiWBViewControllerOModel.swift in Sources */, 0448964A2DBC8493006C7493 /* SheZhiViewControllerOModel.swift in Sources */, 044896E82DBC8494006C7493 /* ShuCaiKuFaBuTypeAlterCollectionViewCell.m in Sources */, + CA787DBD2DBF192300F97762 /* TongZhiTSView.m in Sources */, 044898382DBC849B006C7493 /* RSAEncrypt.m in Sources */, 044896AA2DBC8493006C7493 /* KCSPUploadImageManager.m in Sources */, 044896A92DBC8493006C7493 /* KCSPXZManager.m in Sources */, @@ -3365,10 +3454,12 @@ 0448983E2DBC849B006C7493 /* NSData+Base64.m in Sources */, 044896E32DBC8494006C7493 /* ShuCaiKuSonListCollectionViewCell.m in Sources */, 044896EC2DBC8494006C7493 /* ShuCaiKuDetailView.m in Sources */, + CA788A5C2DBF69E300F97762 /* ZhiNengShiPingNomoView.m in Sources */, 044896C92DBC8494006C7493 /* KCSPUserCodesModel.m in Sources */, 044896BC2DBC8494006C7493 /* KCSPUserRZModelOModel.swift in Sources */, 044896B82DBC8494006C7493 /* KCSPApplePayManager.m in Sources */, 0448982E2DBC849B006C7493 /* UIView+Additions.m in Sources */, + CA788A632DBF6D4E00F97762 /* ZhiNengShiPingBottomView.m in Sources */, 044896D42DBC8494006C7493 /* JiLuImageCollectionViewCellOModel.swift in Sources */, 044896C12DBC8494006C7493 /* KCSPActivityExchangesModelOModel.swift in Sources */, 0448965D2DBC8493006C7493 /* DuiHuanZSLineTableViewCell.m in Sources */, @@ -3385,11 +3476,13 @@ 044896D62DBC8494006C7493 /* JiLuAudioTableViewCell.m in Sources */, 044896682DBC8493006C7493 /* ShiPingZBHFVideoCollectionViewCell.m in Sources */, 044896632DBC8493006C7493 /* DuiHuanZSLineView.m in Sources */, + CA788A552DBF685F00F97762 /* ZhiNengShiPingViewController.m in Sources */, 0448968E2DBC8493006C7493 /* ShiPingEditShuiYinView.m in Sources */, 044896982DBC8493006C7493 /* BaoCunAlterViewOModel.swift in Sources */, 044896422DBC8493006C7493 /* PeiZhiShowViewController.m in Sources */, 044896C32DBC8494006C7493 /* KCSPUserSysterConfModelOModel.swift in Sources */, 044896622DBC8493006C7493 /* DuiHuanZSLineViewOModel.swift in Sources */, + CA788A752DBF871700F97762 /* VideoGenModel.m in Sources */, 0448965A2DBC8493006C7493 /* WoDeTableViewCell.m in Sources */, 044896EA2DBC8494006C7493 /* ShuCaiKuFaBuTypeAlterView.m in Sources */, 044896B32DBC8494006C7493 /* KCSPMaterialsModel.m in Sources */, @@ -3413,8 +3506,10 @@ 044898322DBC849B006C7493 /* WYCamaImageTools.m in Sources */, 0448982D2DBC849B006C7493 /* RadianDisView.m in Sources */, 044896C52DBC8494006C7493 /* KCSPOrderSPModel.m in Sources */, + CA788A782DBF903A00F97762 /* VideoGenDetailModel.m in Sources */, 0448969B2DBC8493006C7493 /* GengXinAlterView.m in Sources */, 044896CC2DBC8494006C7493 /* KCSPActivityLsModel.m in Sources */, + CA788A6F2DBF7C0800F97762 /* ZhiNengShiPingBottomSetCollectionViewCell.m in Sources */, 044896912DBC8493006C7493 /* ShiPingEditJGViewOModel.swift in Sources */, 044896DE2DBC8494006C7493 /* LoginPhoneYiJianView.m in Sources */, 044896942DBC8493006C7493 /* XieYiAlterView.m in Sources */, @@ -3424,6 +3519,7 @@ 044896AF2DBC8494006C7493 /* KCSPUserMasModelOModel.swift in Sources */, 044894A12DBC8487006C7493 /* ffmpeg_videotoolbox.c in Sources */, 044893CD2DBC7AC7006C7493 /* swiftpg.swift in Sources */, + CA788A722DBF842400F97762 /* ZhiNengShiPingVideoView.m in Sources */, 0448969E2DBC8493006C7493 /* JinDuTiaoView.m in Sources */, 044896712DBC8493006C7493 /* UrlXiaZaiSPCollectionViewCell.m in Sources */, 044896B42DBC8494006C7493 /* KCSPCheckActivesModel.m in Sources */, @@ -3575,7 +3671,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = KuaiCunShiPin/KuaiCunShiPin.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 111; + CURRENT_PROJECT_VERSION = 112; DEVELOPMENT_TEAM = B8MTNU3W9A; GCC_PREFIX_HEADER = "$(SRCROOT)/KuaiCunShiPin/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; @@ -3600,7 +3696,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers\"", "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/WechatOpenSDK\"", - "$(SRCROOT)/$(PRODUCT_NAME)/FFmpeg-iOS/include", + "\"$(SRCROOT)/KuaiCunShiPin/FFmpeg-iOS/include\"", "\"$(SRCROOT)/KuaiCunShiPin/OtherFrameworks/Category/RSAEncrypt/lib/include\"", ); INFOPLIST_FILE = KuaiCunShiPin/Info.plist; @@ -3650,7 +3746,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = KuaiCunShiPin/KuaiCunShiPin.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 111; + CURRENT_PROJECT_VERSION = 112; DEVELOPMENT_TEAM = B8MTNU3W9A; GCC_PREFIX_HEADER = "$(SRCROOT)/KuaiCunShiPin/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; @@ -3675,7 +3771,7 @@ "\"${PODS_CONFIGURATION_BUILD_DIR}/YiVideoEditor/YiVideoEditor.framework/Headers\"", "\"${PODS_ROOT}/Headers/Public\"", "\"${PODS_ROOT}/Headers/Public/WechatOpenSDK\"", - "$(SRCROOT)/$(PRODUCT_NAME)/FFmpeg-iOS/include", + "\"$(SRCROOT)/KuaiCunShiPin/FFmpeg-iOS/include\"", "\"$(SRCROOT)/KuaiCunShiPin/OtherFrameworks/Category/RSAEncrypt/lib/include\"", ); INFOPLIST_FILE = KuaiCunShiPin/Info.plist; diff --git a/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index 8b07db8..c0ffc04 100644 Binary files a/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/KuaiCunShiPin/KuaiCunShiPin.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@2x.png new file mode 100644 index 0000000..48eb23c Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@3x.png new file mode 100644 index 0000000..d3639fd Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/tz_tz.imageset/容器@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/Contents.json new file mode 100644 index 0000000..b4f774f --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "图层 1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "图层 1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@2x.png new file mode 100644 index 0000000..20ad49a Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@3x.png new file mode 100644 index 0000000..f465c46 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/sy_智能视频.imageset/图层 1@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/Contents.json new file mode 100644 index 0000000..c452fe9 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43068@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43068@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@2x.png new file mode 100644 index 0000000..37717de Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@3x.png new file mode 100644 index 0000000..457c0ea Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_bofang.imageset/组 43068@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@2x.png new file mode 100644 index 0000000..a32f432 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@3x.png new file mode 100644 index 0000000..abb61a3 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_clear.imageset/容器@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/Contents.json new file mode 100644 index 0000000..8925e57 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@2x(1).png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@2x(1).png new file mode 100644 index 0000000..ab462b1 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@2x(1).png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@3x(1).png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@3x(1).png new file mode 100644 index 0000000..a1b1aa1 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_set.imageset/容器@3x(1).png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/Contents.json new file mode 100644 index 0000000..c8b348a --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 45917@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 45917@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@2x.png new file mode 100644 index 0000000..b0d6f69 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@3x.png new file mode 100644 index 0000000..3c828a5 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_xiazai.imageset/组 45917@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@2x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@2x.png new file mode 100644 index 0000000..f577436 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@2x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@3x.png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@3x.png new file mode 100644 index 0000000..e53a751 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_上传图片.imageset/容器@3x.png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/Contents.json b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/Contents.json new file mode 100644 index 0000000..1e403a6 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(3).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@2x(3).png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@2x(3).png new file mode 100644 index 0000000..0ef347c Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@2x(3).png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@3x(3).png b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@3x(3).png new file mode 100644 index 0000000..115f448 Binary files /dev/null and b/KuaiCunShiPin/KuaiCunShiPin/Assets.xcassets/首页/智能视频/znsp_文本消息.imageset/容器@3x(3).png differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-500-Medium.otf b/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-500-Medium.otf index d72d454..1fb1d74 100644 Binary files a/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-500-Medium.otf and b/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-500-Medium.otf differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-700-Bold.otf b/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-700-Bold.otf index 7b33805..dd755ad 100644 Binary files a/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-700-Bold.otf and b/KuaiCunShiPin/KuaiCunShiPin/D-DIN-PRO-700-Bold.otf differ diff --git a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.h b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.h index dcd5446..4a4c32f 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.h +++ b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.h @@ -19,3 +19,4 @@ void setDuration(long long int time); // 获取当前时间 void setCurrentTime(char info[1024]); + diff --git a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.m b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.m index e30ef28..f27f158 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.m +++ b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/FFmpegConverOC.m @@ -55,3 +55,4 @@ void setCurrentTime(char info[1024]) { + diff --git a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.h b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.h index d4403a1..ee313f4 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.h @@ -48,3 +48,4 @@ +(void)myStop; @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.m b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.m index aeffad2..ef082dd 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/FFmpeg-iOS/KCSPFFmpegCenterManager.m @@ -192,3 +192,4 @@ } @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.h index 22154a8..eec12f2 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.h @@ -25,6 +25,8 @@ #import "KCSPActivityLsModel.h" #import "KCSPActivityExchangesModel.h" +#import "UserNoticeModel.h" + NS_ASSUME_NONNULL_BEGIN @interface GongGongNetManager : NSObject @@ -226,7 +228,14 @@ NS_ASSUME_NONNULL_BEGIN link:(NSString *)link Callback:(completeModeBlock)callback; +/* + 用户公告 + api/user/notice + */ ++ (void)getUserNoticeData:(UIView *)view + Callback:(completeModeBlock)callback; @end NS_ASSUME_NONNULL_END + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m index a87730c..4ec8d59 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/GongGongNetManager.m @@ -894,4 +894,37 @@ }]; } +/* + 用户公告 + api/user/notice + */ ++ (void)getUserNoticeData:(UIView *)view + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicQuery = [NSMutableDictionary new]; + + NSMutableDictionary *dicHeader = [NSMutableDictionary new]; + + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + + [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:1 url:@"api/user/notice" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id _Nullable responseObject, NSError * _Nullable error) { + BOOL state = NO; + NSString *describle = @""; + if (responseObject==nil) { + describle = @"网络错误"; + BaseModel *model = [BaseModel new]; + model.message =describle; + callback(state,model,describle); + }else{ + NSDictionary *dicAll=responseObject; + describle = dicAll[@"message"]; + if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) { + state = YES; + } + callback(state,[UserNoticeModel yy_modelWithJSON:dicAll],describle); + } + }]; +} + @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.h index d58877a..31596b5 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.h @@ -46,3 +46,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.m index aeacc76..e4339ff 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPApplePayManager.m @@ -170,3 +170,4 @@ static KCSPApplePayManager *manager = nil; } @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.h index c474084..744cd58 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.h @@ -21,8 +21,8 @@ //#import "ZhiXunListModel.h" #import "MaterialTagModel.h" - - +#import "VideoGenModel.h" +#import "VideoGenDetailModel.h" NS_ASSUME_NONNULL_BEGIN @interface KCSPNetManager : NSObject @@ -250,6 +250,32 @@ NS_ASSUME_NONNULL_BEGIN ID:(NSString *)ID download:(NSString *)download Callback:(completeModeBlock)callback; + +/* + 创建任务 + /api/video/gen + prompt :文本 + duration：秒 + ratio：比例 + image_id：图片ID + type:类型 + */ ++(void)requestVideoGenData:(UIView *)view + prompt:(NSString *)prompt + duration:(NSString *)duration + ratio:(NSString *)ratio + image_id:(NSString *)image_id + type:(NSString *)type + Callback:(completeModeBlock)callback; + +/* + 任务状态 + /api/video/gen/status + id + */ ++(void)requestVideoGenStatusData:(UIView *)view + ID:(NSString *)ID + Callback:(completeModeBlock)callback; @end NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.m index dd936e8..a9e34d5 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPNetManager.m @@ -909,4 +909,89 @@ }]; } +/* + 创建任务 + /api/video/gen + prompt :文本 + duration：秒 + ratio：比例 + image_id：图片ID + type:类型 + */ ++(void)requestVideoGenData:(UIView *)view + prompt:(NSString *)prompt + duration:(NSString *)duration + ratio:(NSString *)ratio + image_id:(NSString *)image_id + type:(NSString *)type + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicQuery = [NSMutableDictionary new]; + + NSMutableDictionary *dicHeader = [NSMutableDictionary new]; + + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + [dicpush setObject:[Tools isStringnil:prompt] forKey:@"prompt"]; + [dicpush setObject:[Tools isStringnil:duration] forKey:@"duration"]; + + [dicpush setObject:[Tools isStringnil:ratio] forKey:@"ratio"]; + [dicpush setObject:[Tools isStringnil:image_id] forKey:@"image_id"]; + [dicpush setObject:[Tools isStringnil:type] forKey:@"type"]; + + [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:2 url:@"api/video/gen" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id _Nullable responseObject, NSError * _Nullable error) { + BOOL state = NO; + NSString *describle = @""; + if (responseObject==nil) { + describle = @"网络错误"; + BaseModel *model = [BaseModel new]; + model.message =describle; + callback(state,model,describle); + }else{ + NSDictionary *dicAll=responseObject; + describle = dicAll[@"message"]; + if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) { + state = YES; + } + callback(state,[VideoGenModel yy_modelWithJSON:dicAll],describle); + } + }]; +} + +/* + 任务状态 + /api/video/gen/status + id + */ ++(void)requestVideoGenStatusData:(UIView *)view + ID:(NSString *)ID + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicQuery = [NSMutableDictionary new]; + [dicQuery setObject:[Tools isStringnil:ID] forKey:@"id"]; + + NSMutableDictionary *dicHeader = [NSMutableDictionary new]; + + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + + [YSAPIClient requestWithRequestBaseUrl:BaseUrl Type:1 url:@"api/video/gen/status" paraments:dicpush Headers:dicHeader Query:dicQuery completeBlock:^(id _Nullable responseObject, NSError * _Nullable error) { + BOOL state = NO; + NSString *describle = @""; + if (responseObject==nil) { + describle = @"网络错误"; + BaseModel *model = [BaseModel new]; + model.message =describle; + callback(state,model,describle); + }else{ + NSDictionary *dicAll=responseObject; + describle = dicAll[@"message"]; + if ([[NSString stringWithFormat:@"%@",dicAll[@"code"]] intValue] == 0) { + state = YES; + } + callback(state,[VideoGenDetailModel yy_modelWithJSON:dicAll],describle); + } + }]; +} + + @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.h index 71eb75c..f55523d 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.h @@ -18,3 +18,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.m index 20c0b6f..1ac9795 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPUploadImageManager.m @@ -285,3 +285,4 @@ totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend { NSLog(@"进度 %f",progress); } @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.h index 5040287..9e8f1ad 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.h @@ -27,3 +27,4 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.m index afb7730..f5939f6 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/KCSPZhiFuManager.m @@ -308,3 +308,4 @@ static KCSPZhiFuManager *manager = nil; }]; } @end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.h new file mode 100644 index 0000000..65d6151 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.h @@ -0,0 +1,22 @@ +// +// UserNoticeModel.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "BaseModel.h" + +NS_ASSUME_NONNULL_BEGIN +@class UserNoticeModelData; +@interface UserNoticeModel : BaseModel +/// +@property (nonatomic , strong) UserNoticeModelData *data; +@end +@interface UserNoticeModelData : NSObject +/////是否循环播放 +@property (nonatomic , strong) NSString *loop; + +@property (nonatomic , strong) NSArray *notice; +@end +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.m new file mode 100644 index 0000000..e5344e8 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/PublicModel/UserNoticeModel.m @@ -0,0 +1,18 @@ +// +// UserNoticeModel.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "UserNoticeModel.h" + +@implementation UserNoticeModel ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"data" : [UserNoticeModelData class]}; +} +@end +@implementation UserNoticeModelData + +@end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.h new file mode 100644 index 0000000..a4ee727 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.h @@ -0,0 +1,28 @@ +// +// VideoGenDetailModel.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "BaseModel.h" + +NS_ASSUME_NONNULL_BEGIN +@class VideoGenDetailModelData; +@interface VideoGenDetailModel : BaseModel +/// +@property (nonatomic , strong) VideoGenDetailModelData *data; +@end +@interface VideoGenDetailModelData : NSObject +/// +@property (nonatomic , strong) NSString *ID; + +///详情 +///1 队列中 2.生产中 3.取消 4.成功 5.失败 +@property (nonatomic , strong) NSString *status; + +@property (nonatomic , strong) NSString *content; +/// +@property (nonatomic , strong) NSString *message; +@end +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.m new file mode 100644 index 0000000..a14d473 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenDetailModel.m @@ -0,0 +1,21 @@ +// +// VideoGenDetailModel.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "VideoGenDetailModel.h" + +@implementation VideoGenDetailModel ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"data" : [VideoGenDetailModelData class]}; +} +@end +@implementation VideoGenDetailModelData ++ (nullable NSDictionary *)modelCustomPropertyMapper +{ + return @{@"ID" : @"id"}; +} +@end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.h b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.h new file mode 100644 index 0000000..6264c11 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.h @@ -0,0 +1,16 @@ +// +// VideoGenModel.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "BaseModel.h" + +NS_ASSUME_NONNULL_BEGIN +@interface VideoGenModel : BaseModel +/// +@property (nonatomic , strong) NSString *data; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.m b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.m new file mode 100644 index 0000000..1b9ef70 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/NetWork/model/VideoGenModel.m @@ -0,0 +1,13 @@ +// +// VideoGenModel.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "VideoGenModel.h" + +@implementation VideoGenModel + +@end + diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/ShouYeViewController.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/ShouYeViewController.m index 48d05b5..4da6983 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/ShouYeViewController.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/ShouYeViewController.m @@ -206,6 +206,13 @@ [UserDetailModel shareModel].vip = responseObject.data.vip; } }]; + +// [GongGongNetManager getUserNoticeData:self.view Callback:^(BOOL state, UserNoticeModel *responseObject, NSString * _Nullable describle) { +// if(state) +// { +// [self.viewShow showTSData:responseObject.data.notice]; +// } +// }]; } -(void)getIdfa diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/cell/ShouYeBigCollectionViewCell.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/cell/ShouYeBigCollectionViewCell.m index 7e3750c..b4cae81 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/cell/ShouYeBigCollectionViewCell.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/cell/ShouYeBigCollectionViewCell.m @@ -21,7 +21,7 @@ if(self = [super initWithFrame:frame]) { UIView *viewback = [[UIView alloc] init]; - [viewback setBackgroundColor:RGBCOLOR(48, 49, 50)]; + [viewback setBackgroundColor:RGBCOLOR(237, 243, 248)]; [self.contentView addSubview:viewback]; [viewback mas_makeConstraints:^(MASConstraintMaker *make) { make.edges.equalTo(self); @@ -30,35 +30,36 @@ [viewback.layer setCornerRadius:10]; UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setContentMode:UIViewContentModeScaleAspectFit]; [viewback addSubview:imgvback]; [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { make.top.offset(15); - make.width.height.offset(45); + make.width.height.offset(70); make.centerX.equalTo(viewback); }]; _imgvback = imgvback; UILabel *lbname = [[UILabel alloc] init]; - [lbname setTextColor:RGBACOLOR(255, 255, 255, 0.9)]; + [lbname setTextColor:RGBACOLOR(26, 26, 26, 0.9)]; [lbname setTextAlignment:NSTextAlignmentLeft]; - [lbname setFont:[UIFont boldSystemFontOfSize:20]]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:20]]; [viewback addSubview:lbname]; [lbname mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(imgvback.mas_bottom).offset(10); + make.top.equalTo(imgvback.mas_bottom).offset(-1); make.centerX.equalTo(viewback); }]; _lbname = lbname; - UILabel *lbinfo = [[UILabel alloc] init]; - [lbinfo setTextColor:RGBACOLOR(255, 255, 255, 0.5)]; - [lbinfo setTextAlignment:NSTextAlignmentLeft]; - [lbinfo setFont:[UIFont systemFontOfSize:15]]; - [viewback addSubview:lbinfo]; - [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(lbname.mas_bottom).offset(2); - make.centerX.equalTo(viewback); - }]; - _lbinfo = lbinfo; +// UILabel *lbinfo = [[UILabel alloc] init]; +// [lbinfo setTextColor:RGBACOLOR(255, 255, 255, 0.5)]; +// [lbinfo setTextAlignment:NSTextAlignmentLeft]; +// [lbinfo setFont:[UIFont systemFontOfSize:15]]; +// [viewback addSubview:lbinfo]; +// [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { +// make.top.equalTo(lbname.mas_bottom).offset(2); +// make.centerX.equalTo(viewback); +// }]; +// _lbinfo = lbinfo; } return self; diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.h index 3b4a5ea..5b2852d 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.h +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.h @@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN @interface ShouYeView : UIView -(void)refShowBanner; -(void)refShowData; +-(void)showTSData:(NSArray *)arr; @end NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.m index 81e6545..549feed 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.m +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/ShouYeView.m @@ -22,8 +22,14 @@ #import "XZM3SaveManager.h" #import "ShiPingEditJGViewController.h" +#import "TongZhiTSView.h" + +#import "ZhiNengShiPingViewController.h" + @interface ShouYeView () /// +@property (nonatomic , strong) TongZhiTSView *viewtz; +/// @property (nonatomic , strong) UIView *viewsh; /// @property (nonatomic , strong) UICollectionView *collect; @@ -57,6 +63,18 @@ self.viewController.automaticallyAdjustsScrollViewInsets =NO; } + TongZhiTSView *viewtz = [[TongZhiTSView alloc] init]; + [viewtz setBackgroundColor:RGBCOLOR(255, 234, 234)]; + [scvback addSubview:viewtz]; + [viewtz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.width.equalTo(scvback); + make.top.offset(KMagrinTop+5); + make.height.offset(30); + }]; + _viewtz = viewtz; +// viewtz.arrdata = @[@"视频号出现故障，预计2天后完善，请耐心等待",@"视频号出现故障，预计2天后完善，请耐心等待1",@"视频号出现故障，预计2天后完善，请耐心等待2"]; + [viewtz setHidden:YES]; + float f_w = (UISCREEN_WIDTH-44)/3.0; NSArray *arr = @[@"链接提取",@"视频号",@"直播回放"]; NSArray *arrinfo = @[@"涵盖大多数平台",@"支持微信视频号",@"支持微信直播回放"]; @@ -140,6 +158,8 @@ make.centerX.equalTo(viewsh); }]; + [scvback bringSubviewToFront:self.viewtz]; + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; layout.minimumLineSpacing = 0; layout.minimumInteritemSpacing = 0; @@ -233,12 +253,24 @@ [self.viewsh setHidden:YES]; } } +-(void)showTSData:(NSArray *)arr +{ + [self.viewtz setHidden:YES]; + if([arr isKindOfClass:[NSArray class]]) + { + if(arr.count>0) + { + [self.viewtz setHidden:NO]; + self.viewtz.arrdata = arr; + } + } +} -(void)getdata { self.arrdata = [NSMutableArray new]; - NSArray *arr = @[@"加背景音乐",@"视频时长剪切",@"视频加水印",@"MD5去重",@"视频裁剪",@"视频转音频",@"去背景音乐",@"视频倒放",@"视频拼接"]; - NSArray *arrinfo = @[@"赋予不同的声音",@"轻松裁剪多余部分",@"快捷留下专属标记",@"专业去重工具",@"留下一切美好瞬间",@"提取视频中的音频",@"无声世界更有意境",@"趣味视频生成",@"一键拼接视频"]; + NSArray *arr = @[@"智能视频",@"视频时长剪切",@"视频加水印",@"加背景音乐",@"视频裁剪",@"视频转音频",@"去背景音乐",@"视频倒放",@"视频拼接"]; + NSArray *arrinfo = @[@"赋予不同的声音",@"轻松裁剪多余部分",@"快捷留下专属标记",@"赋予不同的声音",@"留下一切美好瞬间",@"提取视频中的音频",@"无声世界更有意境",@"趣味视频生成",@"一键拼接视频"]; ///视频去除音频 视频时长剪切 for(int i = 0 ; i < arr.count; i++) { @@ -355,6 +387,11 @@ ShiPingTiQuYinPingViewController *vc = [ShiPingTiQuYinPingViewController new]; [self.viewController.navigationController pushViewController:vc animated:YES]; } + else if([model.title isEqualToString:@"智能视频"]) + { + ZhiNengShiPingViewController *vc = [ZhiNengShiPingViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } else if([model.title isEqualToString:@"视频拼接"]) { [self pinJieVideoSelect]; @@ -494,6 +531,10 @@ { back = 9; } + else if([name isEqualToString:@"智能视频"]) + { + back = 10; + } return back; } diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.h new file mode 100644 index 0000000..b72f323 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.h @@ -0,0 +1,16 @@ +// +// TongZhiTSView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface TongZhiTSView : UIView +@property (nonatomic , strong) NSArray *arrdata; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.m new file mode 100644 index 0000000..b2cdcbc --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/view/TongZhiTSView.m @@ -0,0 +1,145 @@ +// +// TongZhiTSView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "TongZhiTSView.h" + +@interface TongZhiTSView () +/// +@property (nonatomic , strong) UIView *viewinfo ; +/// +@property (nonatomic , strong) UIView *viewlast; + +@property (nonatomic , assign) NSInteger itag; + +@property (nonatomic , assign) float fleft; +@property (nonatomic , assign) int icccc; + +/// +@property (nonatomic , strong) NSMutableArray *arrItemView; + +@end + +@implementation TongZhiTSView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + {// + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"tz_tz"]]; + [self addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(18); + make.centerY.equalTo(self); + make.left.offset(11); + }]; + + UIView *viewback = [[UIView alloc] init]; + [self addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(imgvback.mas_right).offset(10); + make.top.bottom.right.equalTo(self); + }]; + [viewback setClipsToBounds:YES]; + UIView *viewinfo = [[UIView alloc] init]; + [viewback addSubview:viewinfo]; + [viewinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(0); + make.top.bottom.equalTo(viewback); + }]; + _viewinfo = viewinfo; + } + return self; +} +-(void)drawItemView:(UIView *)view arrtag:(NSInteger)tag +{ + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:self.arrdata[tag]]; + [lbname setTextColor:RGBCOLOR(255, 33, 35)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:13]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(0); + make.centerY.equalTo(view); + }]; + + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(lbname); + }]; +} + +-(void)setArrdata:(NSArray *)arrdata +{ + _arrdata = arrdata; + if(arrdata.count==0)return; + + self.arrItemView = [NSMutableArray new]; + + NSInteger icc = self.arrdata.count; + if(icc>3)icc=3; + + self.itag = icc; + + for(int i = 0 ; i < icc; i++) + { + UIView *viewitem = [[UIView alloc] init]; + [self.viewinfo addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + if(self.viewlast) + { + make.left.equalTo(self.viewlast.mas_right).offset(30); + } + else + { + make.left.offset(0); + } + make.top.bottom.equalTo(self.viewinfo); + }]; + [self drawItemView:viewitem arrtag:i]; + self.viewlast = viewitem; + [self.arrItemView addObject:viewitem]; + } + + self.icccc = 0; + NSTimer *timemove = [NSTimer scheduledTimerWithTimeInterval:0.04 target:self selector:@selector(movingView) userInfo:nil repeats:YES]; + [[NSRunLoop mainRunLoop] addTimer:timemove forMode:NSRunLoopCommonModes]; +} + +-(void)movingView +{ + self.icccc += 1; + self.fleft-=1; + [self.viewinfo mas_updateConstraints:^(MASConstraintMaker *make) { + make.left.offset(self.fleft); + }]; + if(self.icccc==120) + { + self.icccc = 0; + if(self.itag>=self.arrdata.count)self.itag=0; + + if(self.arrItemView.count>1) + { + UIView *viewfirst = self.arrItemView.firstObject; + [viewfirst removeFromSuperview]; + viewfirst = nil; + } + + UIView *viewitem = [[UIView alloc] init]; + [self.viewinfo addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.viewlast.mas_right).offset(30); + make.top.bottom.equalTo(self.viewinfo); + }]; + [self drawItemView:viewitem arrtag:self.itag]; + self.viewlast = viewitem; + self.itag+=1; + [self.arrItemView addObject:viewitem]; + } +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.h new file mode 100644 index 0000000..1bb01e4 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.h @@ -0,0 +1,16 @@ +// +// ZhiNengShiPingViewController.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiNengShiPingViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.m new file mode 100644 index 0000000..dbe774e --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/ZhiNengShiPingViewController.m @@ -0,0 +1,39 @@ +// +// ZhiNengShiPingViewController.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingViewController.h" +#import "ZhiNengShiPingView.h" + +@interface ZhiNengShiPingViewController () + +@end + +@implementation ZhiNengShiPingViewController +- (UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleLightContent; +} +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [self.navigationController setNavigationBarHidden:YES animated:NO]; + [self showNaviGationView:YES]; + [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)]; + [self.navigationView setTitle:@"智能视频" titleColor:RGBACOLOR(255, 255, 255, 1)]; +} +- (void)viewDidLoad { + [super viewDidLoad]; + + ZhiNengShiPingView *view = [ZhiNengShiPingView new]; + [self.view addSubview:view]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.offset(NavHeight); + }]; + +} + + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.h new file mode 100644 index 0000000..68aecb7 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.h @@ -0,0 +1,17 @@ +// +// ZhiNengShiPingBottomSetCollectionViewCell.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiNengShiPingBottomSetCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) baseInfoModel *model; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.m new file mode 100644 index 0000000..bf3e3dc --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingBottomSetCollectionViewCell.m @@ -0,0 +1,77 @@ +// +// ZhiNengShiPingBottomSetCollectionViewCell.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingBottomSetCollectionViewCell.h" + +@interface ZhiNengShiPingBottomSetCollectionViewCell () +/// +@property (nonatomic , strong) UIView *viewback; +/// +@property (nonatomic , strong) UILabel *lbname; +/// +@property (nonatomic , strong) UIImageView *imgvselect; + +@end + +@implementation ZhiNengShiPingBottomSetCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:RGBCOLOR(52, 58, 69)]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.contentView); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:4]; + [viewback.layer setBorderColor:RGBCOLOR(52, 58, 69).CGColor]; + [viewback.layer setBorderWidth:1]; + _viewback = viewback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"1"]; + [lbname setTextColor:RGBACOLOR(255, 255, 255, 0.9)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:13]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(viewback); + }]; + _lbname = lbname; + + UIImageView *imgvselect = [[UIImageView alloc] init]; + [imgvselect setImage:[UIImage imageNamed:@"dhzs_zsSelect"]]; + [viewback addSubview:imgvselect]; + [imgvselect mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(12); + make.left.bottom.equalTo(viewback); + }]; + _imgvselect = imgvselect; + + } + return self; +} + +-(void)setModel:(baseInfoModel *)model +{ + _model = model; + self.lbname.text = model.title; + if(model.select) + { + [self.viewback.layer setBorderColor:RGBCOLOR(240, 54, 94).CGColor]; + [self.imgvselect setHidden:NO]; + } + else + { + [self.viewback.layer setBorderColor:RGBCOLOR(52, 58, 69).CGColor]; + [self.imgvselect setHidden:YES]; + } +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.h new file mode 100644 index 0000000..2ab6852 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.h @@ -0,0 +1,20 @@ +// +// ZhiNengShiPingNomoCollectionViewCell.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiNengShiPingNomoCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) UIImageView *imgvback; +/// +@property (nonatomic , strong) UILabel *lbname; + +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.m new file mode 100644 index 0000000..9c2496a --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/cell/ZhiNengShiPingNomoCollectionViewCell.m @@ -0,0 +1,45 @@ +// +// ZhiNengShiPingNomoCollectionViewCell.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingNomoCollectionViewCell.h" + +@implementation ZhiNengShiPingNomoCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIView *viewback = [[UIView alloc] init]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.contentView); + }]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setContentMode:UIViewContentModeScaleAspectFill]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.width.equalTo(viewback); + make.height.equalTo(viewback.mas_width); + }]; + [imgvback setClipsToBounds:YES]; + _imgvback = imgvback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"案列1"]; + [lbname setTextColor:RGBCOLOR(95, 98, 103)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:13]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(viewback); + make.bottom.equalTo(viewback); + }]; + _lbname = lbname; + } + return self; +} +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.h new file mode 100644 index 0000000..bb570ff --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.h @@ -0,0 +1,22 @@ +// +// ZhiNengShiPingBottomSetView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + + +#define ZNSPBiLi @"ZNSPBiLi" +#define ZNSPShiChang @"ZNSPShiChang" + +NS_ASSUME_NONNULL_BEGIN +typedef void(^ZhiNengShiPingBottomSetViewBack)(NSString *strbl,NSString *strsc); +@interface ZhiNengShiPingBottomSetView : UIView +/// +@property (nonatomic , strong) ZhiNengShiPingBottomSetViewBack backValue; +-(void)showRef; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.m new file mode 100644 index 0000000..67ae5cd --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomSetView.m @@ -0,0 +1,306 @@ +// +// ZhiNengShiPingBottomSetView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingBottomSetView.h" +#import "ZhiNengShiPingBottomSetCollectionViewCell.h" + + +@interface ZhiNengShiPingBottomSetView () +/// +@property (nonatomic , strong) UICollectionView *collect; +@property (nonatomic , strong) UICollectionView *collect1; + +/// +@property (nonatomic , strong) NSMutableArray *arrdata; +@property (nonatomic , strong) NSMutableArray *arrdata1; +@end + +@implementation ZhiNengShiPingBottomSetView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + [self setBackgroundColor:[UIColor clearColor]]; + + + UILabel *lbbl = [[UILabel alloc] init]; + [lbbl setText:@"视频比例"]; + [lbbl setTextColor:RGBACOLOR(255, 255, 255, 0.8)]; + [lbbl setTextAlignment:NSTextAlignmentLeft]; + [lbbl setFont:[UIFont systemFontOfSize:13]]; + [self addSubview:lbbl]; + [lbbl mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(31); + }]; + + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.minimumLineSpacing = 0; + layout.minimumInteritemSpacing = 0; + UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + [collect setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:[UIColor clearColor]]; + [self addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbbl.mas_right).offset(20); + make.right.equalTo(self).offset(-10); + make.top.equalTo(lbbl).offset(-6); + make.height.offset(80); + }]; + [collect setTag:0]; + [collect registerClass:[ZhiNengShiPingBottomSetCollectionViewCell class] forCellWithReuseIdentifier:@"ZhiNengShiPingBottomSetCollectionViewCell"]; + _collect = collect; + + UILabel *lbsc = [[UILabel alloc] init]; + [lbsc setText:@"视频时长"]; + [lbsc setTextColor:RGBACOLOR(255, 255, 255, 0.8)]; + [lbsc setTextAlignment:NSTextAlignmentLeft]; + [lbsc setFont:[UIFont systemFontOfSize:13]]; + [self addSubview:lbsc]; + [lbsc mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbbl); + make.top.equalTo(collect.mas_bottom).offset(20); + }]; + + UICollectionViewFlowLayout *layout1 = [[UICollectionViewFlowLayout alloc] init]; + layout1.minimumLineSpacing = 0; + layout1.minimumInteritemSpacing = 0; + UICollectionView *collect1 = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout1]; + [collect1 setScrollEnabled:NO]; + [collect1 setDelegate:self]; + [collect1 setDataSource:self]; + [collect1 setBackgroundColor:[UIColor clearColor]]; + [self addSubview:collect1]; + [collect1 mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbbl.mas_right).offset(20); + make.right.equalTo(self).offset(-10); + make.top.equalTo(lbsc).offset(-6); + make.height.offset(30); + }]; + [collect1 setTag:1]; + [collect1 registerClass:[ZhiNengShiPingBottomSetCollectionViewCell class] forCellWithReuseIdentifier:@"ZhiNengShiPingBottomSetCollectionViewCell"]; + _collect1 = collect1; + + [self getdata]; + + UIButton *btqx = [[UIButton alloc] init]; + [btqx setTitle:@"取消" forState:UIControlStateNormal]; + [btqx setTitleColor:RGBACOLOR(255, 255, 255, 0.6) forState:UIControlStateNormal]; + [btqx.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btqx.layer setMasksToBounds:YES]; + [btqx.layer setCornerRadius:15]; + [btqx setBackgroundColor:RGBCOLOR(52, 58, 69)]; + [self addSubview:btqx]; + [btqx mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(74, 30)); + make.top.equalTo(collect1.mas_bottom).offset(20); + make.right.equalTo(self.mas_centerX).offset(-8); + }]; + [btqx addTarget:self action:@selector(quxiaoAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btqd = [[UIButton alloc] initWithFrame:CGRectMake(74, 30, 74, 30)]; + [btqd setTitle:@"确定" forState:UIControlStateNormal]; + [btqd setTitleColor:RGBACOLOR(255, 255, 255, 0.9) forState:UIControlStateNormal]; + [btqd.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btqd.layer setMasksToBounds:YES]; + [btqd.layer setCornerRadius:15]; + [self addSubview:btqd]; + [btqd mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(74, 30)); + make.top.equalTo(btqx); + make.left.equalTo(btqx.mas_right).offset(16); + }]; + [btqd addTarget:self action:@selector(qdAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btqd colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + } + return self; +} +-(void)quxiaoAction +{ + [self setHidden:YES]; +} +-(void)qdAction +{ + if(self.backValue) + { + baseInfoModel *modelselect; + for(baseInfoModel *model in self.arrdata) + { + if(model.select==YES) + { + modelselect = model; + break; + } + } + baseInfoModel *modelselect1; + for(baseInfoModel *model in self.arrdata1) + { + if(model.select==YES) + { + modelselect1 = model; + break; + } + } + + self.backValue(modelselect.title, [modelselect1.title stringByReplacingOccurrencesOfString:@"s" withString:@""]); + } + [self setHidden:YES]; +} +-(void)showRef +{ + +} + +-(void)getdata +{ + NSString *strbili = [[NSUserDefaults standardUserDefaults] objectForKey:ZNSPBiLi]; + self.arrdata = [NSMutableArray new]; + NSArray *arr = @[@"1:1",@"16:9",@"4:3",@"21:9",@"9:16",@"3:4",@"9:21"]; + for(int i = 0 ; i < arr.count; i++) + { + NSString *str = arr[i]; + baseInfoModel *model = [baseInfoModel new]; + model.title = str; + [self.arrdata addObject:model]; + if(i==0&&[Tools isStringnil:strbili].length==0) + { + model.select = YES; + } + else if([strbili isEqualToString:str]) + { + model.select = YES; + } + } + + NSString *strsc = [[NSUserDefaults standardUserDefaults] objectForKey:ZNSPShiChang]; + self.arrdata1 = [NSMutableArray new]; + NSArray *arr1 = @[@"5s",@"10s"]; + for(int i = 0 ; i < arr1.count; i++) + { + NSString *str = arr1[i]; + baseInfoModel *model = [baseInfoModel new]; + model.title = str; + [self.arrdata1 addObject:model]; + if(i==0&&[Tools isStringnil:strsc].length==0) + { + model.select = YES; + } + else if([[NSString stringWithFormat:@"%@s",strsc] isEqualToString:str]) + { + model.select = YES; + } + } +} + +- (void)drawRect:(CGRect)rect +{ + CGContextRef context = UIGraphicsGetCurrentContext(); + CGContextSetLineWidth(context, 2.0); + CGContextSetFillColorWithColor(context, RGBCOLOR(30, 34, 43).CGColor); + [self getDrawPath:context]; + CGContextFillPath(context); +} +-(void)getDrawPath:(CGContextRef)context{ + + CGRect rrect = self.bounds; + + CGFloat radius = 10.0; + + CGFloat minx = CGRectGetMinX(rrect), + + maxx = CGRectGetMaxX(rrect); + + CGFloat miny = CGRectGetMinY(rrect)+5, + + maxy = CGRectGetMaxY(rrect)-10; + + CGContextMoveToPoint(context, maxx-15, maxy); + + CGContextAddArcToPoint(context, maxx-15, maxy, maxx-20, maxy+10, 1); + + CGContextAddArcToPoint(context, maxx-20, maxy+10, maxx-25, maxy, 1); + + CGContextAddArcToPoint(context, maxx-25, maxy, minx, maxy, radius); + + CGContextAddArcToPoint(context, minx, maxy, minx, miny, radius); + + CGContextAddArcToPoint(context, minx, miny, maxx, miny, radius); + + CGContextAddArcToPoint(context, maxx, miny, maxx, maxy, radius); + + CGContextAddArcToPoint(context,maxx, maxy, maxx-15, maxy, radius); + + CGContextClosePath(context); + +} + +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + if(collectionView.tag==1)return self.arrdata1.count; + return self.arrdata.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + ZhiNengShiPingBottomSetCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ZhiNengShiPingBottomSetCollectionViewCell" forIndexPath:indexPath]; + if(collectionView.tag==1) + { + cell.model = self.arrdata1[indexPath.row]; + } + else + { + cell.model = self.arrdata[indexPath.row]; + } + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 0, 0, 0); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 10; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 10; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake(52, 30); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + ///做选中操作 + if(collectionView.tag==1) + { + for(baseInfoModel *model in self.arrdata1) + { + model.select = NO; + } + baseInfoModel *model = self.arrdata1[indexPath.row]; + model.select = YES; + [collectionView reloadData]; + } + else + { + for(baseInfoModel *model in self.arrdata) + { + model.select = NO; + } + baseInfoModel *model = self.arrdata[indexPath.row]; + model.select = YES; + [collectionView reloadData]; + } +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.h new file mode 100644 index 0000000..1412627 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.h @@ -0,0 +1,19 @@ +// +// ZhiNengShiPingBottomView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +typedef void(^ZhiNengShiPingBottomViewBack)(NSString *strurl); +typedef void(^ZhiNengShiPingBottomViewClearBack)(void); +@interface ZhiNengShiPingBottomView : UIView +/// +@property (nonatomic , strong) ZhiNengShiPingBottomViewBack backValue; +@property (nonatomic , strong) ZhiNengShiPingBottomViewClearBack backClearValue; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.m new file mode 100644 index 0000000..2d713f8 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingBottomView.m @@ -0,0 +1,469 @@ +// +// ZhiNengShiPingBottomView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingBottomView.h" +#import "FSTextView.h" +#import "WYCamaImageTools.h" +#import "GongGongNetManager.h" +#import "ZhiNengShiPingBottomSetView.h" + +#import "KCSPNetManager.h" + +#import "HuiYuanZXViewController.h" +#import "NomoAlterView.h" + +@interface ZhiNengShiPingBottomView () +/// +@property (nonatomic , strong) UIButton *btselect; +/// +@property (nonatomic , strong) UIView *viewtext; +/// +@property (nonatomic , strong) UIView *viewimage; + +/// +@property (nonatomic , strong) FSTextView *textView; +@property (nonatomic , strong) FSTextView *textImgView; +/// +@property (nonatomic , strong) UIImageView *imgvadd; + +@property (nonatomic, strong) WYCamaImageTools *tools; + +/// +@property (nonatomic , strong) ZhiNengShiPingBottomSetView *viewset; +///ratio：比例 duration：秒 +@property (nonatomic , strong) NSString *ratio; +@property (nonatomic , strong) NSString *duration; + +/// +@property (nonatomic , strong) NSString *image_id; + + + +@end + +@implementation ZhiNengShiPingBottomView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + self.ratio = [[NSUserDefaults standardUserDefaults] objectForKey:ZNSPBiLi]; + if([Tools isStringnil:self.ratio].length==0) + { + self.ratio = @"1:1"; + [[NSUserDefaults standardUserDefaults] setObject:@"1:1" forKey:ZNSPBiLi]; + } + self.duration = [[NSUserDefaults standardUserDefaults] objectForKey:ZNSPShiChang]; + if([Tools isStringnil:self.duration].length==0) + { + self.duration = @"5"; + [[NSUserDefaults standardUserDefaults] setObject:@"5" forKey:ZNSPShiChang]; + } + [self setBackgroundColor:RGBCOLOR(23, 27, 35)]; + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(98, 108, 128)]; + [self addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.offset(40); + make.top.offset(12); + make.height.offset(4); + make.centerX.equalTo(self); + }]; + [viewline.layer setMasksToBounds:YES]; + [viewline.layer setCornerRadius:2]; + + UIView *viewnomo = [[UIView alloc] init]; + [self addSubview:viewnomo]; + [viewnomo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self); + make.top.equalTo(viewline.mas_bottom).offset(23); + }]; + [self drawNoMoView:viewnomo]; + + } + return self; +} + +-(void)drawNoMoView:(UIView *)view +{ + NSArray *arrbt = @[@"文本消息",@"上传图片"]; + for(int i = 0 ; i < arrbt.count; i++) + { + UIButton *btitem = [[UIButton alloc] init]; + [btitem setTitle:arrbt[i] forState:UIControlStateNormal]; + [btitem setTitleColor:RGBCOLOR(152, 157, 159) forState:UIControlStateNormal]; + [btitem setTitleColor:RGBCOLOR(227, 235, 240) forState:UIControlStateSelected]; + [btitem setImage:[UIImage imageNamed:[NSString stringWithFormat:@"znsp_%@",arrbt[i]]] forState:UIControlStateNormal]; + [btitem.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [btitem.layer setMasksToBounds:YES]; + [btitem.layer setCornerRadius:8]; + [btitem setBackgroundColor:RGBCOLOR(34, 37, 46)]; + [btitem.layer setBorderWidth:1]; + [btitem.layer setBorderColor:RGBCOLOR(34, 37, 46).CGColor]; + [view addSubview:btitem]; + [btitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(0); + make.left.offset(16+96*i); + make.height.offset(30); + make.width.offset(86); + }]; + [btitem setIconInLeft]; + [btitem setTag:i]; + [btitem addTarget:self action:@selector(topAction:) forControlEvents:UIControlEventTouchUpInside]; + if(i==0) + { + [btitem setSelected:YES]; + [btitem setBackgroundColor:RGBCOLOR(52, 58, 69)]; + [btitem.layer setBorderColor:RGBACOLOR(255, 255, 255, 0.5).CGColor]; + self.btselect = btitem; + } + } + + + UIButton *btset = [[UIButton alloc] init]; + [btset setImage:[UIImage imageNamed:@"znsp_set"] forState:UIControlStateNormal]; + [view addSubview:btset]; + [btset mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.offset(36); + make.height.offset(30); + make.right.equalTo(view).offset(-16); + make.top.offset(0); + }]; + [btset setTag:0]; + [btset addTarget:self action:@selector(topFunctionAction:) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btclear = [[UIButton alloc] init]; + [btclear setImage:[UIImage imageNamed:@"znsp_clear"] forState:UIControlStateNormal]; + [view addSubview:btclear]; + [btclear mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.offset(36); + make.height.offset(30); + make.right.equalTo(btset.mas_left); + make.top.offset(0); + }]; + [btclear setTag:1]; + [btclear addTarget:self action:@selector(topFunctionAction:) forControlEvents:UIControlEventTouchUpInside]; + + UIView *viewtext = [[UIView alloc] init]; + [viewtext setBackgroundColor:RGBCOLOR(34, 40, 50)]; + [view addSubview:viewtext]; + [viewtext mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.right.equalTo(view).offset(-16); + make.top.offset(42); + make.bottom.equalTo(view).offset(-TabHeight+30); + }]; + [viewtext.layer setMasksToBounds:YES]; + [viewtext.layer setCornerRadius:10]; + [self drawTextView:viewtext]; + _viewtext = viewtext; + + + UIView *viewimage = [[UIView alloc] init]; + [viewimage setBackgroundColor:RGBCOLOR(34, 40, 50)]; + [view addSubview:viewimage]; + [viewimage mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(viewtext); + }]; + [viewimage.layer setMasksToBounds:YES]; + [viewimage.layer setCornerRadius:10]; + [viewimage setHidden:YES]; + [self drawImageView:viewimage]; + _viewimage = viewimage; + +} +-(void)drawImageView:(UIView *)view +{ + FSTextView *textView = [[FSTextView alloc] init]; + [textView setTextColor:[UIColor whiteColor]]; + [textView setTextAlignment:NSTextAlignmentLeft]; + [textView setFont:[UIFont systemFontOfSize:15]]; + [textView setPlaceholder:@"请填写您对素材的要求"]; + [textView setPlaceholderColor:RGBCOLOR(90, 98, 106)]; + [textView setBackgroundColor:[UIColor clearColor]]; + [view addSubview:textView]; + [textView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.offset(5); + make.bottom.equalTo(view).offset(-50); + make.right.equalTo(view).offset(-5);; + }]; + _textImgView = textView; + + UIImageView *imgvadd = [[UIImageView alloc] init]; + [imgvadd setImage:[UIImage imageNamed:@"sc_add_video"]]; + [view addSubview:imgvadd]; + [imgvadd mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(52); + make.left.offset(12); + make.bottom.equalTo(view).offset(-14); + }]; + [imgvadd.layer setMasksToBounds:YES]; + [imgvadd.layer setCornerRadius:5]; + _imgvadd = imgvadd; + + UIButton *btaddimg = [[UIButton alloc] init]; + [view addSubview:btaddimg]; + [btaddimg mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(imgvadd); + }]; + [btaddimg addTarget:self action:@selector(imageaddAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btsend = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 74, 30)]; + [btsend setTitle:@"提交" forState:UIControlStateNormal]; + [btsend setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btsend.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btsend.layer setMasksToBounds:YES]; + [btsend.layer setCornerRadius:15]; + [view addSubview:btsend]; + [btsend mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(74, 30)); + make.right.equalTo(view).offset(-12); + make.bottom.equalTo(view).offset(-20); + }]; + [btsend addTarget:self action:@selector(sendAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btsend colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; +} +-(void)drawTextView:(UIView *)view +{ + FSTextView *textView = [[FSTextView alloc] init]; + [textView setTextColor:[UIColor whiteColor]]; + [textView setTextAlignment:NSTextAlignmentLeft]; + [textView setFont:[UIFont systemFontOfSize:15]]; + [textView setPlaceholder:@"请填写您对素材的要求"]; + [textView setPlaceholderColor:RGBCOLOR(90, 98, 106)]; + [textView setBackgroundColor:[UIColor clearColor]]; + [view addSubview:textView]; + [textView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.offset(5); + make.bottom.equalTo(view).offset(-42); + make.right.equalTo(view).offset(-5);; + }]; + _textView = textView; + + UIButton *btsend = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 74, 30)]; + [btsend setTitle:@"提交" forState:UIControlStateNormal]; + [btsend setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btsend.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btsend.layer setMasksToBounds:YES]; + [btsend.layer setCornerRadius:15]; + [view addSubview:btsend]; + [btsend mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(74, 30)); + make.right.bottom.equalTo(view).offset(-12); + }]; + [btsend addTarget:self action:@selector(sendAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btsend colors:@[(id)RGBCOLOR(246, 44, 108).CGColor,(id)RGBCOLOR(252, 79, 84).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; +} + +-(void)topAction:(UIButton *)sender +{ + if(sender.tag==self.btselect.tag)return;; + [self.btselect setSelected:NO]; + [self.btselect setBackgroundColor:RGBCOLOR(34, 37, 46)]; + [self.btselect.layer setBorderColor:RGBCOLOR(34, 37, 46).CGColor]; + + self.btselect = sender; + [self.btselect setSelected:YES]; + [self.btselect setBackgroundColor:RGBCOLOR(52, 58, 69)]; + [self.btselect.layer setBorderColor:RGBACOLOR(255, 255, 255, 0.5).CGColor]; + + if(self.btselect.tag==1) + { + [self.viewtext setHidden:YES]; + [self.viewimage setHidden:NO]; + } + else + { + [self.viewtext setHidden:NO]; + [self.viewimage setHidden:YES]; + } +} +-(void)topFunctionAction:(UIButton *)sender +{ + if(sender.tag==0) + { + if(!_viewset) + { + ZhiNengShiPingBottomSetView *viewset = [[ZhiNengShiPingBottomSetView alloc] init]; + [self.viewController.view addSubview:viewset]; + [viewset mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.width.offset(UISCREEN_WIDTH-32); + make.height.offset(236); + make.bottom.equalTo(self.viewController.view).offset(-200-TabHeight+30); + }]; + _viewset = viewset; + [viewset setBackValue:^(NSString * _Nonnull strbl, NSString * _Nonnull strsc) { + self.ratio = strbl; + self.duration = strsc; + }]; + } + else + { + self.viewset.hidden = !self.viewset.height; + } + } + else + { + + [NomoAlterView showInfo:@"是否确实清空所有数据" SelectTag:^(NSInteger tag) { + if(tag==1) + { + self.textView.text = @""; + self.textImgView.text = @""; + self.imgvadd.image = [UIImage imageNamed:@"sc_add_video"]; + self.image_id = @""; + if(self.backClearValue) + { + self.backClearValue(); + } + } + }]; + } +} +-(void)imageaddAction +{ + [self.tools choosePicWithViewController:self.viewController chooseType:ChooseTypeAlbum]; +} +#pragma mark - WYCamaImageToolsDelegate +-(void)didEndChoosePic:(UIImage *)image +{ + [self uploadImgData:image]; +} +- (void)uploadImgData:(UIImage *)image { + [KCSPHUDAlterView showView]; + [GongGongNetManager postUserUploadData:self scene:@"video_gen" image:image Callback:^(BOOL state, KCSPUserGXModel *responseObject, NSString * _Nullable describle) { + [KCSPHUDAlterView dismis]; + if(state) + { + self.imgvadd.image = image; + self.image_id = responseObject.data.ID; + } + else + { + [HXHud showMessage:describle afterDelayType:1]; + } + }]; +} + +-(void)sendAction +{ + [self getQuanXian]; +} +-(void)createVideo +{ + NSString *prompt = @""; + NSString *type = @""; + if(self.btselect.tag==1) + { + if(self.image_id.length==0) + { + [HXHud showMessage:@"请上传图片" afterDelayType:0]; + return; + } + prompt = self.textImgView.text; + type = @"1"; + } + else + { + if(self.textView.text.length==0) + { + [HXHud showMessage:@"请填写您对素材的要求" afterDelayType:0]; + return; + } + prompt = self.textView.text; + type = @"2"; + } + //类型 1.图生视频 2.文生视频 + [KCSPHUDAlterView showView]; + [KCSPNetManager requestVideoGenData:self prompt:prompt duration:self.duration ratio:self.ratio image_id:self.image_id type:type Callback:^(BOOL state, VideoGenModel *responseObject, NSString * _Nullable describle) { + if(state) + { + [self getVideoCreateState:responseObject.data]; + } + else + { + [KCSPHUDAlterView dismis]; + [HXHud showMessage:responseObject.message afterDelayType:1]; + } + }]; +} + +-(void)getVideoCreateState:(NSString *)strid +{ + [KCSPNetManager requestVideoGenStatusData:self ID:strid Callback:^(BOOL state, VideoGenDetailModel *responseObject, NSString * _Nullable describle) { + if(state) + { + if(responseObject.data.status.intValue==1||responseObject.data.status.intValue==2) + { + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self getVideoCreateState:strid]; + }); + } + else if (responseObject.data.status.intValue==4) + { + [KCSPHUDAlterView dismis]; + if(self.backValue) + { + self.backValue(responseObject.data.content); + } + } + else + { + [KCSPHUDAlterView dismis]; + [HXHud showMessage:responseObject.data.message afterDelayType:1]; + } + } + else + { + [KCSPHUDAlterView dismis]; + [HXHud showMessage:responseObject.message afterDelayType:1]; + } + }]; +} + +///权限校验 +-(void)getQuanXian +{ + [GongGongNetManager getUserAuthinfoData:self scene:@"download" Callback:^(BOOL state, KCSPUserRZModel *responseObject, NSString * _Nullable describle) { + if(state) + { + if(responseObject.data.auth.boolValue == YES) + { + [self createVideo]; + } + else + {///跳转充值页 + HuiYuanZXViewController *vc = [[HuiYuanZXViewController alloc] init]; + vc.source = @"download_material_material_create"; + [self.viewController.navigationController pushViewController:vc animated:YES]; + [UserDetailModel pushActionInfo:0 key:@"client.jump.to.member.recharge.material_create" value:@"download_material_material_create" extra:@""]; + } + } + else + { + [HXHud showMessage:describle afterDelayType:0]; + } + }]; +} +///权限上报 +-(void)upDataUserState +{ + [GongGongNetManager postUserAuthPostinfoData:self scene:@"download" count:@"1" Callback:^(BOOL state, id _Nullable responseObject, NSString * _Nullable describle) { + + }]; +} + + +- (WYCamaImageTools *)tools { + if (!_tools) { + _tools = [[WYCamaImageTools alloc] init]; + _tools.delegate = self; + }return _tools; +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.h new file mode 100644 index 0000000..e05c694 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.h @@ -0,0 +1,17 @@ +// +// ZhiNengShiPingNomoView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +typedef void(^ZhiNengShiPingNomoViewBacl)(NSString *strurl,NSString *strbili); +@interface ZhiNengShiPingNomoView : UIView +/// +@property (nonatomic , strong) ZhiNengShiPingNomoViewBacl backValue; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.m new file mode 100644 index 0000000..ccfd5ee --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingNomoView.m @@ -0,0 +1,117 @@ +// +// ZhiNengShiPingNomoView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingNomoView.h" +#import "ZhiNengShiPingNomoCollectionViewCell.h" + +@interface ZhiNengShiPingNomoView () +/// +@property (nonatomic , strong) UICollectionView *collect; +/// +@property (nonatomic , strong) NSArray *arrdata; +@end + +@implementation ZhiNengShiPingNomoView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"素材生成案列"]; + [lbname setTextColor:RGBCOLOR(226, 231, 234)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:15]]; + [self addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.offset(12); + }]; + + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.minimumLineSpacing = 0; + layout.minimumInteritemSpacing = 0; + UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + [collect setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:[UIColor clearColor]]; + [self addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.right.equalTo(self).offset(-12); + make.top.equalTo(lbname.mas_bottom).offset(14); + make.height.offset((UISCREEN_WIDTH-40)/3.0+25); + }]; + [collect registerClass:[ZhiNengShiPingNomoCollectionViewCell class] forCellWithReuseIdentifier:@"ZhiNengShiPingNomoCollectionViewCell"]; + _collect = collect; + + UIImageView *imgvbacknot = [[UIImageView alloc] init]; + [imgvbacknot setImage:[UIImage imageNamed:@"jl_暂无视频"]]; + [self addSubview:imgvbacknot]; + [imgvbacknot mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.equalTo(self); + make.width.height.offset(162); + }]; + + UILabel *lbzanw = [[UILabel alloc] init]; + [lbzanw setText:@"暂无视频"]; + [lbzanw setTextColor:RGBCOLOR(158, 158, 158)]; + [lbzanw setTextAlignment:NSTextAlignmentLeft]; + [lbzanw setFont:[UIFont systemFontOfSize:12]]; + [self addSubview:lbzanw]; + [lbzanw mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(imgvbacknot.mas_bottom); + make.centerX.equalTo(imgvbacknot); + }]; + + self.arrdata = [[UserDetailModel shareModel].config objectForKey:@"client.ai_case_study"]; + [collect reloadData]; + } + return self; +} +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + return self.arrdata.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + ZhiNengShiPingNomoCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ZhiNengShiPingNomoCollectionViewCell" forIndexPath:indexPath]; + NSDictionary *dic = self.arrdata[indexPath.row]; + cell.lbname.text = [Tools isStringnilkong:[dic objectForKey:@"name"]]; + [cell.imgvback sd_setImageWithURL:[NSURL URLWithString:[dic objectForKey:@"image"]] placeholderImage:[UIImage imageNamed:@"sc_zanwushuju"]]; + + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 0, 0, 0); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 8; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 8; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-40)/3.0, (UISCREEN_WIDTH-40)/3.0+25); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + NSDictionary *dic = self.arrdata[indexPath.row]; + if(self.backValue) + { + self.backValue([dic objectForKey:@"url"], [dic objectForKey:@"video_scale"]); + } +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.h new file mode 100644 index 0000000..720d0a6 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.h @@ -0,0 +1,19 @@ +// +// ZhiNengShiPingVideoView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiNengShiPingVideoView : UIView +/// +@property (nonatomic , strong) NSString *strbilv; +/// +@property (nonatomic , strong) NSString *strvideourl; +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.m new file mode 100644 index 0000000..8e40367 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingVideoView.m @@ -0,0 +1,132 @@ +// +// ZhiNengShiPingVideoView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingVideoView.h" +#import "WMPlayer.h" + +#import "XiaZaiManager.h" +#import "KCSPMaterialsModel.h" +#import "KCSPNetManager.h" +#import "ImagesConnectManager.h" +#import "NomoAlterView.h" + +@interface ZhiNengShiPingVideoView () +@property (nonatomic , strong) WMPlayer *player; +/// +@property (nonatomic , strong) UILabel *lbli; + +@end + +@implementation ZhiNengShiPingVideoView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + [self drawUI]; + } + return self; +} +-(void)setStrvideourl:(NSString *)strvideourl +{ + _strvideourl = strvideourl; + if(self.player) + { + [self.player pause]; + } + for(UIView *view in self.subviews) + { + [view removeFromSuperview]; + } + [self drawUI]; +} +-(void)drawUI +{ + NSString *strtemp = self.strvideourl; + WMPlayerModel *model = [[WMPlayerModel alloc] init]; + model.videoURL = [NSURL URLWithString:strtemp]; + + WMPlayer *player = [[WMPlayer alloc] initPlayerModel:model]; +// [player setDelegate:self]; + player.enableFastForwardGesture = NO; + player.isprogressSliderAction = YES; + _player = player; + [self addSubview:player]; + [player mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.width.top.equalTo(self); + make.height.offset(UISCREEN_HEIGHT-TabHeight-NavHeight-190); + }]; + + UILabel *lbli = [[UILabel alloc] init]; + [lbli setText:[[NSUserDefaults standardUserDefaults] objectForKey:@"ZNSPBiLi"]]; + if(self.strbilv.length>0) + { + lbli.text = self.strbilv; + } + [lbli setTextColor:[UIColor whiteColor]]; + [lbli setTextAlignment:NSTextAlignmentCenter]; + [lbli setFont:[UIFont systemFontOfSize:12]]; + [lbli setBackgroundColor:RGBACOLOR(0, 0, 0, 0.5)]; + [self addSubview:lbli]; + [lbli mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.offset(32); + make.height.offset(18); + make.left.offset(12); + make.top.offset(10); + }]; + [lbli.layer setMasksToBounds:YES]; + [lbli.layer setCornerRadius:2]; + _lbli = lbli; + + UIButton *btdown = [[UIButton alloc] init]; + [btdown setImage:[UIImage imageNamed:@"znsp_xiazai"] forState:UIControlStateNormal]; + [self addSubview:btdown]; + [btdown mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(30); + make.top.offset(10); + make.right.equalTo(self).offset(-12); + }]; + [btdown addTarget:self action:@selector(xiazaiAction) forControlEvents:UIControlEventTouchUpInside]; + +} + +-(void)xiazaiAction +{ + if([UserDetailModel pushDengLuVC:self.viewController ispush:YES]==NO)return;; + + [ImagesConnectManager getXCQuanXian:^(BOOL issave) { + dispatch_async(dispatch_get_main_queue(), ^{ + if(issave) + { + [self saveData]; + } + else + { + [NomoAlterView showInfo:@"无相册权限，请到设置中开启APP相册权限再保存，照片>所有照片 权限" SelectTag:^(NSInteger tag) { + if(tag==1) + { + [Tools pushAppSet]; + } + }]; + } + }); + }]; +} +-(void)saveData +{ + NSMutableArray *arrtemp = [NSMutableArray new]; + KCSPMaterialsModelDataMaterialImage *model = [KCSPMaterialsModelDataMaterialImage new]; + model.title = @"s"; + model.url = self.strvideourl; + model.origin_url = self.strvideourl; + [arrtemp addObject:model]; + + [[XiaZaiManager shareManager] xiaZaiManagerInfo:arrtemp logid:@"112" Success:^(NSMutableArray * _Nonnull arrPath) { + + } issave:YES]; +} +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.h b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.h new file mode 100644 index 0000000..b716c30 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.h @@ -0,0 +1,16 @@ +// +// ZhiNengShiPingView.h +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiNengShiPingView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.m b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.m new file mode 100644 index 0000000..1711b77 --- /dev/null +++ b/KuaiCunShiPin/KuaiCunShiPin/Main/首页/智能视频/view/ZhiNengShiPingView.m @@ -0,0 +1,70 @@ +// +// ZhiNengShiPingView.m +// KuaiCunShiPin +// +// Created by 工作 on 2025/4/28. +// + +#import "ZhiNengShiPingView.h" +#import "ZhiNengShiPingNomoView.h" +#import "ZhiNengShiPingBottomView.h" + +#import "ZhiNengShiPingVideoView.h" + + +@interface ZhiNengShiPingView () +/// +@property (nonatomic , strong) ZhiNengShiPingVideoView *viewvideo; + +@end + +@implementation ZhiNengShiPingView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + ///默认页面 + ZhiNengShiPingNomoView *view = [[ZhiNengShiPingNomoView alloc] init]; + [self addSubview:view]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [view setBackValue:^(NSString * _Nonnull strurl, NSString * _Nonnull strbili) { + [self.viewvideo setHidden:NO]; + self.viewvideo.strbilv = strbili; + self.viewvideo.strvideourl = strurl; + }]; + + ZhiNengShiPingVideoView *viewvideo = [[ZhiNengShiPingVideoView alloc] init]; + [self addSubview:viewvideo]; + [viewvideo mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewvideo setHidden:YES]; + _viewvideo = viewvideo; + + ZhiNengShiPingBottomView *viewbottom = [[ZhiNengShiPingBottomView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + [self addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self); + make.height.offset(200+TabHeight); + }]; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewbottom.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(12,12)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewbottom.bounds; + maskLayer.path = maskPath.CGPath; + viewbottom.layer.mask = maskLayer; + [viewbottom setBackValue:^(NSString * _Nonnull strurl) { + [self.viewvideo setHidden:NO]; + self.viewvideo.strbilv = @""; + self.viewvideo.strvideourl = strurl; + }]; + [viewbottom setBackClearValue:^{ + [self.viewvideo setHidden:YES]; + }]; + } + return self; +} + +@end diff --git a/KuaiCunShiPin/KuaiCunShiPin/PrivacyInfo.xcprivacy b/KuaiCunShiPin/KuaiCunShiPin/PrivacyInfo.xcprivacy index 65e2e66..55a1d06 100644 --- a/KuaiCunShiPin/KuaiCunShiPin/PrivacyInfo.xcprivacy +++ b/KuaiCunShiPin/KuaiCunShiPin/PrivacyInfo.xcprivacy @@ -45,3 +45,4 @@ +a