diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 05b556d..95b0291 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -20,6 +20,18 @@ CA4401092DA3724C00DFD65C /* D-DIN-PRO-500-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = CA4401082DA3724C00DFD65C /* D-DIN-PRO-500-Medium.otf */; }; CA4401742DA3B12800DFD65C /* TTTAttributedLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4401722DA3B12800DFD65C /* TTTAttributedLabel.m */; }; CA44018E2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CA44018D2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf */; }; + CA651D992DB1E2D200B37092 /* ShiPinJiLuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651D982DB1E2D200B37092 /* ShiPinJiLuViewController.m */; }; + CA651D9D2DB1E6B500B37092 /* JiLuAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651D9C2DB1E6B500B37092 /* JiLuAudioView.m */; }; + CA651DA22DB1E6C500B37092 /* JiLuAudioTableViewCellOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA651DA12DB1E6C500B37092 /* JiLuAudioTableViewCellOModel.swift */; }; + CA651DA32DB1E6C500B37092 /* JiLuAudioTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DA02DB1E6C500B37092 /* JiLuAudioTableViewCell.m */; }; + CA651DA82DB1E6CC00B37092 /* JiLuAudioPlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DA52DB1E6CC00B37092 /* JiLuAudioPlayView.m */; }; + CA651DA92DB1E6CC00B37092 /* JiLuAudioPlayViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA651DA62DB1E6CC00B37092 /* JiLuAudioPlayViewOModel.swift */; }; + CA651DBA2DB22C2D00B37092 /* ZhiXunViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DB92DB22C2D00B37092 /* ZhiXunViewController.m */; }; + CA651DBE2DB230B300B37092 /* ZhiXunFenLaiModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DBD2DB230B300B37092 /* ZhiXunFenLaiModel.m */; }; + CA651DC22DB2320800B37092 /* ZhiXunFenLaiView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DC12DB2320800B37092 /* ZhiXunFenLaiView.m */; }; + CA651DC52DB2323000B37092 /* ZhiXunFenLaiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DC42DB2323000B37092 /* ZhiXunFenLaiViewController.m */; }; + CA651DC92DB2372300B37092 /* ZhiXunFenLaiTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DC82DB2372300B37092 /* ZhiXunFenLaiTableViewCell.m */; }; + CA651DCC2DB237F700B37092 /* ZhiXunListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA651DCB2DB237F700B37092 /* ZhiXunListModel.m */; }; CA87E1AE2DA66AF900005681 /* load_start.pag in Resources */ = {isa = PBXBuildFile; fileRef = CA87E1AD2DA66AF900005681 /* load_start.pag */; }; CA87E1AF2DA66AF900005681 /* download_progress.pag in Resources */ = {isa = PBXBuildFile; fileRef = CA87E1AB2DA66AF900005681 /* download_progress.pag */; }; CA87E1B02DA66AF900005681 /* download_success.pag in Resources */ = {isa = PBXBuildFile; fileRef = CA87E1AC2DA66AF900005681 /* download_success.pag */; }; @@ -64,13 +76,9 @@ CAC346F12D9E249F00E7E3D6 /* WMPlayer.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CAC346E62D9E249F00E7E3D6 /* WMPlayer.bundle */; }; CAFA631F2DB0E92600FD9D86 /* KCSPUserCodesModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62FC2DB0E92600FD9D86 /* KCSPUserCodesModel.m */; }; CAFA63202DB0E92600FD9D86 /* KCSPUserDengLuModelOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62FF2DB0E92600FD9D86 /* KCSPUserDengLuModelOModel.swift */; }; - CAFA63212DB0E92600FD9D86 /* JiLuImageCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D32DB0E92600FD9D86 /* JiLuImageCollectionViewCell.m */; }; - CAFA63222DB0E92600FD9D86 /* JiLuAudioPlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61CC2DB0E92600FD9D86 /* JiLuAudioPlayView.m */; }; - CAFA63232DB0E92600FD9D86 /* RecordImageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D62DB0E92600FD9D86 /* RecordImageModel.m */; }; CAFA63242DB0E92600FD9D86 /* KCSPUserModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA63032DB0E92600FD9D86 /* KCSPUserModel.m */; }; CAFA63252DB0E92600FD9D86 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62C82DB0E92600FD9D86 /* LoginViewController.m */; }; CAFA63262DB0E92600FD9D86 /* IJKPlayerPlayViewControllerOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62162DB0E92600FD9D86 /* IJKPlayerPlayViewControllerOModel.swift */; }; - CAFA63272DB0E92600FD9D86 /* JiLuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61E32DB0E92600FD9D86 /* JiLuViewController.m */; }; CAFA63282DB0E92600FD9D86 /* MainMySetTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA628F2DB0E92600FD9D86 /* MainMySetTableViewCell.m */; }; CAFA63292DB0E92600FD9D86 /* KCSPUserSysterConfModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA630B2DB0E92600FD9D86 /* KCSPUserSysterConfModel.m */; }; CAFA632A2DB0E92600FD9D86 /* KCSPApplePayManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA63172DB0E92600FD9D86 /* KCSPApplePayManager.m */; }; @@ -85,7 +93,6 @@ CAFA63332DB0E92600FD9D86 /* GongGongNetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA63142DB0E92600FD9D86 /* GongGongNetManager.m */; }; CAFA63342DB0E92600FD9D86 /* XZM3SaveManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62D52DB0E92600FD9D86 /* XZM3SaveManager.m */; }; CAFA63352DB0E92600FD9D86 /* ShiPingEditJGView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61FD2DB0E92600FD9D86 /* ShiPingEditJGView.m */; }; - CAFA63362DB0E92600FD9D86 /* JiLuAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61DC2DB0E92600FD9D86 /* JiLuAudioView.m */; }; CAFA63372DB0E92600FD9D86 /* ShouYeBigCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62342DB0E92600FD9D86 /* ShouYeBigCollectionViewCell.m */; }; CAFA63382DB0E92600FD9D86 /* UrlXiaZaiWBViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61F62DB0E92600FD9D86 /* UrlXiaZaiWBViewController.m */; }; CAFA63392DB0E92600FD9D86 /* ShiPingEditJGViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61FE2DB0E92600FD9D86 /* ShiPingEditJGViewOModel.swift */; }; @@ -103,8 +110,6 @@ CAFA63452DB0E92600FD9D86 /* ShiPingEditBiaoJiViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62082DB0E92600FD9D86 /* ShiPingEditBiaoJiViewOModel.swift */; }; CAFA63462DB0E92600FD9D86 /* LoginViewControllerOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62C92DB0E92600FD9D86 /* LoginViewControllerOModel.swift */; }; CAFA63472DB0E92600FD9D86 /* HuiYuanZXQuanYiView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62602DB0E92600FD9D86 /* HuiYuanZXQuanYiView.m */; }; - CAFA63482DB0E92600FD9D86 /* JiLuAudioPlayViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61CD2DB0E92600FD9D86 /* JiLuAudioPlayViewOModel.swift */; }; - CAFA63492DB0E92600FD9D86 /* RecordImageModelSuper.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D92DB0E92600FD9D86 /* RecordImageModelSuper.m */; }; CAFA634A2DB0E92600FD9D86 /* LoginViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62C32DB0E92600FD9D86 /* LoginViewOModel.swift */; }; CAFA634B2DB0E92600FD9D86 /* ShiPingTopSelectView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA622B2DB0E92600FD9D86 /* ShiPingTopSelectView.m */; }; CAFA634C2DB0E92600FD9D86 /* DuiHuanZSLineTableViewCellOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62472DB0E92600FD9D86 /* DuiHuanZSLineTableViewCellOModel.swift */; }; @@ -133,7 +138,6 @@ CAFA63632DB0E92600FD9D86 /* HuiYuanZXUserView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62622DB0E92600FD9D86 /* HuiYuanZXUserView.m */; }; CAFA63642DB0E92600FD9D86 /* KCSPUploadImageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA631B2DB0E92600FD9D86 /* KCSPUploadImageManager.m */; }; CAFA63652DB0E92600FD9D86 /* UrlXiaZaiSPViewControllerOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61EA2DB0E92600FD9D86 /* UrlXiaZaiSPViewControllerOModel.swift */; }; - CAFA63662DB0E92600FD9D86 /* JiLuImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61E02DB0E92600FD9D86 /* JiLuImageView.m */; }; CAFA63672DB0E92600FD9D86 /* KCSPXZManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62D12DB0E92600FD9D86 /* KCSPXZManager.m */; }; CAFA63682DB0E92600FD9D86 /* KCSPZFOrderModelOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA63112DB0E92600FD9D86 /* KCSPZFOrderModelOModel.swift */; }; CAFA63692DB0E92600FD9D86 /* XZM3Manager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62D32DB0E92600FD9D86 /* XZM3Manager.m */; }; @@ -170,7 +174,6 @@ CAFA63882DB0E92600FD9D86 /* GengXinAlterViewOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62AB2DB0E92600FD9D86 /* GengXinAlterViewOModel.swift */; }; CAFA63892DB0E92600FD9D86 /* KCSPWXVideoLogsModelOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62E72DB0E92600FD9D86 /* KCSPWXVideoLogsModelOModel.swift */; }; CAFA638A2DB0E92600FD9D86 /* ZhuanShiAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62B82DB0E92600FD9D86 /* ZhuanShiAlterView.m */; }; - CAFA638B2DB0E92600FD9D86 /* RecordImageModelOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D72DB0E92600FD9D86 /* RecordImageModelOModel.swift */; }; CAFA638C2DB0E92600FD9D86 /* GongGongNetManagerOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA63152DB0E92600FD9D86 /* GongGongNetManagerOModel.swift */; }; CAFA638D2DB0E92600FD9D86 /* DynamicVideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62252DB0E92600FD9D86 /* DynamicVideoViewController.m */; }; CAFA638E2DB0E92600FD9D86 /* ImagesConnectManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62392DB0E92600FD9D86 /* ImagesConnectManager.m */; }; @@ -180,7 +183,6 @@ CAFA63922DB0E92600FD9D86 /* KCSPOrderTfModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62F82DB0E92600FD9D86 /* KCSPOrderTfModel.m */; }; CAFA63932DB0E92600FD9D86 /* ShiPingEditBiaoJiView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62072DB0E92600FD9D86 /* ShiPingEditBiaoJiView.m */; }; CAFA63942DB0E92600FD9D86 /* ShiPingEditShuiYinView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA620B2DB0E92600FD9D86 /* ShiPingEditShuiYinView.m */; }; - CAFA63952DB0E92600FD9D86 /* JiLuHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61DE2DB0E92600FD9D86 /* JiLuHeaderView.m */; }; CAFA63962DB0E92600FD9D86 /* KCSPUserDengLuModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62FE2DB0E92600FD9D86 /* KCSPUserDengLuModel.m */; }; CAFA63972DB0E92600FD9D86 /* KCSPCheckActivesModelOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62D92DB0E92600FD9D86 /* KCSPCheckActivesModelOModel.swift */; }; CAFA63982DB0E92600FD9D86 /* UrlXiaZaiTPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61F02DB0E92600FD9D86 /* UrlXiaZaiTPViewController.m */; }; @@ -188,7 +190,6 @@ CAFA639A2DB0E92600FD9D86 /* PeiZhiShowView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA626A2DB0E92600FD9D86 /* PeiZhiShowView.m */; }; CAFA639B2DB0E92600FD9D86 /* ZhangHaoBDPhoneView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62832DB0E92600FD9D86 /* ZhangHaoBDPhoneView.m */; }; CAFA639C2DB0E92600FD9D86 /* ShiPingEditJGViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62012DB0E92600FD9D86 /* ShiPingEditJGViewController.m */; }; - CAFA639D2DB0E92600FD9D86 /* JiLuAudioTableViewCellOModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D12DB0E92600FD9D86 /* JiLuAudioTableViewCellOModel.swift */; }; CAFA639E2DB0E92600FD9D86 /* ShouYeView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62402DB0E92600FD9D86 /* ShouYeView.m */; }; CAFA639F2DB0E92600FD9D86 /* ShiPingTiQuYinPingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62222DB0E92600FD9D86 /* ShiPingTiQuYinPingViewController.m */; }; CAFA63A02DB0E92600FD9D86 /* UrlXiaZaiTPCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61ED2DB0E92600FD9D86 /* UrlXiaZaiTPCollectionViewCell.m */; }; @@ -198,7 +199,6 @@ CAFA63A42DB0E92600FD9D86 /* LoginWXView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62C52DB0E92600FD9D86 /* LoginWXView.m */; }; CAFA63A52DB0E92600FD9D86 /* VChangeManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA623B2DB0E92600FD9D86 /* VChangeManager.m */; }; CAFA63A62DB0E92600FD9D86 /* HuiYuanZXQuanYiCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA625B2DB0E92600FD9D86 /* HuiYuanZXQuanYiCollectionViewCell.m */; }; - CAFA63A72DB0E92600FD9D86 /* JiLuAudioTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA61D02DB0E92600FD9D86 /* JiLuAudioTableViewCell.m */; }; CAFA63A82DB0E92600FD9D86 /* XieYiAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62B42DB0E92600FD9D86 /* XieYiAlterView.m */; }; CAFA63A92DB0E92600FD9D86 /* ZhangHaoBDViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA62862DB0E92600FD9D86 /* ZhangHaoBDViewController.m */; }; CAFA63AA2DB0E92600FD9D86 /* ShiPingHaoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAFA621B2DB0E92600FD9D86 /* ShiPingHaoViewController.m */; }; @@ -390,6 +390,28 @@ CA4401712DA3B12800DFD65C /* TTTAttributedLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TTTAttributedLabel.h; sourceTree = ""; }; CA4401722DA3B12800DFD65C /* TTTAttributedLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TTTAttributedLabel.m; sourceTree = ""; }; CA44018D2DA3C76E00DFD65C /* D-DIN-PRO-700-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "D-DIN-PRO-700-Bold.otf"; sourceTree = ""; }; + CA651D972DB1E2D200B37092 /* ShiPinJiLuViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShiPinJiLuViewController.h; sourceTree = ""; }; + CA651D982DB1E2D200B37092 /* ShiPinJiLuViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShiPinJiLuViewController.m; sourceTree = ""; }; + CA651D9B2DB1E6B500B37092 /* JiLuAudioView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioView.h; sourceTree = ""; }; + CA651D9C2DB1E6B500B37092 /* JiLuAudioView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioView.m; sourceTree = ""; }; + CA651D9F2DB1E6C500B37092 /* JiLuAudioTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioTableViewCell.h; sourceTree = ""; }; + CA651DA02DB1E6C500B37092 /* JiLuAudioTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioTableViewCell.m; sourceTree = ""; }; + CA651DA12DB1E6C500B37092 /* JiLuAudioTableViewCellOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiLuAudioTableViewCellOModel.swift; sourceTree = ""; }; + CA651DA42DB1E6CC00B37092 /* JiLuAudioPlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioPlayView.h; sourceTree = ""; }; + CA651DA52DB1E6CC00B37092 /* JiLuAudioPlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioPlayView.m; sourceTree = ""; }; + CA651DA62DB1E6CC00B37092 /* JiLuAudioPlayViewOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiLuAudioPlayViewOModel.swift; sourceTree = ""; }; + CA651DB82DB22C2D00B37092 /* ZhiXunViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunViewController.h; sourceTree = ""; }; + CA651DB92DB22C2D00B37092 /* ZhiXunViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunViewController.m; sourceTree = ""; }; + CA651DBC2DB230B300B37092 /* ZhiXunFenLaiModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunFenLaiModel.h; sourceTree = ""; }; + CA651DBD2DB230B300B37092 /* ZhiXunFenLaiModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunFenLaiModel.m; sourceTree = ""; }; + CA651DC02DB2320800B37092 /* ZhiXunFenLaiView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunFenLaiView.h; sourceTree = ""; }; + CA651DC12DB2320800B37092 /* ZhiXunFenLaiView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunFenLaiView.m; sourceTree = ""; }; + CA651DC32DB2323000B37092 /* ZhiXunFenLaiViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunFenLaiViewController.h; sourceTree = ""; }; + CA651DC42DB2323000B37092 /* ZhiXunFenLaiViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunFenLaiViewController.m; sourceTree = ""; }; + CA651DC72DB2372300B37092 /* ZhiXunFenLaiTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunFenLaiTableViewCell.h; sourceTree = ""; }; + CA651DC82DB2372300B37092 /* ZhiXunFenLaiTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunFenLaiTableViewCell.m; sourceTree = ""; }; + CA651DCA2DB237F700B37092 /* ZhiXunListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZhiXunListModel.h; sourceTree = ""; }; + CA651DCB2DB237F700B37092 /* ZhiXunListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZhiXunListModel.m; sourceTree = ""; }; CA87E1AB2DA66AF900005681 /* download_progress.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = download_progress.pag; sourceTree = ""; }; CA87E1AC2DA66AF900005681 /* download_success.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = download_success.pag; sourceTree = ""; }; CA87E1AD2DA66AF900005681 /* load_start.pag */ = {isa = PBXFileReference; lastKnownFileType = file; path = load_start.pag; sourceTree = ""; }; @@ -559,27 +581,6 @@ CAC346E92D9E249F00E7E3D6 /* WMPlayerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WMPlayerModel.h; sourceTree = ""; }; CAC346EA2D9E249F00E7E3D6 /* WMPlayerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WMPlayerModel.m; sourceTree = ""; }; CAC346F62D9E394200E7E3D6 /* ProductApp-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ProductApp-Bridging-Header.h"; sourceTree = ""; }; - CAFA61CB2DB0E92600FD9D86 /* JiLuAudioPlayView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioPlayView.h; sourceTree = ""; }; - CAFA61CC2DB0E92600FD9D86 /* JiLuAudioPlayView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioPlayView.m; sourceTree = ""; }; - CAFA61CD2DB0E92600FD9D86 /* JiLuAudioPlayViewOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiLuAudioPlayViewOModel.swift; sourceTree = ""; }; - CAFA61CF2DB0E92600FD9D86 /* JiLuAudioTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioTableViewCell.h; sourceTree = ""; }; - CAFA61D02DB0E92600FD9D86 /* JiLuAudioTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioTableViewCell.m; sourceTree = ""; }; - CAFA61D12DB0E92600FD9D86 /* JiLuAudioTableViewCellOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JiLuAudioTableViewCellOModel.swift; sourceTree = ""; }; - CAFA61D22DB0E92600FD9D86 /* JiLuImageCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuImageCollectionViewCell.h; sourceTree = ""; }; - CAFA61D32DB0E92600FD9D86 /* JiLuImageCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuImageCollectionViewCell.m; sourceTree = ""; }; - CAFA61D52DB0E92600FD9D86 /* RecordImageModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecordImageModel.h; sourceTree = ""; }; - CAFA61D62DB0E92600FD9D86 /* RecordImageModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecordImageModel.m; sourceTree = ""; }; - CAFA61D72DB0E92600FD9D86 /* RecordImageModelOModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordImageModelOModel.swift; sourceTree = ""; }; - CAFA61D82DB0E92600FD9D86 /* RecordImageModelSuper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RecordImageModelSuper.h; sourceTree = ""; }; - CAFA61D92DB0E92600FD9D86 /* RecordImageModelSuper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RecordImageModelSuper.m; sourceTree = ""; }; - CAFA61DB2DB0E92600FD9D86 /* JiLuAudioView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuAudioView.h; sourceTree = ""; }; - CAFA61DC2DB0E92600FD9D86 /* JiLuAudioView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuAudioView.m; sourceTree = ""; }; - CAFA61DD2DB0E92600FD9D86 /* JiLuHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuHeaderView.h; sourceTree = ""; }; - CAFA61DE2DB0E92600FD9D86 /* JiLuHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuHeaderView.m; sourceTree = ""; }; - CAFA61DF2DB0E92600FD9D86 /* JiLuImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuImageView.h; sourceTree = ""; }; - CAFA61E02DB0E92600FD9D86 /* JiLuImageView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuImageView.m; sourceTree = ""; }; - CAFA61E22DB0E92600FD9D86 /* JiLuViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JiLuViewController.h; sourceTree = ""; }; - CAFA61E32DB0E92600FD9D86 /* JiLuViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JiLuViewController.m; sourceTree = ""; }; CAFA61E52DB0E92600FD9D86 /* UrlXiaZaiSPCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UrlXiaZaiSPCollectionViewCell.h; sourceTree = ""; }; CAFA61E62DB0E92600FD9D86 /* UrlXiaZaiSPCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UrlXiaZaiSPCollectionViewCell.m; sourceTree = ""; }; CAFA61E82DB0E92600FD9D86 /* UrlXiaZaiSPViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UrlXiaZaiSPViewController.h; sourceTree = ""; }; @@ -1232,6 +1233,90 @@ path = TTTAttributedLabel; sourceTree = ""; }; + CA651D962DB1E2BB00B37092 /* 记录 */ = { + isa = PBXGroup; + children = ( + CA651DA72DB1E6CC00B37092 /* 播放音频 */, + CA651D9E2DB1E6B800B37092 /* cell */, + CA651D9A2DB1E2D500B37092 /* view */, + CA651D972DB1E2D200B37092 /* ShiPinJiLuViewController.h */, + CA651D982DB1E2D200B37092 /* ShiPinJiLuViewController.m */, + ); + path = "记录"; + sourceTree = ""; + }; + CA651D9A2DB1E2D500B37092 /* view */ = { + isa = PBXGroup; + children = ( + CA651D9B2DB1E6B500B37092 /* JiLuAudioView.h */, + CA651D9C2DB1E6B500B37092 /* JiLuAudioView.m */, + ); + path = view; + sourceTree = ""; + }; + CA651D9E2DB1E6B800B37092 /* cell */ = { + isa = PBXGroup; + children = ( + CA651D9F2DB1E6C500B37092 /* JiLuAudioTableViewCell.h */, + CA651DA02DB1E6C500B37092 /* JiLuAudioTableViewCell.m */, + CA651DA12DB1E6C500B37092 /* JiLuAudioTableViewCellOModel.swift */, + ); + path = cell; + sourceTree = ""; + }; + CA651DA72DB1E6CC00B37092 /* 播放音频 */ = { + isa = PBXGroup; + children = ( + CA651DA42DB1E6CC00B37092 /* JiLuAudioPlayView.h */, + CA651DA52DB1E6CC00B37092 /* JiLuAudioPlayView.m */, + CA651DA62DB1E6CC00B37092 /* JiLuAudioPlayViewOModel.swift */, + ); + path = "播放音频"; + sourceTree = ""; + }; + CA651DB72DB22C2000B37092 /* 资讯 */ = { + isa = PBXGroup; + children = ( + CA651DC62DB2371200B37092 /* cell */, + CA651DBF2DB231ED00B37092 /* view */, + CA651DBB2DB230A400B37092 /* models */, + CA651DB82DB22C2D00B37092 /* ZhiXunViewController.h */, + CA651DB92DB22C2D00B37092 /* ZhiXunViewController.m */, + ); + path = "资讯"; + sourceTree = ""; + }; + CA651DBB2DB230A400B37092 /* models */ = { + isa = PBXGroup; + children = ( + CA651DBC2DB230B300B37092 /* ZhiXunFenLaiModel.h */, + CA651DBD2DB230B300B37092 /* ZhiXunFenLaiModel.m */, + CA651DCA2DB237F700B37092 /* ZhiXunListModel.h */, + CA651DCB2DB237F700B37092 /* ZhiXunListModel.m */, + ); + path = models; + sourceTree = ""; + }; + CA651DBF2DB231ED00B37092 /* view */ = { + isa = PBXGroup; + children = ( + CA651DC02DB2320800B37092 /* ZhiXunFenLaiView.h */, + CA651DC12DB2320800B37092 /* ZhiXunFenLaiView.m */, + CA651DC32DB2323000B37092 /* ZhiXunFenLaiViewController.h */, + CA651DC42DB2323000B37092 /* ZhiXunFenLaiViewController.m */, + ); + path = view; + sourceTree = ""; + }; + CA651DC62DB2371200B37092 /* cell */ = { + isa = PBXGroup; + children = ( + CA651DC72DB2372300B37092 /* ZhiXunFenLaiTableViewCell.h */, + CA651DC82DB2372300B37092 /* ZhiXunFenLaiTableViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; CAAD72C32DA4B2AC00927BA5 /* FFmpeg */ = { isa = PBXGroup; children = ( @@ -1535,66 +1620,6 @@ path = WMPlayer; sourceTree = ""; }; - CAFA61CE2DB0E92600FD9D86 /* 播放音频 */ = { - isa = PBXGroup; - children = ( - CAFA61CB2DB0E92600FD9D86 /* JiLuAudioPlayView.h */, - CAFA61CC2DB0E92600FD9D86 /* JiLuAudioPlayView.m */, - CAFA61CD2DB0E92600FD9D86 /* JiLuAudioPlayViewOModel.swift */, - ); - path = "播放音频"; - sourceTree = ""; - }; - CAFA61D42DB0E92600FD9D86 /* cell */ = { - isa = PBXGroup; - children = ( - CAFA61CF2DB0E92600FD9D86 /* JiLuAudioTableViewCell.h */, - CAFA61D02DB0E92600FD9D86 /* JiLuAudioTableViewCell.m */, - CAFA61D12DB0E92600FD9D86 /* JiLuAudioTableViewCellOModel.swift */, - CAFA61D22DB0E92600FD9D86 /* JiLuImageCollectionViewCell.h */, - CAFA61D32DB0E92600FD9D86 /* JiLuImageCollectionViewCell.m */, - ); - path = cell; - sourceTree = ""; - }; - CAFA61DA2DB0E92600FD9D86 /* model */ = { - isa = PBXGroup; - children = ( - CAFA61D52DB0E92600FD9D86 /* RecordImageModel.h */, - CAFA61D62DB0E92600FD9D86 /* RecordImageModel.m */, - CAFA61D72DB0E92600FD9D86 /* RecordImageModelOModel.swift */, - CAFA61D82DB0E92600FD9D86 /* RecordImageModelSuper.h */, - CAFA61D92DB0E92600FD9D86 /* RecordImageModelSuper.m */, - ); - path = model; - sourceTree = ""; - }; - CAFA61E12DB0E92600FD9D86 /* view */ = { - isa = PBXGroup; - children = ( - CAFA61DB2DB0E92600FD9D86 /* JiLuAudioView.h */, - CAFA61DC2DB0E92600FD9D86 /* JiLuAudioView.m */, - CAFA61DD2DB0E92600FD9D86 /* JiLuHeaderView.h */, - CAFA61DE2DB0E92600FD9D86 /* JiLuHeaderView.m */, - CAFA61DF2DB0E92600FD9D86 /* JiLuImageView.h */, - CAFA61E02DB0E92600FD9D86 /* JiLuImageView.m */, - ); - path = view; - sourceTree = ""; - }; - CAFA61E42DB0E92600FD9D86 /* JiLu */ = { - isa = PBXGroup; - children = ( - CAFA61CE2DB0E92600FD9D86 /* 播放音频 */, - CAFA61D42DB0E92600FD9D86 /* cell */, - CAFA61DA2DB0E92600FD9D86 /* model */, - CAFA61E12DB0E92600FD9D86 /* view */, - CAFA61E22DB0E92600FD9D86 /* JiLuViewController.h */, - CAFA61E32DB0E92600FD9D86 /* JiLuViewController.m */, - ); - path = JiLu; - sourceTree = ""; - }; CAFA61E72DB0E92600FD9D86 /* cell */ = { isa = PBXGroup; children = ( @@ -1773,6 +1798,7 @@ CAFA62232DB0E92600FD9D86 /* 视频转音频 */ = { isa = PBXGroup; children = ( + CA651D962DB1E2BB00B37092 /* 记录 */, CAFA62202DB0E92600FD9D86 /* view */, CAFA62212DB0E92600FD9D86 /* ShiPingTiQuYinPingViewController.h */, CAFA62222DB0E92600FD9D86 /* ShiPingTiQuYinPingViewController.m */, @@ -3046,7 +3072,7 @@ CAFA631E2DB0E92600FD9D86 /* NetWorkManager */, CAFA62B92DB0E92600FD9D86 /* alters */, CAFA62BC2DB0E92600FD9D86 /* LoadAlter */, - CAFA61E42DB0E92600FD9D86 /* JiLu */, + CA651DB72DB22C2000B37092 /* 资讯 */, CAFA62442DB0E92600FD9D86 /* ShouYe */, CAFA629E2DB0E92600FD9D86 /* WoDe */, CAFA62CA2DB0E92600FD9D86 /* login */, @@ -3286,6 +3312,8 @@ CB489DD027449D5C00DA044A /* ViewController.m in Sources */, CB489FAA2744A0BD00DA044A /* UIImage+XLExtension.m in Sources */, CB489F582744A0BD00DA044A /* UIDevice+PGJ.m in Sources */, + CA651DBA2DB22C2D00B37092 /* ZhiXunViewController.m in Sources */, + CA651DC92DB2372300B37092 /* ZhiXunFenLaiTableViewCell.m in Sources */, CBD422B128DAEDFC00C32440 /* UIImageView+PWebCache.m in Sources */, CB489FB32744A0BD00DA044A /* THDatePickerView.m in Sources */, CB489FB62744A0BD00DA044A /* NSDate+CXCategory.m in Sources */, @@ -3307,6 +3335,7 @@ CB489F4B2744A0BD00DA044A /* PGGDatePickView.m in Sources */, CB489FB72744A0BD00DA044A /* UIAlertController+Blocks.m in Sources */, CB489FCC2744A0BD00DA044A /* ConfigireSetting.m in Sources */, + CA651DC52DB2323000B37092 /* ZhiXunFenLaiViewController.m in Sources */, CB489F742744A0BD00DA044A /* MCTabBar.m in Sources */, CB489FB12744A0BD00DA044A /* FSActionSheetCell.m in Sources */, CB489F6D2744A0BD00DA044A /* UIView+Additions.m in Sources */, @@ -3317,13 +3346,9 @@ CB489F6F2744A0BD00DA044A /* XLAlertView.m in Sources */, CAFA631F2DB0E92600FD9D86 /* KCSPUserCodesModel.m in Sources */, CAFA63202DB0E92600FD9D86 /* KCSPUserDengLuModelOModel.swift in Sources */, - CAFA63212DB0E92600FD9D86 /* JiLuImageCollectionViewCell.m in Sources */, - CAFA63222DB0E92600FD9D86 /* JiLuAudioPlayView.m in Sources */, - CAFA63232DB0E92600FD9D86 /* RecordImageModel.m in Sources */, CAFA63242DB0E92600FD9D86 /* KCSPUserModel.m in Sources */, CAFA63252DB0E92600FD9D86 /* LoginViewController.m in Sources */, CAFA63262DB0E92600FD9D86 /* IJKPlayerPlayViewControllerOModel.swift in Sources */, - CAFA63272DB0E92600FD9D86 /* JiLuViewController.m in Sources */, CAFA63282DB0E92600FD9D86 /* MainMySetTableViewCell.m in Sources */, CAFA63292DB0E92600FD9D86 /* KCSPUserSysterConfModel.m in Sources */, CAFA632A2DB0E92600FD9D86 /* KCSPApplePayManager.m in Sources */, @@ -3338,7 +3363,6 @@ CAFA63332DB0E92600FD9D86 /* GongGongNetManager.m in Sources */, CAFA63342DB0E92600FD9D86 /* XZM3SaveManager.m in Sources */, CAFA63352DB0E92600FD9D86 /* ShiPingEditJGView.m in Sources */, - CAFA63362DB0E92600FD9D86 /* JiLuAudioView.m in Sources */, CAFA63372DB0E92600FD9D86 /* ShouYeBigCollectionViewCell.m in Sources */, CAFA63382DB0E92600FD9D86 /* UrlXiaZaiWBViewController.m in Sources */, CAFA63392DB0E92600FD9D86 /* ShiPingEditJGViewOModel.swift in Sources */, @@ -3356,8 +3380,6 @@ CAFA63452DB0E92600FD9D86 /* ShiPingEditBiaoJiViewOModel.swift in Sources */, CAFA63462DB0E92600FD9D86 /* LoginViewControllerOModel.swift in Sources */, CAFA63472DB0E92600FD9D86 /* HuiYuanZXQuanYiView.m in Sources */, - CAFA63482DB0E92600FD9D86 /* JiLuAudioPlayViewOModel.swift in Sources */, - CAFA63492DB0E92600FD9D86 /* RecordImageModelSuper.m in Sources */, CAFA634A2DB0E92600FD9D86 /* LoginViewOModel.swift in Sources */, CAFA634B2DB0E92600FD9D86 /* ShiPingTopSelectView.m in Sources */, CAFA634C2DB0E92600FD9D86 /* DuiHuanZSLineTableViewCellOModel.swift in Sources */, @@ -3373,6 +3395,9 @@ CAFA63562DB0E92600FD9D86 /* KCSPUserRZModelOModel.swift in Sources */, CAFA63572DB0E92600FD9D86 /* ZhiBoHuiFangViewController.m in Sources */, CAFA63582DB0E92600FD9D86 /* KCSPActivityExchangesModelOModel.swift in Sources */, + CA651DBE2DB230B300B37092 /* ZhiXunFenLaiModel.m in Sources */, + CA651DA82DB1E6CC00B37092 /* JiLuAudioPlayView.m in Sources */, + CA651DA92DB1E6CC00B37092 /* JiLuAudioPlayViewOModel.swift in Sources */, CAFA63592DB0E92600FD9D86 /* PeiZhiShowViewController.m in Sources */, CAFA635A2DB0E92600FD9D86 /* UrlXiaZaiViewController.m in Sources */, CAFA635B2DB0E92600FD9D86 /* LoginAppleView.m in Sources */, @@ -3386,7 +3411,6 @@ CAFA63632DB0E92600FD9D86 /* HuiYuanZXUserView.m in Sources */, CAFA63642DB0E92600FD9D86 /* KCSPUploadImageManager.m in Sources */, CAFA63652DB0E92600FD9D86 /* UrlXiaZaiSPViewControllerOModel.swift in Sources */, - CAFA63662DB0E92600FD9D86 /* JiLuImageView.m in Sources */, CAFA63672DB0E92600FD9D86 /* KCSPXZManager.m in Sources */, CAFA63682DB0E92600FD9D86 /* KCSPZFOrderModelOModel.swift in Sources */, CAFA63692DB0E92600FD9D86 /* XZM3Manager.m in Sources */, @@ -3412,6 +3436,8 @@ CAFA637D2DB0E92600FD9D86 /* UrlXiaZaiSPCollectionViewCell.m in Sources */, CAFA637E2DB0E92600FD9D86 /* ShareAlterView.m in Sources */, CAFA637F2DB0E92600FD9D86 /* ShiPingEditShiChangView.m in Sources */, + CA651DCC2DB237F700B37092 /* ZhiXunListModel.m in Sources */, + CA651D9D2DB1E6B500B37092 /* JiLuAudioView.m in Sources */, CAFA63802DB0E92600FD9D86 /* SheZhiViewControllerOModel.swift in Sources */, CAFA63812DB0E92600FD9D86 /* GuiZheAlterView.m in Sources */, CAFA63822DB0E92600FD9D86 /* ZhangHaoBDTableViewCellOModel.swift in Sources */, @@ -3423,7 +3449,6 @@ CAFA63882DB0E92600FD9D86 /* GengXinAlterViewOModel.swift in Sources */, CAFA63892DB0E92600FD9D86 /* KCSPWXVideoLogsModelOModel.swift in Sources */, CAFA638A2DB0E92600FD9D86 /* ZhuanShiAlterView.m in Sources */, - CAFA638B2DB0E92600FD9D86 /* RecordImageModelOModel.swift in Sources */, CAFA638C2DB0E92600FD9D86 /* GongGongNetManagerOModel.swift in Sources */, CAFA638D2DB0E92600FD9D86 /* DynamicVideoViewController.m in Sources */, CAFA638E2DB0E92600FD9D86 /* ImagesConnectManager.m in Sources */, @@ -3433,7 +3458,6 @@ CAFA63922DB0E92600FD9D86 /* KCSPOrderTfModel.m in Sources */, CAFA63932DB0E92600FD9D86 /* ShiPingEditBiaoJiView.m in Sources */, CAFA63942DB0E92600FD9D86 /* ShiPingEditShuiYinView.m in Sources */, - CAFA63952DB0E92600FD9D86 /* JiLuHeaderView.m in Sources */, CAFA63962DB0E92600FD9D86 /* KCSPUserDengLuModel.m in Sources */, CAFA63972DB0E92600FD9D86 /* KCSPCheckActivesModelOModel.swift in Sources */, CAFA63982DB0E92600FD9D86 /* UrlXiaZaiTPViewController.m in Sources */, @@ -3441,7 +3465,6 @@ CAFA639A2DB0E92600FD9D86 /* PeiZhiShowView.m in Sources */, CAFA639B2DB0E92600FD9D86 /* ZhangHaoBDPhoneView.m in Sources */, CAFA639C2DB0E92600FD9D86 /* ShiPingEditJGViewController.m in Sources */, - CAFA639D2DB0E92600FD9D86 /* JiLuAudioTableViewCellOModel.swift in Sources */, CAFA639E2DB0E92600FD9D86 /* ShouYeView.m in Sources */, CAFA639F2DB0E92600FD9D86 /* ShiPingTiQuYinPingViewController.m in Sources */, CAFA63A02DB0E92600FD9D86 /* UrlXiaZaiTPCollectionViewCell.m in Sources */, @@ -3451,7 +3474,6 @@ CAFA63A42DB0E92600FD9D86 /* LoginWXView.m in Sources */, CAFA63A52DB0E92600FD9D86 /* VChangeManager.m in Sources */, CAFA63A62DB0E92600FD9D86 /* HuiYuanZXQuanYiCollectionViewCell.m in Sources */, - CAFA63A72DB0E92600FD9D86 /* JiLuAudioTableViewCell.m in Sources */, CAFA63A82DB0E92600FD9D86 /* XieYiAlterView.m in Sources */, CAFA63A92DB0E92600FD9D86 /* ZhangHaoBDViewController.m in Sources */, CAFA63AA2DB0E92600FD9D86 /* ShiPingHaoViewController.m in Sources */, @@ -3489,6 +3511,7 @@ CAAD73522DA4B2AC00927BA5 /* ffmpeg.c in Sources */, CAAD73532DA4B2AC00927BA5 /* cmdutils.c in Sources */, CAAD73542DA4B2AC00927BA5 /* FFmpegConverOC.m in Sources */, + CA651DC22DB2320800B37092 /* ZhiXunFenLaiView.m in Sources */, CAAD73552DA4B2AC00927BA5 /* ffmpeg_opt.c in Sources */, CAAD73562DA4B2AC00927BA5 /* ffmpeg_videotoolbox.c in Sources */, CAAD73572DA4B2AC00927BA5 /* KCSPFFmpegCenterManager.m in Sources */, @@ -3530,6 +3553,7 @@ CB489FA22744A0BD00DA044A /* UIViewController+ZJScrollPageController.m in Sources */, CB489F5A2744A0BD00DA044A /* YQLocationTransform.m in Sources */, CB489F782744A0BD00DA044A /* NSBundle+DAUtils.m in Sources */, + CA651D992DB1E2D200B37092 /* ShiPinJiLuViewController.m in Sources */, CBD422BD28DAF34B00C32440 /* IndexSectionView.m in Sources */, CB489FA12744A0BD00DA044A /* ZJTitleView.m in Sources */, CB489FAF2744A0BD00DA044A /* FSActionSheetConfig.m in Sources */, @@ -3545,6 +3569,8 @@ CAC346EE2D9E249F00E7E3D6 /* WMPlayerModel.m in Sources */, CAC346EF2D9E249F00E7E3D6 /* UIViewController+ShouldAutorotate.m in Sources */, CAC346F02D9E249F00E7E3D6 /* FastForwardView.m in Sources */, + CA651DA22DB1E6C500B37092 /* JiLuAudioTableViewCellOModel.swift in Sources */, + CA651DA32DB1E6C500B37092 /* JiLuAudioTableViewCell.m in Sources */, CB489F562744A0BD00DA044A /* amrFileCodec.m in Sources */, CB489F572744A0BD00DA044A /* AudioRecored.m in Sources */, ); @@ -3693,7 +3719,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B8MTNU3W9A; @@ -3726,6 +3752,7 @@ INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频-VideoDeep需要使用日历功能"; INFOPLIST_KEY_NSCameraUsageDescription = "快存视频-VideoDeep处理视频、图片处理和意见反馈需要使用相机拍摄照片"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频-VideoDeep友盟SDK需要使用您的位置信息"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "快存视频-VideoDeep拍摄需要使用麦克风"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频-VideoDeep处理视频、保存图片、处理图片和意见反馈需要使用相册"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频-VideoDeep处理视频、保存图片、处理图片和意见反馈需要使用相册"; INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频-VideoDeep用于推荐个性化广告"; @@ -3745,6 +3772,7 @@ "$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib", "$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib", "$(PROJECT_DIR)/ProductApp/FFmpeg-iOS/lib", + "$(PROJECT_DIR)/ProductApp/ProductMain/EasyVideoRecorderLib", ); MARKETING_VERSION = 2.5.4; PRODUCT_BUNDLE_IDENTIFIER = com.devcon.video; @@ -3766,7 +3794,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = ProductApp/ProductApp.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = B8MTNU3W9A; @@ -3799,6 +3827,7 @@ INFOPLIST_KEY_NSCalendarsUsageDescription = "快存视频-VideoDeep需要使用日历功能"; INFOPLIST_KEY_NSCameraUsageDescription = "快存视频-VideoDeep处理视频、图片处理和意见反馈需要使用相机拍摄照片"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "快存视频-VideoDeep友盟SDK需要使用您的位置信息"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "快存视频-VideoDeep拍摄需要使用麦克风"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "快存视频-VideoDeep处理视频、保存图片、处理图片和意见反馈需要使用相册"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "快存视频-VideoDeep处理视频、保存图片、处理图片和意见反馈需要使用相册"; INFOPLIST_KEY_NSUserTrackingUsageDescription = "快存视频-VideoDeep用于推荐个性化广告"; @@ -3818,6 +3847,7 @@ "$(PROJECT_DIR)/ProductApp/Other/语音/arm/lib", "$(PROJECT_DIR)/ProductApp/BaseControl/Category/RSAEncrypt/lib", "$(PROJECT_DIR)/ProductApp/FFmpeg-iOS/lib", + "$(PROJECT_DIR)/ProductApp/ProductMain/EasyVideoRecorderLib", ); MARKETING_VERSION = 2.5.4; PRODUCT_BUNDLE_IDENTIFIER = com.devcon.video; diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index 905541f..71211a7 100644 Binary files a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate and b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ProductApp/ProductApp/AppDelegate.m b/ProductApp/ProductApp/AppDelegate.m index a6949e6..8d62a76 100644 --- a/ProductApp/ProductApp/AppDelegate.m +++ b/ProductApp/ProductApp/AppDelegate.m @@ -50,8 +50,8 @@ [self.window setRootViewController:[TabBarController new]]; [self.window makeKeyAndVisible]; - - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tuisongJianTing) name:@"updataUserState" object:nil]; + +// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tuisongJianTing) name:@"updataUserState" object:nil]; [WXApi registerApp:WXAPPID universalLink:WXUrlLink]; @@ -95,7 +95,7 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; if(self.isstart == NO) { self.isstart = YES; - [[NSNotificationCenter defaultCenter] postNotificationName:@"pauseNotifi" object:nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"copyTiShiNotifi" object:nil]; } /// [[NSNotificationCenter defaultCenter] postNotificationName:@"huoquidfanotifi" object:nil]; @@ -216,38 +216,38 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; } --(void)tuisongJianTing -{ - [[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) { - switch (settings.authorizationStatus) { - case UNAuthorizationStatusAuthorized: - { - // 用户已授权 - NSDictionary *dic = @{@"client_cid":[Tools isStringnil:[[NSUserDefaults standardUserDefaults] objectForKey:@"UserClientId"]], - @"client_permission_notify":@"on"}; - [self updataUserInfo:dic]; - } - break; - case UNAuthorizationStatusDenied: - { - // 用户拒绝授权 - NSDictionary *dic = @{@"client_cid":[Tools isStringnil:[[NSUserDefaults standardUserDefaults] objectForKey:@"UserClientId"]], - @"client_permission_notify":@"off"}; - [self updataUserInfo:dic]; - } - break; - case UNAuthorizationStatusNotDetermined: - // 用户尚未决定 - break; - case UNAuthorizationStatusProvisional: - // 用户授权提示界面正在显示 - break; - case UNAuthorizationStatusEphemeral: - // 临时授权 - break; - } - }]; -} +//-(void)tuisongJianTing +//{ +// [[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) { +// switch (settings.authorizationStatus) { +// case UNAuthorizationStatusAuthorized: +// { +// // 用户已授权 +// NSDictionary *dic = @{@"client_cid":[Tools isStringnil:[[NSUserDefaults standardUserDefaults] objectForKey:@"UserClientId"]], +// @"client_permission_notify":@"on"}; +// [self updataUserInfo:dic]; +// } +// break; +// case UNAuthorizationStatusDenied: +// { +// // 用户拒绝授权 +// NSDictionary *dic = @{@"client_cid":[Tools isStringnil:[[NSUserDefaults standardUserDefaults] objectForKey:@"UserClientId"]], +// @"client_permission_notify":@"off"}; +// [self updataUserInfo:dic]; +// } +// break; +// case UNAuthorizationStatusNotDetermined: +// // 用户尚未决定 +// break; +// case UNAuthorizationStatusProvisional: +// // 用户授权提示界面正在显示 +// break; +// case UNAuthorizationStatusEphemeral: +// // 临时授权 +// break; +// } +// }]; +//} -(void)updataUserInfo:(NSDictionary *)dic { if([Tools isStringnil:[UserDetailModel shareModel].token].length>3) @@ -279,7 +279,7 @@ self.window.overrideUserInterfaceStyle = UIUserInterfaceStyleLight; { [[NSUserDefaults standardUserDefaults] setObject:[Tools isStringnil:clientId] forKey:@"UserClientId"]; - [self tuisongJianTing]; +// [self tuisongJianTing]; } /// 通知展示（iOS10及以上版本） /// @param center center diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/Contents.json similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/Contents.json rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/Contents.json diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/容器@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/容器@2x(1).png similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/容器@2x(1).png rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/容器@2x(1).png diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/容器@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/容器@3x(1).png similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录N.imageset/容器@3x(1).png rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯N.imageset/容器@3x(1).png diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/Contents.json similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/Contents.json rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/Contents.json diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/容器@2x(4).png b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/容器@2x(4).png similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/容器@2x(4).png rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/容器@2x(4).png diff --git a/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/容器@3x(4).png b/ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/容器@3x(4).png similarity index 100% rename from ProductApp/ProductApp/Assets.xcassets/tabbar/tab_记录Y.imageset/容器@3x(4).png rename to ProductApp/ProductApp/Assets.xcassets/tabbar/tab_资讯Y.imageset/容器@3x(4).png diff --git a/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m b/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m index 24d420f..92395fb 100644 --- a/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m +++ b/ProductApp/ProductApp/BaseControl/AFNetworking/YSAPIClient.m @@ -766,13 +766,13 @@ static NSTimeInterval af_timeout = 30.0f; AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]]; //method 为时post请求还是get请 - NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:[BaseUrl stringByAppendingPathComponent:urlString] parameters:nil error:nil]; + NSMutableURLRequest *request = [[AFHTTPRequestSerializer serializer] requestWithMethod:@"POST" URLString:urlString parameters:nil error:nil]; //设置超时时长 request.timeoutInterval = 30; //设置上传数据type [request setValue:@"text/html" forHTTPHeaderField:@"Content-Type"]; [request setValue:@"text/plain" forHTTPHeaderField:@"Content-Type"]; - [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; + [request setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"]; //token if ([UserDetailModel shareModel].loginState.intValue == 1) { [request setValue:[NSString stringWithFormat:@"%@" , [UserDetailModel shareModel].token] forHTTPHeaderField:@"token"]; diff --git a/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.xib b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.xib index d7e92e1..3dd74d4 100755 --- a/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.xib +++ b/ProductApp/ProductApp/BaseControl/Category/NavGationView/NaviGationView.xib @@ -21,6 +21,7 @@ + diff --git a/ProductApp/ProductApp/BaseControl/TabBar/TabBarController.m b/ProductApp/ProductApp/BaseControl/TabBar/TabBarController.m index f638a1b..17586ea 100644 --- a/ProductApp/ProductApp/BaseControl/TabBar/TabBarController.m +++ b/ProductApp/ProductApp/BaseControl/TabBar/TabBarController.m @@ -9,8 +9,8 @@ #import "TabBarController.h" #import "NavgationController.h" #import "ShouYeViewController.h" -#import "JiLuViewController.h" #import "WoDeViewController.h" +#import "ZhiXunViewController.h" @interface TabBarController () @@ -38,14 +38,14 @@ [self.rootVcAry addObject:honeVC]; - JiLuViewController *cartVC =[[JiLuViewController alloc] init]; + ZhiXunViewController *cartVC =[[ZhiXunViewController alloc] init]; [self setTabBarItem:cartVC.tabBarItem - title:@"记录" + title:@"资讯" titleSize:11.0 titleFontName:@"HeiTi SC" - selectedImage:@"tab_记录Y" + selectedImage:@"tab_资讯Y" selectedTitleColor:RGBCOLOR(240, 54, 94) - normalImage:@"tab_记录N" + normalImage:@"tab_资讯N" normalTitleColor:RGBCOLOR(117, 117, 117)]; [self.rootVcAry addObject:cartVC]; diff --git a/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m b/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m index 98db36c..e72caf1 100644 --- a/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m +++ b/ProductApp/ProductApp/BaseControl/WKWebview/WkWebviewViewController.m @@ -22,11 +22,12 @@ [super viewWillAppear:animated]; [self.navigationController setNavigationBarHidden:YES animated:animated]; [self showNaviGationView:YES]; - [self.navigationView.backButton setImage:[Tools imageWithImageName:[UIImage imageNamed:@"返回"] imageColor:RGBCOLOR(20, 20, 20)] forState:UIControlStateNormal]; + [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)]; +// [self.navigationView.backButton setImage:@"" forState:UIControlStateNormal]; self. navigationController. interactivePopGestureRecognizer.enabled = NO; if(self.strtitle.length>0) { - [self.navigationView setTitle:self.strtitle titleColor:[UIColor blackColor]]; + [self.navigationView setTitle:self.strtitle titleColor:[UIColor whiteColor]]; } if(self.viewsuperShow) { @@ -45,7 +46,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - [self.view setBackgroundColor:[UIColor whiteColor]]; + [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)]; WKWebViewConfiguration *wkWebConfig = [[WKWebViewConfiguration alloc] init]; NSString *jSString = [NSString stringWithFormat:@"var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=%f'); document.getElementsByTagName('head')[0].appendChild(meta);",UISCREEN_WIDTH-10]; WKUserScript *wkUserScript = [[WKUserScript alloc] initWithSource:jSString injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]; diff --git a/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.h b/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.h deleted file mode 100644 index bb62930..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// JiLuViewController.h -// ProductApp -// -// Created by 工作 on 2025/4/2. -// - -#import "BaseViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface JiLuViewController : BaseViewController - -@end - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.m b/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.m deleted file mode 100644 index 068dc3c..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/JiLuViewController.m +++ /dev/null @@ -1,157 +0,0 @@ -// -// JiLuViewController.m -// ProductApp -// -// Created by 工作 on 2025/4/2. -// - -#import "JiLuViewController.h" -#import "JiLuHeaderView.h" -#import "JiLuImageView.h" -#import "JiLuAudioView.h" - - -@interface JiLuViewController () -/// -@property (nonatomic , strong) UIScrollView *scvback ; -/// -@property (nonatomic , strong) JiLuHeaderView *viewtop; -/// -@property (nonatomic , strong) JiLuImageView *viewVideo; -@property (nonatomic , strong) JiLuImageView *viewImage; -@property (nonatomic , strong) JiLuAudioView *viewAudeo; -@end - -@implementation JiLuViewController -- (UIStatusBarStyle)preferredStatusBarStyle { - return UIStatusBarStyleLightContent; -} --(void)viewDidAppear:(BOOL)animated -{ - [super viewDidAppear:animated]; - if(self.viewVideo) - { - [self.viewVideo refData]; - [self.viewImage refData]; - [self.viewAudeo refData]; - } -} -- (void)viewDidLoad { - [super viewDidLoad]; - [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)]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(topSelectNotifi:) name:@"recordShowSonView" object:nil]; - - JiLuHeaderView *viewtop = [[JiLuHeaderView alloc] init]; - [viewtop setBackgroundColor:RGBCOLOR(20, 20, 20)]; - [self.view addSubview:viewtop]; - [viewtop mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.equalTo(self.view); - make.top.offset(NavHeight); - make.height.offset(52); - }]; - [viewtop setBackValue:^(NSInteger itag) { - if(itag==0) - { - [self.scvback setContentOffset:CGPointMake(0, 0)]; - } - else if (itag==1) - { - [self.scvback setContentOffset:CGPointMake(UISCREEN_WIDTH, 0)]; - } - else if (itag==2) - { - [self.scvback setContentOffset:CGPointMake(UISCREEN_WIDTH*2, 0)]; - } - else - { - NSInteger temp = [self.viewtop getselect]; - if(temp==0) - { - [self.viewVideo clearAll]; - } - else if (temp==1) - { - [self.viewImage clearAll]; - } - else - { - [self.viewAudeo clearAll]; - } - } - }]; - _viewtop = viewtop; - - UIScrollView *scvback = [[UIScrollView alloc] initWithFrame:CGRectMake(0, NavHeight+52, UISCREEN_WIDTH, UISCREEN_HEIGHT-NavHeight-52-TabHeight)]; - [scvback setShowsHorizontalScrollIndicator:NO]; - [scvback setPagingEnabled:YES]; - [scvback setScrollEnabled:NO]; - [self.view addSubview:scvback]; - _scvback = scvback; - if([UserDetailModel zhiFuState]) - { - [scvback setContentSize:CGSizeMake(UISCREEN_WIDTH*3, 0)]; - ///3个子页面 - JiLuImageView *viewVideo = [[JiLuImageView alloc] init]; - [scvback addSubview:viewVideo]; - [viewVideo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(scvback); - make.left.offset(0); - }]; - viewVideo.type = 1; - _viewVideo =viewVideo; - - JiLuImageView *viewImage = [[JiLuImageView alloc] init]; - [scvback addSubview:viewImage]; - [viewImage mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(scvback); - make.left.offset(UISCREEN_WIDTH); - }]; - _viewImage = viewImage; - - JiLuAudioView *viewAudeo = [[JiLuAudioView alloc] init]; - [scvback addSubview:viewAudeo]; - [viewAudeo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(scvback); - make.left.offset(UISCREEN_WIDTH*2); - }]; - _viewAudeo = viewAudeo; - [self.viewVideo refData]; - [self.viewImage refData]; - [self.viewAudeo refData]; - } - else - { - [scvback setContentSize:CGSizeMake(UISCREEN_WIDTH*2, 0)]; - ///3个子页面 - JiLuImageView *viewVideo = [[JiLuImageView alloc] init]; - [scvback addSubview:viewVideo]; - [viewVideo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(scvback); - make.left.offset(0); - }]; - viewVideo.type = 1; - _viewVideo =viewVideo; - - JiLuAudioView *viewAudeo = [[JiLuAudioView alloc] init]; - [scvback addSubview:viewAudeo]; - [viewAudeo mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(scvback); - make.left.offset(UISCREEN_WIDTH); - }]; - _viewAudeo = viewAudeo; - [self.viewVideo refData]; - [self.viewImage refData]; - [self.viewAudeo refData]; - } - -} - --(void)topSelectNotifi:(NSNotification *)notifi -{ - [self.viewtop setSelectBtTag:[notifi.object integerValue]]; -} - -@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.h deleted file mode 100644 index 1045db3..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.h +++ /dev/null @@ -1,25 +0,0 @@ -// -// JiLuImageCollectionViewCell.h -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import -#import "RecordImageModel.h" -NS_ASSUME_NONNULL_BEGIN - -@interface JiLuImageCollectionViewCell : UICollectionViewCell -/// -@property (nonatomic , strong) UIButton *btplay; -///1视频 -@property (nonatomic , assign) int type; -/// -@property (nonatomic , strong) RecordImageModel *model; - -/// -@property (nonatomic , strong) UIButton *btshanchu ; - -@end - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.m deleted file mode 100644 index 7fcfa23..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuImageCollectionViewCell.m +++ /dev/null @@ -1,182 +0,0 @@ -// -// JiLuImageCollectionViewCell.m -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import "JiLuImageCollectionViewCell.h" - - -@interface JiLuImageCollectionViewCell () -/// -@property (nonatomic , strong) UIView *viewback; -/// -@property (nonatomic , strong) UIImageView *imgvhd; - - - - -@end - -@implementation JiLuImageCollectionViewCell --(id)initWithFrame:(CGRect)frame -{ - if(self = [super initWithFrame:frame]) - { - UIView *viewback = [[UIView alloc] init]; - [viewback setBackgroundColor:[UIColor clearColor]]; - [self.contentView addSubview:viewback]; - [viewback mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self); - }]; - [viewback.layer setMasksToBounds:YES]; - [viewback.layer setCornerRadius:6]; - _viewback = viewback; - - UIImageView *imgvhd = [[UIImageView alloc] init]; - [imgvhd setClipsToBounds:YES]; - [imgvhd setContentMode:UIViewContentModeScaleAspectFill]; - [viewback addSubview:imgvhd]; - [imgvhd mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.equalTo(viewback); - make.bottom.equalTo(viewback); - }]; - [imgvhd.layer setMasksToBounds:YES]; - [imgvhd.layer setCornerRadius:6]; - [imgvhd setUserInteractionEnabled:YES]; - [imgvhd setBackgroundColor:[UIColor redColor]]; - _imgvhd = imgvhd; - - UIButton *btplay = [[UIButton alloc] init]; - [btplay setImage:[UIImage imageNamed:@"xiazai_video"] forState:UIControlStateNormal]; - [viewback addSubview:btplay]; - [btplay mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.offset(50); - make.center.equalTo(viewback); - }]; - [btplay setUserInteractionEnabled:NO]; - _btplay = btplay; - - UIView *viewselect = [[UIView alloc] init]; - [viewselect setBackgroundColor:RGBACOLOR(0, 0, 0, 0.3)]; - [viewback addSubview:viewselect]; - [viewselect mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.bottom.equalTo(viewback); - make.height.offset(34); - }]; - - UIButton *btfenxiang = [[UIButton alloc] init]; - [btfenxiang setImage:[UIImage imageNamed:@"jl_fenxiang"] forState:UIControlStateNormal]; - [viewselect addSubview:btfenxiang]; - [btfenxiang mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(viewselect); - make.left.offset(0); - make.width.equalTo(viewselect).multipliedBy(0.5); - }]; - [btfenxiang addTarget:self action:@selector(shareAction) forControlEvents:UIControlEventTouchUpInside]; - - UIButton *btshanchu = [[UIButton alloc] init]; - [btshanchu setImage:[UIImage imageNamed:@"ji_shanchu"] forState:UIControlStateNormal]; - [viewselect addSubview:btshanchu]; - [btshanchu mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(viewselect); - make.right.equalTo(viewback); - make.width.equalTo(viewselect).multipliedBy(0.5); - }]; - _btshanchu = btshanchu; - } - return self; -} - --(void)setModel:(RecordImageModel *)model -{ - _model = model; - - if(model.imageshow) - { - self.imgvhd.image = model.imageshow; - } - else - { - self.imgvhd.image = [UIImage imageNamed:@"sc_nomo"]; - PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init]; - options.synchronous = NO; - if(self.model.asset.mediaType == PHAssetMediaTypeImage) - { - ///图片信息 - [[PHImageManager defaultManager] requestImageDataForAsset:self.model.asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) { - // 在这里处理获取到的照片数据 - if(imageData) - { - self.model.imageshow = [UIImage imageWithData:imageData]; - self.imgvhd.image = self.model.imageshow; - } - }]; - } - else - { - [[PHImageManager defaultManager] requestImageForAsset:self.model.asset targetSize:CGSizeMake(UISCREEN_WIDTH, UISCREEN_WIDTH) contentMode:PHImageContentModeDefault options:options resultHandler:^(UIImage *result, NSDictionary *info) { - if(result) - { - self.model.imageshow = result; - self.imgvhd.image = self.model.imageshow; - } - - }]; - } - } -} - --(void)shareAction -{ - if(self.type==1) - { - PHAsset *asset = self.model.asset; - NSArray *arr = [asset.localIdentifier componentsSeparatedByString:@"/"]; - if(arr.count>0) - { - NSString *strtmpe = [NSString stringWithFormat:@"assets-library://asset/asset.MP4?id=%@&ext=MP4",arr[0]]; - [self showAlter:[NSMutableArray arrayWithObject:[NSURL URLWithString:strtmpe]] time:0.01]; - } - else - { - PHVideoRequestOptions *optionV = [[PHVideoRequestOptions alloc] init]; - [[PHImageManager defaultManager] requestAVAssetForVideo:asset options:optionV resultHandler:^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) { - AVURLAsset *assettemp = (AVURLAsset *)asset; - dispatch_async(dispatch_get_main_queue(), ^{ - NSString *strtmpe = assettemp.URL.absoluteString; - - [self showAlter:[NSMutableArray arrayWithObject:[NSURL URLWithString:strtmpe]] time:0.01]; - }); - }]; - } - } - else - { - [self showAlter:[NSMutableArray arrayWithObject:self.model.imageshow] time:0.01]; - } -} --(void)showAlter:(NSMutableArray *)activityItems time:(float)time -{ - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(time * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - - UIActivityViewController *activityVC = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil]; - //__weak typeof(self) weakself = self; - activityVC.completionWithItemsHandler = ^(UIActivityType _Nullable activityType, BOOL completed, NSArray * _Nullable returnedItems, NSError * _Nullable activityError) { - //上面判断是写的失败详细内容，若需求不需要这么详细，直接下面这段代码就可以 - if (activityType != nil && completed) { - //成功 - }else{ - //失败 - } - }; - [self.viewController presentViewController:activityVC animated:YES completion:^{ - - }]; - }); -} - - - -@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.h b/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.h deleted file mode 100644 index 5a467c8..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.h +++ /dev/null @@ -1,24 +0,0 @@ -// -// RecordImageModel.h -// ProductApp -// 图片管理器 -// Created by 工作 on 2024/6/28. -// - -#import - -#import - -NS_ASSUME_NONNULL_BEGIN -@interface RecordImageModel : NSObject - -@property (nonatomic , assign) BOOL select; - -@property (nonatomic , strong) PHAsset *asset; - -@property (nonatomic , strong) UIImage *imageshow; - -@end - - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.m b/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.m deleted file mode 100644 index 4f29c4b..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModel.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RecordImageModel.m -// ProductApp -// -// Created by 工作 on 2024/6/28. -// - -#import "RecordImageModel.h" - -@implementation RecordImageModel - -@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelOModel.swift b/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelOModel.swift deleted file mode 100644 index 12012b2..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelOModel.swift +++ /dev/null @@ -1,31 +0,0 @@ -import UIKit - -open class RecordImageModelOModel: NSObject { - open var sylvestreneZygobranch1: CGFloat = 9051.9058 - open var sylvestreneZygobranch2: CGFloat = 9052.9054 - open var sylvestreneZygobranch3: CGFloat = 9053.905 - - - @MainActor @objc -open func interfederationQuasiacademically() { - func summation(a: Int, b: Int) -> Int { - return a + b - } - if (summation(a: 9051, b: 9052) + 9053) < 0 { - print("sylvestreneZygobranch String", sylvestreneZygobranch1) - } - -} - - @MainActor @objc -open func portrayalsPrimordality() { - func summation(a: Int, b: Int) -> Int { - return a + b - } - if (summation(a: 9051, b: 9052) + 9053) < 0 { - print("sylvestreneZygobranch String", sylvestreneZygobranch1) - } - interfederationQuasiacademically() -} - -} \ No newline at end of file diff --git a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.h b/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.h deleted file mode 100644 index 7ac5adf..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// RecordImageModelSuper.h -// ProductApp -// -// Created by 工作 on 2024/6/28. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface RecordImageModelSuper : NSObject -///年月日 -@property (nonatomic , strong) NSString *strtime; - -@property (nonatomic , strong) NSMutableArray *arrItems; -@end - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.m b/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.m deleted file mode 100644 index cf84e90..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/model/RecordImageModelSuper.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// RecordImageModelSuper.m -// ProductApp -// -// Created by 工作 on 2024/6/28. -// - -#import "RecordImageModelSuper.h" - -@implementation RecordImageModelSuper - -@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.h b/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.h deleted file mode 100644 index 3e21e9f..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// JiLuHeaderView.h -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -typedef void(^JiLuHeaderViewBack)(NSInteger itag); -@interface JiLuHeaderView : UIView -/// -@property (nonatomic , strong) JiLuHeaderViewBack backValue; --(void)setSelectBtTag:(NSInteger)tag; --(NSInteger)getselect; -@end - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.m b/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.m deleted file mode 100644 index 5e8fb80..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuHeaderView.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// JiLuHeaderView.m -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import "JiLuHeaderView.h" - - -@interface JiLuHeaderView () -/// -@property (nonatomic , strong) NSMutableArray *arrbtn; -/// -@property (nonatomic , strong) UIButton *btselect; -@end - -@implementation JiLuHeaderView - --(id)initWithFrame:(CGRect)frame -{ - if(self = [super initWithFrame:frame]) - { - NSArray *arr = @[@"视频",@"图片",@"音频"]; - if([UserDetailModel zhiFuState]==NO) - { - arr = @[@"视频",@"音频"]; - } - self.arrbtn = [NSMutableArray new]; - for(int i = 0 ; i < arr.count; i++) - { - UIButton *btitem = [[UIButton alloc] init]; - [btitem setTitle:arr[i] forState:UIControlStateNormal]; - [btitem setTitleColor:RGBACOLOR(255, 255, 255, 0.5) forState:UIControlStateNormal]; - [btitem setTitleColor:RGBCOLOR(240, 54, 94) forState:UIControlStateSelected]; - [btitem.titleLabel setFont:[UIFont systemFontOfSize:14]]; - [self addSubview:btitem]; - [btitem mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self); - make.left.offset(60*i); - make.width.offset(60); - }]; - [btitem setTag:i]; - [btitem addTarget:self action:@selector(topAction:) forControlEvents:UIControlEventTouchUpInside]; - if(i==0) - { - [btitem.titleLabel setFont:[UIFont systemFontOfSize:17]]; - [btitem setSelected:YES]; - self.btselect = btitem; - } - [self.arrbtn addObject:btitem]; - } - - UIButton *btjc = [[UIButton alloc] init]; - [btjc setTitle:@"全部清空" forState:UIControlStateNormal]; - [btjc setTitleColor:RGBACOLOR(255, 255, 255, 0.8) forState:UIControlStateNormal]; - [btjc.titleLabel setFont:[UIFont systemFontOfSize:14]]; - [btjc setImage:[UIImage imageNamed:@"jl_全部清空"] forState:UIControlStateNormal]; - [self addSubview:btjc]; - [btjc mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.right.equalTo(self); - make.width.offset(80); - }]; - [btjc setIconInLeft]; - [btjc setTag:10]; - [btjc addTarget:self action:@selector(jcAction:) forControlEvents:UIControlEventTouchUpInside]; - - } - return self; -} --(void)setSelectBtTag:(NSInteger)tag -{ - [self.btselect setSelected:NO]; - [self.btselect.titleLabel setFont:[UIFont systemFontOfSize:14]]; - - UIButton *sender = self.arrbtn[tag]; - [sender setSelected:YES]; - [sender.titleLabel setFont:[UIFont systemFontOfSize:17]]; - if(self.backValue) - { - self.backValue(sender.tag); - } -} --(NSInteger)getselect -{ - return self.btselect.tag; -} --(void)jcAction:(UIButton *)sender -{ - if(self.backValue) - { - self.backValue(sender.tag); - } -} --(void)topAction:(UIButton *)sender -{ - if(sender.tag==self.btselect.tag)return; - [self.btselect setSelected:NO]; - [self.btselect.titleLabel setFont:[UIFont systemFontOfSize:14]]; - - [sender setSelected:YES]; - [sender.titleLabel setFont:[UIFont systemFontOfSize:17]]; - self.btselect = sender; - - if(self.backValue) - { - self.backValue(sender.tag); - } -} - -@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.h b/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.h deleted file mode 100644 index 7a6e5be..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// JiLuImageView.h -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface JiLuImageView : UIView -///1视频 -@property (nonatomic , assign) int type; --(void)refData; --(void)clearAll; -@end - -NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.m b/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.m deleted file mode 100644 index ff0ce5c..0000000 --- a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuImageView.m +++ /dev/null @@ -1,337 +0,0 @@ -// -// JiLuImageView.m -// ProductApp -// -// Created by 工作 on 2025/4/3. -// - -#import "JiLuImageView.h" -#import "JiLuImageCollectionViewCell.h" - -#import -#import -#import "ImagesConnectManager.h" -#import "DynamicVideoViewController.h" -#import "XLPhotoBrowser.h" -#import "NomoAlterView.h" - - -@interface JiLuImageView () -/// -@property (nonatomic , strong) UICollectionView *collect; - -/// -@property (nonatomic , strong) NSMutableArray *arrdata; - -///是否有相册权限 -@property (nonatomic , assign) BOOL isxiangcequanxian; - -/// -@property (nonatomic , assign) BOOL isjujuequanxian; - - - -@end - -@implementation JiLuImageView - --(id)initWithFrame:(CGRect)frame -{ - if(self = [super initWithFrame:frame]) - { - UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; - layout.minimumLineSpacing = 0; - layout.minimumInteritemSpacing = 0; - UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - [collect setDelegate:self]; - [collect setDataSource:self]; - [collect setShowsVerticalScrollIndicator:NO]; - [collect setBackgroundColor:[UIColor clearColor]]; - [self addSubview:collect]; - [collect mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.top.equalTo(self); - make.bottom.equalTo(self); - }]; - [collect registerClass:[JiLuImageCollectionViewCell class] forCellWithReuseIdentifier:@"JiLuImageCollectionViewCell"]; - [collect setEmptyDataSetDelegate:self]; - [collect setEmptyDataSetSource:self]; - _collect = collect; - - } - return self; -} - --(void)delAction:(UIButton *)sender -{ - RecordImageModel *model = self.arrdata[sender.tag]; - PHAsset *asset = model.asset ; - - [NomoAlterView showInfo:self.type==1?@"确定要删除这个视频吗？":@"确定要删除这个图片吗？" SelectTag:^(NSInteger tag) { - if(tag==1) - { - [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ - // 查找set - PHFetchResult * result = [PHAsset fetchAssetsWithLocalIdentifiers:@[asset.localIdentifier] options:nil]; - - [PHAssetChangeRequest deleteAssets:result]; - } completionHandler:^(BOOL success, NSError * _Nullable error) { - if (success) { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.arrdata removeObject:model]; - [self.collect reloadData]; - }); - } - }]; - } - }]; -} --(void)clearAll -{ - if(self.arrdata.count==0)return; - [NomoAlterView showInfo:self.type==1?@"是否删除所有视频？":@"是否删除所有图片？" SelectTag:^(NSInteger tag) { - if(tag==1) - { - NSMutableArray *arrAset = [NSMutableArray new]; - for(RecordImageModel *model in self.arrdata){ - [arrAset addObject:model.asset.localIdentifier]; - } - - [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{ - // 查找set - PHFetchResult * result = [PHAsset fetchAssetsWithLocalIdentifiers:arrAset options:nil]; - - [PHAssetChangeRequest deleteAssets:result]; - } completionHandler:^(BOOL success, NSError * _Nullable error) { - if (success) { - dispatch_async(dispatch_get_main_queue(), ^{ - [self.arrdata removeAllObjects]; - [self.collect reloadData]; - }); - } - }]; - } - }]; -} - -#pragma mark - UICollectionView -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section -{ - return self.arrdata.count; -} -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath -{ - JiLuImageCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"JiLuImageCollectionViewCell" forIndexPath:indexPath]; - if(self.type==0) - { - [cell.btplay setHidden:YES]; - } - cell.type = self.type; - cell.model = self.arrdata[indexPath.row]; - [cell.btshanchu setTag:indexPath.row]; - [cell.btshanchu addTarget:self action:@selector(delAction:) forControlEvents:UIControlEventTouchUpInside]; - return cell; -} -//定义每个section的间距 -- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ - - return UIEdgeInsetsMake(0, 16, 0, 16); -} -//纵向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 -{ - float fw = (UISCREEN_WIDTH-42)/2.0; - return CGSizeMake(fw, fw*260/167.0); -} --(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath -{ - RecordImageModel *model = self.arrdata[indexPath.row]; - if(self.type==1) - { - [self getShowValue:model Image:^(NSMutableArray *arrValue) { - DynamicVideoViewController *vc = [[DynamicVideoViewController alloc] init]; - [vc setdataArray:arrValue index:0]; - [self.viewController.navigationController pushViewController:vc animated:NO]; - [vc show]; - }]; - } - else - { - [self getShowValue:model Image:^(NSMutableArray *arrValue) { - [XLPhotoBrowser showPhotoBrowserWithImages:arrValue currentImageIndex:0]; - }]; - } -} -///获得指定图片 或者视频链接 --(void)getShowValue:(RecordImageModel *)model Image:(void(^)(NSMutableArray *arrValue))backValue -{ - - NSMutableArray *arrimages = [NSMutableArray new]; - if(self.type==1) - { - PHVideoRequestOptions *optionV = [[PHVideoRequestOptions alloc] init]; - [[PHImageManager defaultManager] requestAVAssetForVideo:model.asset options:optionV resultHandler:^(AVAsset * _Nullable asset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) { - AVURLAsset *assettemp = (AVURLAsset *)asset; - if(assettemp.URL) - { - [arrimages addObject:assettemp.URL]; - dispatch_async(dispatch_get_main_queue(), ^{ - backValue(arrimages); - }); - } - }]; - } - else - { - if(model.imageshow) - { - [arrimages addObject:model.imageshow]; - dispatch_async(dispatch_get_main_queue(), ^{ - backValue(arrimages); - }); - - } - else - { - PHImageRequestOptions *options = [[PHImageRequestOptions alloc] init]; - options.synchronous = NO; - ///图片信息 - [[PHImageManager defaultManager] requestImageDataForAsset:model.asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) { - if(imageData) - { - UIImage *image = [UIImage imageWithData:imageData]; - if(image) - { - [arrimages addObject:image]; - } - dispatch_async(dispatch_get_main_queue(), ^{ - backValue(arrimages); - }); - } - }]; - } - } -} -#pragma mark - DZNEmptyDataSetSource -- (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView -{ - NSString *str = @"暂无图片"; - if(self.type==1) - { - str = @"暂无视频"; - } - return [Tools arrstring:str andstart:0 andend:(int)str.length andfont:[UIFont systemFontOfSize:14] andcolor:RGBCOLOR(158, 158, 158)]; -} -- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView -{ - NSString *strimg = @"jl_暂无图片"; - if(self.type==1) - { - strimg = @"jl_暂无视频"; - } - return [UIImage imageNamed:strimg]; -} - --(void)refData -{ - [self getQuanXian]; -} -///获取相册权限 --(void)getQuanXian -{ - [PHPhotoLibrary authorizationStatus]; - if (@available(iOS 14, *)) { - [PHPhotoLibrary requestAuthorizationForAccessLevel:PHAccessLevelAddOnly&PHAccessLevelReadWrite handler:^(PHAuthorizationStatus status) { - if(status == PHAuthorizationStatusLimited) - {///部分权限 - self.isjujuequanxian = NO; - if(self.isxiangcequanxian==NO) - { - self.isxiangcequanxian = YES; - } - [self getdata]; - } - else - { - [self quanXianState:status]; - } - - }]; - } else { - [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) { - [self quanXianState:status]; - }]; - } -} --(void)quanXianState:(PHAuthorizationStatus)status -{ - dispatch_async(dispatch_get_main_queue(), ^{ - switch (status) { - case PHAuthorizationStatusAuthorized: - {//有权限 - self.isjujuequanxian = NO; - if(self.isxiangcequanxian==NO) - { - self.isxiangcequanxian = YES; - } - [self getdata]; - } - break; - case PHAuthorizationStatusDenied: - { - self.isxiangcequanxian = NO; - self.isjujuequanxian = YES; - self.arrdata = [NSMutableArray new]; - [self.collect reloadData]; - } - break; - default: - { - self.isxiangcequanxian = NO; - self.arrdata = [NSMutableArray new]; - [self.collect reloadData]; - } - break; - } - }); -} -///获取所有的图片和视频 --(void)getdata -{ - [ImagesConnectManager getAllXCImages:^(NSMutableArray * _Nonnull arr) { - NSMutableArray *arrData = [NSMutableArray new]; - for(PHAsset *asset in arr) - { - if(self.type == 0) - { - if(asset.mediaType == PHAssetMediaTypeImage) - { - RecordImageModel *model = [RecordImageModel new]; - model.asset = asset; - [arrData addObject:model]; - } - } - else - { - if(asset.mediaType == PHAssetMediaTypeVideo) - { - RecordImageModel *model = [RecordImageModel new]; - model.asset = asset; - [arrData addObject:model]; - } - } - } - self.arrdata = arrData; - dispatch_async(dispatch_get_main_queue(), ^{ - [self.collect reloadData]; - }); - }]; -} -@end diff --git a/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.h b/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.h index bdf8630..554db73 100644 --- a/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.h +++ b/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.h @@ -16,6 +16,10 @@ #import "KCSPWXVideoLogsModel.h" #import "KCSPMaterialLogsModel.h" #import "KCSPCheckActivesModel.h" + +#import "ZhiXunFenLaiModel.h" +#import "ZhiXunListModel.h" + NS_ASSUME_NONNULL_BEGIN @interface KCSPNetManager : NSObject @@ -165,6 +169,20 @@ NS_ASSUME_NONNULL_BEGIN //+ (void)requestcheckInData:(UIView *)view // ID:(NSString *)ID // Callback:(completeModeBlock)callback; +/* + 获取资讯分类 + */ ++(void)requestZhiXunFenLeiData:(UIView *)view + Callback:(completeModeBlock)callback; + +/* + 咨询列表 + */ ++(void)requestZhiXunListData:(UIView *)view + channelId:(NSString *)channelId + page:(NSString *)page + Callback:(completeModeBlock)callback; + @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.m b/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.m index dc2da6b..09d51d8 100644 --- a/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.m +++ b/ProductApp/ProductApp/ProductMain/NetWorkManager/KCSPNetManager.m @@ -609,4 +609,57 @@ }]; } +/* + 获取资讯分类 + */ ++(void)requestZhiXunFenLeiData:(UIView *)view + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + + [YSAPIClient requestHttpWithRequestPost:@"https://route.showapi.com/109-34?appKey=1e86DbFC4F7F4FA0B1607454E3fDdc1c" paraments:dicpush 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 = @"成功"; + state = YES; + callback(state,[ZhiXunFenLaiModel yy_modelWithJSON:dicAll],describle); + } + }]; +} +/* + 咨询列表 + */ ++(void)requestZhiXunListData:(UIView *)view + channelId:(NSString *)channelId + page:(NSString *)page + Callback:(completeModeBlock)callback +{ + NSMutableDictionary *dicpush = [NSMutableDictionary new]; + [dicpush setObject:[Tools isStringnil:channelId] forKey:@"channelId"]; + [dicpush setObject:[Tools isStringnil:page] forKey:@"page"]; + [dicpush setObject:@"20" forKey:@"maxResult"]; + + [YSAPIClient requestHttpWithRequestPost:@"https://route.showapi.com/109-35?appKey=1e86DbFC4F7F4FA0B1607454E3fDdc1c" paraments:dicpush 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 = @"成功"; + state = YES; + callback(state,[ZhiXunListModel yy_modelWithJSON:dicAll],describle); + } + }]; +} @end diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/ShouYeViewController.m b/ProductApp/ProductApp/ProductMain/ShouYe/ShouYeViewController.m index a0dd1a5..8b7d25d 100644 --- a/ProductApp/ProductApp/ProductMain/ShouYe/ShouYeViewController.m +++ b/ProductApp/ProductApp/ProductMain/ShouYe/ShouYeViewController.m @@ -47,7 +47,7 @@ //第一次进入程序 手动检查一下是否有粘贴的信息 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - [self pauseNotifi]; + [self copyTiShiNotifi]; }); [self.viewShow refShowData]; @@ -68,7 +68,7 @@ [self getAllData]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(pauseNotifi) name:@"pauseNotifi" object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(copyTiShiNotifi) name:@"copyTiShiNotifi" object:nil]; } @@ -114,7 +114,7 @@ [UMCommonLogManager setUpUMCommonLogManager]; if(self.isnetwork) { - [self pauseNotifi]; + [self copyTiShiNotifi]; } } @@ -291,7 +291,7 @@ } } ///去获取粘贴板的信息 --(void)pauseNotifi +-(void)copyTiShiNotifi { if([UserDetailModel zhiFuState]==NO)return; if([[[NSUserDefaults standardUserDefaults] objectForKey:YongHuXieYiState] intValue] !=1)return; diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/view/ShouYeView.m b/ProductApp/ProductApp/ProductMain/ShouYe/view/ShouYeView.m index 4cb54f1..3909a69 100644 --- a/ProductApp/ProductApp/ProductMain/ShouYe/view/ShouYeView.m +++ b/ProductApp/ProductApp/ProductMain/ShouYe/view/ShouYeView.m @@ -342,6 +342,7 @@ { ///[@"视频加水印",@"MD5去重",@"视频裁剪",@"视频转音频",@"去背景音乐",@"视频时长剪切" 1开始 baseInfoModel *model = self.arrdata[indexPath.row]; + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:model.title extra:@""]; if([model.title isEqualToString:@"视频转音频"]) { ShiPingTiQuYinPingViewController *vc = [ShiPingTiQuYinPingViewController new]; diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/ShiPingTiQuYinPingViewController.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/ShiPingTiQuYinPingViewController.m index cbee4f9..f158501 100644 --- a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/ShiPingTiQuYinPingViewController.m +++ b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/ShiPingTiQuYinPingViewController.m @@ -7,6 +7,7 @@ #import "ShiPingTiQuYinPingViewController.h" #import "ShiPingTiQuYinPingView.h" +#import "ShiPinJiLuViewController.h" @interface ShiPingTiQuYinPingViewController () @@ -22,6 +23,12 @@ [self showNaviGationView:YES]; [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)]; [self.navigationView setTitle:@"视频转音频" titleColor:RGBACOLOR(255, 255, 255, 1)]; + [self.navigationView setMuenTitle:@"历史记录" titleColor:RGBACOLOR(255, 255, 255, 0.8)]; +} +-(void)navMuenButtonAction +{ + ShiPinJiLuViewController *vc = [ShiPinJiLuViewController new]; + [self.navigationController pushViewController:vc animated:YES]; } -(void)viewDidDisappear:(BOOL)animated { diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/view/ShiPingTiQuYinPingView.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/view/ShiPingTiQuYinPingView.m index da24926..b032a41 100644 --- a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/view/ShiPingTiQuYinPingView.m +++ b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/view/ShiPingTiQuYinPingView.m @@ -16,6 +16,7 @@ #import "BaoCunAlterView.h" #import "GongGongNetManager.h" #import "HuiYuanZXViewController.h" +#import "ShiPinJiLuViewController.h" @interface ShiPingTiQuYinPingView () @@ -297,19 +298,23 @@ -(void)tiaozhuan { - [self.viewController.navigationController popToRootViewControllerAnimated:NO]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"tabbarChangerNotifi" object:@"1"]; - dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ - if([UserDetailModel zhiFuState]) - { - [[NSNotificationCenter defaultCenter] postNotificationName:@"recordShowSonView" object:@"2"]; - } - else - { - [[NSNotificationCenter defaultCenter] postNotificationName:@"recordShowSonView" object:@"1"]; - } - - }); +// [self.viewController.navigationController popToRootViewControllerAnimated:NO]; +// [[NSNotificationCenter defaultCenter] postNotificationName:@"tabbarChangerNotifi" object:@"1"]; +// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ +// if([UserDetailModel zhiFuState]) +// { +// [[NSNotificationCenter defaultCenter] postNotificationName:@"recordShowSonView" object:@"2"]; +// } +// else +// { +// [[NSNotificationCenter defaultCenter] postNotificationName:@"recordShowSonView" object:@"1"]; +// } +// +// }); + + ShiPinJiLuViewController *vc = [ShiPinJiLuViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + } - (void)extractAudioFromVideo:(NSURL *)videoURL back:(void (^)(NSString *backAudio))blockValue { diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.h b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.h new file mode 100644 index 0000000..9b4175b --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.h @@ -0,0 +1,16 @@ +// +// ShiPinJiLuViewController.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ShiPinJiLuViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.m new file mode 100644 index 0000000..81c9547 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/ShiPinJiLuViewController.m @@ -0,0 +1,44 @@ +// +// ShiPinJiLuViewController.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ShiPinJiLuViewController.h" +#import "JiLuAudioView.h" + +@interface ShiPinJiLuViewController () + +@end + +@implementation ShiPinJiLuViewController +- (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)viewDidDisappear:(BOOL)animated +{ + [super viewDidDisappear:animated]; +} +- (void)viewDidLoad { + [super viewDidLoad]; + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"音频记录" extra:@""]; + JiLuAudioView *viewback = [[JiLuAudioView alloc] init]; + [self.view addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.offset(NavHeight); + }]; + +} + + + +@end diff --git a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCell.h b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCell.h similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCell.h rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCell.h diff --git a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCell.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCell.m similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCell.m rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCell.m diff --git a/ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCellOModel.swift b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCellOModel.swift similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/cell/JiLuAudioTableViewCellOModel.swift rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/cell/JiLuAudioTableViewCellOModel.swift diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuAudioView.h b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/view/JiLuAudioView.h similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/view/JiLuAudioView.h rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/view/JiLuAudioView.h diff --git a/ProductApp/ProductApp/ProductMain/JiLu/view/JiLuAudioView.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/view/JiLuAudioView.m similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/view/JiLuAudioView.m rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/view/JiLuAudioView.m diff --git a/ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayView.h b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayView.h similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayView.h rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayView.h diff --git a/ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayView.m b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayView.m similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayView.m rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayView.m diff --git a/ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayViewOModel.swift b/ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayViewOModel.swift similarity index 100% rename from ProductApp/ProductApp/ProductMain/JiLu/播放音频/JiLuAudioPlayViewOModel.swift rename to ProductApp/ProductApp/ProductMain/ShouYe/视频转音频/记录/播放音频/JiLuAudioPlayViewOModel.swift diff --git a/ProductApp/ProductApp/ProductMain/WoDe/FenXiang/ShareAlterView.m b/ProductApp/ProductApp/ProductMain/WoDe/FenXiang/ShareAlterView.m index 5a7ea80..093ed6f 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/FenXiang/ShareAlterView.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/FenXiang/ShareAlterView.m @@ -107,7 +107,7 @@ WXMediaMessage *message = [WXMediaMessage message]; message.title = [Tools isStringnil:[dic objectForKey:@"title"]]; message.description = [Tools isStringnil:[dic objectForKey:@"content"]]; - [message setThumbImage:[UIImage imageNamed:@"logo"]]; + [message setThumbImage:[UIImage imageNamed:@"my_headnomo"]]; message.mediaObject = webpageObject; SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init]; @@ -126,7 +126,7 @@ WXMediaMessage *message = [WXMediaMessage message]; message.title = [Tools isStringnil:[dic objectForKey:@"title"]]; message.description = [Tools isStringnil:[dic objectForKey:@"content"]]; - [message setThumbImage:[UIImage imageNamed:@"logo"]]; + [message setThumbImage:[UIImage imageNamed:@"my_headnomo"]]; message.mediaObject = webpageObject; SendMessageToWXReq *req = [[SendMessageToWXReq alloc] init]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/SheZhiViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/SheZhiViewController.m index 8ddd4d2..f3a6fcf 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/SheZhiViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/SheZhiViewController.m @@ -43,7 +43,7 @@ - (void)viewDidLoad { [super viewDidLoad]; [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"设置" extra:@""]; UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; [tableView setBackgroundColor:[UIColor clearColor]]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/关于我们/GuanYuWoMenViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/关于我们/GuanYuWoMenViewController.m index ad216b7..df2fbeb 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/关于我们/GuanYuWoMenViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/关于我们/GuanYuWoMenViewController.m @@ -36,7 +36,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"关于我们" extra:@""]; UIImageView *imgvback = [[UIImageView alloc] init]; [imgvback setImage:[UIImage imageNamed:@"logicon"]]; [self.view addSubview:imgvback]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/意见反馈/YiJianFanKuiController.m b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/意见反馈/YiJianFanKuiController.m index 13ce84f..5655915 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/意见反馈/YiJianFanKuiController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/意见反馈/YiJianFanKuiController.m @@ -26,7 +26,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"意见反馈" extra:@""]; YiJianFanKuiView *view= [[YiJianFanKuiView alloc] init]; [self.view addSubview:view]; [view mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账号绑定/ZhangHaoBDViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账号绑定/ZhangHaoBDViewController.m index d3d877c..a713c0a 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账号绑定/ZhangHaoBDViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账号绑定/ZhangHaoBDViewController.m @@ -36,7 +36,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"账号绑定" extra:@""]; UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; [tableView setBackgroundColor:[UIColor clearColor]]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账户管理/ZhangHuGuanLiViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账户管理/ZhangHuGuanLiViewController.m index 9dd1282..dfb467f 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账户管理/ZhangHuGuanLiViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/SheZhi/账户管理/ZhangHuGuanLiViewController.m @@ -35,7 +35,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"账户管理" extra:@""]; UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; [tableView setBackgroundColor:[UIColor clearColor]]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/WoDeViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/WoDeViewController.m index 7d953aa..522b903 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/WoDeViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/WoDeViewController.m @@ -22,6 +22,7 @@ { [super viewDidAppear:animated]; [self getdata]; + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"我的" extra:@""]; } - (void)viewDidLoad { [super viewDidLoad]; diff --git a/ProductApp/ProductApp/ProductMain/WoDe/view/WoDeView.m b/ProductApp/ProductApp/ProductMain/WoDe/view/WoDeView.m index 9de0633..98d11df 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/view/WoDeView.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/view/WoDeView.m @@ -179,7 +179,7 @@ [tableView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.equalTo(imgvback); make.top.equalTo(imgvhy.mas_bottom).offset(20); - make.height.offset(60*4); + make.height.offset(60*3); }]; [scvback mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.equalTo(tableView).offset(20); @@ -284,7 +284,7 @@ self.arrdata = [NSMutableArray new]; [self.arrdata addObject:@"兑换钻石"]; [self.arrdata addObject:@"分享APP"]; - [self.arrdata addObject:@"联系客服"]; +// [self.arrdata addObject:@"联系客服"]; [self.arrdata addObject:@"系统设置"]; } @@ -363,12 +363,13 @@ } else if([str isEqualToString:@"分享APP"]) { + [UserDetailModel pushActionInfo:0 key:@"click.share.action" value:@"分享APP" extra:@""]; ShareAlterView *view = [[ShareAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; [[UIApplication sharedApplication].delegate.window addSubview:view]; } else if([str isEqualToString:@"联系客服"]) { - [self getKeFuData]; +// [self getKeFuData]; } else if([str isEqualToString:@"系统设置"]) { @@ -378,31 +379,31 @@ } --(void)getKeFuData -{ - [KCSPHUDAlterView showView]; - [GongGongNetManager getWeixinServiceinfoData:self Callback:^(BOOL state, KCSPWXServiceModel *responseObject, NSString * _Nullable describle) { - [KCSPHUDAlterView dismis]; - if(state) - { - if([Tools isStringnil:responseObject.data.corpid].length>1) - { - WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init]; - req.corpid = responseObject.data.corpid; //企业ID - req.url = responseObject.data.kf_address; - [WXApi sendReq:req completion:nil]; - } - else - { - [HXHud showMessage:@"暂时无法联系在线客服，请电话咨询" afterDelayType:1]; - } - } - else - { - [HXHud showMessage:responseObject.message afterDelayType:1]; - } - }]; -} +//-(void)getKeFuData +//{ +// [KCSPHUDAlterView showView]; +// [GongGongNetManager getWeixinServiceinfoData:self Callback:^(BOOL state, KCSPWXServiceModel *responseObject, NSString * _Nullable describle) { +// [KCSPHUDAlterView dismis]; +// if(state) +// { +// if([Tools isStringnil:responseObject.data.corpid].length>1) +// { +// WXOpenCustomerServiceReq *req = [[WXOpenCustomerServiceReq alloc] init]; +// req.corpid = responseObject.data.corpid; //企业ID +// req.url = responseObject.data.kf_address; +// [WXApi sendReq:req completion:nil]; +// } +// else +// { +// [HXHud showMessage:@"暂时无法联系在线客服，请电话咨询" afterDelayType:1]; +// } +// } +// else +// { +// [HXHud showMessage:responseObject.message afterDelayType:1]; +// } +// }]; +//} -(void)loinPressAction { diff --git a/ProductApp/ProductApp/ProductMain/WoDe/会员中心/HuiYuanZXViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/会员中心/HuiYuanZXViewController.m index 7f22ba6..f4a1782 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/会员中心/HuiYuanZXViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/会员中心/HuiYuanZXViewController.m @@ -27,7 +27,7 @@ } - (void)viewDidLoad { [super viewDidLoad]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"会员中心" extra:@""]; HuiYuanZXView *view = [HuiYuanZXView new]; [self.view addSubview:view]; [view mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/ProductApp/ProductApp/ProductMain/WoDe/兑换钻石/DuiHuanZSViewController.m b/ProductApp/ProductApp/ProductMain/WoDe/兑换钻石/DuiHuanZSViewController.m index 97fda49..25ab28d 100644 --- a/ProductApp/ProductApp/ProductMain/WoDe/兑换钻石/DuiHuanZSViewController.m +++ b/ProductApp/ProductApp/ProductMain/WoDe/兑换钻石/DuiHuanZSViewController.m @@ -38,7 +38,7 @@ - (void)viewDidLoad { [super viewDidLoad]; [self.view setBackgroundColor:[UIColor whiteColor]]; - + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"兑换钻石" extra:@""]; DuiHuanZSView *view = [DuiHuanZSView new]; [self.view addSubview:view]; [view mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.h b/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.h new file mode 100644 index 0000000..9eba5be --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.h @@ -0,0 +1,16 @@ +// +// ZhiXunViewController.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiXunViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.m b/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.m new file mode 100644 index 0000000..c037409 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/ZhiXunViewController.m @@ -0,0 +1,128 @@ +// +// ZhiXunViewController.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunViewController.h" +#import "KCSPNetManager.h" + +#import "ZJScrollPageView.h" +#import "ZhiXunFenLaiViewController.h" + +@interface ZhiXunViewController () +@property (nonatomic, strong) ZJScrollPageView *scrollPageView; + +/// +@property (nonatomic , strong) NSArray *arrdata; + +@end + +@implementation ZhiXunViewController +- (UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleLightContent; +} +-(void)viewDidAppear:(BOOL)animated +{ + [super viewDidAppear:animated]; + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"资讯列表" extra:@""]; +} +- (void)viewDidLoad { + [super viewDidLoad]; + [self showNaviGationView:YES]; + [self.navigationView setBackgroundColor:RGBCOLOR(20, 20, 20)]; + [self.navigationView setTitle:@"每日资讯" titleColor:RGBCOLOR(255, 255, 255)]; + [self.navigationController setNavigationBarHidden:YES animated:NO]; + [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)]; + + ///新闻频道 https://route.showapi.com/109-34?appKey=1e86DbFC4F7F4FA0B1607454E3fDdc1c + ///新闻详情 https://route.showapi.com/109-35?appKey= + /* + channelId String新闻频道id，必须精确匹配 + page String 页数，默认1，最大返回新闻条数为1万条 + maxResult String 每页返回记录数，值在20-100之间。 + */ + + + + ZJSegmentStyle *style = [[ZJSegmentStyle alloc] init]; + //显示滚动条 + style.showLine = NO; + style.scaleTitle = YES; + style.normalTitleColor = RGBACOLOR(255, 255, 255, 0.5); + style.selectedTitleColor = RGBCOLOR(240, 54, 94); + style.titleFont = [UIFont systemFontOfSize:14]; + style.autoAdjustTitlesWidth = YES; + style.adjustCoverOrLineWidth = NO; + _scrollPageView = [[ZJScrollPageView alloc] initWithFrame:CGRectMake(0, NavHeight, UISCREEN_WIDTH, UISCREEN_HEIGHT - NavHeight-TabHeight) segmentStyle:style titles:@[@"热门"] parentViewController:self delegate:self]; + [self.view addSubview:self.scrollPageView]; + [self.scrollPageView setBackgroundColor:RGBCOLOR(20, 20, 20)]; + self.scrollPageView.segmentView.backgroundColor = RGBCOLOR(20, 20, 20); + self.scrollPageView.contentView.backgroundColor = RGBCOLOR(20, 20, 20); + self.scrollPageView.contentView.collectionView.backgroundColor = RGBCOLOR(20, 20, 20); + [self getdata]; +} + +-(void)getdata +{ +// if(DEBUG) +// { +// self.arrdata = @[@"热门",@"热门",@"热门",@"热门",@"热门",@"热门",@"热门",@"热门",@"热门",@"热门"]; +// [self.scrollPageView reloadWithNewTitles:self.arrdata]; +// return; +// } + [KCSPHUDAlterView showView]; + ///分类 + [KCSPNetManager requestZhiXunFenLeiData:self.view Callback:^(BOOL state, ZhiXunFenLaiModel *responseObject, NSString * _Nullable describle) { + [KCSPHUDAlterView dismis]; + if(state) + { + self.arrdata = responseObject.showapi_res_body.channelList; + NSMutableArray *arrtemp = [NSMutableArray new]; + for(ZhiXunFenLaiModelBodyList *model in self.arrdata) + { + [arrtemp addObject:[Tools isStringnilkong:model.name]]; + } + [self.scrollPageView reloadWithNewTitles:arrtemp]; + } + else + { + [HXHud showMessage:responseObject.message afterDelayType:1]; + } + }]; +} +#pragma mark - custom delegate - 自定义或者第三方控件的delegate +- (NSInteger)numberOfChildViewControllers { + return self.arrdata.count; +} + +- (UIViewController *)childViewController:(UIViewController *)reuseViewController forIndex:(NSInteger)index { + ZhiXunFenLaiViewController *childVC = (ZhiXunFenLaiViewController *)reuseViewController; + if (!childVC) { + childVC = [[ZhiXunFenLaiViewController alloc] init]; + } +// if(DEBUG) +// { +// childVC.logid = @"112"; +// } +// else +// { +// ZhiXunFenLaiModelBodyList *model = self.arrdata[index]; +// childVC.logid = model.channelId; +// } + ZhiXunFenLaiModelBodyList *model = self.arrdata[index]; + childVC.logid = model.channelId; + + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:[NSString stringWithFormat:@"资讯列表-%@",model.name] extra:@""]; + + return childVC; +} +- (void)scrollPageController:(UIViewController *)scrollPageController childViewControllDidAppear:(UIViewController *)childViewController forIndex:(NSInteger)index +{ +} +- (BOOL)shouldAutomaticallyForwardAppearanceMethods { + return NO; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.h b/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.h new file mode 100644 index 0000000..c45b9a9 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.h @@ -0,0 +1,17 @@ +// +// ZhiXunFenLaiTableViewCell.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import +#import "ZhiXunListModel.h" +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiXunFenLaiTableViewCell : UITableViewCell +/// +@property (nonatomic , strong) ZhiXunListModelBodyPageItem *model; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.m b/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.m new file mode 100644 index 0000000..34a4aa1 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/cell/ZhiXunFenLaiTableViewCell.m @@ -0,0 +1,131 @@ +// +// ZhiXunFenLaiTableViewCell.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunFenLaiTableViewCell.h" + + +@interface ZhiXunFenLaiTableViewCell () +/// +@property (nonatomic , strong) UIImageView *imgvback; +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbinfo; +@property (nonatomic , strong) UILabel *lbtime; +@end + +@implementation ZhiXunFenLaiTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:RGBCOLOR(51, 51, 51)]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.bottom.equalTo(self); + make.left.offset(15); + make.right.equalTo(self).offset(-15); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:6]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(12); + make.bottom.equalTo(viewback).offset(-12); + make.width.offset(120); + }]; + [imgvback setContentMode:UIViewContentModeScaleAspectFill]; + [imgvback.layer setMasksToBounds:YES]; + [imgvback.layer setCornerRadius:6]; + _imgvback = imgvback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@""]; + [lbname setTextColor:RGBCOLOR(255, 255, 255)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:16]]; + [lbname setNumberOfLines:2]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(imgvback.mas_right).offset(10); + make.top.equalTo(imgvback); + make.right.equalTo(viewback).offset(-15); + }]; + _lbname = lbname; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@""]; + [lbinfo setTextColor:RGBACOLOR(245, 245, 245,0.8)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.centerY.equalTo(imgvback).offset(5); + make.width.lessThanOrEqualTo(@(150)); + }]; + _lbinfo = lbinfo; + + UILabel *lbtime = [[UILabel alloc] init]; + [lbtime setText:@""]; + [lbtime setTextColor:RGBACOLOR(245, 245, 245,0.8)]; + [lbtime setTextAlignment:NSTextAlignmentLeft]; + [lbtime setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbtime]; + [lbtime mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(imgvback); + make.left.equalTo(lbname); + }]; + _lbtime = lbtime; + } + return self; +} + +-(void)setModel:(ZhiXunListModelBodyPageItem *)model +{ + _model = model; + self.lbname.text = [Tools isStringnilkong:model.title]; + self.lbtime.text = [Tools isStringnilkong:model.pubDate]; + + self.lbinfo.text = [Tools isStringnilkong:model.source]; + + NSString *strimgurl = [Tools isStringnil:model.img]; + if(strimgurl.length==0) + { + if(model.imageurls.count>0) + { + ZhiXunListModelBodyPageItemImageurls *modelimg = model.imageurls.firstObject; + strimgurl = [Tools isStringnil:modelimg.url]; + } + } + if(strimgurl.length>0) + { + [self.imgvback mas_updateConstraints:^(MASConstraintMaker *make) { + make.width.offset(120); + }]; + [self.imgvback setHidden:NO]; + [self.imgvback sd_setImageWithURL:[NSURL URLWithString:strimgurl] placeholderImage:nil]; + [self.lbname mas_updateConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.imgvback.mas_right).offset(10); + }]; + } + else + { + [self.imgvback mas_updateConstraints:^(MASConstraintMaker *make) { + make.width.offset(0); + }]; + [self.lbname mas_updateConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(self.imgvback.mas_right).offset(0); + }]; + [self.imgvback setHidden:YES]; + } +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.h b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.h new file mode 100644 index 0000000..f9bd6f4 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.h @@ -0,0 +1,24 @@ +// +// ZhiXunFenLaiModel.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "BaseModel.h" +NS_ASSUME_NONNULL_BEGIN +@class ZhiXunFenLaiModelBody,ZhiXunFenLaiModelBodyList; +@interface ZhiXunFenLaiModel : BaseModel +/// +@property (nonatomic , strong) ZhiXunFenLaiModelBody *showapi_res_body; +@end +@interface ZhiXunFenLaiModelBody : NSObject +/// +@property (nonatomic , strong) NSArray *channelList; +@end +@interface ZhiXunFenLaiModelBodyList : NSObject +/// +@property (nonatomic , strong) NSString *channelId; +@property (nonatomic , strong) NSString *name; +@end +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.m b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.m new file mode 100644 index 0000000..f289945 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunFenLaiModel.m @@ -0,0 +1,23 @@ +// +// ZhiXunFenLaiModel.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunFenLaiModel.h" + +@implementation ZhiXunFenLaiModel ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"showapi_res_body" : [ZhiXunFenLaiModelBody class]}; +} +@end +@implementation ZhiXunFenLaiModelBody ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"channelList" : [ZhiXunFenLaiModelBodyList class]}; +} +@end +@implementation ZhiXunFenLaiModelBodyList + +@end + diff --git a/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.h b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.h new file mode 100644 index 0000000..8e5eb60 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.h @@ -0,0 +1,50 @@ +// +// ZhiXunListModel.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "BaseModel.h" + +NS_ASSUME_NONNULL_BEGIN +@class ZhiXunListModelBody,ZhiXunListModelBodyPage,ZhiXunListModelBodyPageItem,ZhiXunListModelBodyPageItemImageurls; +@interface ZhiXunListModel : BaseModel +/// +@property (nonatomic , strong) ZhiXunListModelBody *showapi_res_body; +@end +@interface ZhiXunListModelBody : BaseModel +@property (nonatomic , strong) ZhiXunListModelBodyPage *pagebean; +@end +@interface ZhiXunListModelBodyPage : BaseModel +@property (nonatomic , strong) NSArray *contentlist; +@end +@interface ZhiXunListModelBodyPageItem : BaseModel +/// +@property (nonatomic , strong) NSString *ID; +/// +@property (nonatomic , strong) NSString *havePic; +/// +@property (nonatomic , strong) NSString *pubDate; +/// +@property (nonatomic , strong) NSString *title; +/// +@property (nonatomic , strong) NSString *channelName; +/// +@property (nonatomic , strong) NSString *source; +/// +@property (nonatomic , strong) NSString *channelId; +/// +@property (nonatomic , strong) NSString *link; +/// +@property (nonatomic , strong) NSString *img; +/// +@property (nonatomic , strong) NSArray *imageurls; + +@end + +@interface ZhiXunListModelBodyPageItemImageurls : BaseModel +/// +@property (nonatomic , strong) NSString *url; +@end +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.m b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.m new file mode 100644 index 0000000..47aa450 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/models/ZhiXunListModel.m @@ -0,0 +1,36 @@ +// +// ZhiXunListModel.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunListModel.h" + +@implementation ZhiXunListModel ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"showapi_res_body" : [ZhiXunListModelBody class]}; +} +@end +@implementation ZhiXunListModelBody ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"pagebean" : [ZhiXunListModelBodyPage class]}; +} +@end +@implementation ZhiXunListModelBodyPage ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"contentlist" : [ZhiXunListModelBodyPageItem class]}; +} +@end +@implementation ZhiXunListModelBodyPageItem ++ (NSDictionary *)modelContainerPropertyGenericClass { + return @{@"imageurls" : [ZhiXunListModelBodyPageItemImageurls class]}; +} ++ (nullable NSDictionary *)modelCustomPropertyMapper +{ + return @{@"ID" : @"id"}; +} +@end +@implementation ZhiXunListModelBodyPageItemImageurls + +@end diff --git a/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.h b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.h new file mode 100644 index 0000000..0e7b075 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.h @@ -0,0 +1,16 @@ +// +// ZhiXunFenLaiView.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiXunFenLaiView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.m b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.m new file mode 100644 index 0000000..c336b31 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiView.m @@ -0,0 +1,21 @@ +// +// ZhiXunFenLaiView.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunFenLaiView.h" + +@implementation ZhiXunFenLaiView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + + } + return self; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.h b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.h new file mode 100644 index 0000000..177f21f --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.h @@ -0,0 +1,17 @@ +// +// ZhiXunFenLaiViewController.h +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import +#import "ZJScrollPageView.h" +NS_ASSUME_NONNULL_BEGIN + +@interface ZhiXunFenLaiViewController : UIViewController +/// +@property (nonatomic , strong) NSString *logid; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.m b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.m new file mode 100644 index 0000000..6b54dc7 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/资讯/view/ZhiXunFenLaiViewController.m @@ -0,0 +1,165 @@ +// +// ZhiXunFenLaiViewController.m +// ProductApp +// +// Created by 工作 on 2025/4/18. +// + +#import "ZhiXunFenLaiViewController.h" +#import "KCSPNetManager.h" +#import "ZhiXunFenLaiTableViewCell.h" +#import "WkWebviewViewController.h" + +@interface ZhiXunFenLaiViewController () +/// +@property (nonatomic , strong) UITableView *tableView; + +/// +@property (nonatomic , strong) NSMutableArray *arrdata; + +@property (nonatomic , assign) int ipage; + +@end + +@implementation ZhiXunFenLaiViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + [self.view setBackgroundColor:RGBCOLOR(20, 20, 20)]; + + UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; + [tableView setBackgroundColor:[UIColor clearColor]]; + [tableView setDelegate:self]; + [tableView setDataSource:self]; + [self.view addSubview:tableView]; + [tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.view); + }]; + _tableView = tableView; + tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ + self.ipage=1; + [self getdata]; + }]; + tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{ + self.ipage+=1; + [self getdata]; + }]; + +} +-(void)setLogid:(NSString *)logid +{ + if([self.logid isEqualToString:logid]) + { + + } + else + { + _logid = logid; + self.ipage = 1; + [self getdata]; + } +} +-(void)getdata +{ +// if(DEBUG) +// { +// [self.tableView.mj_header endRefreshing]; +// [self.tableView.mj_footer endRefreshing]; +// if(self.ipage==1)self.arrdata=[NSMutableArray new]; +// +// for(int i = 0 ; i < 3; i++) +// { +// ZhiXunListModelBodyPageItem *model = [ZhiXunListModelBodyPageItem new]; +// model.source = @"界面新闻"; +// model.title = @"发布豆包深度思考模型，火山引擎要争夺Agent市场"; +// model.pubDate = @"2025-04-18 15:00:00"; +// model.link = @"https://www.163.com/dy/article/JTEEE6V3051492T3.html"; +// model.img = @""; +// model.imageurls = @[]; +// if(i==1) +// { +// model.img = @"https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2025%2F0418%2F4812347cj00suwh4l0082d000hs0080g.jpg&thumbnail=660x2147483647&quality=80&type=jpg"; +// } +// else if (i==2) +// { +// ZhiXunListModelBodyPageItemImageurls *modelimg = [ZhiXunListModelBodyPageItemImageurls new]; +// modelimg.url = @"https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2025%2F0418%2F5c819166j00suwifk000md000hs00bvg.jpg&thumbnail=660x2147483647&quality=80&type=jpg"; +// model.imageurls = @[modelimg]; +// } +// [self.arrdata addObject:model]; +// +// } +// [self.tableView reloadData]; +// return; +// } + [KCSPNetManager requestZhiXunListData:self.view channelId:self.logid page:[NSString stringWithFormat:@"%d",self.ipage] Callback:^(BOOL state, ZhiXunListModel *responseObject, NSString * _Nullable describle) { + if(self.ipage==1)self.arrdata=[NSMutableArray new]; + [self.tableView.mj_header endRefreshing]; + [self.tableView.mj_footer endRefreshing]; + if(state) + { + [self.arrdata addObjectsFromArray:responseObject.showapi_res_body.pagebean.contentlist]; + } + else + { + [HXHud showMessage:responseObject.message afterDelayType:1]; + } + [self.tableView reloadData]; + }]; +} + +#pragma mark - UITableView +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + return self.arrdata.count; +} +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 1; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"ZhiXunFenLaiTableViewCell"; + ZhiXunFenLaiTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ZhiXunFenLaiTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + cell.model = self.arrdata[indexPath.section]; + + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 0.01; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 120; +} +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section +{ + return [UIView new]; +} +-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section +{ + return [UIView new]; +} +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + ZhiXunListModelBodyPageItem *model = self.arrdata[indexPath.section]; + WkWebviewViewController *vc = [WkWebviewViewController new]; + vc.strurl = model.link; + vc.strtitle = model.title; + [self.navigationController pushViewController:vc animated:YES]; + [UserDetailModel pushActionInfo:0 key:@"click.go.to.vc" value:@"资讯详情" extra:@""]; +} + +@end