diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 4daaaec..226ebf9 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -8,6 +8,31 @@ /* Begin PBXBuildFile section */ 664551746CA42328436EB43A /* Pods_ProductApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E9D1598912BF8D031CA536 /* Pods_ProductApp.framework */; }; + CA0D082D2CA4F8930086855E /* ShouYeZNXZTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D082C2CA4F8930086855E /* ShouYeZNXZTableViewCell.m */; }; + CA0D08302CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D082F2CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m */; }; + CA0D08332CA4FFB90086855E /* ShouYeBannerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08322CA4FFB90086855E /* ShouYeBannerTableViewCell.m */; }; + CA0D08362CA501710086855E /* ShouYeToolsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08352CA501710086855E /* ShouYeToolsTableViewCell.m */; }; + CA0D083A2CA509D20086855E /* ShouYeToolsCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08392CA509D20086855E /* ShouYeToolsCollectionViewCell.m */; }; + CA0D083D2CA50F480086855E /* ShouYeZuoWenTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D083C2CA50F480086855E /* ShouYeZuoWenTableViewCell.m */; }; + CA0D08412CA52F800086855E /* ShouYeShenFenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08402CA52F800086855E /* ShouYeShenFenViewController.m */; }; + CA0D08452CA5316B0086855E /* ShouYeShenFenView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08442CA5316B0086855E /* ShouYeShenFenView.m */; }; + CA0D08492CA534ED0086855E /* ShouYeShenFenCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08482CA534ED0086855E /* ShouYeShenFenCollectionViewCell.m */; }; + CA0D084C2CA538710086855E /* ShouYeShenFenNianJiView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D084B2CA538700086855E /* ShouYeShenFenNianJiView.m */; }; + CA0D084F2CA53B970086855E /* ShouYeLingYuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D084E2CA53B970086855E /* ShouYeLingYuViewController.m */; }; + CA0D08542CA543370086855E /* ShouYeLSZWPGTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08532CA543370086855E /* ShouYeLSZWPGTableViewCell.m */; }; + CA0D08572CA543440086855E /* ShouYeLSKTPGTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08562CA543440086855E /* ShouYeLSKTPGTableViewCell.m */; }; + CA0D085A2CA543E40086855E /* ShouYeZCPPTTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08592CA543E40086855E /* ShouYeZCPPTTableViewCell.m */; }; + CA0D085D2CA543EE0086855E /* ShouYeZCXZTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D085C2CA543EE0086855E /* ShouYeZCXZTableViewCell.m */; }; + CA0D08612CA547C60086855E /* ShouYeLiShiJiLuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08602CA547C60086855E /* ShouYeLiShiJiLuViewController.m */; }; + CA0D08672CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08662CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.m */; }; + CA0D086A2CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08692CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.m */; }; + CA0D086D2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D086C2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.m */; }; + CA0D08712CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08702CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.m */; }; + CA0D08752CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08742CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.m */; }; + CA0D08782CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08772CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.m */; }; + CA0D087C2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D087B2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.m */; }; + CA0D087F2CA55E5D0086855E /* JJGradientLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D087E2CA55E5D0086855E /* JJGradientLabel.m */; }; + CA0D08832CA5682D0086855E /* CamreViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0D08822CA5682D0086855E /* CamreViewController.m */; }; CA4257852CA24E1100A36A10 /* StartPZXZDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4257842CA24E1100A36A10 /* StartPZXZDetailViewController.m */; }; CA4257892CA24E8C00A36A10 /* StartPZXZDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4257882CA24E8C00A36A10 /* StartPZXZDetailView.m */; }; CA42578D2CA262B300A36A10 /* StartZNPPTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA42578C2CA262B300A36A10 /* StartZNPPTViewController.m */; }; @@ -266,6 +291,56 @@ /* Begin PBXFileReference section */ 87167CC240BDAA55C86F80DE /* Pods-ProductApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ProductApp.debug.xcconfig"; path = "Target Support Files/Pods-ProductApp/Pods-ProductApp.debug.xcconfig"; sourceTree = ""; }; B3DBEC0C6ED0E182F65EDBEA /* Pods-ProductApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ProductApp.release.xcconfig"; path = "Target Support Files/Pods-ProductApp/Pods-ProductApp.release.xcconfig"; sourceTree = ""; }; + CA0D082B2CA4F8930086855E /* ShouYeZNXZTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeZNXZTableViewCell.h; sourceTree = ""; }; + CA0D082C2CA4F8930086855E /* ShouYeZNXZTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeZNXZTableViewCell.m; sourceTree = ""; }; + CA0D082E2CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeXieZuoTableViewCell.h; sourceTree = ""; }; + CA0D082F2CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeXieZuoTableViewCell.m; sourceTree = ""; }; + CA0D08312CA4FFB90086855E /* ShouYeBannerTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeBannerTableViewCell.h; sourceTree = ""; }; + CA0D08322CA4FFB90086855E /* ShouYeBannerTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeBannerTableViewCell.m; sourceTree = ""; }; + CA0D08342CA501710086855E /* ShouYeToolsTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeToolsTableViewCell.h; sourceTree = ""; }; + CA0D08352CA501710086855E /* ShouYeToolsTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeToolsTableViewCell.m; sourceTree = ""; }; + CA0D08382CA509D20086855E /* ShouYeToolsCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeToolsCollectionViewCell.h; sourceTree = ""; }; + CA0D08392CA509D20086855E /* ShouYeToolsCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeToolsCollectionViewCell.m; sourceTree = ""; }; + CA0D083B2CA50F480086855E /* ShouYeZuoWenTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeZuoWenTableViewCell.h; sourceTree = ""; }; + CA0D083C2CA50F480086855E /* ShouYeZuoWenTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeZuoWenTableViewCell.m; sourceTree = ""; }; + CA0D083F2CA52F800086855E /* ShouYeShenFenViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeShenFenViewController.h; sourceTree = ""; }; + CA0D08402CA52F800086855E /* ShouYeShenFenViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeShenFenViewController.m; sourceTree = ""; }; + CA0D08432CA5316B0086855E /* ShouYeShenFenView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeShenFenView.h; sourceTree = ""; }; + CA0D08442CA5316B0086855E /* ShouYeShenFenView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeShenFenView.m; sourceTree = ""; }; + CA0D08472CA534ED0086855E /* ShouYeShenFenCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeShenFenCollectionViewCell.h; sourceTree = ""; }; + CA0D08482CA534ED0086855E /* ShouYeShenFenCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeShenFenCollectionViewCell.m; sourceTree = ""; }; + CA0D084A2CA538700086855E /* ShouYeShenFenNianJiView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeShenFenNianJiView.h; sourceTree = ""; }; + CA0D084B2CA538700086855E /* ShouYeShenFenNianJiView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeShenFenNianJiView.m; sourceTree = ""; }; + CA0D084D2CA53B970086855E /* ShouYeLingYuViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLingYuViewController.h; sourceTree = ""; }; + CA0D084E2CA53B970086855E /* ShouYeLingYuViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLingYuViewController.m; sourceTree = ""; }; + CA0D08522CA543370086855E /* ShouYeLSZWPGTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLSZWPGTableViewCell.h; sourceTree = ""; }; + CA0D08532CA543370086855E /* ShouYeLSZWPGTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLSZWPGTableViewCell.m; sourceTree = ""; }; + CA0D08552CA543440086855E /* ShouYeLSKTPGTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLSKTPGTableViewCell.h; sourceTree = ""; }; + CA0D08562CA543440086855E /* ShouYeLSKTPGTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLSKTPGTableViewCell.m; sourceTree = ""; }; + CA0D08582CA543E40086855E /* ShouYeZCPPTTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeZCPPTTableViewCell.h; sourceTree = ""; }; + CA0D08592CA543E40086855E /* ShouYeZCPPTTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeZCPPTTableViewCell.m; sourceTree = ""; }; + CA0D085B2CA543EE0086855E /* ShouYeZCXZTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeZCXZTableViewCell.h; sourceTree = ""; }; + CA0D085C2CA543EE0086855E /* ShouYeZCXZTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeZCXZTableViewCell.m; sourceTree = ""; }; + CA0D085F2CA547C60086855E /* ShouYeLiShiJiLuViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuViewController.h; sourceTree = ""; }; + CA0D08602CA547C60086855E /* ShouYeLiShiJiLuViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuViewController.m; sourceTree = ""; }; + CA0D08652CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuXZTableViewController.h; sourceTree = ""; }; + CA0D08662CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuXZTableViewController.m; sourceTree = ""; }; + CA0D08682CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuPGTableViewController.h; sourceTree = ""; }; + CA0D08692CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuPGTableViewController.m; sourceTree = ""; }; + CA0D086B2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuPPTTableViewController.h; sourceTree = ""; }; + CA0D086C2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuPPTTableViewController.m; sourceTree = ""; }; + CA0D086F2CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuXZTableViewCell.h; sourceTree = ""; }; + CA0D08702CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuXZTableViewCell.m; sourceTree = ""; }; + CA0D08732CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuPGTableViewCell.h; sourceTree = ""; }; + CA0D08742CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuPGTableViewCell.m; sourceTree = ""; }; + CA0D08762CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuPGCollectionViewCell.h; sourceTree = ""; }; + CA0D08772CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuPGCollectionViewCell.m; sourceTree = ""; }; + CA0D087A2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeLiShiJiLuPPTTableViewCell.h; sourceTree = ""; }; + CA0D087B2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeLiShiJiLuPPTTableViewCell.m; sourceTree = ""; }; + CA0D087D2CA55E5C0086855E /* JJGradientLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JJGradientLabel.h; sourceTree = ""; }; + CA0D087E2CA55E5D0086855E /* JJGradientLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JJGradientLabel.m; sourceTree = ""; }; + CA0D08812CA5682D0086855E /* CamreViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CamreViewController.h; sourceTree = ""; }; + CA0D08822CA5682D0086855E /* CamreViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CamreViewController.m; sourceTree = ""; }; CA4257832CA24E1100A36A10 /* StartPZXZDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartPZXZDetailViewController.h; sourceTree = ""; }; CA4257842CA24E1100A36A10 /* StartPZXZDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StartPZXZDetailViewController.m; sourceTree = ""; }; CA4257872CA24E8C00A36A10 /* StartPZXZDetailView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StartPZXZDetailView.h; sourceTree = ""; }; @@ -818,6 +893,170 @@ path = Pods; sourceTree = ""; }; + CA0D082A2CA4F8720086855E /* cell */ = { + isa = PBXGroup; + children = ( + CA0D08512CA5431B0086855E /* 职场 */, + CA0D08502CA543150086855E /* 老师 */, + CA0D08372CA509BC0086855E /* son */, + CA0D082B2CA4F8930086855E /* ShouYeZNXZTableViewCell.h */, + CA0D082C2CA4F8930086855E /* ShouYeZNXZTableViewCell.m */, + CA0D082E2CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.h */, + CA0D082F2CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m */, + CA0D08312CA4FFB90086855E /* ShouYeBannerTableViewCell.h */, + CA0D08322CA4FFB90086855E /* ShouYeBannerTableViewCell.m */, + CA0D08342CA501710086855E /* ShouYeToolsTableViewCell.h */, + CA0D08352CA501710086855E /* ShouYeToolsTableViewCell.m */, + CA0D083B2CA50F480086855E /* ShouYeZuoWenTableViewCell.h */, + CA0D083C2CA50F480086855E /* ShouYeZuoWenTableViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CA0D08372CA509BC0086855E /* son */ = { + isa = PBXGroup; + children = ( + CA0D08382CA509D20086855E /* ShouYeToolsCollectionViewCell.h */, + CA0D08392CA509D20086855E /* ShouYeToolsCollectionViewCell.m */, + ); + path = son; + sourceTree = ""; + }; + CA0D083E2CA52F680086855E /* 切换身份 */ = { + isa = PBXGroup; + children = ( + CA0D08462CA534D70086855E /* cell */, + CA0D08422CA5315E0086855E /* view */, + CA0D083F2CA52F800086855E /* ShouYeShenFenViewController.h */, + CA0D08402CA52F800086855E /* ShouYeShenFenViewController.m */, + CA0D084D2CA53B970086855E /* ShouYeLingYuViewController.h */, + CA0D084E2CA53B970086855E /* ShouYeLingYuViewController.m */, + ); + path = "切换身份"; + sourceTree = ""; + }; + CA0D08422CA5315E0086855E /* view */ = { + isa = PBXGroup; + children = ( + CA0D08432CA5316B0086855E /* ShouYeShenFenView.h */, + CA0D08442CA5316B0086855E /* ShouYeShenFenView.m */, + CA0D084A2CA538700086855E /* ShouYeShenFenNianJiView.h */, + CA0D084B2CA538700086855E /* ShouYeShenFenNianJiView.m */, + ); + path = view; + sourceTree = ""; + }; + CA0D08462CA534D70086855E /* cell */ = { + isa = PBXGroup; + children = ( + CA0D08472CA534ED0086855E /* ShouYeShenFenCollectionViewCell.h */, + CA0D08482CA534ED0086855E /* ShouYeShenFenCollectionViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CA0D08502CA543150086855E /* 老师 */ = { + isa = PBXGroup; + children = ( + CA0D08522CA543370086855E /* ShouYeLSZWPGTableViewCell.h */, + CA0D08532CA543370086855E /* ShouYeLSZWPGTableViewCell.m */, + CA0D08552CA543440086855E /* ShouYeLSKTPGTableViewCell.h */, + CA0D08562CA543440086855E /* ShouYeLSKTPGTableViewCell.m */, + ); + path = "老师"; + sourceTree = ""; + }; + CA0D08512CA5431B0086855E /* 职场 */ = { + isa = PBXGroup; + children = ( + CA0D08582CA543E40086855E /* ShouYeZCPPTTableViewCell.h */, + CA0D08592CA543E40086855E /* ShouYeZCPPTTableViewCell.m */, + CA0D085B2CA543EE0086855E /* ShouYeZCXZTableViewCell.h */, + CA0D085C2CA543EE0086855E /* ShouYeZCXZTableViewCell.m */, + ); + path = "职场"; + sourceTree = ""; + }; + CA0D085E2CA547B60086855E /* 历史记录 */ = { + isa = PBXGroup; + children = ( + CA0D08642CA548B40086855E /* PPT */, + CA0D08632CA548AE0086855E /* 批改 */, + CA0D08622CA548A50086855E /* 写作 */, + CA0D085F2CA547C60086855E /* ShouYeLiShiJiLuViewController.h */, + CA0D08602CA547C60086855E /* ShouYeLiShiJiLuViewController.m */, + ); + path = "历史记录"; + sourceTree = ""; + }; + CA0D08622CA548A50086855E /* 写作 */ = { + isa = PBXGroup; + children = ( + CA0D086E2CA54D350086855E /* cell */, + CA0D08652CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.h */, + CA0D08662CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.m */, + ); + path = "写作"; + sourceTree = ""; + }; + CA0D08632CA548AE0086855E /* 批改 */ = { + isa = PBXGroup; + children = ( + CA0D08722CA555D30086855E /* cell */, + CA0D08682CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.h */, + CA0D08692CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.m */, + ); + path = "批改"; + sourceTree = ""; + }; + CA0D08642CA548B40086855E /* PPT */ = { + isa = PBXGroup; + children = ( + CA0D08792CA55BA90086855E /* cell */, + CA0D086B2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.h */, + CA0D086C2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.m */, + ); + path = PPT; + sourceTree = ""; + }; + CA0D086E2CA54D350086855E /* cell */ = { + isa = PBXGroup; + children = ( + CA0D086F2CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.h */, + CA0D08702CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CA0D08722CA555D30086855E /* cell */ = { + isa = PBXGroup; + children = ( + CA0D08732CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.h */, + CA0D08742CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.m */, + CA0D08762CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.h */, + CA0D08772CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CA0D08792CA55BA90086855E /* cell */ = { + isa = PBXGroup; + children = ( + CA0D087A2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.h */, + CA0D087B2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CA0D08802CA568120086855E /* 自定义相机 */ = { + isa = PBXGroup; + children = ( + CA0D08812CA5682D0086855E /* CamreViewController.h */, + CA0D08822CA5682D0086855E /* CamreViewController.m */, + ); + path = "自定义相机"; + sourceTree = ""; + }; CA4257822CA24DFB00A36A10 /* 文章 */ = { isa = PBXGroup; children = ( @@ -1040,6 +1279,10 @@ CABA145A2C9D0AF2002CB3B1 /* 首页 */ = { isa = PBXGroup; children = ( + CA0D08802CA568120086855E /* 自定义相机 */, + CA0D085E2CA547B60086855E /* 历史记录 */, + CA0D083E2CA52F680086855E /* 切换身份 */, + CA0D082A2CA4F8720086855E /* cell */, CABA145F2C9D0B1C002CB3B1 /* ShouYeViewController.h */, CABA14602C9D0B1C002CB3B1 /* ShouYeViewController.m */, ); @@ -1469,6 +1712,8 @@ CA81818D2C9E60B100EE7E6E /* ViewLable.m */, CA8181A52C9EAB8700EE7E6E /* PGJUILabel.h */, CA8181A62C9EAB8700EE7E6E /* PGJUILabel.m */, + CA0D087D2CA55E5C0086855E /* JJGradientLabel.h */, + CA0D087E2CA55E5D0086855E /* JJGradientLabel.m */, ); path = Other; sourceTree = ""; @@ -2339,6 +2584,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + CA0D086A2CA548EE0086855E /* ShouYeLiShiJiLuPGTableViewController.m in Sources */, CB489F882744A0BD00DA044A /* TagView.m in Sources */, CABA14B22C9D4318002CB3B1 /* UserCodeModel.m in Sources */, CB489F672744A0BD00DA044A /* DAYIndicatorView.m in Sources */, @@ -2354,12 +2600,15 @@ CB489F582744A0BD00DA044A /* UIDevice+PGJ.m in Sources */, CBD422B128DAEDFC00C32440 /* UIImageView+PWebCache.m in Sources */, CABA14852C9D2710002CB3B1 /* StartGNViewController.m in Sources */, + CA0D083A2CA509D20086855E /* ShouYeToolsCollectionViewCell.m in Sources */, CB489FB32744A0BD00DA044A /* THDatePickerView.m in Sources */, CB489FB62744A0BD00DA044A /* NSDate+CXCategory.m in Sources */, CABA146A2C9D0B38002CB3B1 /* GongJuViewController.m in Sources */, CB489F612744A0BD00DA044A /* ListAlterView.m in Sources */, CBD422C028DAF38900C32440 /* KAlterView.m in Sources */, + CA0D08302CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m in Sources */, CABA14BB2C9D4330002CB3B1 /* PublicUploadImageManager.m in Sources */, + CA0D08412CA52F800086855E /* ShouYeShenFenViewController.m in Sources */, CA4257AA2CA2A30C00A36A10 /* StartZNPPTYuLanViewController.m in Sources */, CB489F9D2744A0BD00DA044A /* AssistiveView.m in Sources */, CABA14CB2C9D4395002CB3B1 /* GTMBases64.m in Sources */, @@ -2389,6 +2638,7 @@ CABA14B72C9D4318002CB3B1 /* UserUploadModel.m in Sources */, CB489FB22744A0BD00DA044A /* FSActionSheetItem.m in Sources */, CA4257AE2CA2AF3600A36A10 /* StartZNPPTYuLanTableViewCell.m in Sources */, + CA0D08362CA501710086855E /* ShouYeToolsTableViewCell.m in Sources */, CB489F4B2744A0BD00DA044A /* PGGDatePickView.m in Sources */, CB489FB72744A0BD00DA044A /* UIAlertController+Blocks.m in Sources */, CABA14612C9D0B1C002CB3B1 /* ShouYeViewController.m in Sources */, @@ -2398,10 +2648,13 @@ CB489FCC2744A0BD00DA044A /* ConfigireSetting.m in Sources */, CA4257952CA2671400A36A10 /* StartZNPPTCell.m in Sources */, CABA14CC2C9D4395002CB3B1 /* NSData+PEHIExtension.m in Sources */, + CA0D08542CA543370086855E /* ShouYeLSZWPGTableViewCell.m in Sources */, CABA14AC2C9D4318002CB3B1 /* OrderGoodsModel.m in Sources */, CABA14EB2C9D7AB2002CB3B1 /* StartKeTangXieZuoView.m in Sources */, CABA14642C9D0B25002CB3B1 /* FanWenViewController.m in Sources */, CA487D8D2CA3E6B700AE773B /* StartZNPPTDaGangSonTableViewCell.m in Sources */, + CA0D087F2CA55E5D0086855E /* JJGradientLabel.m in Sources */, + CA0D08712CA54D4B0086855E /* ShouYeLiShiJiLuXZTableViewCell.m in Sources */, CB489F742744A0BD00DA044A /* MCTabBar.m in Sources */, CB489FB12744A0BD00DA044A /* FSActionSheetCell.m in Sources */, CB489F6D2744A0BD00DA044A /* UIView+Additions.m in Sources */, @@ -2410,18 +2663,22 @@ CABA14B52C9D4318002CB3B1 /* UserModel.m in Sources */, CB489FA92744A0BD00DA044A /* UIView+XLExtension.m in Sources */, CB489F512744A0BD00DA044A /* PGJSearchView.m in Sources */, + CA0D084F2CA53B970086855E /* ShouYeLingYuViewController.m in Sources */, + CA0D087C2CA55BB80086855E /* ShouYeLiShiJiLuPPTTableViewCell.m in Sources */, CA8181B02C9EB96000EE7E6E /* StartKTXZPGDetailFJView.m in Sources */, CB489F7A2744A0BD00DA044A /* FSTextView.m in Sources */, CAC8065C2CA1449E00C21AA7 /* StartZNXZKeysViewController.m in Sources */, CABA14B32C9D4318002CB3B1 /* UserConfigModel.m in Sources */, CA8181992C9E77FB00EE7E6E /* DownJDLoadView.m in Sources */, CB489F6F2744A0BD00DA044A /* XLAlertView.m in Sources */, + CA0D085A2CA543E40086855E /* ShouYeZCPPTTableViewCell.m in Sources */, CA81819D2C9E9C6600EE7E6E /* StartKTXZPGDetailViewController.m in Sources */, CB489FA32744A0BD00DA044A /* ZJContentView.m in Sources */, CA8181922C9E748500EE7E6E /* StartKTXZPGViewController.m in Sources */, CAC8064E2CA119F800C21AA7 /* StartZWPIDetailView.m in Sources */, CB489F6C2744A0BD00DA044A /* RadianDisView.m in Sources */, CA487D8A2CA3AB6B00AE773B /* UITableView+MoveCell.m in Sources */, + CA0D08782CA557700086855E /* ShouYeLiShiJiLuPGCollectionViewCell.m in Sources */, CABA14AE2C9D4318002CB3B1 /* OrderInfoModel.m in Sources */, CB489F502744A0BD00DA044A /* Tools.m in Sources */, CAC806682CA1521200C21AA7 /* StartZNXZSiLuView.m in Sources */, @@ -2429,6 +2686,8 @@ CA4257892CA24E8C00A36A10 /* StartPZXZDetailView.m in Sources */, CABA14E72C9D76F8002CB3B1 /* StartKeTangXieZuoViewController.m in Sources */, CABA14782C9D13CD002CB3B1 /* StartSFViewController.m in Sources */, + CA0D085D2CA543EE0086855E /* ShouYeZCXZTableViewCell.m in Sources */, + CA0D086D2CA548F70086855E /* ShouYeLiShiJiLuPPTTableViewController.m in Sources */, CA487D932CA4055B00AE773B /* StartPayGoodsCollectionViewCell.m in Sources */, CA4257B62CA2BBB000A36A10 /* StartPayView.m in Sources */, CB489DDB27449D5D00DA044A /* main.m in Sources */, @@ -2436,11 +2695,13 @@ CB489F652744A0BD00DA044A /* DAYComponentView.m in Sources */, CB489FAC2744A0BD00DA044A /* XLPhotoBrowser.m in Sources */, CB489F522744A0BD00DA044A /* PlayAudio.m in Sources */, + CA0D08492CA534ED0086855E /* ShouYeShenFenCollectionViewCell.m in Sources */, CB489F662744A0BD00DA044A /* DAYUtils.m in Sources */, CA4257B22CA2BB8500A36A10 /* StartPayViewController.m in Sources */, CB489F6A2744A0BD00DA044A /* UILabel+PGGLabText.m in Sources */, CB489F772744A0BD00DA044A /* WYCamaImageTools.m in Sources */, CA8181B62C9ECB5800EE7E6E /* StartKTXZPGDetailFJItemView.m in Sources */, + CA0D08752CA555DE0086855E /* ShouYeLiShiJiLuPGTableViewCell.m in Sources */, CA8181A72C9EAB8700EE7E6E /* PGJUILabel.m in Sources */, CA81818E2C9E60B100EE7E6E /* ViewLable.m in Sources */, CB489FB42744A0BD00DA044A /* CXDatePickerView.m in Sources */, @@ -2464,10 +2725,12 @@ CB489F9B2744A0BD00DA044A /* YSAPIClient.m in Sources */, CB489F822744A0BD00DA044A /* NSData+Base64.m in Sources */, CB489FA62744A0BD00DA044A /* ZJScrollSegmentView.m in Sources */, + CA0D08332CA4FFB90086855E /* ShouYeBannerTableViewCell.m in Sources */, CABA14AF2C9D4318002CB3B1 /* PayOrderModel.m in Sources */, CB489F812744A0BD00DA044A /* GTMBase64.m in Sources */, CAC806642CA151ED00C21AA7 /* StartZNXZSiLuViewController.m in Sources */, CB489F962744A0BD00DA044A /* SmsloginCodeModel.m in Sources */, + CA0D08612CA547C60086855E /* ShouYeLiShiJiLuViewController.m in Sources */, CB489F712744A0BD00DA044A /* RootTabBarController.m in Sources */, CAC806462CA113A200C21AA7 /* StartZWPIViewCell.m in Sources */, CABA14BE2C9D4342002CB3B1 /* TimeTools.m in Sources */, @@ -2492,6 +2755,7 @@ CABA14D92C9D5071002CB3B1 /* PageControlView.m in Sources */, CA4257852CA24E1100A36A10 /* StartPZXZDetailViewController.m in Sources */, CB489FA52744A0BD00DA044A /* ZJSegmentStyle.m in Sources */, + CA0D08672CA548E50086855E /* ShouYeLiShiJiLuXZTableViewController.m in Sources */, CABA147F2C9D19A0002CB3B1 /* TextCollectionViewCell.m in Sources */, CA487D982CA40A8300AE773B /* StartPayDaoJiShiView.m in Sources */, CB489F642744A0BD00DA044A /* DAYNavigationBar.m in Sources */, @@ -2502,6 +2766,7 @@ CB489FA82744A0BD00DA044A /* XLProgressView.m in Sources */, CA8181AD2C9EB95700EE7E6E /* StartKTXZPGDetailZHView.m in Sources */, CB489F802744A0BD00DA044A /* NSString+Base64.m in Sources */, + CA0D08572CA543440086855E /* ShouYeLSKTPGTableViewCell.m in Sources */, CB489FD82744A30000DA044A /* PGGMovieLineSetView.m in Sources */, CB489F4D2744A0BD00DA044A /* AddressListAlterView.m in Sources */, CB489FA22744A0BD00DA044A /* UIViewController+ZJScrollPageController.m in Sources */, @@ -2513,9 +2778,12 @@ CABA14DD2C9D6E40002CB3B1 /* NetWorkManager.m in Sources */, CBD422BD28DAF34B00C32440 /* IndexSectionView.m in Sources */, CB489FA12744A0BD00DA044A /* ZJTitleView.m in Sources */, + CA0D082D2CA4F8930086855E /* ShouYeZNXZTableViewCell.m in Sources */, CB489FAF2744A0BD00DA044A /* FSActionSheetConfig.m in Sources */, + CA0D08452CA5316B0086855E /* ShouYeShenFenView.m in Sources */, CB489FB52744A0BD00DA044A /* HYTimePickerView.m in Sources */, CA4257A32CA29BF900A36A10 /* StartZNPPTDaGangAlterView.m in Sources */, + CA0D08832CA5682D0086855E /* CamreViewController.m in Sources */, CA487D9B2CA40D3A00AE773B /* StartPayGoodsPayView.m in Sources */, CAC8066C2CA16DCC00C21AA7 /* StartPZXZViewController.m in Sources */, CB489F722744A0BD00DA044A /* MCTabBarController.m in Sources */, @@ -2529,7 +2797,9 @@ CB489F562744A0BD00DA044A /* amrFileCodec.m in Sources */, CABA14822C9D1D0A002CB3B1 /* TextHeaderCollectionViewCell.m in Sources */, CB489F572744A0BD00DA044A /* AudioRecored.m in Sources */, + CA0D083D2CA50F480086855E /* ShouYeZuoWenTableViewCell.m in Sources */, CA8181B32C9EB96F00EE7E6E /* StartKTXZPGDetailXZView.m in Sources */, + CA0D084C2CA538710086855E /* ShouYeShenFenNianJiView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index 0e7d361..a5fca9c 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 0a859ac..173b22a 100644 --- a/ProductApp/ProductApp/AppDelegate.m +++ b/ProductApp/ProductApp/AppDelegate.m @@ -10,7 +10,7 @@ #import "StartViewController.h" -#import "StartPayViewController.h" +#import "TabBarController.h" @interface AppDelegate () @@ -33,7 +33,9 @@ self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.window.backgroundColor = [UIColor whiteColor]; - [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartPayViewController new]]]; +// [self.window setRootViewController:[[NavgationController alloc] initWithRootViewController:[StartPayViewController new]]]; + + [self.window setRootViewController:[TabBarController new]]; [self.window makeKeyAndVisible]; diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/Contents.json new file mode 100644 index 0000000..f5e7aa1 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "蒙版组 12961@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "蒙版组 12961@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@2x.png new file mode 100644 index 0000000..91e935b Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@3x.png new file mode 100644 index 0000000..07aee66 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_back.imageset/蒙版组 12961@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/Contents.json new file mode 100644 index 0000000..f9fd3cc --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "助手banner@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "助手banner@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@2x.png new file mode 100644 index 0000000..4ef5783 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@3x.png new file mode 100644 index 0000000..5112ec9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_bannernomo.imageset/助手banner@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/Contents.json new file mode 100644 index 0000000..2074b0e --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43312@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43312@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@2x.png new file mode 100644 index 0000000..27f68ed Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@3x.png new file mode 100644 index 0000000..69ef86f Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_item_nomo.imageset/组 43312@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/Contents.json new file mode 100644 index 0000000..e310f08 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43353@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43353@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@2x.png new file mode 100644 index 0000000..3ca5861 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@3x.png new file mode 100644 index 0000000..7ddb708 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ketangback.imageset/组 43353@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/Contents.json new file mode 100644 index 0000000..f100bed --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42804@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42804@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@2x.png new file mode 100644 index 0000000..0d61e28 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@3x.png new file mode 100644 index 0000000..e7755d6 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_lishi.imageset/组 42804@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/Contents.json new file mode 100644 index 0000000..e10b770 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42385@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42385@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@2x.png new file mode 100644 index 0000000..6ab5dfe Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@3x.png new file mode 100644 index 0000000..72e0ac3 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_bt.imageset/组 42385@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/Contents.json new file mode 100644 index 0000000..ced280e --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43356@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43356@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@2x.png new file mode 100644 index 0000000..320df12 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@3x.png new file mode 100644 index 0000000..e1dd1fa Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_ktpg.imageset/组 43356@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/Contents.json new file mode 100644 index 0000000..9d1b65e --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43358@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43358@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@2x.png new file mode 100644 index 0000000..cdd4eba Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@3x.png new file mode 100644 index 0000000..c319bd9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_pzxz.imageset/组 43358@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/Contents.json new file mode 100644 index 0000000..5ae02e9 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43357@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43357@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@2x.png new file mode 100644 index 0000000..e76f823 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@3x.png new file mode 100644 index 0000000..143addf Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_znxz.imageset/组 43357@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/Contents.json new file mode 100644 index 0000000..7588551 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43355@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43355@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@2x.png new file mode 100644 index 0000000..044c91e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@3x.png new file mode 100644 index 0000000..30c03bc Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_zwpg.imageset/组 43355@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@2x.png new file mode 100644 index 0000000..b231072 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@3x.png new file mode 100644 index 0000000..889827d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_ls_下载分享.imageset/容器@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/Contents.json new file mode 100644 index 0000000..27cf2b5 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43351@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43351@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@2x.png new file mode 100644 index 0000000..6ffd856 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@3x.png new file mode 100644 index 0000000..4202682 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_pigaiback.imageset/组 43351@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/Contents.json new file mode 100644 index 0000000..ce15447 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43352@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43352@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@2x.png new file mode 100644 index 0000000..0aaa919 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@3x.png new file mode 100644 index 0000000..1a89887 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_pzback.imageset/组 43352@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/Contents.json new file mode 100644 index 0000000..e10b770 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42385@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42385@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@2x.png new file mode 100644 index 0000000..20e2695 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@3x.png new file mode 100644 index 0000000..a75719b Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_bt.imageset/组 42385@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/Contents.json new file mode 100644 index 0000000..bf1d5ed --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43354@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43354@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@2x.png new file mode 100644 index 0000000..cb64e44 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@3x.png new file mode 100644 index 0000000..de0ba4e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_zc_ppt.imageset/组 43354@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/Contents.json new file mode 100644 index 0000000..e10b770 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42385@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42385@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@2x.png new file mode 100644 index 0000000..8c2b409 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@3x.png new file mode 100644 index 0000000..42d48c9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxz_bt.imageset/组 42385@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/Contents.json new file mode 100644 index 0000000..bf1d5ed --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43354@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43354@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@2x.png new file mode 100644 index 0000000..b5cc06e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@3x.png new file mode 100644 index 0000000..37fff53 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_znxzback.imageset/组 43354@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/Contents.json new file mode 100644 index 0000000..34b6815 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "三角 1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "三角.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角 1.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角 1.png new file mode 100644 index 0000000..c6945a9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角 1.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角.png b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角.png new file mode 100644 index 0000000..083116d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/home_三角.imageset/三角.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/Contents.json new file mode 100644 index 0000000..36397ac --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43019@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43019@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@2x.png new file mode 100644 index 0000000..26ad311 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@3x.png new file mode 100644 index 0000000..e35f8ed Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/next.imageset/组 43019@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/Contents.json new file mode 100644 index 0000000..2f793a1 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43296@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43296@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@2x(1).png new file mode 100644 index 0000000..94267c4 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@2x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@3x(1).png new file mode 100644 index 0000000..8547f8a Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_N.imageset/组 43296@3x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/Contents.json new file mode 100644 index 0000000..9fdaf7e --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43296@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43296@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@2x.png new file mode 100644 index 0000000..2f44743 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@3x.png new file mode 100644 index 0000000..bb7f3ca Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_select_Y.imageset/组 43296@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@2x.png new file mode 100644 index 0000000..31787b3 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@3x.png new file mode 100644 index 0000000..b982151 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Avatar 04 (1)@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Contents.json new file mode 100644 index 0000000..de1a420 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/sf_学生.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Avatar 04 (1)@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Avatar 04 (1)@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@2x.png new file mode 100644 index 0000000..dcc103d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@3x.png new file mode 100644 index 0000000..1e7e8e2 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Avatar 6@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Contents.json new file mode 100644 index 0000000..e2b55e0 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/sf_家长.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Avatar 6@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Avatar 6@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/Contents.json new file mode 100644 index 0000000..3449b45 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器 156@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器 156@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@2x.png new file mode 100644 index 0000000..ab83055 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@3x.png new file mode 100644 index 0000000..836c03b Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/sf_老师.imageset/容器 156@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/Contents.json new file mode 100644 index 0000000..93c72f4 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43133@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43133@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@2x.png new file mode 100644 index 0000000..8678c41 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@3x.png new file mode 100644 index 0000000..54bdb89 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43133.imageset/组 43133@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/Contents.json new file mode 100644 index 0000000..13f310b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43313@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43313@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@2x.png new file mode 100644 index 0000000..edb4d8e Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@3x.png new file mode 100644 index 0000000..ed71dba Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43313.imageset/组 43313@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/Contents.json new file mode 100644 index 0000000..1a61d93 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43314@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43314@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@2x.png new file mode 100644 index 0000000..79bde70 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@3x.png new file mode 100644 index 0000000..0a1d238 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43314.imageset/组 43314@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/Contents.json new file mode 100644 index 0000000..11a76a7 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 43318@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 43318@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@2x.png new file mode 100644 index 0000000..c3ba2c0 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@3x.png new file mode 100644 index 0000000..220ad35 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/组 43318.imageset/组 43318@3x.png differ diff --git a/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.h b/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.h index 9356fee..e2e42fe 100644 --- a/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.h +++ b/ProductApp/ProductApp/BaseControl/UserInfo/UserInfoModel.h @@ -45,6 +45,10 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic , strong) NSString *vip; @property (nonatomic , assign) BOOL isloadconfig; +///领域1教育 2职场 +@property (nonatomic , strong) NSString *lingyu; +///1学生 2家长 3老师 +@property (nonatomic , strong) NSString *shenfen; +(void)setLoingState:(NSString *)value; +(void)setToken:(NSString *)value; diff --git a/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.h b/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.h index 3d0afb7..01e3fed 100644 --- a/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.h +++ b/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.h @@ -26,6 +26,10 @@ typedef void(^ExtraBtnOnClick)(UIButton *extraBtn); @property (weak, nonatomic) id delegate; @property (strong, nonatomic) UIImage *backgroundImage; +// 滚动条 +@property (strong, nonatomic) UIView *scrollLine; + + - (instancetype)initWithFrame:(CGRect )frame segmentStyle:(ZJSegmentStyle *)segmentStyle delegate:(id)delegate titles:(NSArray *)titles titleDidClick:(TitleBtnOnClickBlock)titleDidClick; diff --git a/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m b/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m index 9716eec..0483c46 100644 --- a/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m +++ b/ProductApp/ProductApp/BaseControl/ZJScrollPageView/ZJScrollSegmentView.m @@ -16,8 +16,7 @@ NSUInteger _oldIndex; // BOOL _isScroll; } -// 滚动条 -@property (strong, nonatomic) UIView *scrollLine; + // 遮盖 @property (strong, nonatomic) UIView *coverLayer; // 滚动scrollView @@ -601,7 +600,7 @@ static CGFloat const contentSizeXOff = 20.0; if (!_scrollLine) { UIView *lineView = [[UIView alloc] init]; lineView.backgroundColor = self.segmentStyle.scrollLineColor; - lineView.layer.cornerRadius = 2; + lineView.layer.cornerRadius = 1.5; lineView.layer.masksToBounds = YES; _scrollLine = lineView; diff --git a/ProductApp/ProductApp/Other/JJGradientLabel.h b/ProductApp/ProductApp/Other/JJGradientLabel.h new file mode 100644 index 0000000..988e86e --- /dev/null +++ b/ProductApp/ProductApp/Other/JJGradientLabel.h @@ -0,0 +1,18 @@ +// +// JJGradientLabel.h +// ProductApp +// +// Created by 工作 on 2024/6/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface JJGradientLabel : UILabel +@property(nonatomic, strong) NSArray* colors; +///垂直渐变 +@property (nonatomic , assign) BOOL isshuline; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/Other/JJGradientLabel.m b/ProductApp/ProductApp/Other/JJGradientLabel.m new file mode 100644 index 0000000..60f30c7 --- /dev/null +++ b/ProductApp/ProductApp/Other/JJGradientLabel.m @@ -0,0 +1,90 @@ +// +// JJGradientLabel.m +// ProductApp +// +// Created by 工作 on 2024/6/19. +// + +#import "JJGradientLabel.h" + +@implementation JJGradientLabel + +//- (void)drawRect:(CGRect)rect +//{ +// CGSize textSize = [self.text sizeWithAttributes:@{NSFontAttributeName : self.font}]; +// CGRect textRect = (CGRect){0, 0, textSize}; +// +// // 画文字(不做显示用 主要作用是设置layer的mask) +// CGContextRef context = UIGraphicsGetCurrentContext(); +// [self.textColor set]; +// [self.text drawWithRect:rect options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : self.font} context:NULL]; +// +// // 坐标 (只对设置后的画到context起作用 之前画的文字不起作用) +// CGContextTranslateCTM(context, 0.0f, rect.size.height- (rect.size.height - textSize.height)*0.5); +// CGContextScaleCTM(context, 1.0f, -1.0f); +// +// CGImageRef alphaMask = NULL; +// alphaMask = CGBitmapContextCreateImage(context); +// CGContextClearRect(context, rect);// 清除之前画的文字 +// +// // 设置mask +// CGContextClipToMask(context, rect, alphaMask); +// +// // 画渐变色 +// +// CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); +// CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)self.colors, NULL); +// CGPoint startPoint = CGPointMake(textRect.origin.x, +// textRect.origin.y); +// CGPoint endPoint = CGPointMake(textRect.origin.x + textRect.size.width, +// textRect.origin.y + textRect.size.height); +// CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation); +// +// // 释放内存 +// CGColorSpaceRelease(colorSpace); +// CGGradientRelease(gradient); +// CFRelease(alphaMask); +// +//} +- (void)drawRect:(CGRect)rect +{ + + CGContextRef context = UIGraphicsGetCurrentContext(); + + // 获取文字mask + [self.text drawInRect:self.bounds withAttributes:@{NSFontAttributeName : self.font}]; + CGImageRef textMask = CGBitmapContextCreateImage(context); + + // 清空画布 + CGContextClearRect(context, rect); + + // 设置蒙层 + CGContextTranslateCTM(context, 0.0, self.bounds.size.height); + CGContextScaleCTM(context, 1.0, -1.0); + CGContextClipToMask(context, rect, textMask); + + // 绘制渐变 + CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); + CGFloat locations[] = {0, 0.5, 1}; + +// CGFloat colors[] = {1.0,0.0,0.0,1.0, +// 0.0,1.0,0.0,1.0, +// 0.0,0.0,1.0,1.0}; +// CGGradientRef gradient=CGGradientCreateWithColorComponents(colorSpace, colors, locations, 3); + CGGradientRef gradient= CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef)self.colors, locations); + + CGPoint start = CGPointMake(0, self.bounds.size.height / 2.0); + CGPoint end = CGPointMake(self.bounds.size.width, self.bounds.size.height / 2.0); + if(self.isshuline) + { + start = CGPointMake(0, self.bounds.size.height); + end = CGPointMake(0, 0); + } + CGContextDrawLinearGradient(context, gradient, start, end, kCGGradientDrawsBeforeStartLocation); + + // 释放 + CGColorSpaceRelease(colorSpace); + CGGradientRelease(gradient); + CGImageRelease(textMask); +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m index cedcc5c..fb26193 100644 --- a/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/ShouYeViewController.m @@ -6,26 +6,392 @@ // #import "ShouYeViewController.h" +#import "ShouYeZNXZTableViewCell.h" +#import "ShouYeXieZuoTableViewCell.h" +#import "ShouYeBannerTableViewCell.h" +#import "ShouYeToolsTableViewCell.h" +#import "ShouYeZuoWenTableViewCell.h" +#import "ShouYeShenFenViewController.h" +#import "ShouYeLingYuViewController.h" +#import "ShouYeLSZWPGTableViewCell.h" +#import "ShouYeLSKTPGTableViewCell.h" +#import "ShouYeZCPPTTableViewCell.h" +#import "ShouYeZCXZTableViewCell.h" +#import "ShouYeLiShiJiLuViewController.h" -@interface ShouYeViewController () + +@interface ShouYeViewController () +/// +@property (nonatomic , strong) UITableView *tableView ; @end @implementation ShouYeViewController - +-(UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleDefault; +} +-(void)viewWillAppear:(BOOL)animated +{ + [super viewWillAppear:animated]; + if(self.tableView) + { + [self.tableView reloadData]; + } +} - (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view. + [super viewDidLoad]; + [self.navigationController setNavigationBarHidden:YES animated:NO]; + [self showNaviGationView:YES]; + [self.navigationView setTitle:@"" titleColor:RGBCOLOR(60, 60, 60)]; + [self.navigationView setBackgroundColor:[UIColor clearColor]]; + [self drawTopView]; + + UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; + [tableView setBackgroundColor:[UIColor clearColor]]; + [tableView setDelegate:self]; + [tableView setDataSource:self]; + [tableView setShowsVerticalScrollIndicator:NO]; + [self.view addSubview:tableView]; + [tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(self.view); + make.left.offset(16); + make.right.equalTo(self.view).offset(-16); + make.top.offset(NavHeight+15); + }]; + _tableView = tableView; } -/* -#pragma mark - Navigation - -// In a storyboard-based application, you will often want to do a little preparation before navigation -- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { - // Get the new view controller using [segue destinationViewController]. - // Pass the selected object to the new view controller. +-(void)drawTopView +{ + [self.view setBackgroundColor:RGBCOLOR(242, 242, 242)]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"home_back"]]; + [self.view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.equalTo(self.view); + }]; + [self.view sendSubviewToBack:imgvback]; + + UIButton *btnianji = [[UIButton alloc] init]; + [btnianji setTitle:@"学生-五年级" forState:UIControlStateNormal]; + [btnianji setTitleColor:RGBCOLOR(26, 26, 26) forState:UIControlStateNormal]; + [btnianji.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btnianji setImage:[UIImage imageNamed:@"home_三角"] forState:UIControlStateNormal]; + [self.navigationView addSubview:btnianji]; + [btnianji mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.bottom.equalTo(self.navigationView).offset(-2); + make.height.offset(40); + }]; + [btnianji setIconInRightWithSpacing:6]; + [btnianji setTag:0]; + [btnianji addTarget:self action:@selector(topAction:) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btlishi = [[UIButton alloc] init]; + [btlishi setImage:[UIImage imageNamed:@"home_lishi"] forState:UIControlStateNormal]; + [self.navigationView addSubview:btlishi]; + [btlishi mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.navigationView).offset(-16); + make.centerY.equalTo(btnianji); + make.width.height.offset(40); + }]; + [btlishi setTag:1]; + [btlishi addTarget:self action:@selector(topAction:) forControlEvents:UIControlEventTouchUpInside]; } -*/ + +-(void)topAction:(UIButton *)sender +{ + if(sender.tag==1) + {///历史记录 + ShouYeLiShiJiLuViewController *vc = [ShouYeLiShiJiLuViewController new]; + [self.navigationController pushViewController:vc animated:YES]; + } + else + {///身份选择 + ///未选择过身份或者是职场 + if([UserInfoModel shareModel].lingyu.intValue == 1) + { + ShouYeShenFenViewController *vc = [ShouYeShenFenViewController new]; + [self.navigationController pushViewController:vc animated:YES]; + } + else + { + ShouYeLingYuViewController *vc = [ShouYeLingYuViewController new]; + [self.navigationController pushViewController:vc animated:YES]; + } + } +} + +#pragma mark - UITableView +-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView +{ + if([UserInfoModel shareModel].lingyu.intValue==2)return 4; + return 5; +} +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + if(section==4) + {///高分作文 + return 5; + } + return 1; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + int type = [UserInfoModel shareModel].lingyu.intValue; + if(indexPath.section==0) + { + if(type==2) + {///职场 + static NSString *strcell = @"ShouYeZCPPTTableViewCell"; + ShouYeZCPPTTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeZCPPTTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + else + { + ///1学生 2家长 3老师 + int shenfen = [UserInfoModel shareModel].shenfen.intValue; + if (shenfen==3||shenfen==2) + { + static NSString *strcell = @"ShouYeLSZWPGTableViewCell"; + ShouYeLSZWPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeLSZWPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + else + { + static NSString *strcell = @"ShouYeZNXZTableViewCell"; + ShouYeZNXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeZNXZTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + } + } + else if(indexPath.section==1) + { + if(type==2) + {///职场 + static NSString *strcell = @"ShouYeZCXZTableViewCell"; + ShouYeZCXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeZCXZTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + else + { + ///1学生 2家长 3老师 + int shenfen = [UserInfoModel shareModel].shenfen.intValue; + if (shenfen==3||shenfen==2) + { + static NSString *strcell = @"ShouYeLSKTPGTableViewCell"; + ShouYeLSKTPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeLSKTPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + else + { + static NSString *strcell = @"ShouYeXieZuoTableViewCell"; + ShouYeXieZuoTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeXieZuoTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + } + } + else if(indexPath.section==2) + { + static NSString *strcell = @"ShouYeBannerTableViewCell"; + ShouYeBannerTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeBannerTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + else if(indexPath.section==3) + { + static NSString *strcell = @"ShouYeToolsTableViewCell"; + ShouYeToolsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeToolsTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; + } + + static NSString *strcell = @"ShouYeZuoWenTableViewCell"; + ShouYeZuoWenTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeZuoWenTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + if(indexPath.row==4) + { + cell.islast = YES; + } + else + { + cell.islast = NO; + } + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + if(section==4) + {///高分作文 + return 45; + } + return 0.01; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + if(section==4) + {///高分作文 + return 10; + } + return 15; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + if(indexPath.section==0) + { + return 140; + } + else if(indexPath.section==1) + { + int type = [UserInfoModel shareModel].lingyu.intValue; + if(type==2) + { + return 140; + } + return 160; + } + else if(indexPath.section==2) + { + return 92; + } + else if(indexPath.section==3) + { + /// 没得工具52 有 +86一行 第一行是76； + float fheight = 52; + fheight+=86-10; + return fheight; + } + return 75; +} +-(UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section +{ + if(section==4) + {///高分作文 + UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 45)]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewback.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(8,8)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewback.bounds; + maskLayer.path = maskPath.CGPath; + viewback.layer.mask = maskLayer; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"高分作文"]; + [lbname setTextColor:RGBCOLOR(51, 51, 51)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(14); + make.top.offset(18); + }]; + + UIButton *btmore = [[UIButton alloc] init]; + [btmore setTitle:@"查看更多" forState:UIControlStateNormal]; + [btmore setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal]; + [btmore.titleLabel setFont:[UIFont systemFontOfSize:12]]; + [btmore setImage:[UIImage imageNamed:@"next"] forState:UIControlStateNormal]; + [viewback addSubview:btmore]; + [btmore mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.equalTo(lbname); + make.right.equalTo(viewback).offset(-10); + make.height.offset(30); + make.width.offset(80); + }]; + [btmore setIconInRightWithSpacing:2]; + [btmore addTarget:self action:@selector(morezwAction) forControlEvents:UIControlEventTouchUpInside]; + + return viewback; + } + return [UIView new]; +} +-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section +{ + if(section==4) + {///高分作文 + UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 10)]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewback.bounds byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(8,8)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewback.bounds; + maskLayer.path = maskPath.CGPath; + viewback.layer.mask = maskLayer; + return viewback; + } + return [UIView new]; +} +-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + if(indexPath.section==4) + { + + } +} +///高分作文查看更多 +-(void)morezwAction +{ + +} + @end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.h new file mode 100644 index 0000000..346f295 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeBannerTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeBannerTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m new file mode 100644 index 0000000..183746d --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeBannerTableViewCell.m @@ -0,0 +1,55 @@ +// +// ShouYeBannerTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeBannerTableViewCell.h" + + +@interface ShouYeBannerTableViewCell () +//轮播 +@property (nonatomic, strong) SDCycleScrollView *cleScrollView; +@end + +@implementation ShouYeBannerTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + SDCycleScrollView *cleScrollView = [SDCycleScrollView cycleScrollViewWithFrame:CGRectZero imageNamesGroup:@[]]; + cleScrollView.scrollDirection = UICollectionViewScrollDirectionHorizontal; + cleScrollView.delegate = self; + cleScrollView.backgroundColor = [UIColor whiteColor]; + cleScrollView.titleLabelBackgroundColor = [UIColor clearColor]; + cleScrollView.titleLabelTextColor = [UIColor darkGrayColor]; + cleScrollView.titleLabelTextFont = [UIFont systemFontOfSize:[Tools sizeFont:14]]; + cleScrollView.autoScrollTimeInterval = 3.0; + cleScrollView.placeholderImage = [UIImage imageNamed:@"home_bannernomo"]; + cleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; + [cleScrollView setShowPageControl:YES]; + cleScrollView.pageControlBottomOffset = -5; + cleScrollView.pageControlDotSize = CGSizeMake(4, 4); + [self addSubview:cleScrollView]; + [cleScrollView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [cleScrollView.layer setMasksToBounds:YES]; + [cleScrollView.layer setCornerRadius:8]; + _cleScrollView = cleScrollView; + + cleScrollView.imageURLStringsGroup = @[@"",@"",@""]; + + } + return self; +} +/** 点击图片回调 */ +- (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index +{ + +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.h new file mode 100644 index 0000000..8ca94fa --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeToolsTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeToolsTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m new file mode 100644 index 0000000..4ed2851 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeToolsTableViewCell.m @@ -0,0 +1,118 @@ +// +// ShouYeToolsTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeToolsTableViewCell.h" +#import "ShouYeToolsCollectionViewCell.h" + +@interface ShouYeToolsTableViewCell () +/// +@property (nonatomic , strong) UICollectionView *collect; + + +@end + +@implementation ShouYeToolsTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"常用工具"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont boldSystemFontOfSize:16]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(14); + make.top.offset(16); + }]; + + UIButton *btmore = [[UIButton alloc] init]; + [btmore setTitle:@"查看更多" forState:UIControlStateNormal]; + [btmore setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal]; + [btmore.titleLabel setFont:[UIFont systemFontOfSize:12]]; + [btmore setImage:[UIImage imageNamed:@"next"] forState:UIControlStateNormal]; + [viewback addSubview:btmore]; + [btmore mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.equalTo(lbname); + make.right.equalTo(viewback).offset(-10); + make.height.offset(30); + make.width.offset(80); + }]; + [btmore setIconInRightWithSpacing:2]; + [btmore addTarget:self action:@selector(moreAction) forControlEvents:UIControlEventTouchUpInside]; + + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.minimumLineSpacing = 0; + layout.minimumInteritemSpacing = 0; + UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + [collect setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:[UIColor clearColor]]; + [viewback addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(0); + make.right.equalTo(viewback); + make.top.equalTo(lbname.mas_bottom).offset(2); + make.height.offset(86); + }]; + [collect registerClass:[ShouYeToolsCollectionViewCell class] forCellWithReuseIdentifier:@"ShouYeToolsCollectionViewCell"]; + _collect = collect; + + } + return self; +} +-(void)moreAction +{ + +} +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + return 4; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + ShouYeToolsCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShouYeToolsCollectionViewCell" forIndexPath:indexPath]; + + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 0, 0, 0); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 0; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 0; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-32)/4.0, 86); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + ///做选中操作 + +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.h new file mode 100644 index 0000000..4e1b03b --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeXieZuoTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeXieZuoTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m new file mode 100644 index 0000000..b10821b --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeXieZuoTableViewCell.m @@ -0,0 +1,150 @@ +// +// ShouYeXieZuoTableViewCell.m +// ProductApp +// 拍照写作 课堂写作 作文批改 +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeXieZuoTableViewCell.h" +#import "CamreViewController.h" + +@interface ShouYeXieZuoTableViewCell () + +@end + +@implementation ShouYeXieZuoTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + + UIView *viewpz = [[UIView alloc] init]; + [viewpz setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewpz]; + [viewpz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.bottom.equalTo(viewback); + make.width.offset((UISCREEN_WIDTH-42)/2.0); + }]; + [self drawPZView:viewpz]; + + + UIView *viewkt = [[UIView alloc] init]; + [viewkt setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewkt]; + [viewkt mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(viewpz.mas_right).offset(10); + make.top.right.equalTo(viewback); + make.height.offset(75); + }]; + [self drawSmillView:viewkt title:@"课堂写作" info:@"提升能力" img:@"home_ketangback" tag:1]; + + + UIView *viewpg = [[UIView alloc] init]; + [viewpg setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewpg]; + [viewpg mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.height.equalTo(viewkt); + make.top.equalTo(viewkt.mas_bottom).offset(10); + }]; + [self drawSmillView:viewpg title:@"作文批改" info:@"严谨老师" img:@"home_pigaiback" tag:2]; + } + return self; +} + +-(void)drawSmillView:(UIView *)view title:(NSString *)title info:(NSString *)info img:(NSString *)img tag:(int)tag +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:8]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:img]]; + [imgvback setContentMode:UIViewContentModeBottomRight]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:20]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(13); + make.top.offset(13); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:info]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + UIButton *btaction = [[UIButton alloc] init]; + [view addSubview:btaction]; + [btaction mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [btaction setTag:tag]; + [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; +} + +-(void)drawPZView:(UIView *)view +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:8]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"home_pzback"]]; + [imgvback setContentMode:UIViewContentModeBottomRight]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"拍照写作"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"破壁作家"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + UIButton *btaction = [[UIButton alloc] init]; + [view addSubview:btaction]; + [btaction mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [btaction setTag:0]; + [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; +} +-(void)btAction:(UIButton *)sender +{ + + CamreViewController *vc = [CamreViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.h new file mode 100644 index 0000000..3d9e3f5 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeZNXZTableViewCell.h +// ProductApp +// 智能写作 +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeZNXZTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m new file mode 100644 index 0000000..d99154c --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZNXZTableViewCell.m @@ -0,0 +1,80 @@ +// +// ShouYeZNXZTableViewCell.m +// ProductApp +// 智能写作 +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeZNXZTableViewCell.h" + +@interface ShouYeZNXZTableViewCell () + +@end + +@implementation ShouYeZNXZTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIImageView *viewback = [[UIImageView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + [viewback setImage:[UIImage imageNamed:@"home_znxzback"]]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"智能写作"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(29); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"优秀的虚拟作家"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + + UIButton *btsy = [[UIButton alloc] init]; + [btsy setTitle:@"立即使用" forState:UIControlStateNormal]; + [btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal]; + [btsy.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btsy setBackgroundImage:[UIImage imageNamed:@"home_znxz_bt"] forState:UIControlStateNormal]; + [viewback addSubview:btsy]; + [btsy mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(26); + make.size.sizeOffset(CGSizeMake(102, 33)); + make.top.equalTo(lbinfo.mas_bottom).offset(15); + }]; + [btsy setUserInteractionEnabled:NO]; + + UILabel *lbts = [[UILabel alloc] init]; + [lbts setText:@"100万+正在使用"]; + [lbts setTextColor:RGBCOLOR(27, 123, 103)]; + [lbts setTextAlignment:NSTextAlignmentLeft]; + [lbts setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbts]; + [lbts mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(11); + make.right.equalTo(viewback).offset(-18); + }]; + + } + return self; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.h new file mode 100644 index 0000000..ad83860 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeZuoWenTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeZuoWenTableViewCell : UITableViewCell +@property (nonatomic , assign) BOOL islast; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.m new file mode 100644 index 0000000..7d59653 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/ShouYeZuoWenTableViewCell.m @@ -0,0 +1,108 @@ +// +// ShouYeZuoWenTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeZuoWenTableViewCell.h" + +@interface ShouYeZuoWenTableViewCell () +/// +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbtype; +@property (nonatomic , strong) UILabel *lbnumber; +@property (nonatomic , strong) UILabel *lbfen; +@property (nonatomic , strong) UIView *viewline; + +@end + +@implementation ShouYeZuoWenTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"我的父亲"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont boldSystemFontOfSize:15]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(14); + make.top.offset(16); + make.width.lessThanOrEqualTo(@(UISCREEN_WIDTH-100)); + }]; + _lbname = lbname; + + UILabel *lbtype = [[UILabel alloc] init]; + [lbtype setText:@" 写景为主的记叙文 "]; + [lbtype setTextColor:RGBCOLOR(108, 119, 246)]; + [lbtype setTextAlignment:NSTextAlignmentCenter]; + [lbtype setFont:[UIFont systemFontOfSize:12]]; + [viewback addSubview:lbtype]; + [lbtype mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + make.height.offset(19); + }]; + [lbtype setBackgroundColor:RGBCOLOR(233, 236, 255)]; + [lbtype.layer setMasksToBounds:YES]; + [lbtype.layer setCornerRadius:2]; + _lbtype = lbtype; + + UILabel *lbnumber = [[UILabel alloc] init]; + [lbnumber setText:@" 280字 "]; + [lbnumber setTextColor:RGBCOLOR(0, 193, 214)]; + [lbnumber setTextAlignment:NSTextAlignmentCenter]; + [lbnumber setFont:[UIFont systemFontOfSize:12]]; + [viewback addSubview:lbnumber]; + [lbnumber mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbtype.mas_right).offset(8); + make.top.height.equalTo(lbtype); + }]; + [lbnumber setBackgroundColor:RGBCOLOR(213, 251, 255)]; + [lbnumber.layer setMasksToBounds:YES]; + [lbnumber.layer setCornerRadius:2]; + _lbnumber = lbnumber; + + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"99.6分"]; + [lbfen setTextColor:RGBCOLOR(255, 98, 98)]; + [lbfen setTextAlignment:NSTextAlignmentRight]; + [lbfen setFont:[UIFont fontWithName:@"D-DIN-PRO-Bold" size:24]]; + [viewback addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(viewback).offset(-14); + make.centerY.equalTo(viewback); + }]; + lbfen.attributedText = [Tools arrstring:lbfen.text andstart:(int)lbfen.text.length-1 andend:1 andfont:[UIFont systemFontOfSize:14] andcolor:RGBCOLOR(255, 98, 98)]; + _lbfen = lbfen; + + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(242, 242, 242)]; + [viewback addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(viewback); + make.left.offset(14); + make.right.equalTo(viewback).offset(-14); + make.height.offset(1); + }]; + _viewline = viewline; + } + return self; +} +-(void)setIslast:(BOOL)islast +{ + [self.viewline setHidden:islast]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.h new file mode 100644 index 0000000..5399540 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.h @@ -0,0 +1,20 @@ +// +// ShouYeToolsCollectionViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeToolsCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) UIImageView *imgvback; +/// +@property (nonatomic , strong) UILabel *lbname; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.m new file mode 100644 index 0000000..61d4687 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/son/ShouYeToolsCollectionViewCell.m @@ -0,0 +1,49 @@ +// +// ShouYeToolsCollectionViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeToolsCollectionViewCell.h" + +@interface ShouYeToolsCollectionViewCell () + +@end + +@implementation ShouYeToolsCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIView *viewback = [[UIView alloc] init]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(38); + make.centerX.equalTo(viewback); + make.centerY.equalTo(viewback).offset(-10); + }]; + imgvback.image = [UIImage imageNamed:@"home_item_nomo"]; + _imgvback = imgvback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"课堂写作"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:12]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(viewback); + make.top.equalTo(imgvback.mas_bottom).offset(6); + }]; + _lbname = lbname; + } + return self; +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.h new file mode 100644 index 0000000..a0cbd20 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeLSKTPGTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLSKTPGTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m new file mode 100644 index 0000000..b37fae5 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSKTPGTableViewCell.m @@ -0,0 +1,147 @@ +// +// ShouYeLSKTPGTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLSKTPGTableViewCell.h" + + +@interface ShouYeLSKTPGTableViewCell () + +@end +@implementation ShouYeLSKTPGTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + + UIView *viewpz = [[UIView alloc] init]; + [viewpz setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewpz]; + [viewpz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.bottom.equalTo(viewback); + make.width.offset((UISCREEN_WIDTH-42)/2.0); + }]; + [self drawPZView:viewpz]; + + + UIView *viewkt = [[UIView alloc] init]; + [viewkt setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewkt]; + [viewkt mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(viewpz.mas_right).offset(10); + make.top.right.equalTo(viewback); + make.height.offset(75); + }]; + [self drawSmillView:viewkt title:@"智能写作" info:@"优秀作家" img:@"home_ls_znxz" tag:1]; + + + UIView *viewpg = [[UIView alloc] init]; + [viewpg setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewpg]; + [viewpg mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.height.equalTo(viewkt); + make.top.equalTo(viewkt.mas_bottom).offset(10); + }]; + [self drawSmillView:viewpg title:@"拍照写作" info:@"破壁作家" img:@"home_ls_pzxz" tag:2]; + } + return self; +} + +-(void)drawSmillView:(UIView *)view title:(NSString *)title info:(NSString *)info img:(NSString *)img tag:(int)tag +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:8]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:img]]; + [imgvback setContentMode:UIViewContentModeBottomRight]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:20]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(13); + make.top.offset(13); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:info]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + UIButton *btaction = [[UIButton alloc] init]; + [view addSubview:btaction]; + [btaction mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [btaction setTag:tag]; + [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; +} + +-(void)drawPZView:(UIView *)view +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:8]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"home_ls_ktpg"]]; + [imgvback setContentMode:UIViewContentModeBottomRight]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"课堂批改"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"跟随课堂批改作文"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + UIButton *btaction = [[UIButton alloc] init]; + [view addSubview:btaction]; + [btaction mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [btaction setTag:0]; + [btaction addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; +} +-(void)btAction:(UIButton *)sender +{ + +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.h new file mode 100644 index 0000000..9ff8a58 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeLSZWPGTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLSZWPGTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m new file mode 100644 index 0000000..910d9b7 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/老师/ShouYeLSZWPGTableViewCell.m @@ -0,0 +1,82 @@ +// +// ShouYeLSZWPGTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLSZWPGTableViewCell.h" + + +@interface ShouYeLSZWPGTableViewCell () + +@end + +@implementation ShouYeLSZWPGTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIImageView *viewback = [[UIImageView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + [viewback setImage:[UIImage imageNamed:@"home_znxzback"]]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"作文批改"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(29); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"拍照批改快速整理作文优缺点"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + + UIButton *btsy = [[UIButton alloc] init]; + [btsy setTitle:@"立即使用" forState:UIControlStateNormal]; + [btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal]; + [btsy.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btsy setBackgroundImage:[UIImage imageNamed:@"home_ls_bt"] forState:UIControlStateNormal]; + [viewback addSubview:btsy]; + [btsy mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(26); + make.size.sizeOffset(CGSizeMake(102, 33)); + make.top.equalTo(lbinfo.mas_bottom).offset(15); + }]; + [btsy setUserInteractionEnabled:NO]; + + UILabel *lbts = [[UILabel alloc] init]; + [lbts setText:@"100万+正在使用"]; + [lbts setTextColor:RGBCOLOR(11, 142, 147)]; + [lbts setTextAlignment:NSTextAlignmentLeft]; + [lbts setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbts]; + [lbts mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(11); + make.right.equalTo(viewback).offset(-18); + }]; + + } + return self; +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.h new file mode 100644 index 0000000..90d4966 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeZCPPTTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeZCPPTTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.m new file mode 100644 index 0000000..f5c2382 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCPPTTableViewCell.m @@ -0,0 +1,80 @@ +// +// ShouYeZCPPTTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeZCPPTTableViewCell.h" + +@interface ShouYeZCPPTTableViewCell () + +@end + +@implementation ShouYeZCPPTTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIImageView *viewback = [[UIImageView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + [viewback setImage:[UIImage imageNamed:@"home_zc_ppt"]]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"智能PPT生成"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(29); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"一键生成各种类型的幻灯片"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + + UIButton *btsy = [[UIButton alloc] init]; + [btsy setTitle:@"立即使用" forState:UIControlStateNormal]; + [btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal]; + [btsy.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btsy setBackgroundImage:[UIImage imageNamed:@"home_znxz_bt"] forState:UIControlStateNormal]; + [viewback addSubview:btsy]; + [btsy mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(26); + make.size.sizeOffset(CGSizeMake(102, 33)); + make.top.equalTo(lbinfo.mas_bottom).offset(15); + }]; + [btsy setUserInteractionEnabled:NO]; + + UILabel *lbts = [[UILabel alloc] init]; + [lbts setText:@"100万+正在使用"]; + [lbts setTextColor:RGBCOLOR(175, 106, 32)]; + [lbts setTextAlignment:NSTextAlignmentLeft]; + [lbts setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbts]; + [lbts mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(11); + make.right.equalTo(viewback).offset(-18); + }]; + + } + return self; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.h new file mode 100644 index 0000000..1900baf --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeZCXZTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeZCXZTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m new file mode 100644 index 0000000..baa287f --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/cell/职场/ShouYeZCXZTableViewCell.m @@ -0,0 +1,81 @@ +// +// ShouYeZCXZTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeZCXZTableViewCell.h" + + +@interface ShouYeZCXZTableViewCell () + +@end +@implementation ShouYeZCXZTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIImageView *viewback = [[UIImageView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + [viewback setImage:[UIImage imageNamed:@"home_znxzback"]]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"智能写作"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont fontWithName:@"AlimamaShuHeiTi-Bold" size:24]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(29); + make.top.offset(20); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"优秀的虚拟作家"]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + + UIButton *btsy = [[UIButton alloc] init]; + [btsy setTitle:@"立即使用" forState:UIControlStateNormal]; + [btsy setTitleColor:RGBCOLOR(27, 123, 103) forState:UIControlStateNormal]; + [btsy.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btsy setBackgroundImage:[UIImage imageNamed:@"home_znxz_bt"] forState:UIControlStateNormal]; + [viewback addSubview:btsy]; + [btsy mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(26); + make.size.sizeOffset(CGSizeMake(102, 33)); + make.top.equalTo(lbinfo.mas_bottom).offset(15); + }]; + [btsy setUserInteractionEnabled:NO]; + + UILabel *lbts = [[UILabel alloc] init]; + [lbts setText:@"100万+正在使用"]; + [lbts setTextColor:RGBCOLOR(27, 123, 103)]; + [lbts setTextAlignment:NSTextAlignmentLeft]; + [lbts setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbts]; + [lbts mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(11); + make.right.equalTo(viewback).offset(-18); + }]; + + } + return self; +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.h b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.h new file mode 100644 index 0000000..5fe5cdb --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.h @@ -0,0 +1,16 @@ +// +// ShouYeLingYuViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLingYuViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.m b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.m new file mode 100644 index 0000000..5c05945 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeLingYuViewController.m @@ -0,0 +1,161 @@ +// +// ShouYeLingYuViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLingYuViewController.h" +#import "ShouYeShenFenViewController.h" + +@interface ShouYeLingYuViewController () +/// +@property (nonatomic , strong) NSMutableArray *arrLB; + +@end + +@implementation ShouYeLingYuViewController +- (UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleDefault; +} +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [self.navigationController setNavigationBarHidden:YES animated:animated]; + [self showNaviGationView:YES]; + [self.navigationView setTitle:@"领域身份" titleColor:RGBCOLOR(60, 60, 60)]; + [self.navigationView setBackgroundColor:[UIColor clearColor]]; + +} +- (void)viewDidLoad { + [super viewDidLoad]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"yd_back"]]; + [self.view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.view); + }]; + [self.view sendSubviewToBack:imgvback]; + + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"请选择您的领域"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:24]]; + [self.view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.top.offset(KMagrinTop+74); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"请选择您的领域"]; + [lbinfo setTextColor:RGBCOLOR(26, 26, 26)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:15]]; + [self.view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(10); + }]; + + + NSArray *arrtt = @[@"教育",@"职场"]; + self.arrLB = [NSMutableArray new]; + for(int i = 0 ; i < arrtt.count; i++) + { + UIView *viewitem = [[UIView alloc] init]; + [self.view addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.right.equalTo(self.view).offset(-20); + make.top.equalTo(lbinfo.mas_bottom).offset(60+120*i); + make.height.offset(100); + }]; + UILabel *lbitem = [self drawItemView:viewitem title:arrtt[i] tag:i]; + [self.arrLB addObject:lbitem]; + } +} +-(UILabel *)drawItemView:(UIView *)view title:(NSString *)title tag:(int)tag +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:10]; + [view setBackgroundColor:[UIColor whiteColor]]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:[NSString stringWithFormat:@"yd_%@",title]]]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(10); + make.top.bottom.equalTo(view); + make.width.offset(100); + }]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:16]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(imgvback.mas_right).offset(41); + make.centerY.equalTo(view); + }]; + + UIImageView *imgvnext = [[UIImageView alloc] init]; + [imgvnext setImage:[UIImage imageNamed:@"yd_next"]]; + [view addSubview:imgvnext]; + [imgvnext mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(18); + make.centerY.equalTo(view); + make.right.equalTo(view).offset(-12); + }]; + + UIButton *bt = [[UIButton alloc] init]; + [view addSubview:bt]; + [bt mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [bt setTag:tag]; + [bt addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; + + return lbname; +} + +-(void)btAction:(UIButton *)sender +{ + [self.view setUserInteractionEnabled:NO]; + for(UILabel *lb in self.arrLB) + { + [lb setTextColor:RGBCOLOR(26, 26, 26)]; + } + UILabel *lb = self.arrLB[sender.tag]; + [lb setTextColor:MainColor]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self.view setUserInteractionEnabled:YES]; + if(sender.tag==0) + { + [UserInfoModel shareModel].lingyu = @"1"; + NSArray *arrvc = self.navigationController.viewControllers; + for(UIViewController *vc in arrvc) + { + if([vc isKindOfClass:[ShouYeShenFenViewController class]]) + { + [self.navigationController popToViewController:vc animated:YES]; + return; + } + } + ShouYeShenFenViewController *vc = [ShouYeShenFenViewController new]; + [self.navigationController pushViewController:vc animated:YES]; + } + else + { + [UserInfoModel shareModel].lingyu = @"2"; + [self.navigationController popToRootViewControllerAnimated:YES]; + } + }); +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.h b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.h new file mode 100644 index 0000000..93123aa --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.h @@ -0,0 +1,16 @@ +// +// ShouYeShenFenViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeShenFenViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.m b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.m new file mode 100644 index 0000000..035dfad --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/ShouYeShenFenViewController.m @@ -0,0 +1,77 @@ +// +// ShouYeShenFenViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeShenFenViewController.h" +#import "ShouYeShenFenView.h" + + +@interface ShouYeShenFenViewController () +/// +@property (nonatomic , strong) ShouYeShenFenView *viewshow; + +@end + +@implementation ShouYeShenFenViewController +- (UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleDefault; +} +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [self.navigationController setNavigationBarHidden:YES animated:animated]; + [self showNaviGationView:NO]; + [self.navigationView setTitle:@"领域身份" titleColor:RGBCOLOR(60, 60, 60)]; + [self.navigationView setBackgroundColor:[UIColor clearColor]]; + +} +-(void)navBackButtonAction +{ + [self.navigationController popToRootViewControllerAnimated:YES]; +} +- (void)viewDidLoad { + [super viewDidLoad]; + [self drawTop]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"yd_back"]]; + [self.view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.view); + }]; + [self.view sendSubviewToBack:imgvback]; + + ShouYeShenFenView *view = [ShouYeShenFenView new]; + [self.view addSubview:view]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.offset(NavHeight); + }]; + _viewshow = view; +} + +-(void)drawTop +{ + UIButton *btok = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 68, 32)]; + [btok setTitle:@"确定" forState:UIControlStateNormal]; + [btok setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btok.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btok.layer setMasksToBounds:YES]; + [btok.layer setCornerRadius:16]; + [self.navigationView addSubview:btok]; + [btok mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(self.navigationView).offset(-20); + make.size.sizeOffset(CGSizeMake(68, 32)); + make.centerY.equalTo(self.navigationView.backButton); + }]; + [Tools changedView:btok colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + [btok addTarget:self action:@selector(okAction) forControlEvents:UIControlEventTouchUpInside]; +} +-(void)okAction +{ + [self.viewshow okAction]; + [self.navigationController popToRootViewControllerAnimated:YES]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.h new file mode 100644 index 0000000..6e6542c --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.h @@ -0,0 +1,17 @@ +// +// ShouYeShenFenCollectionViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeShenFenCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) baseInfoModel *model; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.m new file mode 100644 index 0000000..815f951 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/cell/ShouYeShenFenCollectionViewCell.m @@ -0,0 +1,79 @@ +// +// ShouYeShenFenCollectionViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeShenFenCollectionViewCell.h" + +@interface ShouYeShenFenCollectionViewCell () +/// +@property (nonatomic , strong) UIImageView *imgvback; +@property (nonatomic , strong) UIImageView *imgvselect; +@property (nonatomic , strong) UILabel *lbname; + +@end + +@implementation ShouYeShenFenCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIView *viewback = [[UIView alloc] init]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(70); + make.centerX.equalTo(viewback); + make.centerY.equalTo(viewback).offset(-12); + }]; + _imgvback = imgvback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"家长"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:15]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(imgvback.mas_bottom).offset(10); + make.centerX.equalTo(viewback); + }]; + _lbname = lbname; + + UIImageView *imgvselect = [[UIImageView alloc] init]; + [imgvselect setImage:[UIImage imageNamed:@"sf_select_N"]]; + [viewback addSubview:imgvselect]; + [imgvselect mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(20); + make.right.equalTo(imgvback).offset(-4); + make.bottom.equalTo(imgvback).offset(4); + }]; + _imgvselect = imgvselect; + + } + return self; +} + +-(void)setModel:(baseInfoModel *)model +{ + _model = model; + self.lbname.text = model.name; + self.imgvselect.image = [UIImage imageNamed:model.select?@"sf_select_Y":@"sf_select_N"]; + self.imgvback.image = [UIImage imageNamed:[NSString stringWithFormat:@"sf_%@",model.name]]; + [self.lbname setTextColor:RGBCOLOR(26, 26, 26)]; + if(model.select) + { + [self.lbname setTextColor:RGBCOLOR(87, 127, 255)]; + } + +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.h b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.h new file mode 100644 index 0000000..08c96ab --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.h @@ -0,0 +1,20 @@ +// +// ShouYeShenFenNianJiView.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeShenFenNianJiView : UIView +///0学生 1家长 2老师 +@property (nonatomic , assign) NSInteger type; + +-(NSString *)getSelectNJ; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.m b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.m new file mode 100644 index 0000000..ae270ce --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenNianJiView.m @@ -0,0 +1,249 @@ +// +// ShouYeShenFenNianJiView.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeShenFenNianJiView.h" +#import "TextCollectionViewCell.h" +#import "TextHeaderCollectionViewCell.h" + +@interface ShouYeShenFenNianJiView () +/// +@property (nonatomic , strong) UICollectionView *collect; +/// +@property (nonatomic , strong) NSMutableArray *arrData; + +/// +@property (nonatomic , strong) NSArray *arrGetData; +/// +@property (nonatomic , strong) UIButton *btselect; + +@end + + +@implementation ShouYeShenFenNianJiView + +-(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 setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:[UIColor clearColor]]; + [self addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(0); + make.right.equalTo(self); + make.top.offset(0); + make.height.offset(403); + }]; + [collect registerClass:[TextCollectionViewCell class] forCellWithReuseIdentifier:@"TextCollectionViewCell"]; + [collect registerClass:[TextHeaderCollectionViewCell class] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"TextHeaderCollectionViewCell"]; + + _collect = collect; + [self setdata]; + + [self mas_makeConstraints:^(MASConstraintMaker *make) { + make.height.offset(403); + }]; + } + return self; +} +-(void)setType:(NSInteger)type +{ + _type = type; + [self setSelectNoModel]; + [self.collect reloadData]; +} +-(void)setdata +{ + NSArray *arr = @[@[@"一年级",@"二年级",@"三年级",@"四年级",@"五年级",@"六年级"],@[@"七年级",@"八年级",@"九年级"],@[@"高一",@"高二",@"高三"]]; + self.arrData = [NSMutableArray new]; + for(NSArray *arrtemp in arr) + { + NSMutableArray *arritem = [NSMutableArray new]; + for(NSString *str in arrtemp) + { + baseInfoModel *model = [baseInfoModel new]; + model.title = str; + [arritem addObject:model]; + } + [self.arrData addObject:arritem]; + } + [self.collect reloadData]; +} + +-(void)btHeaderAction:(UIButton *)sender +{ + sender.selected = YES; + for(NSArray *arr in self.arrData) + { + for(baseInfoModel *model in arr) + { + model.select = NO; + } + } + + NSArray *arr = self.arrData[sender.tag]; + for(baseInfoModel *model in arr) + { + model.select = sender.selected; + } + [self.collect reloadData]; +} +-(NSString *)getSelectNJ +{ + NSMutableArray *arrselect = [NSMutableArray new]; + for(NSArray *arr in self.arrData) + { + for(baseInfoModel *model in arr) + { + if(model.select) + { + [arrselect addObject:model.title]; + } + } + } + if(arrselect.count==0) + { + [HXHud showMessage:@"请选择年级" afterDelayType:0]; + return @""; + } + if(arrselect.count==1) + { + return arrselect.firstObject; + } + else + { + if(self.btselect.tag==0) + { + return @"小学"; + } + else if(self.btselect.tag==1) + { + return @"初中"; + } + else + { + return @"高中"; + } + } +} +#pragma mark - UICollectionView +- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView +{ + return self.arrData.count; +} +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + NSArray *arr = self.arrData[section]; + return arr.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + TextCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"TextCollectionViewCell" forIndexPath:indexPath]; + NSArray *arr = self.arrData[indexPath.section]; + cell.model = arr[indexPath.row]; + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 20, 0, 20); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 16; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 16; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-112)/3.0, 38); +} +///collectionView的头高 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section{ + + return CGSizeMake(UISCREEN_WIDTH-40, 68); +} +- (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath{ + + if (kind == UICollectionElementKindSectionHeader) { + TextHeaderCollectionViewCell *header = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"TextHeaderCollectionViewCell" forIndexPath:indexPath]; + if(indexPath.section==0) + { + header.strtitle = @"小学"; + } + else if(indexPath.section==1) + { + header.strtitle = @"初中"; + } + else + { + header.strtitle = @"高中"; + } + if(self.type==2) + { + [header.btselect setHidden:NO]; + [header.btselect setTag:indexPath.section]; + [header.btselect addTarget:self action:@selector(btHeaderAction:) forControlEvents:UIControlEventTouchUpInside]; + + NSArray *arr = self.arrData[indexPath.section]; + BOOL isselectAll = YES; + for(baseInfoModel *model in arr) + { + if(model.select == NO) + { + isselectAll = NO; + break; + } + } + header.btselect.selected = isselectAll; + if(isselectAll) + { + self.btselect = header.btselect; + } + } + else + { + [header.btselect setHidden:YES]; + } + + return header; + } + + + return [UICollectionReusableView new]; + +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + NSArray *arr = self.arrData[indexPath.section]; + baseInfoModel *model = arr[indexPath.row]; + [self setSelectNoModel]; + model.select = YES; + [self.collect reloadData]; +} + +-(void)setSelectNoModel +{ + for(NSArray *arr in self.arrData) + { + for(baseInfoModel *model in arr) + { + model.select = NO; + } + } +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.h b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.h new file mode 100644 index 0000000..6432adb --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.h @@ -0,0 +1,16 @@ +// +// ShouYeShenFenView.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeShenFenView : UIView +-(void)okAction; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.m b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.m new file mode 100644 index 0000000..6bbded5 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/切换身份/view/ShouYeShenFenView.m @@ -0,0 +1,226 @@ +// +// ShouYeShenFenView.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeShenFenView.h" +#import "ShouYeShenFenCollectionViewCell.h" +#import "ShouYeShenFenNianJiView.h" +#import "ShouYeLingYuViewController.h" + +@interface ShouYeShenFenView () +/// +@property (nonatomic , strong) UICollectionView *collect; +/// +@property (nonatomic , strong) NSMutableArray *arrjx; + +/// +@property (nonatomic , strong) ShouYeShenFenNianJiView *viewnj; + +@end + +@implementation ShouYeShenFenView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIScrollView *scvback = [[UIScrollView alloc] init]; + [self addSubview:scvback]; + [scvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.offset(0); + make.width.height.equalTo(self); + }]; + + UIView *viewtop = [[UIView alloc] init]; + [viewtop setBackgroundColor:RGBACOLOR(255, 255, 255, 0.6)]; + [scvback addSubview:viewtop]; + [viewtop mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.top.offset(16); + make.width.offset(UISCREEN_WIDTH-40); + make.height.offset(70); + }]; + [self drawTopView:viewtop]; + + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.minimumLineSpacing = 0; + layout.minimumInteritemSpacing = 0; + UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + [collect setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:RGBACOLOR(255, 255, 255, 0.6)]; + [scvback addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(viewtop); + make.top.equalTo(viewtop.mas_bottom).offset(12); + make.height.offset(132); + }]; + [collect registerClass:[ShouYeShenFenCollectionViewCell class] forCellWithReuseIdentifier:@"ShouYeShenFenCollectionViewCell"]; + [collect.layer setMasksToBounds:YES]; + [collect.layer setCornerRadius:10]; + _collect = collect; + [self jxData]; + + ShouYeShenFenNianJiView *viewnj = [ShouYeShenFenNianJiView new]; + [viewnj setBackgroundColor:RGBACOLOR(255, 255, 255, 0.6)]; + [scvback addSubview:viewnj]; + [viewnj mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(viewtop); + make.top.equalTo(collect.mas_bottom).offset(12); + }]; + [viewnj.layer setMasksToBounds:YES]; + [viewnj.layer setCornerRadius:10]; + _viewnj = viewnj; + + [scvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(viewnj).offset(20); + }]; + } + return self; +} +-(void)drawTopView:(UIView *)view +{ + [view.layer setMasksToBounds:YES]; + [view.layer setCornerRadius:10]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"当前领域"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:12]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.top.offset(14); + }]; + + UILabel *lbtype = [[UILabel alloc] init]; + [lbtype setText:@"教育"]; + [lbtype setTextColor:RGBCOLOR(87, 127, 255)]; + [lbtype setTextAlignment:NSTextAlignmentLeft]; + [lbtype setFont:[UIFont systemFontOfSize:16]]; + [view addSubview:lbtype]; + [lbtype mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(4); + }]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"next"]]; + [view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(16); + make.right.equalTo(view).offset(-13); + make.centerY.equalTo(view); + }]; + + UILabel *lbqh = [[UILabel alloc] init]; + [lbqh setText:@"切换"]; + [lbqh setTextColor:RGBCOLOR(153, 153, 153)]; + [lbqh setTextAlignment:NSTextAlignmentLeft]; + [lbqh setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbqh]; + [lbqh mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(imgvback.mas_left).offset(-1); + make.centerY.equalTo(view); + }]; + + UIButton *btqh = [[UIButton alloc] init]; + [view addSubview:btqh]; + [btqh mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(view); + }]; + [btqh addTarget:self action:@selector(qiehuanAction) forControlEvents:UIControlEventTouchUpInside]; +} +///切换领域 +-(void)qiehuanAction +{ + ShouYeLingYuViewController *vc = [ShouYeLingYuViewController new]; + [self.viewController.navigationController pushViewController:vc animated:YES]; +} +-(void)jxData +{ + self.arrjx = [NSMutableArray new]; + NSArray *arr = @[@"学生",@"家长",@"老师"]; + for(int i = 0; i< arr.count;i++) + { + baseInfoModel *model = [baseInfoModel new]; + model.name = arr[i]; + model.Id = [NSString stringWithFormat:@"%d",i+1]; + [self.arrjx addObject:model]; + } + +} + +-(void)okAction +{ + baseInfoModel *modelselect; + for(baseInfoModel *model in self.arrjx) + { + if(model.select) + { + modelselect = model; + } + } + if(modelselect==nil) + { + [HXHud showMessage:@"请选择身份" afterDelayType:0]; + return; + } + NSString *strnj = [self.viewnj getSelectNJ]; + if(strnj.length==0) + { + [HXHud showMessage:@"请选择年级" afterDelayType:0]; + return; + } + [UserInfoModel shareModel].shenfen = modelselect.Id; + +} + +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + return self.arrjx.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + ShouYeShenFenCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShouYeShenFenCollectionViewCell" forIndexPath:indexPath]; + cell.model = self.arrjx[indexPath.row]; + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 0, 0, 0); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 0; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 0; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-40)/3.0, 132); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + ///做选中操作 + for(baseInfoModel *model in self.arrjx) + { + model.select = NO; + } + baseInfoModel *model = self.arrjx[indexPath.row]; + model.select = YES; + self.viewnj.type = indexPath.row; + [self.collect reloadData]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.h new file mode 100644 index 0000000..9c1bcef --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.h @@ -0,0 +1,16 @@ +// +// ShouYeLiShiJiLuPPTTableViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import +#import "ZJScrollPageView.h" +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuPPTTableViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m new file mode 100644 index 0000000..e1a9e92 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/ShouYeLiShiJiLuPPTTableViewController.m @@ -0,0 +1,78 @@ +// +// ShouYeLiShiJiLuPPTTableViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuPPTTableViewController.h" +#import "ShouYeLiShiJiLuPPTTableViewCell.h" + + +@interface ShouYeLiShiJiLuPPTTableViewController () +/// +@property (nonatomic , strong) UITableView *tableView; + +@end + +@implementation ShouYeLiShiJiLuPPTTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + [self.view setBackgroundColor:RGBCOLOR(242, 242, 242)]; + + 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; +} + +#pragma mark - Table view data source +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 10; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"ShouYeLiShiJiLuPPTTableViewCell"; + ShouYeLiShiJiLuPPTTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeLiShiJiLuPPTTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 88; +} +-(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 +{ + +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.h new file mode 100644 index 0000000..7338788 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeLiShiJiLuPPTTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuPPTTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.m new file mode 100644 index 0000000..7b02924 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/PPT/cell/ShouYeLiShiJiLuPPTTableViewCell.m @@ -0,0 +1,113 @@ +// +// ShouYeLiShiJiLuPPTTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuPPTTableViewCell.h" +#import "JJGradientLabel.h" + +@interface ShouYeLiShiJiLuPPTTableViewCell () +/// +@property (nonatomic , strong) UIImageView *imgvback; +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbtime; + +@end + +@implementation ShouYeLiShiJiLuPPTTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.right.equalTo(self).offset(-16); + make.top.offset(0); + make.bottom.equalTo(self).offset(-10); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.centerY.equalTo(viewback); + make.size.sizeOffset(CGSizeMake(70, 50)); + }]; + [imgvback.layer setMasksToBounds:YES]; + [imgvback.layer setCornerRadius:4]; + [imgvback setBackgroundColor:[UIColor grayColor]]; + _imgvback = imgvback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"企业工作汇报商务风PPT风..."]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(imgvback.mas_right).offset(10); + make.bottom.equalTo(viewback.mas_centerY); + make.right.equalTo(viewback).offset(-73); + }]; + _lbname = lbname; + + UILabel *lbtime = [[UILabel alloc] init]; + [lbtime setText:@"2024-04-29 16:30:12"]; + [lbtime setTextColor:RGBCOLOR(153, 153, 153)]; + [lbtime setTextAlignment:NSTextAlignmentLeft]; + [lbtime setFont:[UIFont systemFontOfSize:12]]; + [viewback addSubview:lbtime]; + [lbtime mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(5); + }]; + _lbtime = lbtime; + + UIImageView *imgvdown = [[UIImageView alloc] init]; + [imgvdown setImage:[UIImage imageNamed:@"home_ls_下载分享"]]; + [viewback addSubview:imgvdown]; + [imgvdown mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(22); + make.centerY.equalTo(viewback).offset(-10); + make.right.equalTo(viewback).offset(-21); + }]; + + + JJGradientLabel *lbdown = [[JJGradientLabel alloc] init]; + [lbdown setText:@"下载分享"]; + [lbdown setTextColor:RGBCOLOR(51, 51, 51)]; + [lbdown setTextAlignment:NSTextAlignmentCenter]; + [lbdown setFont:[UIFont systemFontOfSize:10]]; + [viewback addSubview:lbdown]; + [lbdown mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(imgvdown); + make.top.equalTo(imgvdown.mas_bottom).offset(4); + }]; + lbdown.isshuline = YES; + lbdown.colors = @[(id)RGBCOLOR(42, 211, 237).CGColor,(id)RGBCOLOR(148, 127, 255).CGColor]; + + + UIButton *btdown = [[UIButton alloc] init]; + [viewback addSubview:btdown]; + [btdown mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerX.equalTo(imgvdown); + make.centerY.equalTo(imgvdown).offset(10); + make.width.height.offset(50); + }]; + [btdown addTarget:self action:@selector(downAction) forControlEvents:UIControlEventTouchUpInside]; + } + return self; +} +-(void)downAction +{ + +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.h new file mode 100644 index 0000000..045b993 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.h @@ -0,0 +1,16 @@ +// +// ShouYeLiShiJiLuViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.m new file mode 100644 index 0000000..856822b --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/ShouYeLiShiJiLuViewController.m @@ -0,0 +1,100 @@ +// +// ShouYeLiShiJiLuViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuViewController.h" +#import "ZJScrollPageView.h" +#import "ShouYeLiShiJiLuXZTableViewController.h" +#import "ShouYeLiShiJiLuPGTableViewController.h" +#import "ShouYeLiShiJiLuPPTTableViewController.h" + + +@interface ShouYeLiShiJiLuViewController () +@property (nonatomic , strong) ZJScrollPageView *scrollPageView; +@end + +@implementation ShouYeLiShiJiLuViewController +- (UIStatusBarStyle)preferredStatusBarStyle { + return UIStatusBarStyleDefault; +} +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + [self.navigationController setNavigationBarHidden:YES animated:animated]; + [self showNaviGationView:YES]; + [self.navigationView setTitle:@"历史记录" titleColor:RGBCOLOR(60, 60, 60)]; + [self.navigationView setBackgroundColor:[UIColor whiteColor]]; + +} +- (void)viewDidLoad { + [super viewDidLoad]; + [self.view setBackgroundColor:RGBCOLOR(242, 242, 242)]; + + ZJSegmentStyle *style = [[ZJSegmentStyle alloc] init]; + //显示滚动条 + style.showLine = YES; + style.normalTitleColor = RGBCOLOR(153, 153, 153); + style.selectedTitleColor = RGBCOLOR(26, 26, 26); + style.titleFont = [UIFont systemFontOfSize:15]; + style.scrollLineSpacing = -5; + style.scrollLineHeight = 3; + style.scrollLineWidth = 20; + style.scrollLineColor = [UIColor whiteColor]; + style.autoAdjustTitlesWidth = YES; + ZJScrollPageView *scrollPageView = [[ZJScrollPageView alloc] initWithFrame:CGRectMake(0, NavHeight, UISCREEN_WIDTH, UISCREEN_HEIGHT - NavHeight) segmentStyle:style titles:@[@"写作",@"批改",@"拍题",@"PPT"] parentViewController:self delegate:self]; + [self.view addSubview:scrollPageView]; + scrollPageView.segmentView.backgroundColor = [UIColor whiteColor]; + [scrollPageView reloadWithNewTitles:@[@"写作",@"批改",@"拍题",@"PPT"]]; + _scrollPageView = scrollPageView; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [Tools changedView:scrollPageView.segmentView.scrollLine colors:@[(id)RGBCOLOR(42, 211, 237).CGColor,(id)RGBCOLOR(167, 247, 153).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + }); + +} + +#pragma mark - custom delegate - 自定义或者第三方控件的delegate +- (NSInteger)numberOfChildViewControllers { + return 4; +} + +- (UIViewController *)childViewController:(UIViewController *)reuseViewController forIndex:(NSInteger)index { + if(index==0) + { + ShouYeLiShiJiLuXZTableViewController *childVC = (ShouYeLiShiJiLuXZTableViewController *)reuseViewController; + if (!childVC) { + childVC = [[ShouYeLiShiJiLuXZTableViewController alloc] init]; + } + + return childVC; + } + else if (index==3) + { + ShouYeLiShiJiLuPPTTableViewController *childVC = (ShouYeLiShiJiLuPPTTableViewController *)reuseViewController; + if (!childVC) { + childVC = [[ShouYeLiShiJiLuPPTTableViewController alloc] init]; + } + + return childVC; + } + else + { + ShouYeLiShiJiLuPGTableViewController *childVC = (ShouYeLiShiJiLuPGTableViewController *)reuseViewController; + if (!childVC) { + childVC = [[ShouYeLiShiJiLuPGTableViewController alloc] init]; + } + childVC.type = index; + return childVC; + } +} +- (void)scrollPageController:(UIViewController *)scrollPageController childViewControllDidAppear:(UIViewController *)childViewController forIndex:(NSInteger)index +{ +} +- (BOOL)shouldAutomaticallyForwardAppearanceMethods { + return NO; +} + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.h new file mode 100644 index 0000000..cebc721 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.h @@ -0,0 +1,16 @@ +// +// ShouYeLiShiJiLuXZTableViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import +#import "ZJScrollPageView.h" +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuXZTableViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m new file mode 100644 index 0000000..2910898 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/ShouYeLiShiJiLuXZTableViewController.m @@ -0,0 +1,78 @@ +// +// ShouYeLiShiJiLuXZTableViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuXZTableViewController.h" +#import "ShouYeLiShiJiLuXZTableViewCell.h" + +@interface ShouYeLiShiJiLuXZTableViewController () +/// +@property (nonatomic , strong) UITableView *tableView; + +@end + +@implementation ShouYeLiShiJiLuXZTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + [self.view setBackgroundColor:RGBCOLOR(242, 242, 242)]; + + 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; +} + +#pragma mark - Table view data source +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 10; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"ShouYeLiShiJiLuXZTableViewCell"; + ShouYeLiShiJiLuXZTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeLiShiJiLuXZTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 185; +} +-(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 +{ + +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.h new file mode 100644 index 0000000..4ef9276 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.h @@ -0,0 +1,16 @@ +// +// ShouYeLiShiJiLuXZTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuXZTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m new file mode 100644 index 0000000..36d788c --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/写作/cell/ShouYeLiShiJiLuXZTableViewCell.m @@ -0,0 +1,135 @@ +// +// ShouYeLiShiJiLuXZTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuXZTableViewCell.h" + + +@interface ShouYeLiShiJiLuXZTableViewCell () + +@end + +@implementation ShouYeLiShiJiLuXZTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.right.equalTo(self).offset(-16); + make.top.offset(0); + make.bottom.equalTo(self).offset(-10); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"我的父亲"]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont boldSystemFontOfSize:18]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(14); + make.right.equalTo(viewback).offset(-12); + }]; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@"描绘早晨的场景：运用细节描绘，如“熙攘的人群热吧校门口的敬礼仪式”，体现新环境的秩序与规矩，象征着成长的仪..."]; + [lbinfo setTextColor:RGBCOLOR(102, 102, 102)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [lbinfo setNumberOfLines:3]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(lbname); + make.top.equalTo(lbname.mas_bottom).offset(8); + }]; + + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(238, 238, 238)]; + [viewback addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(lbinfo); + make.top.equalTo(lbinfo.mas_bottom).offset(12); + make.height.offset(1); + }]; + + UILabel *lbtime = [[UILabel alloc] init]; + [lbtime setText:@"2024-04-29 16:30:12"]; + [lbtime setTextColor:RGBCOLOR(153, 153, 153)]; + [lbtime setTextAlignment:NSTextAlignmentLeft]; + [lbtime setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbtime]; + [lbtime mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(viewline); + make.top.equalTo(viewline.mas_bottom).offset(16); + }]; + + + UIButton *btchakan = [[UIButton alloc] init]; + [btchakan setTitle:@"查看详情" forState:UIControlStateNormal]; + [btchakan setTitleColor:RGBCOLOR(26, 26, 26) forState:UIControlStateNormal]; + [btchakan.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [btchakan.layer setMasksToBounds:YES]; + [btchakan.layer setCornerRadius:5]; + [btchakan.layer setBorderWidth:1]; + [btchakan.layer setBorderColor:RGBCOLOR(225, 225, 225).CGColor]; + [viewback addSubview:btchakan]; + [btchakan mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(64, 26)); + make.right.equalTo(viewline); + make.top.equalTo(viewline.mas_bottom).offset(12); + }]; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setTitle:@"删除" forState:UIControlStateNormal]; + [btdel setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal]; + [btdel.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [btdel.layer setMasksToBounds:YES]; + [btdel.layer setCornerRadius:5]; + [btdel.layer setBorderWidth:1]; + [btdel.layer setBorderColor:RGBCOLOR(225, 225, 225).CGColor]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(btchakan.mas_left).offset(-8); + make.top.equalTo(btchakan); + make.size.sizeOffset(CGSizeMake(38, 26)); + }]; + + UIView *viewtype = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 84, 24)]; + [viewtype setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewtype]; + [viewtype mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(viewback).offset(20); + make.top.offset(10); + make.size.sizeOffset(CGSizeMake(84, 24)); + }]; + [Tools changedView:viewtype colors:@[(id)RGBCOLOR(42, 211, 237).CGColor,(id)RGBCOLOR(167, 247, 153).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + UILabel *lbtype = [[UILabel alloc] init]; + [lbtype setText:@"段落续写"]; + [lbtype setTextColor:[UIColor whiteColor]]; + [lbtype setTextAlignment:NSTextAlignmentCenter]; + [lbtype setFont:[UIFont systemFontOfSize:12]]; + [viewtype addSubview:lbtype]; + [lbtype mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.equalTo(viewtype); + }]; + ///CGAffineTransform + viewtype.transform = CGAffineTransformMakeRotation(45 * M_PI/180.0);; + + + + } + return self; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.h new file mode 100644 index 0000000..e4fec7d --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.h @@ -0,0 +1,17 @@ +// +// ShouYeLiShiJiLuPGTableViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import +#import "ZJScrollPageView.h" +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuPGTableViewController : UIViewController +///1批改 2拍题 +@property (nonatomic , assign) NSInteger type; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m new file mode 100644 index 0000000..8b823a5 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/ShouYeLiShiJiLuPGTableViewController.m @@ -0,0 +1,80 @@ +// +// ShouYeLiShiJiLuPGTableViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuPGTableViewController.h" +#import "ShouYeLiShiJiLuPGTableViewCell.h" + +@interface ShouYeLiShiJiLuPGTableViewController () +/// +@property (nonatomic , strong) UITableView *tableView; + +@end + +@implementation ShouYeLiShiJiLuPGTableViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + [self.view setBackgroundColor:RGBCOLOR(242, 242, 242)]; + + 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; +} + +#pragma mark - Table view data source +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 10; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"ShouYeLiShiJiLuPGTableViewCell"; + ShouYeLiShiJiLuPGTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[ShouYeLiShiJiLuPGTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + cell.type = self.type; + + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 10; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + float fheight = (UISCREEN_WIDTH-96)/3.0+92; + if(self.type==2)fheight+=20; + return fheight; +} +-(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 +{ + +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.h new file mode 100644 index 0000000..ed576f6 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.h @@ -0,0 +1,17 @@ +// +// ShouYeLiShiJiLuPGCollectionViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuPGCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) UIImageView *imgvback; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.m new file mode 100644 index 0000000..1bfb19c --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGCollectionViewCell.m @@ -0,0 +1,54 @@ +// +// ShouYeLiShiJiLuPGCollectionViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuPGCollectionViewCell.h" + +@implementation ShouYeLiShiJiLuPGCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIImageView *imgvback = [[UIImageView alloc] init]; + [self.contentView addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [imgvback.layer setMasksToBounds:YES]; + [imgvback.layer setCornerRadius:6]; + [imgvback.layer setBorderWidth:1]; + [imgvback.layer setBorderColor:RGBCOLOR(42, 211, 237).CGColor]; + _imgvback = imgvback; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self addJianBianLine:imgvback colors:@[(id)RGBCOLOR(42, 211, 237).CGColor,(id)RGBCOLOR(148, 127, 255).CGColor] start:CGPointMake(0, 0) end:CGPointMake(0, 1)]; + }); + } + return self; +} +///给边框添加渐变 +-(void)addJianBianLine:(UIView *)myView colors:(NSArray *)colors start:(CGPoint)start end:(CGPoint)end +{ + // 创建CAGradientLayer实例 + CAGradientLayer *gradientLayer = [CAGradientLayer layer]; + gradientLayer.frame = myView.bounds; // 确保layer的大小和view相同 + // 设置渐变色 + gradientLayer.colors = colors; + // 设置渐变方向 + gradientLayer.startPoint = start; + gradientLayer.endPoint = end; + + // 创建一个子layer来渲染渐变效果，而不是直接在view的layer上 + CALayer *borderLayer = [CALayer layer]; + borderLayer.frame = CGRectInset(myView.bounds, 1, 1); // 内边框 + borderLayer.masksToBounds = YES; + borderLayer.contents = (__bridge id)([UIImage new].CGImage); + // 将渐变layer添加为borderLayer的mask + borderLayer.mask = gradientLayer; + // 将borderLayer添加到view的layer上 + [myView.layer addSublayer:borderLayer]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.h new file mode 100644 index 0000000..0bc6490 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.h @@ -0,0 +1,17 @@ +// +// ShouYeLiShiJiLuPGTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface ShouYeLiShiJiLuPGTableViewCell : UITableViewCell +///1批改 2拍题 +@property (nonatomic , assign) NSInteger type; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m new file mode 100644 index 0000000..a4bfc37 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/历史记录/批改/cell/ShouYeLiShiJiLuPGTableViewCell.m @@ -0,0 +1,202 @@ +// +// ShouYeLiShiJiLuPGTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "ShouYeLiShiJiLuPGTableViewCell.h" +#import "ShouYeLiShiJiLuPGCollectionViewCell.h" + + +@interface ShouYeLiShiJiLuPGTableViewCell () +/// +@property (nonatomic , strong) UIView *viewtype; +/// +@property (nonatomic , strong) UILabel *lbtype; + +/// +@property (nonatomic , strong) UICollectionView *collect; +/// +@property (nonatomic , strong) UILabel *lbtime; + + +@end + +@implementation ShouYeLiShiJiLuPGTableViewCell + +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.right.equalTo(self).offset(-16); + make.top.offset(0); + make.bottom.equalTo(self).offset(-10); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + + UIView *viewtype = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 70, 24)]; + [viewback addSubview:viewtype]; + _viewtype = viewtype; + [Tools changedView:viewtype colors:@[(id)RGBCOLOR(42, 211, 237).CGColor,(id)RGBCOLOR(167, 247, 153).CGColor] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + UILabel *lbtype = [[UILabel alloc] init]; + [lbtype setText:@"拍照成文"]; + [lbtype setTextColor:[UIColor whiteColor]]; + [lbtype setTextAlignment:NSTextAlignmentCenter]; + [lbtype setFont:[UIFont systemFontOfSize:13]]; + [viewtype addSubview:lbtype]; + [lbtype mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.equalTo(viewtype); + }]; + _lbtype = lbtype; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewtype.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomRight cornerRadii:CGSizeMake(8,8)]; + //创建 layer + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewtype.bounds; + //赋值 + maskLayer.path = maskPath.CGPath; + viewtype.layer.mask = maskLayer; + + + + UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; + layout.minimumLineSpacing = 0; + layout.minimumInteritemSpacing = 0; + UICollectionView *collect = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; + [collect setScrollEnabled:NO]; + [collect setDelegate:self]; + [collect setDataSource:self]; + [collect setBackgroundColor:[UIColor clearColor]]; + [viewback addSubview:collect]; + [collect mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.right.equalTo(viewback).offset(-12); + make.top.offset(16); + make.height.offset((UISCREEN_WIDTH-96)/3.0); + }]; + [collect setUserInteractionEnabled:NO]; + [collect setTag:1]; + [collect registerClass:[ShouYeLiShiJiLuPGCollectionViewCell class] forCellWithReuseIdentifier:@"ShouYeLiShiJiLuPGCollectionViewCell"]; + _collect = collect; + + + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(238, 238, 238)]; + [viewback addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(collect); + make.top.equalTo(collect.mas_bottom).offset(16); + make.height.offset(1); + }]; + + UILabel *lbtime = [[UILabel alloc] init]; + [lbtime setText:@"2024-04-29 16:30:12"]; + [lbtime setTextColor:RGBCOLOR(153, 153, 153)]; + [lbtime setTextAlignment:NSTextAlignmentLeft]; + [lbtime setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbtime]; + [lbtime mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(viewline); + make.top.equalTo(viewline.mas_bottom).offset(16); + }]; + _lbtime = lbtime; + + UIButton *btchakan = [[UIButton alloc] init]; + [btchakan setTitle:@"查看详情" forState:UIControlStateNormal]; + [btchakan setTitleColor:RGBCOLOR(26, 26, 26) forState:UIControlStateNormal]; + [btchakan.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [btchakan.layer setMasksToBounds:YES]; + [btchakan.layer setCornerRadius:5]; + [btchakan.layer setBorderWidth:1]; + [btchakan.layer setBorderColor:RGBCOLOR(225, 225, 225).CGColor]; + [viewback addSubview:btchakan]; + [btchakan mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(64, 26)); + make.right.equalTo(viewline); + make.top.equalTo(viewline.mas_bottom).offset(12); + }]; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setTitle:@"删除" forState:UIControlStateNormal]; + [btdel setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal]; + [btdel.titleLabel setFont:[UIFont systemFontOfSize:13]]; + [btdel.layer setMasksToBounds:YES]; + [btdel.layer setCornerRadius:5]; + [btdel.layer setBorderWidth:1]; + [btdel.layer setBorderColor:RGBCOLOR(225, 225, 225).CGColor]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(btchakan.mas_left).offset(-8); + make.top.equalTo(btchakan); + make.size.sizeOffset(CGSizeMake(38, 26)); + }]; + + } + return self; +} + +-(void)setType:(NSInteger)type +{ + _type = type; + if(type==2) + { + [self.collect mas_updateConstraints:^(MASConstraintMaker *make) { + make.top.offset(36); + }]; + [self.viewtype setHidden:NO]; + } + else + { + [self.collect mas_updateConstraints:^(MASConstraintMaker *make) { + make.top.offset(16); + }]; + [self.viewtype setHidden:YES]; + } + +} + + +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + return 3; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + ShouYeLiShiJiLuPGCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"ShouYeLiShiJiLuPGCollectionViewCell" forIndexPath:indexPath]; + [cell.imgvback setBackgroundColor:[UIColor grayColor]]; + + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 8, 0, 8); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 0; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + /// + return 12; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-96)/3.0, (UISCREEN_WIDTH-96)/3.0); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + ///做选中操作 + +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.h b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.h new file mode 100644 index 0000000..71c9709 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.h @@ -0,0 +1,16 @@ +// +// CamreViewController.h +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface CamreViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m new file mode 100644 index 0000000..7637767 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/CamreViewController.m @@ -0,0 +1,31 @@ +// +// CamreViewController.m +// ProductApp +// +// Created by 工作 on 2024/9/26. +// + +#import "CamreViewController.h" + +@interface CamreViewController () + +@end + +@implementation CamreViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end