diff --git a/ProductApp/ProductApp.xcodeproj/project.pbxproj b/ProductApp/ProductApp.xcodeproj/project.pbxproj index 42390fe..93ce039 100644 --- a/ProductApp/ProductApp.xcodeproj/project.pbxproj +++ b/ProductApp/ProductApp.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 664551746CA42328436EB43A /* Pods_ProductApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E7E9D1598912BF8D031CA536 /* Pods_ProductApp.framework */; }; - CA0372992CE6E954001CE910 /* CamreImageEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0372982CE6E954001CE910 /* CamreImageEditViewController.m */; }; CA0688CD2CD328C500DF7025 /* ToolCheckModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0688CC2CD328C500DF7025 /* ToolCheckModel.m */; }; CA0688D02CD3291900DF7025 /* OcrModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0688CF2CD3291900DF7025 /* OcrModel.m */; }; CA0688D32CD329AD00DF7025 /* TranslateLanguageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = CA0688D22CD329AD00DF7025 /* TranslateLanguageModel.m */; }; @@ -308,6 +307,18 @@ CAB0F3642CAA8523003B0C39 /* XieZuoXiangQingView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB0F3632CAA8523003B0C39 /* XieZuoXiangQingView.m */; }; CAB0F3672CAA8694003B0C39 /* XieZuoXiangQingSiLuView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB0F3662CAA8694003B0C39 /* XieZuoXiangQingSiLuView.m */; }; CAB0F36A2CAA9255003B0C39 /* FenXiangWenZhangAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB0F3692CAA9255003B0C39 /* FenXiangWenZhangAlterView.m */; }; + CAB9AA822CEC23A800B75BD6 /* PingYuAlterView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA812CEC23A800B75BD6 /* PingYuAlterView.m */; }; + CAB9AA842CEC2D9600B75BD6 /* wushenyy.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = CAB9AA832CEC2D9600B75BD6 /* wushenyy.mp3 */; }; + CAB9AA882CEC3BB400B75BD6 /* PLPGSetListController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA872CEC3BB400B75BD6 /* PLPGSetListController.m */; }; + CAB9AA8C2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA8B2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.m */; }; + CAB9AA902CEC5DE200B75BD6 /* PLPGSetListEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA8F2CEC5DE200B75BD6 /* PLPGSetListEditViewController.m */; }; + CAB9AA942CEC5F4100B75BD6 /* PLPGSetListEditView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA932CEC5F4100B75BD6 /* PLPGSetListEditView.m */; }; + CAB9AA982CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA972CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.m */; }; + CAB9AA9B2CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA9A2CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.m */; }; + CAB9AA9E2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AA9D2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.m */; }; + CAB9AAA22CEC808500B75BD6 /* PLPGDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AAA12CEC808500B75BD6 /* PLPGDetailViewController.m */; }; + CAB9AAA62CEC83AA00B75BD6 /* PLPGDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AAA52CEC83AA00B75BD6 /* PLPGDetailView.m */; }; + CAB9AAA92CEC856100B75BD6 /* PLPGDetailItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = CAB9AAA82CEC856100B75BD6 /* PLPGDetailItemView.m */; }; CABA14612C9D0B1C002CB3B1 /* ShouYeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA14602C9D0B1C002CB3B1 /* ShouYeViewController.m */; }; CABA14642C9D0B25002CB3B1 /* FanWenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA14632C9D0B25002CB3B1 /* FanWenViewController.m */; }; CABA14672C9D0B31002CB3B1 /* AIChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CABA14662C9D0B31002CB3B1 /* AIChatViewController.m */; }; @@ -559,8 +570,6 @@ /* 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 = ""; }; - CA0372972CE6E954001CE910 /* CamreImageEditViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CamreImageEditViewController.h; sourceTree = ""; }; - CA0372982CE6E954001CE910 /* CamreImageEditViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CamreImageEditViewController.m; sourceTree = ""; }; CA0688CB2CD328C500DF7025 /* ToolCheckModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ToolCheckModel.h; sourceTree = ""; }; CA0688CC2CD328C500DF7025 /* ToolCheckModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ToolCheckModel.m; sourceTree = ""; }; CA0688CE2CD3291900DF7025 /* OcrModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OcrModel.h; sourceTree = ""; }; @@ -1121,6 +1130,29 @@ CAB0F3662CAA8694003B0C39 /* XieZuoXiangQingSiLuView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XieZuoXiangQingSiLuView.m; sourceTree = ""; }; CAB0F3682CAA9255003B0C39 /* FenXiangWenZhangAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FenXiangWenZhangAlterView.h; sourceTree = ""; }; CAB0F3692CAA9255003B0C39 /* FenXiangWenZhangAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FenXiangWenZhangAlterView.m; sourceTree = ""; }; + CAB9AA802CEC23A800B75BD6 /* PingYuAlterView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PingYuAlterView.h; sourceTree = ""; }; + CAB9AA812CEC23A800B75BD6 /* PingYuAlterView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PingYuAlterView.m; sourceTree = ""; }; + CAB9AA832CEC2D9600B75BD6 /* wushenyy.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = wushenyy.mp3; sourceTree = ""; }; + CAB9AA862CEC3BB400B75BD6 /* PLPGSetListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListController.h; sourceTree = ""; }; + CAB9AA872CEC3BB400B75BD6 /* PLPGSetListController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListController.m; sourceTree = ""; }; + CAB9AA8A2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListTableViewCell.h; sourceTree = ""; }; + CAB9AA8B2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListTableViewCell.m; sourceTree = ""; }; + CAB9AA8E2CEC5DE200B75BD6 /* PLPGSetListEditViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListEditViewController.h; sourceTree = ""; }; + CAB9AA8F2CEC5DE200B75BD6 /* PLPGSetListEditViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListEditViewController.m; sourceTree = ""; }; + CAB9AA922CEC5F4100B75BD6 /* PLPGSetListEditView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListEditView.h; sourceTree = ""; }; + CAB9AA932CEC5F4100B75BD6 /* PLPGSetListEditView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListEditView.m; sourceTree = ""; }; + CAB9AA962CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListEditTableViewCell.h; sourceTree = ""; }; + CAB9AA972CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListEditTableViewCell.m; sourceTree = ""; }; + CAB9AA992CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListEditAddItemView.h; sourceTree = ""; }; + CAB9AA9A2CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListEditAddItemView.m; sourceTree = ""; }; + CAB9AA9C2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGSetListEditAddItemCollectionViewCell.h; sourceTree = ""; }; + CAB9AA9D2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGSetListEditAddItemCollectionViewCell.m; sourceTree = ""; }; + CAB9AAA02CEC808500B75BD6 /* PLPGDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGDetailViewController.h; sourceTree = ""; }; + CAB9AAA12CEC808500B75BD6 /* PLPGDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGDetailViewController.m; sourceTree = ""; }; + CAB9AAA42CEC83AA00B75BD6 /* PLPGDetailView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGDetailView.h; sourceTree = ""; }; + CAB9AAA52CEC83AA00B75BD6 /* PLPGDetailView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGDetailView.m; sourceTree = ""; }; + CAB9AAA72CEC856100B75BD6 /* PLPGDetailItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PLPGDetailItemView.h; sourceTree = ""; }; + CAB9AAA82CEC856100B75BD6 /* PLPGDetailItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PLPGDetailItemView.m; sourceTree = ""; }; CABA145F2C9D0B1C002CB3B1 /* ShouYeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShouYeViewController.h; sourceTree = ""; }; CABA14602C9D0B1C002CB3B1 /* ShouYeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShouYeViewController.m; sourceTree = ""; }; CABA14622C9D0B25002CB3B1 /* FanWenViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FanWenViewController.h; sourceTree = ""; }; @@ -1999,8 +2031,6 @@ CA11ED572CA6489600209DFC /* view */, CA0D08812CA5682D0086855E /* CamreViewController.h */, CA0D08822CA5682D0086855E /* CamreViewController.m */, - CA0372972CE6E954001CE910 /* CamreImageEditViewController.h */, - CA0372982CE6E954001CE910 /* CamreImageEditViewController.m */, ); path = "自定义相机"; sourceTree = ""; @@ -2237,6 +2267,9 @@ CA2A38D62CEB13E300156CD2 /* 批量批改 */ = { isa = PBXGroup; children = ( + CAB9AA9F2CEC806600B75BD6 /* 批改详情 */, + CAB9AA852CEC3BA100B75BD6 /* 批改设置列表 */, + CAB9AA7F2CEC239700B75BD6 /* view */, CA2A38E12CEB45BB00156CD2 /* 历史记录 */, CA2A38DA2CEB2CCA00156CD2 /* cell */, CA2A38D72CEB142300156CD2 /* PiLiangXiuGaiViewController.h */, @@ -3120,6 +3153,89 @@ path = view; sourceTree = ""; }; + CAB9AA7F2CEC239700B75BD6 /* view */ = { + isa = PBXGroup; + children = ( + CAB9AA802CEC23A800B75BD6 /* PingYuAlterView.h */, + CAB9AA812CEC23A800B75BD6 /* PingYuAlterView.m */, + ); + path = view; + sourceTree = ""; + }; + CAB9AA852CEC3BA100B75BD6 /* 批改设置列表 */ = { + isa = PBXGroup; + children = ( + CAB9AA8D2CEC5DD100B75BD6 /* 编辑设置 */, + CAB9AA892CEC3CFB00B75BD6 /* cell */, + CAB9AA862CEC3BB400B75BD6 /* PLPGSetListController.h */, + CAB9AA872CEC3BB400B75BD6 /* PLPGSetListController.m */, + ); + path = "批改设置列表"; + sourceTree = ""; + }; + CAB9AA892CEC3CFB00B75BD6 /* cell */ = { + isa = PBXGroup; + children = ( + CAB9AA8A2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.h */, + CAB9AA8B2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CAB9AA8D2CEC5DD100B75BD6 /* 编辑设置 */ = { + isa = PBXGroup; + children = ( + CAB9AA952CEC6B4900B75BD6 /* cell */, + CAB9AA912CEC5F3300B75BD6 /* view */, + CAB9AA8E2CEC5DE200B75BD6 /* PLPGSetListEditViewController.h */, + CAB9AA8F2CEC5DE200B75BD6 /* PLPGSetListEditViewController.m */, + ); + path = "编辑设置"; + sourceTree = ""; + }; + CAB9AA912CEC5F3300B75BD6 /* view */ = { + isa = PBXGroup; + children = ( + CAB9AA922CEC5F4100B75BD6 /* PLPGSetListEditView.h */, + CAB9AA932CEC5F4100B75BD6 /* PLPGSetListEditView.m */, + CAB9AA992CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.h */, + CAB9AA9A2CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.m */, + ); + path = view; + sourceTree = ""; + }; + CAB9AA952CEC6B4900B75BD6 /* cell */ = { + isa = PBXGroup; + children = ( + CAB9AA962CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.h */, + CAB9AA972CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.m */, + CAB9AA9C2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.h */, + CAB9AA9D2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.m */, + ); + path = cell; + sourceTree = ""; + }; + CAB9AA9F2CEC806600B75BD6 /* 批改详情 */ = { + isa = PBXGroup; + children = ( + CAB9AAA32CEC839C00B75BD6 /* view */, + CAB9AAA02CEC808500B75BD6 /* PLPGDetailViewController.h */, + CAB9AAA12CEC808500B75BD6 /* PLPGDetailViewController.m */, + ); + path = "批改详情"; + sourceTree = ""; + }; + CAB9AAA32CEC839C00B75BD6 /* view */ = { + isa = PBXGroup; + children = ( + CAB9AAA42CEC83AA00B75BD6 /* PLPGDetailView.h */, + CAB9AAA52CEC83AA00B75BD6 /* PLPGDetailView.m */, + CAB9AAA72CEC856100B75BD6 /* PLPGDetailItemView.h */, + CAB9AAA82CEC856100B75BD6 /* PLPGDetailItemView.m */, + ); + path = view; + sourceTree = ""; + }; CABA145A2C9D0AF2002CB3B1 /* 首页 */ = { isa = PBXGroup; children = ( @@ -3848,6 +3964,7 @@ CB489DE127449EA300DA044A /* PrefixHeader.pch */, CABA14732C9D1165002CB3B1 /* qidong@2x.png */, CABA14722C9D1165002CB3B1 /* qidong@3x.png */, + CAB9AA832CEC2D9600B75BD6 /* wushenyy.mp3 */, CABA14EC2C9D7CE2002CB3B1 /* alimamashuheiti.ttf */, CAC806572CA13CEC00C21AA7 /* zihunbiantaoti.TTF */, CA487D942CA407F100AE773B /* D-DIN-PRO-700-Bold.otf */, @@ -4703,6 +4820,7 @@ CB489DD827449D5D00DA044A /* LaunchScreen.storyboard in Resources */, CA5D03252CC0DDF0007B3BA5 /* Pay_Public_yhY.png in Resources */, CB489FC72744A0BD00DA044A /* loading6@3x.png in Resources */, + CAB9AA842CEC2D9600B75BD6 /* wushenyy.mp3 in Resources */, CA5D02B62CC0B69E007B3BA5 /* SmileySans-Oblique.ttf in Resources */, CA5D031B2CC0DDF0007B3BA5 /* Pay_Public_QianWang@2x.png in Resources */, CA5D03192CC0DDF0007B3BA5 /* Pay_Public_go@3x.png in Resources */, @@ -4876,6 +4994,7 @@ CB489FB32744A0BD00DA044A /* THDatePickerView.m in Sources */, CB489FB62744A0BD00DA044A /* NSDate+CXCategory.m in Sources */, CA5D03652CC0DE8D007B3BA5 /* YouHuiQuanListTableViewCell.m in Sources */, + CAB9AA902CEC5DE200B75BD6 /* PLPGSetListEditViewController.m in Sources */, CA5D027D2CC0A43F007B3BA5 /* WoDeYouHuiView.m in Sources */, CABA146A2C9D0B38002CB3B1 /* GongJuViewController.m in Sources */, CAB0D37F2CAA533D009BF67D /* ZhiNengXieZuoQuanWenView.m in Sources */, @@ -4883,6 +5002,7 @@ CB489F612744A0BD00DA044A /* ListAlterView.m in Sources */, CA5D02E02CC0DD6B007B3BA5 /* UserConfigModel.m in Sources */, CBD422C028DAF38900C32440 /* KAlterView.m in Sources */, + CAB9AA9B2CEC6F6C00B75BD6 /* PLPGSetListEditAddItemView.m in Sources */, CA2A38DD2CEB2CD900156CD2 /* PiLiangXiuGaiTableViewCell.m in Sources */, CA0D08302CA4FBDB0086855E /* ShouYeXieZuoTableViewCell.m in Sources */, CABA14BB2C9D4330002CB3B1 /* PublicUploadImageManager.m in Sources */, @@ -4925,6 +5045,7 @@ CA4257982CA2914100A36A10 /* StartZNPPTHUDAlter.m in Sources */, CA6B97222CBCEB56000213F3 /* AIChatArcView.m in Sources */, CA5D03602CC0DE8D007B3BA5 /* YaoQingGZView.m in Sources */, + CAB9AA9E2CEC762100B75BD6 /* PLPGSetListEditAddItemCollectionViewCell.m in Sources */, CA22D1C72CD0790200CA7E93 /* XieZuoJiLuXiangQingView.m in Sources */, CAF76E912CBE663000825E5E /* GongJuCreateSelectView.m in Sources */, CB489F7C2744A0BD00DA044A /* RSAEncrypt.m in Sources */, @@ -4958,13 +5079,13 @@ CA5D02A92CC0B2DE007B3BA5 /* ZhangHuGuanLiTableViewCell.m in Sources */, CB489FB22744A0BD00DA044A /* FSActionSheetItem.m in Sources */, CA0C3AA52CB4DED200E01A72 /* DuanLuoXieZuoCellView.m in Sources */, + CAB9AA942CEC5F4100B75BD6 /* PLPGSetListEditView.m in Sources */, CA4257AE2CA2AF3600A36A10 /* StartZNPPTYuLanTableViewCell.m in Sources */, CA38685A2CC1F66E009C98B0 /* LoginWXView.m in Sources */, CA0D08362CA501710086855E /* ShouYeToolsTableViewCell.m in Sources */, CA6B97372CBD2102000213F3 /* AIChaAnswerTableViewCell.m in Sources */, CAF2BC812CCF8D2700028275 /* FanWenSearchListViewController.m in Sources */, CB489F4B2744A0BD00DA044A /* PGGDatePickView.m in Sources */, - CA0372992CE6E954001CE910 /* CamreImageEditViewController.m in Sources */, CB489FB72744A0BD00DA044A /* UIAlertController+Blocks.m in Sources */, CABA14612C9D0B1C002CB3B1 /* ShouYeViewController.m in Sources */, CA5D02E72CC0DD6B007B3BA5 /* OrderGoodsModel.m in Sources */, @@ -5105,6 +5226,7 @@ CABA14E32C9D707E002CB3B1 /* TextbookInfoModel.m in Sources */, CB489F792744A0BD00DA044A /* UIApplication+Visible.m in Sources */, CB489FD72744A30000DA044A /* PGGMoviePlayer.m in Sources */, + CAB9AA8C2CEC3D0B00B75BD6 /* PLPGSetListTableViewCell.m in Sources */, CA5D03692CC0DE8D007B3BA5 /* YouHuiQuanListViewController.m in Sources */, CA3868592CC1F66E009C98B0 /* LoginView.m in Sources */, CB489F982744A0BD00DA044A /* BaseModel.m in Sources */, @@ -5143,6 +5265,7 @@ CAA144CA2CDC66A300A25AC4 /* UpdataAlterView.m in Sources */, CB489F8A2744A0BD00DA044A /* UIButton+HQCustomIcon.m in Sources */, CA4257912CA2652D00A36A10 /* StartZNPPTView.m in Sources */, + CAB9AA982CEC6B5A00B75BD6 /* PLPGSetListEditTableViewCell.m in Sources */, CA2A38E02CEB3AF400156CD2 /* PiLiangXiuGaiPGTableViewCell.m in Sources */, CB489F632744A0BD00DA044A /* CountDownManager.m in Sources */, CB489F9A2744A0BD00DA044A /* baseInfoModel.m in Sources */, @@ -5168,6 +5291,7 @@ CA42578D2CA262B300A36A10 /* StartZNPPTViewController.m in Sources */, CA5D02DD2CC0DD6B007B3BA5 /* OrderInfoModel.m in Sources */, CB489F752744A0BD00DA044A /* NavgationController.m in Sources */, + CAB9AAA62CEC83AA00B75BD6 /* PLPGDetailView.m in Sources */, CB489F682744A0BD00DA044A /* DAYCalendarView.m in Sources */, CA5D03672CC0DE8D007B3BA5 /* YouHuiQuanDuiHuanSuccessView.m in Sources */, CABA14D92C9D5071002CB3B1 /* PageControlView.m in Sources */, @@ -5222,6 +5346,7 @@ CABD8CAF2CBFB3B3009A5E5E /* GongJuMinGanCiView.m in Sources */, CBD422BD28DAF34B00C32440 /* IndexSectionView.m in Sources */, CAA600D12CA9565500026CF4 /* KeTangXieZuoViewController.m in Sources */, + CAB9AAA92CEC856100B75BD6 /* PLPGDetailItemView.m in Sources */, CB489FA12744A0BD00DA044A /* ZJTitleView.m in Sources */, CA0D082D2CA4F8930086855E /* ShouYeZNXZTableViewCell.m in Sources */, CA0688D02CD3291900DF7025 /* OcrModel.m in Sources */, @@ -5229,6 +5354,7 @@ CA2A38E82CEB464C00156CD2 /* PiLiangXiuGaiLiShiTableViewCell.m in Sources */, CAF76E872CBE5F8B00825E5E /* GongJuCreateView.m in Sources */, CA07CD172CC5F25B00AF41ED /* TextbookDetailModel.m in Sources */, + CAB9AA822CEC23A800B75BD6 /* PingYuAlterView.m in Sources */, CAB0D3792CAA488C009BF67D /* ZhiNengXieZuoView.m in Sources */, CABD8C852CBF72A7009A5E5E /* GongJuTextView.m in Sources */, CABD8C812CBF6FFB009A5E5E /* GongJuTextViewController.m in Sources */, @@ -5243,6 +5369,7 @@ CB489FB52744A0BD00DA044A /* HYTimePickerView.m in Sources */, CA4257A32CA29BF900A36A10 /* StartZNPPTDaGangAlterView.m in Sources */, CA0D08832CA5682D0086855E /* CamreViewController.m in Sources */, + CAB9AAA22CEC808500B75BD6 /* PLPGDetailViewController.m in Sources */, CA0FD6932CA8EEF3009A4417 /* XieZuoFenXiangAlterNOTableViewCell.m in Sources */, CA487D9B2CA40D3A00AE773B /* StartPayGoodsPayView.m in Sources */, CABD8C792CBF6AC4009A5E5E /* GongJuCreateResultViewController.m in Sources */, @@ -5251,6 +5378,7 @@ CB489F722744A0BD00DA044A /* MCTabBarController.m in Sources */, CA0688E62CD374CD00DF7025 /* NSString+UnicharUtilities.m in Sources */, CABD8CAB2CBFB39F009A5E5E /* GongJuMinGanCiController.m in Sources */, + CAB9AA882CEC3BB400B75BD6 /* PLPGSetListController.m in Sources */, CA5D03642CC0DE8D007B3BA5 /* YaoQingViewController.m in Sources */, CB489F9F2744A0BD00DA044A /* LogView.m in Sources */, CAF76E8B2CBE642C00825E5E /* GongJuCreateInputView.m in Sources */, diff --git a/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate b/ProductApp/ProductApp.xcworkspace/xcuserdata/gongzuo.xcuserdatad/UserInterfaceState.xcuserstate index ccc1c74..29220cc 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/Assets.xcassets/首页/批量批改/plpg_X.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.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/首页/批量批改/plpg_X.imageset/容器@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/容器@2x.png new file mode 100644 index 0000000..c5c71b6 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/容器@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/容器@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/容器@3x.png new file mode 100644 index 0000000..ef985d2 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_X.imageset/容器@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/Contents.json new file mode 100644 index 0000000..d6d7abe --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(2).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@2x(2).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@2x(2).png new file mode 100644 index 0000000..45f2d67 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@2x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@3x(2).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@3x(2).png new file mode 100644 index 0000000..97e0740 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_add.imageset/容器@3x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/Contents.json new file mode 100644 index 0000000..8925e57 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@2x(1).png new file mode 100644 index 0000000..5b521e6 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@2x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@3x(1).png new file mode 100644 index 0000000..71d63a1 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_bi.imageset/容器@3x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/Contents.json new file mode 100644 index 0000000..1e403a6 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(3).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(3).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@2x(3).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@2x(3).png new file mode 100644 index 0000000..a3e39e4 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@2x(3).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@3x(3).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@3x(3).png new file mode 100644 index 0000000..21fd405 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_clear.imageset/容器@3x(3).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.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/首页/批量批改/plpg_del.imageset/容器@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/容器@2x.png new file mode 100644 index 0000000..c01c7ab Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/容器@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/容器@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/容器@3x.png new file mode 100644 index 0000000..09bd042 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_del.imageset/容器@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/Contents.json new file mode 100644 index 0000000..ea07d1b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42920@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42920@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@2x.png new file mode 100644 index 0000000..5d51061 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@3x.png new file mode 100644 index 0000000..815c5b9 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectN.imageset/组 42920@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/Contents.json new file mode 100644 index 0000000..238a633 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "组 42920@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "组 42920@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@2x(1).png new file mode 100644 index 0000000..f328b1d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@2x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@3x(1).png new file mode 100644 index 0000000..afda4ef Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/plpg_selectY.imageset/组 42920@3x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/Contents.json new file mode 100644 index 0000000..ca0e3df --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "writeback@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/writeback@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/writeback@3x.png new file mode 100644 index 0000000..dc2afd7 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/writeback.imageset/writeback@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/Contents.json new file mode 100644 index 0000000..d6d7abe --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(2).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(2).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@2x(2).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@2x(2).png new file mode 100644 index 0000000..16cd200 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@2x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@3x(2).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@3x(2).png new file mode 100644 index 0000000..ce6bcd6 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验N.imageset/容器@3x(2).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/Contents.json new file mode 100644 index 0000000..8925e57 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器@2x(1).png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器@3x(1).png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@2x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@2x(1).png new file mode 100644 index 0000000..8556fab Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@2x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@3x(1).png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@3x(1).png new file mode 100644 index 0000000..ca03227 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/校验Y.imageset/容器@3x(1).png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/Contents.json new file mode 100644 index 0000000..6696cf4 --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "容器 161@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "容器 161@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@2x.png new file mode 100644 index 0000000..60f9c7d Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@3x.png new file mode 100644 index 0000000..bac8a37 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效N.imageset/容器 161@3x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/Contents.json b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/Contents.json new file mode 100644 index 0000000..7b6156b --- /dev/null +++ b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.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/首页/批量批改/音效Y.imageset/容器@2x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/容器@2x.png new file mode 100644 index 0000000..6e9e701 Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/容器@2x.png differ diff --git a/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/容器@3x.png b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/容器@3x.png new file mode 100644 index 0000000..fb65dec Binary files /dev/null and b/ProductApp/ProductApp/Assets.xcassets/首页/批量批改/音效Y.imageset/容器@3x.png differ diff --git a/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.h b/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.h index a6aa206..db7dc1c 100644 --- a/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.h +++ b/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.h @@ -27,6 +27,7 @@ typedef enum : NSUInteger { UITextFieldTypeLandline, } UITextFieldType; +typedef void(^UITextFieldDidChangeBack)(NSString *value); @interface UITextField (SY) ///字符长度限制 @@ -34,6 +35,8 @@ typedef enum : NSUInteger { ///输入框类型 0:其他 1:纯数字 2:纯字母 3:字母+数字 3:小数点后保留两位 5:座机 @property (nonatomic, assign) UITextFieldType textType; +/// +@property (nonatomic , strong) UITextFieldDidChangeBack backDidTextValue; @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.m b/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.m index 6a93273..39072f9 100644 --- a/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.m +++ b/ProductApp/ProductApp/BaseControl/Category/UITextField/UITextField+SY.m @@ -13,6 +13,7 @@ static NSString *maxlengthKey = @"maxlengthKey"; //那么的key static NSString *textTypeKey = @"textTypeKey"; //那么的key +static NSString *backDidTextValueKey = @"backDidTextValueKey"; //那么的key @interface UITextField (SY) @end @@ -72,6 +73,10 @@ static NSString *textTypeKey = @"textTypeKey"; //那么的key } break; } + if(self.backDidTextValue) + { + self.backDidTextValue(self.text); + } } /** setter方法 @@ -119,6 +124,14 @@ static NSString *textTypeKey = @"textTypeKey"; //那么的key NSNumber *tenlength = objc_getAssociatedObject(self, &textTypeKey); return tenlength.integerValue; } +-(void)setBackDidTextValue:(UITextFieldDidChangeBack)backDidTextValue +{ + objc_setAssociatedObject(self, &backDidTextValueKey, backDidTextValue, OBJC_ASSOCIATION_COPY); +} +-(UITextFieldDidChangeBack)backDidTextValue +{ + return objc_getAssociatedObject(self, &backDidTextValueKey); +} #pragma mark -UITextfieldDelegate - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string diff --git a/ProductApp/ProductApp/Configure/ConfigireSetting.h b/ProductApp/ProductApp/Configure/ConfigireSetting.h index 519220f..8a4da68 100644 --- a/ProductApp/ProductApp/Configure/ConfigireSetting.h +++ b/ProductApp/ProductApp/Configure/ConfigireSetting.h @@ -162,6 +162,10 @@ alpha:alphaValue] //算法备案公示地址 #define SuanFaBeiANUrl @"static/policy/formula.html" +///相机声音和图片校验 +#define yingxiaoSave @"yingxiaoSave" +#define jiaoyanSave @"jiaoyanSave" + @end NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/alter/NomoAlterView.m b/ProductApp/ProductApp/ProductMain/alter/NomoAlterView.m index a4b1e44..aa99ae3 100644 --- a/ProductApp/ProductApp/ProductMain/alter/NomoAlterView.m +++ b/ProductApp/ProductApp/ProductMain/alter/NomoAlterView.m @@ -40,12 +40,20 @@ typedef void(^NomoAlterViewBack)(NSInteger selectTag); [viewback.layer setMasksToBounds:YES]; [viewback.layer setCornerRadius:20]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"plpg_backhd"]]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(viewback); + }]; + + UILabel *lbname = [[UILabel alloc] init]; [lbname setText:@"是否删除"]; [lbname setTextColor:RGBCOLOR(51, 51, 51)]; [lbname setTextAlignment:NSTextAlignmentCenter]; - [lbname setFont:[UIFont boldSystemFontOfSize:18]]; + [lbname setFont:[UIFont boldSystemFontOfSize:16]]; [lbname setNumberOfLines:0]; [viewback addSubview:lbname]; [lbname mas_makeConstraints:^(MASConstraintMaker *make) { @@ -74,7 +82,7 @@ typedef void(^NomoAlterViewBack)(NSInteger selectTag); [btitem.titleLabel setFont:[UIFont systemFontOfSize:14]]; if(i==1) { - [btitem setTitleColor:RGBCOLOR(249, 73, 73) forState:UIControlStateNormal]; + [btitem setTitleColor:RGBCOLOR(108, 119, 246) forState:UIControlStateNormal]; [btitem.titleLabel setFont:[UIFont boldSystemFontOfSize:14]]; } [viewback addSubview:btitem]; @@ -82,7 +90,7 @@ typedef void(^NomoAlterViewBack)(NSInteger selectTag); make.top.equalTo(viewline.mas_bottom); make.left.offset(f_w*i); make.width.offset(f_w); - make.height.offset(40); + make.height.offset(48); }]; [btitem setTag:i]; [btitem addTarget:self action:@selector(btAction:) forControlEvents:UIControlEventTouchUpInside]; @@ -102,7 +110,7 @@ typedef void(^NomoAlterViewBack)(NSInteger selectTag); [viewback mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(viewline).offset(40); + make.bottom.equalTo(viewline).offset(48); }]; } diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/PiLiangXiuGaiViewController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/PiLiangXiuGaiViewController.m index 9f448ac..f026f48 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/PiLiangXiuGaiViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/PiLiangXiuGaiViewController.m @@ -9,6 +9,10 @@ #import "PiLiangXiuGaiTableViewCell.h" #import "PiLiangXiuGaiPGTableViewCell.h" #import "PiLiangXiuGaiLiShiViewController.h" +#import "NomoAlterView.h" +#import "CamreViewController.h" +#import "PLPGSetListController.h" +#import "PLPGDetailViewController.h" @interface PiLiangXiuGaiViewController () @@ -38,7 +42,12 @@ } -(void)navBackButtonAction { - [self.navigationController popViewControllerAnimated:YES]; + [NomoAlterView showInfo:@"退出后会清空列表，是否退出" SelectTag:^(NSInteger tag) { + if(tag==1) + { + [self.navigationController popViewControllerAnimated:YES]; + } + }]; } -(void)navMuenButtonAction { @@ -178,14 +187,20 @@ [btzdy addTarget:self action:@selector(zidingyiAction) forControlEvents:UIControlEventTouchUpInside]; } +///自定义 -(void)zidingyiAction { - + PLPGSetListController *vc = [PLPGSetListController new]; + [self.navigationController pushViewController:vc animated:YES]; } - +///添加作文 -(void)addAction { - + CamreViewController *vc = [CamreViewController new]; + vc.type = 1; + vc.ispiliangpigai = YES; + [self.navigationController pushViewController:vc animated:YES]; + [UserInfoModel shijianShangBao:0 key:@"client.jump.to.camera" value:@"correct" extra:@""]; } #pragma mark - UITableView @@ -241,6 +256,7 @@ } -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - + PLPGDetailViewController *vc = [PLPGDetailViewController new]; + [self.navigationController pushViewController:vc animated:YES]; } @end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/cell/PiLiangXiuGaiTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/cell/PiLiangXiuGaiTableViewCell.m index bbe7b3c..1e046e9 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/cell/PiLiangXiuGaiTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/cell/PiLiangXiuGaiTableViewCell.m @@ -7,6 +7,7 @@ #import "PiLiangXiuGaiTableViewCell.h" +#import "PingYuAlterView.h" @interface PiLiangXiuGaiTableViewCell () @@ -204,7 +205,7 @@ -(void)chakanAction { - + [PingYuAlterView showInfo:@"这篇作文以成长的脚步为线索，贯穿了作者从幼儿园到初中的心路历程，情感真挚，描绘细腻。作者巧妙地运用了不同的比喻和引用，展现了成长中的种种感悟，整体上是一篇富有深意和文采的作文。"]; } -(void)saveAction diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.h new file mode 100644 index 0000000..ba85e5c --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.h @@ -0,0 +1,16 @@ +// +// PingYuAlterView.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PingYuAlterView : UIView ++(void)showInfo:(NSString *)info; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.m new file mode 100644 index 0000000..03ebc61 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/view/PingYuAlterView.m @@ -0,0 +1,146 @@ +// +// PingYuAlterView.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PingYuAlterView.h" +#import "AppDelegate.h" + + +@interface PingYuAlterView () + +/// +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbinfo; +@property (nonatomic , strong) UIButton *btok; + +/// +@property (nonatomic , strong) NSString *strinfo; +@property (nonatomic , strong) NSString *strtitle; +@property (nonatomic , strong) NSString *strbttitle; + +@end + +@implementation PingYuAlterView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + [self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)]; + + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(50); + make.right.equalTo(self).offset(-50); + make.center.equalTo(self); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:20]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"plpg_backhd"]]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.right.equalTo(viewback); + }]; + + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"评语"]; + [lbname setTextColor:RGBCOLOR(51, 51, 51)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont boldSystemFontOfSize:15]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(20); + make.centerX.equalTo(viewback); + }]; + _lbname = lbname; + + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setText:@""]; + [lbinfo setTextColor:RGBCOLOR(51, 51, 51)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:14]]; + [lbinfo setNumberOfLines:0]; + [viewback addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.right.equalTo(viewback).offset(-20); + make.top.equalTo(lbname.mas_bottom).offset(20); + }]; + _lbinfo = lbinfo; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setImage:[UIImage imageNamed:@"plpg_X"] forState:UIControlStateNormal]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(5); + make.right.equalTo(viewback).offset(-5); + make.width.height.offset(35); + }]; + [btdel addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btok = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 80, 40)]; + [btok setTitle:@"复制" forState:UIControlStateNormal]; + [btok setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btok.titleLabel setFont:[UIFont systemFontOfSize:16]]; + [btok.layer setMasksToBounds:YES]; + [btok.layer setCornerRadius:10]; + [viewback addSubview:btok]; + [btok mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.offset(80); + make.centerX.equalTo(viewback); + make.top.equalTo(lbinfo.mas_bottom).offset(20); + make.height.offset(40); + }]; + [btok addTarget:self action:@selector(copyAction) forControlEvents:UIControlEventTouchUpInside]; + [btok.layer setMasksToBounds:YES]; + [btok.layer setCornerRadius:20]; + [Tools changedView:btok colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + _btok = btok; + + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(btok).offset(20); + }]; + } + return self; +} +-(void)delAction +{ + [self removeFromSuperview]; +} +-(void)copyAction +{ + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = self.strinfo; + [HXHud showMessage:@"复制成功" afterDelayType:0]; +} + +-(void)setStrinfo:(NSString *)strinfo +{ + _strinfo = strinfo; + self.lbinfo.text = strinfo; +} +-(void)setStrtitle:(NSString *)strtitle +{ + self.lbname.text = strtitle; +} +-(void)setStrbttitle:(NSString *)strbttitle +{ + [self.btok setTitle:strbttitle forState:UIControlStateNormal]; +} ++(void)showInfo:(NSString *)info +{ + PingYuAlterView *view = [[PingYuAlterView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + AppDelegate *app = (AppDelegate *)[UIApplication sharedApplication].delegate; + view.strinfo = info; + [app.window addSubview:view]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m index 7f78126..ee00308 100644 --- a/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/历史记录/cell/PiLiangXiuGaiLiShiTableViewCell.m @@ -7,6 +7,7 @@ #import "PiLiangXiuGaiLiShiTableViewCell.h" +#import "PingYuAlterView.h" @interface PiLiangXiuGaiLiShiTableViewCell () @@ -168,7 +169,7 @@ -(void)chakanAction { - + [PingYuAlterView showInfo:@"这篇作文以成长的脚步为线索，贯穿了作者从幼儿园到初中的心路历程，情感真挚，描绘细腻。作者巧妙地运用了不同的比喻和引用，展现了成长中的种种感悟，整体上是一篇富有深意和文采的作文。"]; } @end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.h new file mode 100644 index 0000000..cc09598 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.h @@ -0,0 +1,16 @@ +// +// PLPGSetListController.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.m new file mode 100644 index 0000000..279dff8 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/PLPGSetListController.m @@ -0,0 +1,201 @@ +// +// PLPGSetListController.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListController.h" +#import "PLPGSetListTableViewCell.h" +#import "PLPGSetListEditViewController.h" + +@interface PLPGSetListController () +/// +@property (nonatomic , strong) UITableView *tableView; + +/// +@property (nonatomic , strong) NSArray *arrdata; + +@end + +@implementation PLPGSetListController +- (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(246, 249, 250)]; + + 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.left.right.equalTo(self.view); + make.top.offset(NavHeight); + make.bottom.equalTo(self.view).offset(-TabHeight-20); + }]; + _tableView = tableView; + [self.tableView setEmptyDataSetDelegate:self]; + [self.tableView setEmptyDataSetSource:self]; + + + UIView *viewbottom = [[UIView alloc] init]; + [viewbottom setBackgroundColor:[UIColor whiteColor]]; + [self.view addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.equalTo(tableView.mas_bottom); + }]; + [self drawBottomView:viewbottom]; + + [self refShow]; +} + +-(void)refShow +{ + if(self.arrdata.count==0) + { + [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(self.view).offset(0); + }]; + } + else + { + [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(self.view).offset(-TabHeight-20); + }]; + } +} + + +-(void)drawBottomView:(UIView *)view +{ + UIButton *btadd = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 46)]; + [btadd setTitle:@"新增自定义" forState:UIControlStateNormal]; + [btadd setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btadd.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btadd.layer setMasksToBounds:YES]; + [btadd.layer setCornerRadius:6]; + [view addSubview:btadd]; + [btadd mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(9); + make.right.equalTo(view).offset(-16); + make.height.offset(46); + }]; + [btadd addTarget:self action:@selector(addAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btadd colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; +} + +-(void)addAction +{ + PLPGSetListEditViewController *vc = [PLPGSetListEditViewController new]; + [self.navigationController pushViewController:vc animated:YES]; +} + + +#pragma mark - UITableView +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 0; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"PLPGSetListTableViewCell"; + PLPGSetListTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[PLPGSetListTableViewCell 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 5; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 94; +} +-(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 +{ + +} +#pragma mark - DZNEmptyDataSetSource +- (UIView *)customViewForEmptyDataSet:(UIScrollView *)scrollView +{ + UIView *viewback = [[UIView alloc] init]; + NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:viewback attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1 constant:UISCREEN_HEIGHT-NavHeight]; + [viewback addConstraint:heightConstraint]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [viewback setUserInteractionEnabled:YES]; + + NSString *strimg = @"fanwen_noinfo"; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:strimg]]; + [imgvback setContentMode:UIViewContentModeScaleAspectFit]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(UISCREEN_WIDTH*0.6); + make.centerX.equalTo(viewback); + make.top.offset(50); + }]; + + NSString *str = @"暂无数据"; + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:str]; + [lbname setTextColor:RGBCOLOR(158, 158, 158)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:12]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(imgvback.mas_bottom).offset(-20); + make.centerX.equalTo(viewback); + }]; + + UIButton *btadd = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 116, 45)]; + [btadd setTitle:@"新增设置" forState:UIControlStateNormal]; + [btadd setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btadd.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btadd.layer setMasksToBounds:YES]; + [btadd.layer setCornerRadius:22.5]; + [viewback addSubview:btadd]; + [btadd mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(lbname.mas_bottom).offset(30); + make.centerX.equalTo(viewback); + make.size.sizeOffset(CGSizeMake(116, 45)); + }]; + [Tools changedView:btadd colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + [btadd addTarget:self action:@selector(addAction) forControlEvents:UIControlEventTouchUpInside]; + + + return viewback; +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.h new file mode 100644 index 0000000..5c7e522 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.h @@ -0,0 +1,16 @@ +// +// PLPGSetListTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListTableViewCell : UITableViewCell + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.m new file mode 100644 index 0000000..5c64029 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/cell/PLPGSetListTableViewCell.m @@ -0,0 +1,146 @@ +// +// PLPGSetListTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListTableViewCell.h" + + +@interface PLPGSetListTableViewCell () +/// +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbmoren; +@property (nonatomic , strong) UILabel *lbfen; +/// +@property (nonatomic , strong) UIButton *btnomo; + +@end + +@implementation PLPGSetListTableViewCell + +-(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); + }]; + [Tools normalShadow:viewback shadowColor:RGBACOLOR(0, 80, 106, 0.1) shadowOpacity:0 cornerRadius:8 shadowRadius:10]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"我的植物朋友"]; + [lbname setTextColor:RGBCOLOR(51, 51, 51)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont boldSystemFontOfSize:14]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(14); + make.width.lessThanOrEqualTo(@(UISCREEN_WIDTH-120)); + }]; + _lbname = lbname; + + UILabel *lbmoren = [[UILabel alloc] init]; + [lbmoren setText:@"默认"]; + [lbmoren setTextColor:RGBCOLOR(108, 119, 246)]; + [lbmoren setTextAlignment:NSTextAlignmentCenter]; + [lbmoren setFont:[UIFont systemFontOfSize:10]]; + [viewback addSubview:lbmoren]; + [lbmoren mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname.mas_right); + make.centerY.equalTo(lbname); + make.width.offset(25); + make.height.offset(14); + }]; + [lbmoren.layer setMasksToBounds:YES]; + [lbmoren.layer setCornerRadius:2]; + [lbmoren.layer setBorderWidth:1]; + [lbmoren.layer setBorderColor:RGBCOLOR(108, 119, 246).CGColor]; + _lbmoren = lbmoren; + + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"100分制"]; + [lbfen setTextColor:RGBCOLOR(255, 59, 55)]; + [lbfen setTextAlignment:NSTextAlignmentRight]; + [lbfen setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.centerY.equalTo(lbname); + make.right.equalTo(viewback).offset(-12); + make.width.lessThanOrEqualTo(@(80)); + }]; + _lbfen = lbfen; + + UIButton *btnomo = [[UIButton alloc] init]; + [btnomo setTitle:@"设为默认" forState:UIControlStateNormal]; + [btnomo setTitle:@"已默认" forState:UIControlStateSelected]; + [btnomo setTitleColor:RGBCOLOR(153, 153, 153) forState:UIControlStateNormal]; + [btnomo setTitleColor:RGBCOLOR(102, 102, 102) forState:UIControlStateSelected]; + [btnomo.titleLabel setFont:[UIFont systemFontOfSize:12]]; + [btnomo setImage:[UIImage imageNamed:@"ppt_type_selectN"] forState:UIControlStateNormal]; + [btnomo setImage:[UIImage imageNamed:@"ppt_type_selectY"] forState:UIControlStateSelected]; + [viewback addSubview:btnomo]; + [btnomo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname); + make.bottom.equalTo(viewback).offset(-10); + make.height.offset(30); + make.width.offset(80); + }]; + [btnomo setIconInLeftWithSpacing:1]; + [btnomo setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft]; + [btnomo addTarget:self action:@selector(nomoAction) forControlEvents:UIControlEventTouchUpInside]; + _btnomo = btnomo; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setTitle:@"删除" forState:UIControlStateNormal]; + [btdel setTitleColor:RGBCOLOR(51, 51, 51) forState:UIControlStateNormal]; + [btdel.titleLabel setFont:[UIFont systemFontOfSize:12]]; + [btdel.layer setMasksToBounds:YES]; + [btdel.layer setCornerRadius:10]; + [btdel setBackgroundColor:RGBCOLOR(246, 249, 250)]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(lbfen); + make.centerY.equalTo(btnomo); + make.size.sizeOffset(CGSizeMake(36, 20)); + }]; + [btdel addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btedit = [[UIButton alloc] init]; + [btedit setTitle:@"编辑" forState:UIControlStateNormal]; + [btedit setTitleColor:RGBCOLOR(51, 51, 51) forState:UIControlStateNormal]; + [btedit.titleLabel setFont:[UIFont systemFontOfSize:12]]; + [btedit.layer setMasksToBounds:YES]; + [btedit.layer setCornerRadius:10]; + [btedit setBackgroundColor:RGBCOLOR(246, 249, 250)]; + [viewback addSubview:btedit]; + [btedit mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(btdel.mas_left).offset(-14); + make.centerY.equalTo(btnomo); + make.size.sizeOffset(CGSizeMake(36, 20)); + }]; + [btedit addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside]; + + } + return self; +} + +-(void)nomoAction +{ + +} + +-(void)delAction +{ + +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.h new file mode 100644 index 0000000..d5c8b9b --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.h @@ -0,0 +1,16 @@ +// +// PLPGSetListEditViewController.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListEditViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m new file mode 100644 index 0000000..5392021 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/PLPGSetListEditViewController.m @@ -0,0 +1,47 @@ +// +// PLPGSetListEditViewController.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListEditViewController.h" +#import "PLPGSetListEditView.h" + +@interface PLPGSetListEditViewController () + +@end + +@implementation PLPGSetListEditViewController +- (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]; + [self.view setBackgroundColor:RGBCOLOR(246, 249, 250)]; + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"plpg_backhd"]]; + [self.view addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.equalTo(imgvback); + }]; + [self.view sendSubviewToBack:imgvback]; + + PLPGSetListEditView *view = [PLPGSetListEditView new]; + [self.view addSubview:view]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.offset(NavHeight); + }]; + +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.h new file mode 100644 index 0000000..a8f0f1d --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.h @@ -0,0 +1,17 @@ +// +// PLPGSetListEditAddItemCollectionViewCell.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListEditAddItemCollectionViewCell : UICollectionViewCell +/// +@property (nonatomic , strong) NSString *strvalue; +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.m new file mode 100644 index 0000000..19892ec --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditAddItemCollectionViewCell.m @@ -0,0 +1,49 @@ +// +// PLPGSetListEditAddItemCollectionViewCell.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListEditAddItemCollectionViewCell.h" + + +@interface PLPGSetListEditAddItemCollectionViewCell () +/// +@property (nonatomic , strong) UIView *viewback; +/// +@property (nonatomic , strong) UILabel *lbname ; +@end + +@implementation PLPGSetListEditAddItemCollectionViewCell +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + _viewback = viewback; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:4]; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setTextColor:RGBCOLOR(26, 26, 26)]; + [lbname setTextAlignment:NSTextAlignmentCenter]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(viewback); + }]; + _lbname = lbname; + } + return self; +} +-(void)setStrvalue:(NSString *)strvalue +{ + self.lbname.text = strvalue; +} +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.h new file mode 100644 index 0000000..de69952 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.h @@ -0,0 +1,18 @@ +// +// PLPGSetListEditTableViewCell.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +typedef void(^PLPGSetListEditTableViewCellBack)(void); +@interface PLPGSetListEditTableViewCell : UITableViewCell +/// +@property (nonatomic , strong) PLPGSetListEditTableViewCellBack backValue; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.m new file mode 100644 index 0000000..8f039f9 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/cell/PLPGSetListEditTableViewCell.m @@ -0,0 +1,93 @@ +// +// PLPGSetListEditTableViewCell.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListEditTableViewCell.h" +#import "NomoAlterView.h" + +@interface PLPGSetListEditTableViewCell () +/// +@property (nonatomic , strong) UILabel *lbname; +@property (nonatomic , strong) UILabel *lbfen; +@end + +@implementation PLPGSetListEditTableViewCell +-(id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier +{ + if(self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) + { + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:RGBCOLOR(245, 245, 245)]; + [self.contentView addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.right.equalTo(self).offset(-12); + make.top.offset(5); + make.bottom.equalTo(self).offset(-5); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:8]; + + UIImageView *imgvback = [[UIImageView alloc] init]; + [imgvback setImage:[UIImage imageNamed:@"plpg_bi"]]; + [viewback addSubview:imgvback]; + [imgvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.offset(16); + make.centerY.equalTo(viewback); + make.left.offset(12); + }]; + + 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.equalTo(imgvback.mas_right).offset(8); + make.centerY.equalTo(viewback); + }]; + _lbname = lbname; + + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"10分"]; + [lbfen setTextColor:RGBCOLOR(51, 51, 51)]; + [lbfen setTextAlignment:NSTextAlignmentLeft]; + [lbfen setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname.mas_right).offset(8); + make.centerY.equalTo(viewback); + }]; + _lbfen = lbfen; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setImage:[UIImage imageNamed:@"plpg_del"] forState:UIControlStateNormal]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.top.bottom.equalTo(viewback); + make.width.offset(50); + }]; + [btdel addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside]; + + } + return self; +} + +-(void)delAction +{ + [NomoAlterView showInfo:[NSString stringWithFormat:@"是否删除评分维度“%@”",@"主题主题主题主题主题主题"] SelectTag:^(NSInteger tag) { + if(tag==1) + { + if(self.backValue) + { + self.backValue(); + } + } + }]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.h new file mode 100644 index 0000000..6e5e820 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.h @@ -0,0 +1,21 @@ +// +// PLPGSetListEditAddItemView.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListEditAddItemView : UIView +///已设置的分数 +@property (nonatomic , strong) NSString *strfenNow; +///分数上限(最后在设置该参数) +@property (nonatomic , strong) NSString *strfenBig; + + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m new file mode 100644 index 0000000..c2bb4db --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditAddItemView.m @@ -0,0 +1,331 @@ +// +// PLPGSetListEditAddItemView.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListEditAddItemView.h" +#import "UITextField+SY.h" +#import "PLPGSetListEditAddItemCollectionViewCell.h" + +@interface PLPGSetListEditAddItemView () +/// +@property (nonatomic , strong) UIView *viewback; +/// +@property (nonatomic , strong) UITextField *fieldfen; +@property (nonatomic , strong) UITextField *fieldname; +@property (nonatomic , strong) UILabel *lbtsfen; +@property (nonatomic , strong) UILabel *lbtsname; + +/// +@property (nonatomic , strong) UICollectionView *collect; + +/// +@property (nonatomic , strong) NSArray *arrdata; + +@end + +@implementation PLPGSetListEditAddItemView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + [self setBackgroundColor:RGBACOLOR(0, 0, 0, 0.4)]; + + UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, UISCREEN_HEIGHT, UISCREEN_WIDTH, 480+TabHeight)];; + [viewback setBackgroundColor:RGBCOLOR(246, 249, 250)]; + [self addSubview:viewback]; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewback.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(14,14)]; + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewback.bounds; + maskLayer.path = maskPath.CGPath; + viewback.layer.mask = maskLayer; + _viewback = viewback; + + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:@"添加评分维度"]; + [lbname setTextColor:RGBCOLOR(51, 51, 51)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont boldSystemFontOfSize:15]]; + [viewback addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(18); + make.centerX.equalTo(viewback); + }]; + + UIButton *btdel = [[UIButton alloc] init]; + [btdel setImage:[UIImage imageNamed:@"plpg_X"] forState:UIControlStateNormal]; + [viewback addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(viewback); + make.centerY.equalTo(lbname); + make.width.height.offset(50); + }]; + [btdel addTarget:self action:@selector(delAction) forControlEvents:UIControlEventTouchUpInside]; + + + NSArray *arrt = @[@"标准得分",@"标准名称"]; + UIView *viewlast = nil; + for(int i = 0 ; i < arrt.count; i++) + { + UIView *viewitem = [[UIView alloc] init]; + [viewback addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(viewback); + if(viewlast) + { + make.top.equalTo(viewlast.mas_bottom).offset(10); + } + else + { + make.top.equalTo(lbname.mas_bottom).offset(8); + } + make.height.offset(90); + }]; + UITextField *field = [self drawItemView:viewitem andtitle:arrt[i] platch:@"请输入"]; + + UILabel *lbts = [viewitem viewWithTag:10000]; + if(i==0) + { + [field setMaxlength:10]; + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"分"]; + [lbfen setTextColor:RGBCOLOR(51, 51, 51)]; + [lbfen setTextAlignment:NSTextAlignmentLeft]; + [lbfen setFont:[UIFont systemFontOfSize:14]]; + [field.superview addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(field.superview).offset(-12); + make.top.bottom.equalTo(field.superview); + }]; + [field setKeyboardType:UIKeyboardTypeNumberPad]; + + self.lbtsfen = lbts; + + self.fieldfen = field; + [self refShowFen:lbts]; + + [field setBackDidTextValue:^(NSString * _Nonnull value) { + if(self.strfenBig.intValue>0) + { + self.lbtsfen.text = [NSString stringWithFormat:@"%@/%@分",value,self.strfenBig]; + [self refShowFen:self.lbtsfen]; + } + }]; + } + else + { + self.lbtsname = lbts; + [field setMaxlength:10]; + self.fieldname = field; + lbts.text = @"0/10字"; + [self refShowFen:lbts]; + + [field setBackDidTextValue:^(NSString * _Nonnull value) { + lbts.text = [NSString stringWithFormat:@"%ld/10字",value.length]; + [self refShowFen:lbts]; + }]; + + } + + viewlast = viewitem; + } + + 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(viewlast.mas_bottom).offset(12); + make.height.offset(174); + }]; + [collect setTag:1]; + [collect registerClass:[PLPGSetListEditAddItemCollectionViewCell class] forCellWithReuseIdentifier:@"PLPGSetListEditAddItemCollectionViewCell"]; + _collect = collect; + self.arrdata = @[@"主题",@"整体结构",@"深度",@"书写规范",@"观点",@"观点创新",@"逻辑清晰",@"内容新颖",@"内容",@"语言运用",@"词汇表达",@"构思巧妙",@"语法",@"感情真挚",@"卷面整洁",@"立意新颖",]; + + + UIView *viewbottom = [[UIView alloc] init]; + [viewbottom setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(viewback); + make.height.offset(TabHeight+20); + }]; + [self drawBottomView:viewbottom]; + + [UIView animateWithDuration:0.3 animations:^{ + viewback.bottom = UISCREEN_HEIGHT; + }]; + } + return self; +} +-(void)drawBottomView:(UIView *)view +{ + UIButton *btadd = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 46)]; + [btadd setTitle:@"添加" forState:UIControlStateNormal]; + [btadd setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btadd.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btadd.layer setMasksToBounds:YES]; + [btadd.layer setCornerRadius:6]; + [view addSubview:btadd]; + [btadd mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(9); + make.right.equalTo(view).offset(-16); + make.height.offset(46); + }]; + [btadd addTarget:self action:@selector(addAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btadd colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; +} + +-(UITextField *)drawItemView:(UIView *)view andtitle:(NSString *)title platch:(NSString *)platch +{ + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(102, 102, 102)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(16); + }]; + + UILabel *lbtishi = [[UILabel alloc] init]; + [lbtishi setText:@""]; + [lbtishi setTextColor:RGBCOLOR(51, 51, 51)]; + [lbtishi setTextAlignment:NSTextAlignmentLeft]; + [lbtishi setFont:[UIFont systemFontOfSize:12]]; + [lbtishi setTag:10000]; + [view addSubview:lbtishi]; + [lbtishi mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(lbname.mas_right).offset(8); + make.centerY.equalTo(lbname); + }]; + + + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [view addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.equalTo(lbname.mas_bottom).offset(8); + make.right.equalTo(view).offset(-12); + make.height.offset(50); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:4]; + + + UITextField *field = [[UITextField alloc] init]; + [field setTextColor:RGBCOLOR(51, 51, 51)]; + [field setTextAlignment:NSTextAlignmentLeft]; + [field setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:field]; + [field mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.bottom.equalTo(viewback); + make.right.equalTo(viewback).offset(-12); + }]; + [field setPlaceholder:platch]; + + return field; +} +-(void)refShowFen:(UILabel *)lbfen +{ + NSString *str = lbfen.text; + NSArray *arr = [str componentsSeparatedByString:@"/"]; + if(arr.count==2) + { + int one = [arr.firstObject intValue]; + NSString *strtemp = [arr[1] stringByReplacingOccurrencesOfString:@"分" withString:@""]; + strtemp = [strtemp stringByReplacingOccurrencesOfString:@"字" withString:@""]; + int two = [strtemp intValue]; + if(one>two) + { + lbfen.attributedText = [Tools arrstring:str andstart:0 andend:(int)[arr.firstObject length] andfont:[UIFont systemFontOfSize:12] andcolor:RGBCOLOR(255, 59, 55)]; + } + else + { + if(one==0) + { + lbfen.attributedText = [Tools arrstring:str andstart:0 andend:(int)[arr.firstObject length] andfont:[UIFont systemFontOfSize:12] andcolor:RGBCOLOR(153, 153, 153)]; + } + else + { + lbfen.attributedText = [Tools arrstring:str andstart:0 andend:(int)[arr.firstObject length] andfont:[UIFont systemFontOfSize:12] andcolor:RGBCOLOR(51, 51, 51)]; + } + } + } +} +-(void)setStrfenBig:(NSString *)strfenBig +{ + _strfenBig = strfenBig; + if(strfenBig.intValue>0) + { + self.lbtsfen.text = [NSString stringWithFormat:@"%d/%@分",self.strfenNow.intValue,self.strfenBig]; + [self refShowFen:self.lbtsfen]; + } +} +-(void)delAction +{ + [UIView animateWithDuration:0.3 animations:^{ + self.viewback.top = UISCREEN_HEIGHT; + } completion:^(BOOL finished) { + [self removeFromSuperview]; + }]; +} + +-(void)addAction +{ + +} + +#pragma mark - UICollectionView +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section +{ + return self.arrdata.count; +} +- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath +{ + PLPGSetListEditAddItemCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"PLPGSetListEditAddItemCollectionViewCell" forIndexPath:indexPath]; + cell.strvalue = self.arrdata[indexPath.row]; + return cell; +} +//定义每个section的间距 +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + + return UIEdgeInsetsMake(0, 16, 0, 16); +} +//纵向cell间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 10; +} +//cell 间距 +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout ForSectionAtIndex:(NSInteger)section{ + return 10; +} +// 定义每个UICollectionViewCell 的大小 +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath +{ + return CGSizeMake((UISCREEN_WIDTH-62)/4.0, 36); +} +-(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath +{ + ///做选中操作 + self.fieldname.text = self.arrdata[indexPath.row]; + self.lbtsname.text = [NSString stringWithFormat:@"%ld/10字",self.fieldname.text.length]; + [self refShowFen:self.lbtsname]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.h new file mode 100644 index 0000000..03c109a --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.h @@ -0,0 +1,16 @@ +// +// PLPGSetListEditView.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGSetListEditView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.m new file mode 100644 index 0000000..402af8f --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改设置列表/编辑设置/view/PLPGSetListEditView.m @@ -0,0 +1,461 @@ +// +// PLPGSetListEditView.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGSetListEditView.h" +#import "PLPGSetListEditTableViewCell.h" +#import "PLPGSetListEditAddItemView.h" +#import "NomoAlterView.h" + +@interface PLPGSetListEditView () +/// +@property (nonatomic , strong) UIView *viewinfo; +@property (nonatomic , strong) UIView *viewbottom; + +/// +@property (nonatomic , strong) UITextField *fieldname; + +@property (nonatomic , strong) UITextField *fieldnumber; + +@property (nonatomic , strong) UIButton *btcbz; +@property (nonatomic , strong) UIButton *btpy; +@property (nonatomic , strong) UILabel *lbfen; + +/// +@property (nonatomic , strong) UITableView *tableView; + +@end + +@implementation PLPGSetListEditView + +-(id)initWithFrame:(CGRect)frame +{ + if(self = [super initWithFrame:frame]) + { + + UIScrollView *scvback = [[UIScrollView alloc] init]; + [scvback setShowsVerticalScrollIndicator:NO]; + [self addSubview:scvback]; + [scvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.top.offset(0); + make.width.equalTo(self); + make.height.equalTo(self).offset(-TabHeight-40); + }]; + + UIView *viewinfo = [[UIView alloc] init]; + [viewinfo setBackgroundColor:[UIColor whiteColor]]; + [scvback addSubview:viewinfo]; + [viewinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(16); + make.width.offset(UISCREEN_WIDTH-32); + }]; + [viewinfo.layer setMasksToBounds:YES]; + [viewinfo.layer setCornerRadius:8]; + _viewinfo = viewinfo; + [self drawInfoView:viewinfo]; + + [scvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(viewinfo); + }]; + + UIView *viewbottom = [[UIView alloc] init]; + [viewbottom setBackgroundColor:[UIColor whiteColor]]; + [self addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self); + make.height.offset(TabHeight+25); + }]; + _viewbottom = viewbottom; + [self drawBottomView:viewbottom]; + + } + return self; +} + +-(void)drawBottomView:(UIView *)view +{ + UIButton *btdel = [[UIButton alloc] init]; + [btdel setTitle:@"删除" forState:UIControlStateNormal]; + [btdel setTitleColor:RGBCOLOR(108, 119, 246) forState:UIControlStateNormal]; + [btdel.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btdel.layer setMasksToBounds:YES]; + [btdel.layer setCornerRadius:8]; + [view addSubview:btdel]; + [btdel mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.top.offset(9); + make.width.offset(103); + make.height.offset(46); + }]; + [btdel.layer setBorderColor:RGBCOLOR(108, 119, 246).CGColor]; + [btdel.layer setBorderWidth:1]; + [btdel setTag:0]; + [btdel addTarget:self action:@selector(bottomAction:) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btsave = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32-103-10, 46)]; + [btsave setTitle:@"保存" forState:UIControlStateNormal]; + [btsave setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btsave.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btsave.layer setMasksToBounds:YES]; + [btsave.layer setCornerRadius:8]; + [view addSubview:btsave]; + [btsave mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(btdel.mas_right).offset(10); + make.top.offset(9); + make.right.equalTo(view).offset(-16); + make.height.offset(46); + }]; + [Tools changedView:btsave colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; + [btsave setTag:1]; + [btsave addTarget:self action:@selector(bottomAction:) forControlEvents:UIControlEventTouchUpInside]; + ///如果是添加就没得删除 编辑才有 + +} + +-(void)drawInfoView:(UIView *)view +{ + NSArray *arrt = @[@"*名称备注",@"*评分上限"]; + UIView *viewlast = nil; + for(int i = 0 ; i < arrt.count; i++) + { + UIView *viewitem = [[UIView alloc] init]; + [view addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(view); + if(viewlast) + { + make.top.equalTo(viewlast.mas_bottom).offset(10); + } + else + { + make.top.offset(0); + } + make.height.offset(90); + }]; + UITextField *field = [self drawItemView:viewitem andtitle:arrt[i] platch:@"请输入"]; + + if(i==1) + { + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"分"]; + [lbfen setTextColor:RGBCOLOR(51, 51, 51)]; + [lbfen setTextAlignment:NSTextAlignmentLeft]; + [lbfen setFont:[UIFont systemFontOfSize:14]]; + [field.superview addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(field.superview).offset(-12); + make.top.bottom.equalTo(field.superview); + }]; + [field setKeyboardType:UIKeyboardTypeNumberPad]; + self.fieldnumber = field; + } + else + { + self.fieldname = field; + } + + viewlast = viewitem; + } + + NSArray *arrswitch = @[@"错别字检查",@"评语",@"评分维度"]; + + for(int i = 0 ; i < arrswitch.count;i++) + { + UIView *viewitem = [[UIView alloc] init]; + [view addSubview:viewitem]; + [viewitem mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(view); + make.top.equalTo(viewlast.mas_bottom).offset(10); + make.height.offset(50); + }]; + UIButton *bt = [self drwaSelectView:viewitem andtitle:arrswitch[i] tag:i]; + viewlast = viewitem; + + if(i==0) + { + self.btcbz = bt; + } + else if (i==1) + { + self.btpy = bt; + } + else if (i==2) + { + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@"0/0分"]; + [lbfen setTextColor:RGBCOLOR(51, 51, 51)]; + [lbfen setTextAlignment:NSTextAlignmentRight]; + [lbfen setFont:[UIFont systemFontOfSize:12]]; + [viewitem addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.right.equalTo(viewitem).offset(-60); + make.centerY.equalTo(viewitem); + }]; + self.lbfen = lbfen; + [self refShowFen]; + } + } + NSString *strinfo = @"使用说明：\n1.这里设置的评分标准，决定最终的作文评分；\n2.每项分数上限加起来必须满足【评分上限】设置的分数；"; + UILabel *lbinfo = [[UILabel alloc] init]; + [lbinfo setTextColor:RGBCOLOR(158, 158, 158)]; + [lbinfo setTextAlignment:NSTextAlignmentLeft]; + [lbinfo setFont:[UIFont systemFontOfSize:12]]; + [lbinfo setNumberOfLines:0]; + [view addSubview:lbinfo]; + [lbinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.right.equalTo(view).offset(-12); + make.top.equalTo(viewlast.mas_bottom).offset(5); + }]; + ///行间距 + NSMutableParagraphStyle *style = [NSMutableParagraphStyle new]; + style.lineSpacing = 11; + style.lineBreakMode = NSLineBreakByCharWrapping; + style.alignment = NSTextAlignmentLeft; + NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] initWithString:strinfo]; + [attrString addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, strinfo.length)]; + lbinfo.attributedText = attrString; + + UIButton *btclear = [[UIButton alloc] init]; + [btclear setTitle:@"清空" forState:UIControlStateNormal]; + [btclear setTitleColor:RGBCOLOR(51, 51, 51) forState:UIControlStateNormal]; + [btclear.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btclear setImage:[UIImage imageNamed:@"plpg_clear"] forState:UIControlStateNormal]; + [btclear.layer setMasksToBounds:YES]; + [btclear.layer setCornerRadius:8]; + [btclear.layer setBorderWidth:1]; + [btclear.layer setBorderColor:RGBCOLOR(220, 220, 220).CGColor]; + [view addSubview:btclear]; + [btclear mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.equalTo(lbinfo.mas_bottom).offset(20); + make.height.offset(44); + make.width.offset((UISCREEN_WIDTH-32-24-10)/2.0); + }]; + [btclear setIconInLeft]; + [btclear addTarget:self action:@selector(clearAction) forControlEvents:UIControlEventTouchUpInside]; + + + UIButton *btadd = [[UIButton alloc] init]; + [btadd setTitle:@"添加" forState:UIControlStateNormal]; + [btadd setTitleColor:RGBCOLOR(108, 119, 246) forState:UIControlStateNormal]; + [btadd.titleLabel setFont:[UIFont systemFontOfSize:15]]; + [btadd setImage:[UIImage imageNamed:@"plpg_add"] forState:UIControlStateNormal]; + [btadd.layer setMasksToBounds:YES]; + [btadd.layer setCornerRadius:8]; + [btadd setBackgroundColor:RGBCOLOR(240, 241, 254)]; + [view addSubview:btadd]; + [btadd mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.equalTo(btclear.mas_right).offset(10); + make.top.equalTo(lbinfo.mas_bottom).offset(20); + make.height.offset(44); + make.width.offset((UISCREEN_WIDTH-32-24-10)/2.0); + }]; + [btadd setIconInLeft]; + [btadd addTarget:self action:@selector(addAction) forControlEvents:UIControlEventTouchUpInside]; + + + UITableView *tableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStyleGrouped]; + [tableView setSeparatorStyle:UITableViewCellSeparatorStyleNone]; + [tableView setBackgroundColor:[UIColor clearColor]]; + [tableView setDelegate:self]; + [tableView setDataSource:self]; + [view addSubview:tableView]; + [tableView mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(view); + make.top.equalTo(btadd.mas_bottom).offset(10); + make.height.offset(1); + }]; + _tableView = tableView; + ///// + [self.tableView mas_updateConstraints:^(MASConstraintMaker *make) { + make.height.offset(60*5); + }]; + + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(tableView).offset(10); + }]; +} + +-(UIButton *)drwaSelectView:(UIView *)view andtitle:(NSString *)title tag:(int)tag +{ + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(51, 51, 51)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.centerY.equalTo(view); + }]; + + UIButton *btswitch = [[UIButton alloc] init]; + [btswitch setBackgroundImage:[UIImage imageNamed:@"plpg_selectN"] forState:UIControlStateNormal]; + [btswitch setBackgroundImage:[UIImage imageNamed:@"plpg_selectY"] forState:UIControlStateSelected]; + [view addSubview:btswitch]; + [btswitch mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(40, 20)); + make.centerY.equalTo(view); + make.right.equalTo(view).offset(-12); + }]; + [btswitch setTag:tag]; + [btswitch addTarget:self action:@selector(switchAction:) forControlEvents:UIControlEventTouchUpInside]; + if(tag==2) + { + [btswitch setSelected:YES]; + [btswitch setUserInteractionEnabled:NO]; + } + return btswitch; +} + +-(UITextField *)drawItemView:(UIView *)view andtitle:(NSString *)title platch:(NSString *)platch +{ + float f_w = [Tools getWidthWithText:title height:20 font:15]+5; + UILabel *lbname = [[UILabel alloc] init]; + [lbname setText:title]; + [lbname setTextColor:RGBCOLOR(102, 102, 102)]; + [lbname setTextAlignment:NSTextAlignmentLeft]; + [lbname setFont:[UIFont systemFontOfSize:14]]; + [view addSubview:lbname]; + [lbname mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(16); + make.width.offset(f_w); + }]; + lbname.attributedText = [Tools arrstring:title andstart:0 andend:1 andfont:[UIFont systemFontOfSize:14] andcolor:RGBCOLOR(255, 59, 55)]; + + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:RGBCOLOR(246, 249, 250)]; + [view addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.equalTo(lbname.mas_bottom).offset(8); + make.right.equalTo(view).offset(-12); + make.height.offset(50); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:4]; + + + UITextField *field = [[UITextField alloc] init]; + [field setTextColor:RGBCOLOR(51, 51, 51)]; + [field setTextAlignment:NSTextAlignmentLeft]; + [field setFont:[UIFont systemFontOfSize:14]]; + [viewback addSubview:field]; + [field mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.bottom.equalTo(viewback); + make.right.equalTo(viewback).offset(-12); + }]; + [field setPlaceholder:platch]; + + return field; +} +-(void)refShowFen +{ + NSString *str = self.lbfen.text; + NSArray *arr = [str componentsSeparatedByString:@"/"]; + if(arr.count==2) + { + int one = [arr.firstObject intValue]; + int two = [[arr[1] stringByReplacingOccurrencesOfString:@"分" withString:@""] intValue]; + if(one>two) + { + self.lbfen.attributedText = [Tools arrstring:str andstart:0 andend:(int)[arr.firstObject length] andfont:[UIFont systemFontOfSize:12] andcolor:RGBCOLOR(255, 59, 55)]; + } + else + { + self.lbfen.attributedText = [Tools arrstring:str andstart:0 andend:(int)[arr.firstObject length] andfont:[UIFont systemFontOfSize:12] andcolor:RGBCOLOR(153, 153, 153)]; + } + } +} + +-(void)switchAction:(UIButton *)sender +{ + sender.selected = !sender.selected; +} +-(void)clearAction +{ + + [self refShowFen]; + +} +-(void)addAction +{ + PLPGSetListEditAddItemView *view = [[PLPGSetListEditAddItemView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + view.strfenNow = @"0"; + view.strfenBig = self.fieldnumber.text; + [self.viewController.view addSubview:view]; + +} + +-(void)bottomAction:(UIButton *)sender +{ + if(sender.tag==0) + {///删除 + [NomoAlterView showInfo:[NSString stringWithFormat:@"是否删除自定义设置“%@”",self.fieldname.text] SelectTag:^(NSInteger tag) { + if(tag==1) + { + + } + }]; + } + else + {///添加 + + } +} + +#pragma mark - UITableView +-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section +{ + return 5; +} +-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath +{ + static NSString *strcell = @"PLPGSetListEditTableViewCell"; + PLPGSetListEditTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:strcell]; + if(!cell) + { + cell = [[PLPGSetListEditTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:strcell]; + [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; + [cell setBackgroundColor:[UIColor clearColor]]; + } + + [cell setBackValue:^{ + + }]; + + return cell; +} +-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section +{ + return 5; +} +-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section +{ + return 5; +} +-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath +{ + return 60; +} +-(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/首页/批量批改/批改详情/PLPGDetailViewController.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/PLPGDetailViewController.h new file mode 100644 index 0000000..1f9453d --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/PLPGDetailViewController.h @@ -0,0 +1,16 @@ +// +// PLPGDetailViewController.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "BaseViewController.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGDetailViewController : BaseViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/PLPGDetailViewController.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/PLPGDetailViewController.m new file mode 100644 index 0000000..aefde21 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/PLPGDetailViewController.m @@ -0,0 +1,42 @@ +// +// PLPGDetailViewController.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGDetailViewController.h" +#import "PLPGDetailView.h" + + +@interface PLPGDetailViewController () + +@end + +@implementation PLPGDetailViewController +- (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:[UIColor whiteColor]]; + + PLPGDetailView *view = [[PLPGDetailView alloc] init]; + [self.view addSubview:view]; + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self.view); + make.top.offset(NavHeight); + }]; +} + + + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.h new file mode 100644 index 0000000..6c7aba6 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.h @@ -0,0 +1,16 @@ +// +// PLPGDetailItemView.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGDetailItemView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.m new file mode 100644 index 0000000..401543f --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailItemView.m @@ -0,0 +1,91 @@ +// +// PLPGDetailItemView.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGDetailItemView.h" + +@interface PLPGDetailItemView () +/// +@property (nonatomic , strong) UIScrollView *scvback; +/// +@property (nonatomic , strong) UIView *viewinfo ; + +@end + +@implementation PLPGDetailItemView + +-(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); + }]; + [scvback setDelegate:self]; + _scvback = scvback; + + UIView *viewback = [[UIView alloc] init]; + [viewback setBackgroundColor:RGBCOLOR(240, 241, 254)]; + [scvback addSubview:viewback]; + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(20); + make.top.offset(20); + make.width.offset(UISCREEN_WIDTH-40); + }]; + [viewback.layer setMasksToBounds:YES]; + [viewback.layer setCornerRadius:20]; + + + UIView *viewinfo = [[UIView alloc] init]; + [viewinfo setBackgroundColor:[UIColor whiteColor]]; + [viewback addSubview:viewinfo]; + [viewinfo mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(15); + make.right.equalTo(viewback).offset(-12); + }]; + [viewinfo.layer setMasksToBounds:YES]; + [viewinfo.layer setCornerRadius:20]; + _viewinfo = viewinfo; + + [viewback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(viewinfo).offset(15); + }]; + + [scvback mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(viewback).offset(20); + }]; + + + [self drawViewInfo:viewinfo]; + + } + return self; +} + +-(void)drawViewInfo:(UIView *)view +{ + ViewLable *lbwz = [[ViewLable alloc] init]; + [view addSubview:lbwz]; + [lbwz mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(12); + make.top.offset(17); + make.right.equalTo(view).offset(-12); + }]; + lbwz.textColor = RGBCOLOR(61, 61, 61); + lbwz.textFont = [UIFont systemFontOfSize:14]; + lbwz.isCloseAnimation = YES; + lbwz.strValue = @"原文问题：文章内容相对空洞，仅仅描述了春天的景色和小华、小刚放风筝的情景，缺乏深度和细节。"; + + [view mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.equalTo(lbwz).offset(17); + }]; +} + +@end diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.h b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.h new file mode 100644 index 0000000..50f3813 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.h @@ -0,0 +1,16 @@ +// +// PLPGDetailView.h +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface PLPGDetailView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.m b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.m new file mode 100644 index 0000000..d155790 --- /dev/null +++ b/ProductApp/ProductApp/ProductMain/首页/批量批改/批改详情/view/PLPGDetailView.m @@ -0,0 +1,221 @@ +// +// PLPGDetailView.m +// ProductApp +// +// Created by 工作 on 2024/11/19. +// + +#import "PLPGDetailView.h" +#import "StartKTXZPGDetailTabView.h" +#import "PLPGDetailItemView.h" + +@interface PLPGDetailView () +/// +@property (nonatomic , strong) UIScrollView *scvback; +/// +@property (nonatomic , strong) UILabel *lbfen; +@property (nonatomic , strong) UIImageView *imgvnumber; + +/// +@property (nonatomic , strong) UIView *viewback; + +@property (nonatomic , strong) UIView *viewbottom; + +/// +@property (nonatomic , strong) StartKTXZPGDetailTabView *viewtop; +/// +@property (nonatomic , strong) UIScrollView *scvbackinfo; + +/// +@property (nonatomic , strong) PLPGDetailItemView *viewwd; + + +@end + + +@implementation PLPGDetailView + +-(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.equalTo(self); + make.height.equalTo(self).offset(-200); + }]; + _scvback = scvback; + + UILabel *lbfen = [[UILabel alloc] init]; + [lbfen setText:@""]; + [lbfen setTextColor:RGBCOLOR(231, 47, 21)]; + [lbfen setTextAlignment:NSTextAlignmentCenter]; + [lbfen setFont:[UIFont fontWithName:@"SmileySans-Oblique" size:35]]; + [scvback addSubview:lbfen]; + [lbfen mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.offset(20); + make.left.offset(UISCREEN_WIDTH-50); + }]; + _lbfen = lbfen; + + UIImageView *imgvnumber = [[UIImageView alloc] init]; + [imgvnumber setImage:[UIImage imageNamed:@"ic_correct_score_red"]]; + [scvback addSubview:imgvnumber]; + [imgvnumber mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(lbfen.mas_bottom); + make.centerX.equalTo(lbfen); + make.height.offset(10); + make.width.offset(50); + }]; + _imgvnumber = imgvnumber; + + UIView *viewback = [[UIView alloc] initWithFrame:CGRectMake(0, UISCREEN_HEIGHT*0.2, UISCREEN_WIDTH, UISCREEN_HEIGHT*0.8-TabHeight-20-NavHeight)]; + [viewback setBackgroundColor:[UIColor whiteColor]]; + [self addSubview:viewback]; + UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect: viewback.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(20,20)]; + //创建 layer + CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init]; + maskLayer.frame = viewback.bounds; + //赋值 + maskLayer.path = maskPath.CGPath; + viewback.layer.mask = maskLayer; + [self drawInfoView:viewback]; + _viewback = viewback; + + UIView *viewbottom = [[UIView alloc] init]; + [viewbottom setBackgroundColor:[UIColor whiteColor]]; + [self addSubview:viewbottom]; + [viewbottom mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.bottom.equalTo(self); + make.height.offset(TabHeight+20); + }]; + [self drawBottomView:viewbottom]; + _viewbottom = viewbottom; + + } + return self; +} +-(void)drawBottomView:(UIView *)view +{ + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(247, 247, 247)]; + [view addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.top.equalTo(view); + make.height.offset(1); + }]; + + UIButton *btpigai = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH-32, 46)]; + [btpigai setTitle:@"复制保存" forState:UIControlStateNormal]; + [btpigai setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btpigai.titleLabel setFont:[UIFont boldSystemFontOfSize:16]]; + [btpigai.layer setMasksToBounds:YES]; + [btpigai.layer setCornerRadius:5]; + [view addSubview:btpigai]; + [btpigai mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(16); + make.right.equalTo(view).offset(-16); + make.top.offset(10); + make.height.offset(46); + }]; + [btpigai addTarget:self action:@selector(copyAction) forControlEvents:UIControlEventTouchUpInside]; + [Tools changedView:btpigai colors:MainJBColors startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)]; +} +-(void)drawInfoView:(UIView *)view +{ + [view setBackgroundColor:[UIColor whiteColor]]; + UIView *viewline = [[UIView alloc] init]; + [viewline setBackgroundColor:RGBCOLOR(216, 216, 216)]; + [view addSubview:viewline]; + [viewline mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(41, 5)); + make.centerX.equalTo(view); + make.top.offset(10); + }]; + [viewline.layer setMasksToBounds:YES]; + [viewline.layer setCornerRadius:2.5]; + + UIView *viewtap = [[UIView alloc] init]; + [view addSubview:viewtap]; + [viewtap mas_makeConstraints:^(MASConstraintMaker *make) { + make.center.equalTo(viewline); + make.width.offset(80); + make.height.offset(45); + }]; + UIPanGestureRecognizer *panBig = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panGestureAction:)]; + [viewtap addGestureRecognizer:panBig]; + + + StartKTXZPGDetailTabView *viewtop = [[StartKTXZPGDetailTabView alloc] init]; + [view addSubview:viewtop]; + [viewtop mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.right.equalTo(view); + make.top.offset(30); + make.height.offset(40); + }]; + [viewtop setBackSelect:^(NSInteger tag) { + [self.scvbackinfo setContentOffset:CGPointMake(UISCREEN_WIDTH*tag, 0)]; + [self showVC:tag]; + }]; + _viewtop = viewtop; + [viewtop setArrTitle:@[@"评分维度",@"错别字检查",@"优化思路"]]; + + UIScrollView *scvback = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 80, UISCREEN_WIDTH, view.height-80)]; + [scvback setPagingEnabled:YES]; + [scvback setShowsHorizontalScrollIndicator:NO]; + [view addSubview:scvback]; + [scvback setContentSize:CGSizeMake(UISCREEN_WIDTH*2, 0)]; + [scvback setDelegate:self]; + _scvbackinfo = scvback; + + /// + PLPGDetailItemView *viewwd = [PLPGDetailItemView new]; + [scvback addSubview:viewwd]; + [viewwd mas_makeConstraints:^(MASConstraintMaker *make) { + make.left.offset(0); + make.top.offset(0); + make.width.height.equalTo(scvback); + }]; + _viewwd = viewwd; + /// +} +- (void)panGestureAction:(UIPanGestureRecognizer *)pan +{ + if(pan.state == UIGestureRecognizerStateChanged) + { + CGPoint transP = [pan translationInView:self]; + float fmax = UISCREEN_HEIGHT-NavHeight-TabHeight-20-80; + + float fmin = UISCREEN_HEIGHT*0.2; +// if(self.modelHestory) +// { +// fmin = UISCREEN_HEIGHT*0.2+TabHeight+20; +// } + + if(self.viewback.top+transP.y>fmax) + { + self.viewback.top=fmax; + } + else if(self.viewback.top+transP.y // ------------- 设备配置等 ------------- //捕获设备，通常是前置摄像头，后置摄像头，麦克风（音频输入） @@ -48,6 +51,8 @@ /// @property (nonatomic , strong) NSMutableArray *arrData; +@property (nonatomic, strong) AVAudioPlayer *audioPlayer; + @end @implementation CamreViewController @@ -82,7 +87,7 @@ [self addTap]; } - [self drawUI]; + if(self.type==2) { @@ -239,6 +244,52 @@ }]; [btback addTarget:self action:@selector(backAction) forControlEvents:UIControlEventTouchUpInside]; + + UIButton *btyinxiao = [[UIButton alloc] init]; + [btyinxiao setTitle:@"音效" forState:UIControlStateNormal]; + [btyinxiao setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btyinxiao.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btyinxiao.layer setMasksToBounds:YES]; + [btyinxiao.layer setCornerRadius:8]; + [btyinxiao setBackgroundColor:RGBACOLOR(0, 0, 0, 0.8)]; + [btyinxiao setImage:[UIImage imageNamed:@"音效N"] forState:UIControlStateNormal]; + [btyinxiao setImage:[UIImage imageNamed:@"音效Y"] forState:UIControlStateSelected]; + [view addSubview:btyinxiao]; + [btyinxiao mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(70, 24)); + make.centerY.equalTo(view); + make.left.equalTo(btback.mas_right).offset(25); + }]; + [btyinxiao setIconInLeftWithSpacing:4]; + [btyinxiao addTarget:self action:@selector(yinxiaoAction:) forControlEvents:UIControlEventTouchUpInside]; + if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue ]== 1) + { + [btyinxiao setSelected:YES]; + } + + UIButton *btjiaoyan = [[UIButton alloc] init]; + [btjiaoyan setTitle:@"校验" forState:UIControlStateNormal]; + [btjiaoyan setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; + [btjiaoyan.titleLabel setFont:[UIFont systemFontOfSize:14]]; + [btjiaoyan.layer setMasksToBounds:YES]; + [btjiaoyan.layer setCornerRadius:8]; + [btjiaoyan setBackgroundColor:RGBACOLOR(0, 0, 0, 0.8)]; + [btjiaoyan setImage:[UIImage imageNamed:@"校验N"] forState:UIControlStateNormal]; + [btjiaoyan setImage:[UIImage imageNamed:@"校验Y"] forState:UIControlStateSelected]; + [view addSubview:btjiaoyan]; + [btjiaoyan mas_makeConstraints:^(MASConstraintMaker *make) { + make.size.sizeOffset(CGSizeMake(70, 24)); + make.centerY.equalTo(view); + make.left.equalTo(btyinxiao.mas_right).offset(18); + }]; + [btjiaoyan setIconInLeftWithSpacing:4]; + [btjiaoyan addTarget:self action:@selector(jiaoyanAction:) forControlEvents:UIControlEventTouchUpInside]; + if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue ]== 1) + { + [btjiaoyan setSelected:YES]; + } + [btjiaoyan setHidden:!self.ispiliangpigai]; + UIButton *btshili = [[UIButton alloc] init]; [btshili setTitle:@"示例" forState:UIControlStateNormal]; [btshili setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; @@ -261,6 +312,16 @@ { [self.navigationController popViewControllerAnimated:YES]; } +-(void)yinxiaoAction:(UIButton *)sender +{ + sender.selected = !sender.selected; + [[NSUserDefaults standardUserDefaults] setObject:sender.selected==YES?@"1":@"0" forKey:yingxiaoSave]; +} +-(void)jiaoyanAction:(UIButton *)sender +{ + sender.selected = !sender.selected; + [[NSUserDefaults standardUserDefaults] setObject:sender.selected==YES?@"1":@"0" forKey:jiaoyanSave]; +} #pragma mark - 示例 -(void)shiliAction { @@ -336,42 +397,20 @@ [HXHud showMessage:@"请添加图片" afterDelayType:0]; return; } - ///1作文批改 2拍照写作 3课堂写作 - if(self.type==1) - { - [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { - StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; - view.type = 1; - view.arrXZImages = self.arrData; - view.isquanxian = value; - [self.view addSubview:view]; + + if([[[NSUserDefaults standardUserDefaults] objectForKey:jiaoyanSave] intValue] == 1) + {///去校验图片 + [self.session stopRunning]; + ImageEditDrawViewController *vc = [ImageEditDrawViewController new]; + vc.arrImages = @[[UIImage imageNamed:@"yd_xs_0"],[UIImage imageNamed:@"yd_xs_1"]]; + [self.navigationController pushViewController:vc animated:YES]; + [vc setBackValue:^(NSMutableArray * _Nonnull arrimages) { + [self pushImage:arrimages]; }]; } - else if(self.type==2) + else { - [UserInfoModel quanXianJiaoYan:self scence:@"photos_write" ispush:YES back:^(BOOL value) { - if(value) - { - NSArray *arrtt = @[@"改写作文",@"拍题成文",@"拍照续写"]; - int temp = (int)[arrtt indexOfObject:[self.viewtype getSelectName]]; - - StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; - view.type = temp+10; - view.arrXZImages = self.arrData; - [self.view addSubview:view]; - } - }]; - } - else if(self.type==3) - { - [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { - StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; - view.type = 0; - view.arrXZImages = self.arrData; - view.textbook_id = self.textbook_id; - view.isquanxian = value; - [self.view addSubview:view]; - }]; + [self pushImage:self.arrData]; } } break; @@ -399,6 +438,56 @@ break; } } + +-(void)pushImage:(NSMutableArray *)arrImgages +{ + ///1作文批改 2拍照写作 3课堂写作 + if(self.type==1) + { + [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { + if(self.ispiliangpigai) + {///批量批改详情 + [HXHud showMessage:@"批量批改详情" afterDelayType:0]; + + } + else + { + StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + view.type = 1; + view.arrXZImages = arrImgages; + view.isquanxian = value; + [self.view addSubview:view]; + } + }]; + } + else if(self.type==2) + { + [UserInfoModel quanXianJiaoYan:self scence:@"photos_write" ispush:YES back:^(BOOL value) { + if(value) + { + NSArray *arrtt = @[@"改写作文",@"拍题成文",@"拍照续写"]; + int temp = (int)[arrtt indexOfObject:[self.viewtype getSelectName]]; + + StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + view.type = temp+10; + view.arrXZImages = arrImgages; + [self.view addSubview:view]; + } + }]; + } + else if(self.type==3) + { + [UserInfoModel quanXianJiaoYan:self scence:@"write_correct" ispush:NO back:^(BOOL value) { + StartKTXZPGView *view = [[StartKTXZPGView alloc] initWithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT)]; + view.type = 0; + view.arrXZImages = arrImgages; + view.textbook_id = self.textbook_id; + view.isquanxian = value; + [self.view addSubview:view]; + }]; + } +} + #pragma mark - HXPhotoViewController - (void)photoNavigationViewController:(HXCustomNavigationController *)photoNavigationViewController didDoneAllList:(NSArray *)allList photos:(NSArray *)photoList videos:(NSArray *)videoList original:(BOOL)original { @@ -551,6 +640,8 @@ [self.session startRunning]; }); + [self drawUI]; + } // 添加聚焦手势 - (void)addTap { @@ -597,7 +688,26 @@ [self.session commitConfiguration]; } } - +-(void)playAudio +{ + if(!self.audioPlayer) + { + NSString *audioPath = [[NSBundle mainBundle] pathForResource:@"wushenyy" ofType:@"mp3"]; + NSURL *audioURL = [NSURL fileURLWithPath:audioPath]; + + NSError *error; + self.audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:audioURL error:&error]; + if (error) { + NSLog(@"Error creating audio player: %@", [error localizedDescription]); + } else { + [self.audioPlayer prepareToPlay]; + } + } + if([[[NSUserDefaults standardUserDefaults] objectForKey:yingxiaoSave] intValue]==0) + { + [self.audioPlayer play]; + } +} // 保存照片 - (void)shutterCamera { @@ -605,6 +715,9 @@ if (videoConnection == nil) { return; } + + [self playAudio]; + AVCapturePhotoSettings *set = [AVCapturePhotoSettings photoSettings]; [self.imageOutPut capturePhotoWithSettings:set delegate:self]; } diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/ImageEditDrawViewController.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/ImageEditDrawViewController.m index 7c59de9..5388c9b 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/ImageEditDrawViewController.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/ImageEditDrawViewController.m @@ -36,7 +36,7 @@ NSMutableArray *arrback = [self.viewShow getAllEditImages]; self.backValue(arrback); } - [self.navigationController popViewControllerAnimated:YES]; + [self.navigationController popViewControllerAnimated:NO]; } - (void)viewDidLoad { [super viewDidLoad]; diff --git a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/view/ImageEditDrawView.m b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/view/ImageEditDrawView.m index 94fff0b..1c0a926 100644 --- a/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/view/ImageEditDrawView.m +++ b/ProductApp/ProductApp/ProductMain/首页/自定义相机/ImageEditDraw/view/ImageEditDrawView.m @@ -36,7 +36,7 @@ if(self = [super initWithFrame:frame]) { - [self createwithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT - footViewHeight-NavHeight)]; + [self createwithFrame:CGRectMake(0, 0, UISCREEN_WIDTH, UISCREEN_HEIGHT - footViewHeight-NavHeight-100)]; UIView *viewbottom = [[UIView alloc] init]; diff --git a/ProductApp/ProductApp/wushenyy.mp3 b/ProductApp/ProductApp/wushenyy.mp3 new file mode 100644 index 0000000..56d9fec Binary files /dev/null and b/ProductApp/ProductApp/wushenyy.mp3 differ