小李视频 up

jiaPei.xcodeproj/project.pbxproj

@@ -128,6 +128,10 @@
 		905E56B72D59DBF30012AB13 /* NYLIVideoDetailSubPageSectionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 905E56B62D59DBF30012AB13 /* NYLIVideoDetailSubPageSectionHeaderView.xib */; };
 		90626F3D2A204BC400C8FA05 /* kt_jq.db in Resources */ = {isa = PBXBuildFile; fileRef = 90626F3C2A204BC300C8FA05 /* kt_jq.db */; };
 		90626F402A20540600C8FA05 /* YNYDTJQQuestionModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 90626F3F2A20540600C8FA05 /* YNYDTJQQuestionModule.m */; };
+		906710A22D5F129C00D48FC8 /* JSJPXLI.gif in Resources */ = {isa = PBXBuildFile; fileRef = 906710A12D5F129C00D48FC8 /* JSJPXLI.gif */; };
+		906710A62D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 906710A42D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m */; };
+		906710A72D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 906710A52D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib */; };
+		906710AA2D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 906710A92D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m */; };
 		906814FF2D53582C00FE123F /* NYLIVipHeaderImageViewNewReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 906814FE2D53582C00FE123F /* NYLIVipHeaderImageViewNewReusableView.m */; };
 		906815022D53587A00FE123F /* NYLIVipHeaderImageViewNewReusableView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 906815012D53587A00FE123F /* NYLIVipHeaderImageViewNewReusableView.xib */; };
 		906815092D535CA000FE123F /* NYLIVipHeaderImageViewGroupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 906815082D535CA000FE123F /* NYLIVipHeaderImageViewGroupModel.m */; };
@@ -146,6 +150,15 @@
 		9074E7F12CBD047300283D4D /* NYExaminationModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 9074E7F02CBD047300283D4D /* NYExaminationModule.m */; };
 		9074E7F52CBD123D00283D4D /* NYExaminationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9074E7F32CBD123D00283D4D /* NYExaminationViewController.m */; };
 		9074E7F62CBD123D00283D4D /* NYExaminationViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9074E7F42CBD123D00283D4D /* NYExaminationViewController.xib */; };
+		9076618F2D60746900681480 /* NYVipTipsCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 9076618D2D60746900681480 /* NYVipTipsCell.m */; };
+		907661902D60746900681480 /* NYVipTipsCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9076618E2D60746900681480 /* NYVipTipsCell.xib */; };
+		907661932D60753900681480 /* NYLIVipTipsItemViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 907661922D60753900681480 /* NYLIVipTipsItemViewModel.m */; };
+		907661972D607F5000681480 /* NYLiVipContentNewCell02.xib in Resources */ = {isa = PBXBuildFile; fileRef = 907661962D607F5000681480 /* NYLiVipContentNewCell02.xib */; };
+		907661982D607F5000681480 /* NYLiVipContentNewCell02.m in Sources */ = {isa = PBXBuildFile; fileRef = 907661952D607F5000681480 /* NYLiVipContentNewCell02.m */; };
+		9076619B2D607FE500681480 /* NYLIVipContentItemViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9076619A2D607FE500681480 /* NYLIVipContentItemViewModel.m */; };
+		9076619F2D60989D00681480 /* NYLiVipContentNewCell03.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9076619E2D60989C00681480 /* NYLiVipContentNewCell03.xib */; };
+		907661A02D60989D00681480 /* NYLiVipContentNewCell03.m in Sources */ = {isa = PBXBuildFile; fileRef = 9076619D2D60989C00681480 /* NYLiVipContentNewCell03.m */; };
+		907661A32D60994700681480 /* NYLIVipContentItem03ViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 907661A22D60994700681480 /* NYLIVipContentItem03ViewModel.m */; };
 		9078D9462C50FEF500B37D58 /* NYWPViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9078D9452C50FEF500B37D58 /* NYWPViewModel.m */; };
 		90798AFE2A5159BB00E68461 /* CollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90798AFD2A5159BB00E68461 /* CollectionViewCell.m */; };
 		90798B012A517B2500E68461 /* NYSerialQueueManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 90798B002A517B2500E68461 /* NYSerialQueueManager.m */; };
@@ -217,6 +230,12 @@
 		90C640252CF70DBD00F53201 /* NSString+hAdd.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C640232CF70DBD00F53201 /* NSString+hAdd.m */; };
 		90C640292CF724CD00F53201 /* NYVideoListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90C640282CF724CD00F53201 /* NYVideoListCell.xib */; };
 		90C6402A2CF724CD00F53201 /* NYVideoListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90C640272CF724CD00F53201 /* NYVideoListCell.m */; };
+		90CEBA502D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90CEBA4F2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.xib */; };
+		90CEBA512D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90CEBA4E2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.m */; };
+		90CEBA552D61C1880054A61F /* NYLIProfileSubjectFourVipCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90CEBA542D61C1880054A61F /* NYLIProfileSubjectFourVipCell.xib */; };
+		90CEBA562D61C1880054A61F /* NYLIProfileSubjectFourVipCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90CEBA532D61C1880054A61F /* NYLIProfileSubjectFourVipCell.m */; };
+		90CEBA5C2D61C5430054A61F /* NYLIProfileVipCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90CEBA5B2D61C5430054A61F /* NYLIProfileVipCell.xib */; };
+		90CEBA5D2D61C5430054A61F /* NYLIProfileVipCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 90CEBA5A2D61C5430054A61F /* NYLIProfileVipCell.m */; };
 		90D356C62CC0B736002B52B9 /* NYExaminationRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 90D356C42CC0B736002B52B9 /* NYExaminationRoomViewController.m */; };
 		90D356C72CC0B736002B52B9 /* NYExaminationRoomViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 90D356C52CC0B736002B52B9 /* NYExaminationRoomViewController.xib */; };
 		90D356CA2CC0B7C2002B52B9 /* NYExaminationRoomViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 90D356C92CC0B7C2002B52B9 /* NYExaminationRoomViewModel.m */; };
@@ -1982,6 +2001,12 @@
 		90626F3C2A204BC300C8FA05 /* kt_jq.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = kt_jq.db; sourceTree = "<group>"; };
 		90626F3E2A20540600C8FA05 /* YNYDTJQQuestionModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YNYDTJQQuestionModule.h; sourceTree = "<group>"; };
 		90626F3F2A20540600C8FA05 /* YNYDTJQQuestionModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YNYDTJQQuestionModule.m; sourceTree = "<group>"; };
+		906710A12D5F129C00D48FC8 /* JSJPXLI.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = JSJPXLI.gif; sourceTree = "<group>"; };
+		906710A32D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIHomePageSimulationExamCell.h; sourceTree = "<group>"; };
+		906710A42D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIHomePageSimulationExamCell.m; sourceTree = "<group>"; };
+		906710A52D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIHomePageSimulationExamCell.xib; sourceTree = "<group>"; };
+		906710A82D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIHomePageSimulationExamItemViewModel.h; sourceTree = "<group>"; };
+		906710A92D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIHomePageSimulationExamItemViewModel.m; sourceTree = "<group>"; };
 		906814FD2D53582C00FE123F /* NYLIVipHeaderImageViewNewReusableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIVipHeaderImageViewNewReusableView.h; sourceTree = "<group>"; };
 		906814FE2D53582C00FE123F /* NYLIVipHeaderImageViewNewReusableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIVipHeaderImageViewNewReusableView.m; sourceTree = "<group>"; };
 		906815012D53587A00FE123F /* NYLIVipHeaderImageViewNewReusableView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIVipHeaderImageViewNewReusableView.xib; sourceTree = "<group>"; };
@@ -2014,6 +2039,21 @@
 		9074E7F22CBD123D00283D4D /* NYExaminationViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYExaminationViewController.h; sourceTree = "<group>"; };
 		9074E7F32CBD123D00283D4D /* NYExaminationViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYExaminationViewController.m; sourceTree = "<group>"; };
 		9074E7F42CBD123D00283D4D /* NYExaminationViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYExaminationViewController.xib; sourceTree = "<group>"; };
+		9076618C2D60746900681480 /* NYVipTipsCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYVipTipsCell.h; sourceTree = "<group>"; };
+		9076618D2D60746900681480 /* NYVipTipsCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYVipTipsCell.m; sourceTree = "<group>"; };
+		9076618E2D60746900681480 /* NYVipTipsCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYVipTipsCell.xib; sourceTree = "<group>"; };
+		907661912D60753900681480 /* NYLIVipTipsItemViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIVipTipsItemViewModel.h; sourceTree = "<group>"; };
+		907661922D60753900681480 /* NYLIVipTipsItemViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIVipTipsItemViewModel.m; sourceTree = "<group>"; };
+		907661942D607F5000681480 /* NYLiVipContentNewCell02.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLiVipContentNewCell02.h; sourceTree = "<group>"; };
+		907661952D607F5000681480 /* NYLiVipContentNewCell02.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLiVipContentNewCell02.m; sourceTree = "<group>"; };
+		907661962D607F5000681480 /* NYLiVipContentNewCell02.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLiVipContentNewCell02.xib; sourceTree = "<group>"; };
+		907661992D607FE500681480 /* NYLIVipContentItemViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIVipContentItemViewModel.h; sourceTree = "<group>"; };
+		9076619A2D607FE500681480 /* NYLIVipContentItemViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIVipContentItemViewModel.m; sourceTree = "<group>"; };
+		9076619C2D60989C00681480 /* NYLiVipContentNewCell03.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLiVipContentNewCell03.h; sourceTree = "<group>"; };
+		9076619D2D60989C00681480 /* NYLiVipContentNewCell03.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLiVipContentNewCell03.m; sourceTree = "<group>"; };
+		9076619E2D60989C00681480 /* NYLiVipContentNewCell03.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLiVipContentNewCell03.xib; sourceTree = "<group>"; };
+		907661A12D60994700681480 /* NYLIVipContentItem03ViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIVipContentItem03ViewModel.h; sourceTree = "<group>"; };
+		907661A22D60994700681480 /* NYLIVipContentItem03ViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIVipContentItem03ViewModel.m; sourceTree = "<group>"; };
 		9078D9442C50FEF500B37D58 /* NYWPViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYWPViewModel.h; sourceTree = "<group>"; };
 		9078D9452C50FEF500B37D58 /* NYWPViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYWPViewModel.m; sourceTree = "<group>"; };
 		90798AFC2A5159BB00E68461 /* CollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionViewCell.h; sourceTree = "<group>"; };
@@ -2135,6 +2175,15 @@
 		90C640262CF724CD00F53201 /* NYVideoListCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYVideoListCell.h; sourceTree = "<group>"; };
 		90C640272CF724CD00F53201 /* NYVideoListCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYVideoListCell.m; sourceTree = "<group>"; };
 		90C640282CF724CD00F53201 /* NYVideoListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYVideoListCell.xib; sourceTree = "<group>"; };
+		90CEBA4D2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIProfileSubjectOneVipCell.h; sourceTree = "<group>"; };
+		90CEBA4E2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIProfileSubjectOneVipCell.m; sourceTree = "<group>"; };
+		90CEBA4F2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIProfileSubjectOneVipCell.xib; sourceTree = "<group>"; };
+		90CEBA522D61C1880054A61F /* NYLIProfileSubjectFourVipCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIProfileSubjectFourVipCell.h; sourceTree = "<group>"; };
+		90CEBA532D61C1880054A61F /* NYLIProfileSubjectFourVipCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIProfileSubjectFourVipCell.m; sourceTree = "<group>"; };
+		90CEBA542D61C1880054A61F /* NYLIProfileSubjectFourVipCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIProfileSubjectFourVipCell.xib; sourceTree = "<group>"; };
+		90CEBA592D61C5430054A61F /* NYLIProfileVipCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYLIProfileVipCell.h; sourceTree = "<group>"; };
+		90CEBA5A2D61C5430054A61F /* NYLIProfileVipCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYLIProfileVipCell.m; sourceTree = "<group>"; };
+		90CEBA5B2D61C5430054A61F /* NYLIProfileVipCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYLIProfileVipCell.xib; sourceTree = "<group>"; };
 		90D356C32CC0B736002B52B9 /* NYExaminationRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NYExaminationRoomViewController.h; sourceTree = "<group>"; };
 		90D356C42CC0B736002B52B9 /* NYExaminationRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NYExaminationRoomViewController.m; sourceTree = "<group>"; };
 		90D356C52CC0B736002B52B9 /* NYExaminationRoomViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NYExaminationRoomViewController.xib; sourceTree = "<group>"; };
@@ -4625,6 +4674,7 @@
 		185F229D1BE6F38500720049 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				906710A12D5F129C00D48FC8 /* JSJPXLI.gif */,
 				90EAB9DF2D0AC6950024F379 /* easy_error_data.json */,
 				90EAB9E02D0AC6950024F379 /* pointData.json */,
 				D074576B29275AB10050BE10 /* Localizable.strings */,
@@ -4860,6 +4910,9 @@
 				90D8AF692D5C4B170087C165 /* NYLIVideoDetailSubFooterCell.h */,
 				90D8AF6A2D5C4B170087C165 /* NYLIVideoDetailSubFooterCell.m */,
 				90D8AF6B2D5C4B170087C165 /* NYLIVideoDetailSubFooterCell.xib */,
+				906710A32D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.h */,
+				906710A42D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m */,
+				906710A52D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -4881,6 +4934,8 @@
 				90D8AF672D5C41A90087C165 /* NYLIVideoDetailSubGroupViewModel.m */,
 				90D8AF6E2D5C4C420087C165 /* NYLIVideoDetailSubFooterViewModel.h */,
 				90D8AF6F2D5C4C420087C165 /* NYLIVideoDetailSubFooterViewModel.m */,
+				906710A82D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.h */,
+				906710A92D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m */,
 			);
 			path = ViewModel;
 			sourceTree = "<group>";
@@ -4993,6 +5048,12 @@
 				90B32CF72D55A6EE00DD19C3 /* NYLIVipPriceCell.h */,
 				90B32CF82D55A6EE00DD19C3 /* NYLIVipPriceCell.m */,
 				90B32CF92D55A6EE00DD19C3 /* NYLIVipPriceCell.xib */,
+				907661942D607F5000681480 /* NYLiVipContentNewCell02.h */,
+				907661952D607F5000681480 /* NYLiVipContentNewCell02.m */,
+				907661962D607F5000681480 /* NYLiVipContentNewCell02.xib */,
+				9076619C2D60989C00681480 /* NYLiVipContentNewCell03.h */,
+				9076619D2D60989C00681480 /* NYLiVipContentNewCell03.m */,
+				9076619E2D60989C00681480 /* NYLiVipContentNewCell03.xib */,
 			);
 			path = "小李";
 			sourceTree = "<group>";
@@ -5000,12 +5061,18 @@
 		906815152D54519800FE123F /* 小李 */ = {
 			isa = PBXGroup;
 			children = (
+				907661912D60753900681480 /* NYLIVipTipsItemViewModel.h */,
+				907661922D60753900681480 /* NYLIVipTipsItemViewModel.m */,
 				906815162D54525300FE123F /* NYLIVipContentNewItemViewModel.h */,
 				906815172D54525300FE123F /* NYLIVipContentNewItemViewModel.m */,
 				9068151E2D54AD5E00FE123F /* NYLIVipAuthorityNewItemViewModel.h */,
 				9068151F2D54AD5E00FE123F /* NYLIVipAuthorityNewItemViewModel.m */,
 				90B32CFC2D55A8B000DD19C3 /* NYLIVipSinglePriceItemViewModel.h */,
 				90B32CFD2D55A8B000DD19C3 /* NYLIVipSinglePriceItemViewModel.m */,
+				907661992D607FE500681480 /* NYLIVipContentItemViewModel.h */,
+				9076619A2D607FE500681480 /* NYLIVipContentItemViewModel.m */,
+				907661A12D60994700681480 /* NYLIVipContentItem03ViewModel.h */,
+				907661A22D60994700681480 /* NYLIVipContentItem03ViewModel.m */,
 			);
 			path = "小李";
 			sourceTree = "<group>";
@@ -9777,6 +9844,15 @@
 				D0B840A528506727001DB115 /* RQProfileSubjectTwoVipCell.h */,
 				D0B840AA2850672A001DB115 /* RQProfileSubjectTwoVipCell.m */,
 				D0B840A728506728001DB115 /* RQProfileSubjectTwoVipCell.xib */,
+				90CEBA4D2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.h */,
+				90CEBA4E2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.m */,
+				90CEBA4F2D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.xib */,
+				90CEBA522D61C1880054A61F /* NYLIProfileSubjectFourVipCell.h */,
+				90CEBA532D61C1880054A61F /* NYLIProfileSubjectFourVipCell.m */,
+				90CEBA542D61C1880054A61F /* NYLIProfileSubjectFourVipCell.xib */,
+				90CEBA592D61C5430054A61F /* NYLIProfileVipCell.h */,
+				90CEBA5A2D61C5430054A61F /* NYLIProfileVipCell.m */,
+				90CEBA5B2D61C5430054A61F /* NYLIProfileVipCell.xib */,
 			);
 			path = RQProfileVipCells;
 			sourceTree = "<group>";
@@ -10142,6 +10218,9 @@
 				D01F24FA292600AA0014E209 /* RQVipTimeCell.h */,
 				D01F24FB292600AA0014E209 /* RQVipTimeCell.m */,
 				D01F24FC292600AA0014E209 /* RQVipTimeCell.xib */,
+				9076618C2D60746900681480 /* NYVipTipsCell.h */,
+				9076618D2D60746900681480 /* NYVipTipsCell.m */,
+				9076618E2D60746900681480 /* NYVipTipsCell.xib */,
 			);
 			path = "其他";
 			sourceTree = "<group>";
@@ -10647,6 +10726,7 @@
 				D0A927D727078CF4005902DB /* idl-key.face-ios in Resources */,
 				D0295C72243F0B8B00B46AB1 /* 1-1-27.jpg in Resources */,
 				D0295CA0243F0B8B00B46AB1 /* 1-1-1.jpg in Resources */,
+				90CEBA552D61C1880054A61F /* NYLIProfileSubjectFourVipCell.xib in Resources */,
 				D029481A243F07E300B46AB1 /* 评价2@3x.png in Resources */,
 				D0295D52243F0B8C00B46AB1 /* img17.png in Resources */,
 				D0295CE3243F0B8C00B46AB1 /* 1-4-60.jpg in Resources */,
@@ -10805,6 +10885,7 @@
 				D0295D62243F0B8C00B46AB1 /* img07.png in Resources */,
 				D0295CC3243F0B8B00B46AB1 /* 5-15-10.jpg in Resources */,
 				D0F8F1212929C8840008019C /* orderCommentVC.xib in Resources */,
+				906710A22D5F129C00D48FC8 /* JSJPXLI.gif in Resources */,
 				D0295CE7243F0B8C00B46AB1 /* 1-5-20.jpg in Resources */,
 				D0295B80243F0B8A00B46AB1 /* 1-2-21.jpg in Resources */,
 				D0295CF2243F0B8C00B46AB1 /* 1-6-1.jpg in Resources */,
@@ -10815,7 +10896,9 @@
 				D0295C8D243F0B8B00B46AB1 /* 5-15-12.jpg in Resources */,
 				D0295D2E243F0B8C00B46AB1 /* 1-4-73.jpg in Resources */,
 				D06F5450291BA18000C65F02 /* RQVipPriceCell.xib in Resources */,
+				90CEBA502D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.xib in Resources */,
 				D0D1F69D283F84E00086C6AE /* RQExerciseCatalogueCell.xib in Resources */,
+				907661902D60746900681480 /* NYVipTipsCell.xib in Resources */,
 				906815142D544F7600FE123F /* NYLiVipContentNewCell01.xib in Resources */,
 				D0295C1C243F0B8B00B46AB1 /* 1-1-8.jpg in Resources */,
 				90C6401A2CF7078A00F53201 /* MultilevelTableViewCell.xib in Resources */,
@@ -10846,10 +10929,12 @@
 				D0295BCC243F0B8B00B46AB1 /* 2-12-17.jpg in Resources */,
 				D0295D02243F0B8C00B46AB1 /* 1-1-41.jpg in Resources */,
 				D0295C16243F0B8B00B46AB1 /* 1-2-46.jpg in Resources */,
+				90CEBA5C2D61C5430054A61F /* NYLIProfileVipCell.xib in Resources */,
 				D0295D29243F0B8C00B46AB1 /* 1-6-7.jpg in Resources */,
 				D0295BC0243F0B8B00B46AB1 /* 3-13-2.jpg in Resources */,
 				D0295B82243F0B8A00B46AB1 /* 1-5-14.jpg in Resources */,
 				D0295B6E243F0B8A00B46AB1 /* 1-7-10.jpg in Resources */,
+				907661972D607F5000681480 /* NYLiVipContentNewCell02.xib in Resources */,
 				D0F9E832282659710073A7D1 /* RQAgreementView.xib in Resources */,
 				D0E8D7C128D859F500107E40 /* RQVipProblemCell.xib in Resources */,
 				D0C31451292B53200095B396 /* RQVipCenterHeaderItemView.xib in Resources */,
@@ -11081,6 +11166,7 @@
 				D0EA1DAB28C02DAE00C27563 /* RQSynchronizationViewController.xib in Resources */,
 				D0295D18243F0B8C00B46AB1 /* 1-2-2.jpg in Resources */,
 				D0295B85243F0B8A00B46AB1 /* 1-6-8.jpg in Resources */,
+				906710A72D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.xib in Resources */,
 				D00177EC2886ABE40078949E /* RQExercisExplainCell.xib in Resources */,
 				D0295C34243F0B8B00B46AB1 /* 1-1-14.jpg in Resources */,
 				D05A320629220999002EB3E2 /* RQVipAuthorityNewCell.xib in Resources */,
@@ -11120,6 +11206,7 @@
 				D0295C20243F0B8B00B46AB1 /* 5-15-32.jpg in Resources */,
 				D0295BA2243F0B8A00B46AB1 /* 1-10-19.jpg in Resources */,
 				D081CCFD27F15A2C0054317F /* zgzcz.db in Resources */,
+				9076619F2D60989D00681480 /* NYLiVipContentNewCell03.xib in Resources */,
 				D081CCF927F15A2C0054317F /* zgzjl.db in Resources */,
 				D0295D83243F0B8C00B46AB1 /* light4.mp3 in Resources */,
 				D0295BBA243F0B8B00B46AB1 /* 1-4-84.jpg in Resources */,
@@ -11396,6 +11483,7 @@
 				D0B2D4F0289A56C900D6C5F4 /* RQErrorAndCollectViewController.m in Sources */,
 				90EAB9EA2D0AE16F0024F379 /* NYFailSpecialExerciseDetailsCell.m in Sources */,
 				D048E2142819023B005D606F /* RQProfilePracticeCell.m in Sources */,
+				9076618F2D60746900681480 /* NYVipTipsCell.m in Sources */,
 				D04DF7A627006F72006E3633 /* MBProgressHUD+RQExtension.m in Sources */,
 				D074575F29272C680050BE10 /* QMPickedPhotoViewController.m in Sources */,
 				D022FB0228D1E6610081E243 /* RQYDTJSQuestionModule.m in Sources */,
@@ -11659,6 +11747,7 @@
 				D04DF79D27006F72006E3633 /* UIBarButtonItem+RQExtension.m in Sources */,
 				D0D1F6B6283F84E00086C6AE /* NSObject+FBKVOController.m in Sources */,
 				D057C1FE29F5107A002F4AB2 /* RQPlaceListItemViewModel.m in Sources */,
+				907661982D607F5000681480 /* NYLiVipContentNewCell02.m in Sources */,
 				D0354AFA230E32F200E1C54D /* CDZQRScanView.m in Sources */,
 				D04DF6D427006C57006E3633 /* RQCommonCollectionViewCell.m in Sources */,
 				D0E8D7C728D8752400107E40 /* RQVipProblemItemViewModel.m in Sources */,
@@ -11720,6 +11809,7 @@
 				D0324DA6282372B6004A7DF5 /* RQProfileLogouItemViewModel.m in Sources */,
 				D00A14FF2754A41C00793046 /* RQVideoCatalogueViewController.m in Sources */,
 				D074575529272C680050BE10 /* QMDateManager.m in Sources */,
+				906710A62D5F141100D48FC8 /* NYLIHomePageSimulationExamCell.m in Sources */,
 				D09E5D4825E3AA260099E87C /* BDFaceAdjustParams.m in Sources */,
 				D00A15262754A82400793046 /* CGXVerticalMenuTitleCell+RQExtension.m in Sources */,
 				D084D87227CDFF2D00E521F0 /* RQVipAuthoritySmallCell.m in Sources */,
@@ -11742,6 +11832,7 @@
 				D0ED401328F6B47500086901 /* RQVipProblemNewCell.m in Sources */,
 				D00A15132754A41C00793046 /* MPlayerAttributeManager.m in Sources */,
 				D00A15122754A41C00793046 /* MPPreLoaderModel.m in Sources */,
+				90CEBA512D61BD3F0054A61F /* NYLIProfileSubjectOneVipCell.m in Sources */,
 				D00A15102754A41C00793046 /* CGXRefreshHeader.m in Sources */,
 				D0EF8FF12889309A00CC4F96 /* RQExerciseExamAlertHudView.m in Sources */,
 				D0481FF5286328BC00BD0E4E /* RQSpecialPointCell.m in Sources */,
@@ -11761,6 +11852,7 @@
 				D0324DAC2823BF8F004A7DF5 /* RQChooseCarTypeViewModel.m in Sources */,
 				D0D1F691283F84DF0086C6AE /* RQHTTPService+RQGetScoreInfoList.m in Sources */,
 				D0D68D522890E03F00600C5C /* RQExamSituationCell.m in Sources */,
+				907661A32D60994700681480 /* NYLIVipContentItem03ViewModel.m in Sources */,
 				D0870D592701A6B9004EC94E /* LCActionSheetConfig.m in Sources */,
 				D0D1F68E283F84DF0086C6AE /* RQScoreRecordModel.m in Sources */,
 				D0B351D92814F99C0046A872 /* RQRetrainChooseItemViewModel.m in Sources */,
@@ -11796,6 +11888,7 @@
 				D087A18D28DAB840001EB517 /* IAPManager.m in Sources */,
 				D0870D812701A6B9004EC94E /* UIBezierPath+YYAdd.m in Sources */,
 				D0481FD42861F7F300BD0E4E /* RQSpecialPractiseViewModel.m in Sources */,
+				9076619B2D607FE500681480 /* NYLIVipContentItemViewModel.m in Sources */,
 				D02845422972844A0099B9B4 /* RQHTTPService+RQGetActivation.m in Sources */,
 				D09E5D4025E3AA260099E87C /* BDFaceAdjustParamsRootController.m in Sources */,
 				D02010CB29373AE8001B9F4D /* SLMethod.m in Sources */,
@@ -11979,6 +12072,7 @@
 				D074575729272C680050BE10 /* QMItemCollectionCell.m in Sources */,
 				18ACEEF41C3E5FCA00C5DE05 /* InputView.m in Sources */,
 				D04DF7AE27006F72006E3633 /* SAMKeychain+RQUtil.m in Sources */,
+				907661A02D60989D00681480 /* NYLiVipContentNewCell03.m in Sources */,
 				D0870D722701A6B9004EC94E /* UIImagePickerController+BlocksKit.m in Sources */,
 				904CDEFA2D02D5E10094B2D0 /* NYBlockExerciseGroupViewModel.m in Sources */,
 				D04DF6C627006C57006E3633 /* RQCommonCollectionItemViewModel.m in Sources */,
@@ -12208,6 +12302,7 @@
 				D09E5D5825E3AA260099E87C /* BDFaceRemindAnimationView.m in Sources */,
 				D074574329272C680050BE10 /* QMChatRoomInvestigateCell.m in Sources */,
 				D08E8E5E2930C2B9001CEF97 /* RQTimeRuleItemViewModel.m in Sources */,
+				90CEBA562D61C1880054A61F /* NYLIProfileSubjectFourVipCell.m in Sources */,
 				D04DF6B927006C56006E3633 /* RQEXTRuntimeExtensions.m in Sources */,
 				D0180C3828069F8900ED8E4E /* RQRetrainModule.m in Sources */,
 				905E56B52D59DBCE0012AB13 /* NYLIVideoDetailSubPageSectionHeaderView.m in Sources */,
@@ -12234,6 +12329,7 @@
 				D0354B21230E3EDA00E1C54D /* MNQtTrainVC.m in Sources */,
 				D0870D602701A6B9004EC94E /* NSTimer+BlocksKit.m in Sources */,
 				D0D2D0C428616C40004E31E6 /* RQHomePageDriveMethodCell.m in Sources */,
+				907661932D60753900681480 /* NYLIVipTipsItemViewModel.m in Sources */,
 				D0870D662701A6B9004EC94E /* NSArray+BlocksKit.m in Sources */,
 				D00DFB0A2934A2DA0049B050 /* RQADModule.m in Sources */,
 				D0870DB32701AA85004EC94E /* RQNewFeatureViewModel.m in Sources */,
@@ -12242,6 +12338,7 @@
 				D04DF6C127006C57006E3633 /* RQCollectionViewController.m in Sources */,
 				D07ED7D2246934B0002CEA1A /* SignInApple.m in Sources */,
 				D0481FD12861F7BC00BD0E4E /* RQSpecialPractiseViewController.m in Sources */,
+				90CEBA5D2D61C5430054A61F /* NYLIProfileVipCell.m in Sources */,
 				D074574C29272C680050BE10 /* QMChatRoomShowRichTextController.m in Sources */,
 				D0870D682701A6B9004EC94E /* NSIndexSet+BlocksKit.m in Sources */,
 				D0870E4D2701B5A0004EC94E /* RQHTTPService+RQRegister.m in Sources */,
@@ -12327,6 +12424,7 @@
 				90626F402A20540600C8FA05 /* YNYDTJQQuestionModule.m in Sources */,
 				900A2DE52A1FA89700395C1F /* RQAppEventAnnotation.m in Sources */,
 				D0870D6C2701A6B9004EC94E /* UIBarButtonItem+BlocksKit.m in Sources */,
+				906710AA2D5F151B00D48FC8 /* NYLIHomePageSimulationExamItemViewModel.m in Sources */,
 				D074573B29272C670050BE10 /* QMLeaveMessageCell.m in Sources */,
 				D074574029272C680050BE10 /* QMChatRoomMp3Cell.m in Sources */,
 			);

jiaPei/Images.xcassets/Modules/HomePageModule/TeachVideoModule/考场免费.imageset/Contents.json

@@ -1,7 +1,6 @@
 {
   "images" : [
     {
-      "filename" : "考场免费.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

jiaPei/Images.xcassets/Modules/HomePageModule/TeachVideoModule/考场试看.imageset/Contents.json

@@ -1,7 +1,6 @@
 {
   "images" : [
     {
-      "filename" : "考场试看.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/1科一特训包.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "1科一特训包@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "1科一特训包@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/1科四特训包.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "1科四特训包@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "1科四特训包@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/三角形5.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "三角形5@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "三角形5@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/三角形6.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "三角形6@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "三角形6@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/标题右 1.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
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/标题左 1.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
+  }
+}

jiaPei/Images.xcassets/Modules/OtherModule/VipModule/特训包.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
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LIHC精选300题.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LIHC精选300题@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LIHC精选300题@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LIHC精选500题.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LIHC精选500题@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LIHC精选500题@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LIH特训包.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LIH特训包@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LIH特训包@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LIH精选500题.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LI精选500题@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LI精选500题@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LI右组.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LI右组@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LI右组@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/LI左组.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "LI左组@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "LI左组@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_btn暂停.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_btn暂停@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_btn暂停@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_hudongxq_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_hudongxq_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_hudongxq_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_say_up_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_say_up_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_say_up_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_sel_yesh.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_sel_yesh@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_sel_yesh@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_shiyonggaox_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_shiyonggaox_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_shiyonggaox_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_tongshuyidong_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_tongshuyidong_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_tongshuyidong_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_zhengshu_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_zhengshu_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_zhengshu_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/li_zu_point_h.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "li_zu_point_h@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "li_zu_point_h@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/特训包开通.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
+  }
+}

jiaPei/Images.xcassets/Modules/小李视频/特训包未开通.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
+  }
+}

jiaPei/Macros/RQConstEnum.h

@@ -83,6 +83,13 @@ typedef NS_ENUM(NSInteger, RQHomePageSubjectType) {
     RQHomePageSubjectType_SubjectFour,
     /// 全科目
     RQHomePageSubjectType_SubjectAll,
+    /// 科目一特训
+    RQHomePageSubjectType_SubjectOne_LI,
+    /// 科目四特训
+    RQHomePageSubjectType_SubjectFour_LI,
+    /// 全特训
+    RQHomePageSubjectType_SubjectALL_LI,
+
 };
 /// 首页子页面类型
 typedef NS_ENUM(NSUInteger, RQHomeSubPageType) {

jiaPei/Macros/RQMacros.h

@@ -299,14 +299,16 @@ _Pragma("clang diagnostic pop")\
 #define NYPiapph [NSString stringWithFormat:@"http://pt.zzxcx.net/#/yeNing?v=%@",RQ_APP_VERSION]
 #define NYPiapphkc [NSString stringWithFormat:@"http://pt.zzxcx.net/#/yeNingKC?v=%@",RQ_APP_VERSION]
 
+#define NYPiapph_test [NSString stringWithFormat:@"http://pt1.zzxcx.net/#/yeNing?v=%@",RQ_APP_VERSION]
+#define NYPiapphkc_test [NSString stringWithFormat:@"http://pt1.zzxcx.net/#/yeNingKC?v=%@",RQ_APP_VERSION]
+
 #define NYUSerADD0 [userContentController addScriptMessageHandler:self name:DAWDwagVVA11];
 #define NYUSerADD1 [userContentController addScriptMessageHandler:self name:GDRGERDG_SV];
 #define NYUSerADD2 [userContentController addScriptMessageHandler:self name:FEWSRE3_icv];
 #define NYUSerADD3 [userContentController addScriptMessageHandler:self name:FEWcerr_ierT];
 #define NYUSerADD4 [userContentController addScriptMessageHandler:self name:HFcllg_ufoc];
 
-#define NYUCOdw_GO [NSString stringWithFormat:@"iosOrder('%zd', '%@');", code, [obj yy_modelToJSONString]]
-
+#define NYUCOdw_GO [NSString stringWithFormat:@"iosOrder('%zd', '%@', '%zd');", code, [obj yy_modelToJSONString], goodtype]
 
 #define NYDDov_dict @{DAWDwagVVA11:@"callApa",GDRGERDG_SV:@"callHph",FEWSRE3_icv:@"callSsd",FEWcerr_ierT:@"callRee",HFcllg_ufoc:@"callLad"}
 

jiaPei/Modules/HomePageModule/View/HomePage/NYHomePageOneBigCell.m

@@ -126,51 +126,15 @@
 
 //VIP课程
 - (IBAction)btnVipAction:(UIButton *)sender {
-    
-    
-//    NSString *dictType = @"vip_coach_package";
-//    [MBProgressHUD rq_showProgressHUD:@"获取VIP套餐..."];
-//    [[RQ_HTTP_Service getTypeWithDictType:dictType] subscribeNext:^(NSArray *typeModels) {
-//        [MBProgressHUD rq_hideHUD];
-//        NYLIVipCoachViewModel *livipCoachViewModel = [[NYLIVipCoachViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-//            RQViewModelIDKey : @(RQVIPPageType_Full),
-//            RQViewModelUtilKey : typeModels,
-//            RQViewCommonValueKey : @(RQHomePageSubjectType_SubjectOne),
-//        }];
-//        [RQ_APPDELEGATE.services pushViewModel:livipCoachViewModel animated:YES];
-//    } error:^(NSError * _Nullable error) {
-//        [MBProgressHUD rq_hideHUD];
-//        [MBProgressHUD rq_showErrorTips:error];
-//    }];
-//    return;
-    
-    [MBProgressHUD rq_showProgressHUD:@""];
-    [[RQ_HTTP_Service getFiveTeachingList:@"1"] subscribeNext:^(NSArray *fiveModels) {
-        [MBProgressHUD rq_hideHUD];
-        RQPlaceVideoListModel *placeVideoListModel = [[RQPlaceVideoListModel alloc] init];
-        placeVideoListModel.examName = @"科一专项精品课";
-        placeVideoListModel.items = fiveModels;
-        NSIndexPath *indexPath = [NSIndexPath indexPathWithIndex:0];
-        NYLIVideoDetailViewModel *videoDetailViewModel = [[NYLIVideoDetailViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-                    RQViewModelUtilKey      : placeVideoListModel,
-                    RQVideoItemIndexKey        : @(0),
-                    RQVideoItemIndexPathKey    : indexPath,
-                    RQHomePageSubjectTypeKey    : @(self.viewModel.homePageSubjectType),
-                }];
-        [RQ_APPDELEGATE.services pushViewModel:videoDetailViewModel animated:YES];
-    } error:^(NSError * _Nullable error) {
-        [MBProgressHUD rq_hideHUD];
-        [MBProgressHUD rq_showErrorTips:error];
-    }];
 
-    return;
-    [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
-        if (isVip) {
+    [RQ_VIP_Module isVipWithSubject:0 complete:^(BOOL isVip) {
+        if (RQ_VIP_Module.isVip) {
             [RQ_VIP_Module gotoVipCenter];
         } else {
             [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
         }
     }];
+
 }
 
 //真实考场
@@ -279,11 +243,19 @@
     }
 }
 
-//电子资料
+//新规秘卷
 - (IBAction)btnCorpuscleresAction:(UIButton *)sender {
-    NSLog(@"点击了-电子资料-%@",RQ_COMMON_MANAGER.JSJP_XCX_PAGE);
+    NSLog(@"点击了-秘卷-%@",RQ_COMMON_MANAGER.JSJP_XCX_PAGE);
     if (RQ_USER_MANAGER.isShouldLogin) {
-        [RQ_SHARE_FUNCTION miniwithUserName:RQ_COMMON_MANAGER.JSJP_XCX_NAME path:RQ_COMMON_MANAGER.JSJP_XCX_PAGE];
+//        [RQ_SHARE_FUNCTION miniwithUserName:RQ_COMMON_MANAGER.JSJP_XCX_NAME path:RQ_COMMON_MANAGER.JSJP_XCX_PAGE];
+//        [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
+//            if (isVip) {
+                RQHoursBeforeExamHomeViewModel *hoursBeforeExamHomeViewModel = [[RQHoursBeforeExamHomeViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:nil];
+                [RQ_APPDELEGATE.services pushViewModel:hoursBeforeExamHomeViewModel animated:YES];
+//            } else {
+//                [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+//            }
+//        }];
     }
 }
 

jiaPei/Modules/HomePageModule/View/HomePage/NYHomePageOneBigCell.xib

@@ -244,7 +244,7 @@
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                <state key="normal" title="电子资料" image="电子资料-L">
+                                <state key="normal" title="新规秘卷" image="电子资料-L">
                                     <color key="titleColor" red="0.23921568630000001" green="0.23529411759999999" blue="0.21960784310000001" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
                                 <connections>

jiaPei/Modules/HomePageModule/ViewController/HomePage/RQHomePageSubjectOneOrFourViewController.m

@@ -64,8 +64,8 @@
         return [NYHomePageOneBigCell cellWithCollectionView:collectionView forIndexPath:indexPath]; /// 新
     } else if ([itemViewModel isKindOfClass:[RQHomePageOneOrFourSmallItemViewModel class]]) {
         return [RQHomePageOneOrFourSmallCell cellWithCollectionView:collectionView forIndexPath:indexPath];
-    } else if ([itemViewModel isKindOfClass:[RQHomePageSimulationExamItemViewModel class]]) {
-        return [RQHomePageSimulationExamCell cellWithCollectionView:collectionView forIndexPath:indexPath];
+    } else if ([itemViewModel isKindOfClass:[NYLIHomePageSimulationExamItemViewModel class]]) {
+        return [NYLIHomePageSimulationExamCell cellWithCollectionView:collectionView forIndexPath:indexPath];
     } else if ([itemViewModel isKindOfClass:[RQHomePageJiaoGuan12123ItemViewModel class]]) {
         return [RQHomePageJiaoGuan12123Cell cellWithCollectionView:collectionView forIndexPath:indexPath];
     } else if ([itemViewModel isKindOfClass:[RQHomePageDriveMethodItemViewModel class]]) {
@@ -103,8 +103,8 @@
     } else if ([itemViewModel isKindOfClass:[RQHomePageOneOrFourSmallItemViewModel class]]) {
         RQHomePageOneOrFourSmallCell *homePageOneOrFourSmallCell = (RQHomePageOneOrFourSmallCell *)cell;
         [homePageOneOrFourSmallCell bindViewModel:object];
-    } else if ([itemViewModel isKindOfClass:[RQHomePageSimulationExamItemViewModel class]]) {
-        RQHomePageSimulationExamCell *homePageSimulationExamCell = (RQHomePageSimulationExamCell *)cell;
+    } else if ([itemViewModel isKindOfClass:[NYLIHomePageSimulationExamItemViewModel class]]) {
+        NYLIHomePageSimulationExamCell *homePageSimulationExamCell = (NYLIHomePageSimulationExamCell *)cell;
         [homePageSimulationExamCell bindViewModel:object];
     } else if ([itemViewModel isKindOfClass:[RQHomePageJiaoGuan12123ItemViewModel class]]) {
         RQHomePageJiaoGuan12123Cell *homePageJiaoGuan12123Cell = (RQHomePageJiaoGuan12123Cell *)cell;

jiaPei/Modules/HomePageModule/ViewController/HomePage/RQHomePageViewController.m

@@ -60,6 +60,7 @@
 
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
+    RQ_YDTQuestion_Module.subject = [myDelegate.subject intValue]-1;
 //    if (RQ_COMMON_MANAGER.JSJP_APP_ICON_NEED_CHANGE&&
 //        !RQ_COMMON_MANAGER.APP_SWITCH) {//非审核下
 //        [[UIApplication sharedApplication] setAlternateIconName:@"AppIcon_NewRule" completionHandler:^(NSError * _Nullable error) {

jiaPei/Modules/HomePageModule/ViewController/HomeSubPage/考前密卷/RQHoursBeforeExamHomeViewController.m

@@ -31,33 +31,45 @@
     [self.viewModel.services popViewModelAnimated:YES];
 }
 - (IBAction)miJuanOneBtnAction:(id)sender {
-    NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithSubject:RQ_YDTQuestion_Module.subject exerciseType:RQExerciseType_Mi_One ].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
-        return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
-    }].toArray;
-    RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-        RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
-        RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
-        RQHomeSubPageTypeKey        : @(RQHomeSubPageType_MockExamination),
-        RQViewModelIDKey            : @"",
-        RQExerciseTypeKey           : @(RQExerciseType_Mi_One),
-        RQViewModelUtilKey          : arr,
+    [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
+        if (isVip) {
+            NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithSubject:RQ_YDTQuestion_Module.subject exerciseType:RQExerciseType_Mi_One ].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+                return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+            }].toArray;
+            RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+                RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+                RQHomeSubPageTypeKey        : @(RQHomeSubPageType_MockExamination),
+                RQViewModelIDKey            : @"",
+                RQExerciseTypeKey           : @(RQExerciseType_Mi_One),
+                RQViewModelUtilKey          : arr,
+            }];
+            [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+        } else {
+            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+        }
     }];
-    [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
 }
 
 - (IBAction)miJuanTwoBtnAction:(id)sender {
-    NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithSubject:RQ_YDTQuestion_Module.subject exerciseType:RQExerciseType_Mi_Two ].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
-        return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
-    }].toArray;
-    RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-        RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
-        RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
-        RQHomeSubPageTypeKey        : @(RQHomeSubPageType_MockExamination),
-        RQViewModelIDKey            : @"",
-        RQExerciseTypeKey           : @(RQExerciseType_Mi_Two),
-        RQViewModelUtilKey          : arr,
+    [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
+        if (isVip) {
+            NSArray *arr = [[RQ_YDTQuestion_Module getQuestionWithSubject:RQ_YDTQuestion_Module.subject exerciseType:RQExerciseType_Mi_Two ].rac_sequence.signal map:^id _Nullable(RQYDTQuestionModel  *ydtQuestionModel) {
+                return [RQExerciseModel exerciseModelWithRQYDTQuestionModel:ydtQuestionModel];
+            }].toArray;
+            RQExerciseViewModel *exerciseViewModel = [[RQExerciseViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                RQHomePageCarTypeKey        : @(RQ_YDTQuestion_Module.carType),
+                RQHomePageSubjectTypeKey    : @(RQ_YDTQuestion_Module.subject),
+                RQHomeSubPageTypeKey        : @(RQHomeSubPageType_MockExamination),
+                RQViewModelIDKey            : @"",
+                RQExerciseTypeKey           : @(RQExerciseType_Mi_Two),
+                RQViewModelUtilKey          : arr,
+            }];
+            [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
+        } else {
+            [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+        }
     }];
-    [RQ_APPDELEGATE.services pushViewModel:exerciseViewModel animated:YES];
 }
 
 @end

jiaPei/Modules/HomePageModule/ViewModel/HomePage/RQHomePageSubjectOneOrFourViewModel.m

@@ -222,7 +222,11 @@
 - (RQCommonGroupViewModel *)group2 {
     if (!_group2) {
         _group2 = [RQHomePageSectionTwoGroupViewModel groupViewModel];
-        RQHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[RQHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+        
+//        RQHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[RQHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+        
+        NYLIHomePageSimulationExamItemViewModel *homePageSimulationExamItemViewModel = [[NYLIHomePageSimulationExamItemViewModel alloc] initWithRQHomePageCarType:self.homePageCarType homePageSubjectType:self.homePageSubjectType];
+        
         _group2.itemViewModels = @[homePageSimulationExamItemViewModel];
     }
     return _group2;

jiaPei/Modules/HomePageModule/ViewModel/HomePage/itemViewModel/RQHomePageOneOrFourSmallItemViewModel.m

@@ -84,14 +84,16 @@
             };
         } else if ([self.title isEqualToString:@"新规秘卷"]) {
             self.operation = ^{
-                [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
-                    if (isVip) {
-                        RQHoursBeforeExamHomeViewModel *hoursBeforeExamHomeViewModel = [[RQHoursBeforeExamHomeViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:nil];
-                        [RQ_APPDELEGATE.services pushViewModel:hoursBeforeExamHomeViewModel animated:YES];
-                    } else {
-                        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
-                    }
-                }];
+                RQHoursBeforeExamHomeViewModel *hoursBeforeExamHomeViewModel = [[RQHoursBeforeExamHomeViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:nil];
+                [RQ_APPDELEGATE.services pushViewModel:hoursBeforeExamHomeViewModel animated:YES];
+//                [RQ_VIP_Module isVipWithSubject:RQ_YDTQuestion_Module.subject + 1 complete:^(BOOL isVip) {
+//                    if (isVip) {
+//                        RQHoursBeforeExamHomeViewModel *hoursBeforeExamHomeViewModel = [[RQHoursBeforeExamHomeViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:nil];
+//                        [RQ_APPDELEGATE.services pushViewModel:hoursBeforeExamHomeViewModel animated:YES];
+//                    } else {
+//                        [RQ_VIP_Module gotoBuyVipWithVipPageType:RQVIPPageType_Full];
+//                    }
+//                }];
             };
         } else if ([self.title isEqualToString:@"专项练习"]) {
             self.operation = ^{

jiaPei/Modules/HomePageModule/ViewModel/HomePage/考场视频/ItemViewModel/RQPlaceBuyItemViewModel.m

@@ -29,7 +29,11 @@
         [self.wpviewModel.wView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id result, NSError *error) {
             NSLog(@"navigator.userAgent.result is ++++ %@", result);
         }];
-        [self.wpviewModel wkvPL:NYPiapphkc];
+        if(!isOfficial){
+            [self.wpviewModel wkvPL:NYPiapphkc_test];
+        }else{
+            [self.wpviewModel wkvPL:NYPiapphkc];
+        }
         self.placeListModel = placeListModel;
         CGFloat width = RQ_SCREEN_WIDTH - 32.f;
         self.rowHeight = (width * (56.f / 345.f)) + 16 + 20 + 16;
@@ -45,7 +49,7 @@
                 if (self.isBuy) {
                     
                 } else {
-                    [self.wpviewModel wwvPLJS:placeListModel.id];
+                    [self.wpviewModel wwvPLJS:placeListModel.id goodType:1];
                 }
             } else {
                 [[RACScheduler mainThreadScheduler] schedule:^{

jiaPei/Modules/LoginModule/Controller/RQRegisterViewController.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_72" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -89,29 +89,29 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同意" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cA6-rM-a9D">
-                            <rect key="frame" x="50" y="498.33333333333331" width="26.666666666666671" height="15.666666666666686"/>
+                            <rect key="frame" x="50" y="498.33333333333331" width="26" height="15.666666666666686"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <nil key="textColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q61-XV-bbP">
-                            <rect key="frame" x="76.666666666666686" y="491.66666666666669" width="115" height="29.000000000000057"/>
+                            <rect key="frame" x="76" y="491.66666666666669" width="98" height="29.000000000000057"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <state key="normal" title="《用户使用协议》">
                                 <color key="titleColor" red="0.1137254902" green="0.76862745099999996" blue="0.43529411759999997" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             </state>
                         </button>
                         <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="XCs-DY-oTG">
-                            <rect key="frame" x="127" y="611" width="121" height="32"/>
+                            <rect key="frame" x="128.66666666666666" y="611" width="118" height="32"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已有账号," textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Hg-Iz-Imv">
-                                    <rect key="frame" x="0.0" y="0.0" width="70" height="32"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="68" height="32"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <nil key="textColor"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q1y-AB-Fes">
-                                    <rect key="frame" x="72" y="0.0" width="49" height="32"/>
+                                    <rect key="frame" x="70" y="0.0" width="48" height="32"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                     <state key="normal" title="去登录">
                                         <color key="titleColor" red="0.1137254902" green="0.76862745099999996" blue="0.43529411759999997" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>

jiaPei/Modules/OtherModules/ExaminationModule/Controller/NYExaminationRoomViewController.m

@@ -213,7 +213,7 @@
 
 - (void)setUserLeft {
     @weakify(self)
-    NSArray *titls = @[@"科目一",@"科目二",@"科目三",@"科目四"];
+    NSArray *titls = @[@"科目一",@"科目二",@"科目三",@"科目四",@"科一特训",@"科四特训"];
     self.usericon_view.layer.cornerRadius = 58*0.5;
     self.usericon_view.layer.masksToBounds = YES;
     [self.usericon_view yy_setImageWithURL:[NSURL URLWithString:RQ_USER_MANAGER.currentUser.photo] placeholder:RQWebAvatarImagePlaceholder() options:RQWebImageOptionAutomatic completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
@@ -231,7 +231,11 @@
     }
     self.sex_label.text = [NSString stringWithFormat:@"性别：%@",sexStr];
     self.type_label.text = [NSString stringWithFormat:@"考试类型：%@",RQ_USER_MANAGER.currentUser.carType];
-    self.km_label.text = [NSString stringWithFormat:@"科目：%@",titls[RQ_YDTQuestion_Module.subject]];
+    if(RQ_YDTQuestion_Module.subject>4){
+        self.km_label.text = [NSString stringWithFormat:@"科目：%@",titls[RQ_YDTQuestion_Module.subject-1]];
+    }else{
+        self.km_label.text = [NSString stringWithFormat:@"科目：%@",titls[RQ_YDTQuestion_Module.subject]];
+    }
     
 }
 

jiaPei/Modules/OtherModules/ExerciseModule/View/ExercisePage/NYTestingCentreCell.m

@@ -68,7 +68,19 @@
             } else {
                 self.bottom_view.hidden = NO;
             }
-        } else {
+        } else if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI) {
+            if (RQ_VIP_Module.isSpSubject1Vip||tryCount>0) {
+                self.bottom_view.hidden = YES;
+            } else {
+                self.bottom_view.hidden = NO;
+            }
+        } else if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI) {
+            if (RQ_VIP_Module.isSpSubject4Vip||tryCount>0) {
+                self.bottom_view.hidden = YES;
+            } else {
+                self.bottom_view.hidden = NO;
+            }
+        }else {
             self.bottom_view.hidden = YES;
         }
 //        self.skillLabel.hidden = RQObjectIsNil(ydtJSModel);

jiaPei/Modules/OtherModules/ExerciseModule/View/ExercisePage/RQExerciseAnswerCell.m

@@ -100,7 +100,41 @@
                 self.jqmd_label.hidden =  RQObjectIsNil(ydtJSModel);
                 self.tryseeView.hidden = YES;
             }
-        } else {
+        } else if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI) {
+            if (RQ_VIP_Module.isSpSubject1Vip) {
+                self.coverImageView.hidden = YES;
+                self.lookSkillBtn.hidden = YES;
+                self.jqmd_label.hidden = YES;
+                self.tryseeView.hidden = YES;
+            } else if(tryCount>0){//是否试看
+                self.coverImageView.hidden = YES;
+                self.lookSkillBtn.hidden = YES;
+                self.jqmd_label.hidden = YES;
+                self.tryseeView.hidden = NO;
+            } else {
+                self.coverImageView.hidden = RQObjectIsNil(ydtJSModel);
+                self.lookSkillBtn.hidden = RQObjectIsNil(ydtJSModel);
+                self.jqmd_label.hidden =  RQObjectIsNil(ydtJSModel);
+                self.tryseeView.hidden = YES;
+            }
+        } else if (RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI) {
+            if (RQ_VIP_Module.isSpSubject4Vip) {
+                self.coverImageView.hidden = YES;
+                self.lookSkillBtn.hidden = YES;
+                self.jqmd_label.hidden = YES;
+                self.tryseeView.hidden = YES;
+            } else if(tryCount>0){//是否试看
+                self.coverImageView.hidden = YES;
+                self.lookSkillBtn.hidden = YES;
+                self.jqmd_label.hidden = YES;
+                self.tryseeView.hidden = NO;
+            } else {
+                self.coverImageView.hidden = RQObjectIsNil(ydtJSModel);
+                self.lookSkillBtn.hidden = RQObjectIsNil(ydtJSModel);
+                self.jqmd_label.hidden =  RQObjectIsNil(ydtJSModel);
+                self.tryseeView.hidden = YES;
+            }
+        } else{
             self.coverImageView.hidden = YES;
             self.lookSkillBtn.hidden = YES;
             self.jqmd_label.hidden =  YES;
@@ -139,6 +173,11 @@
         
 //        NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
         NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+        if(RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI||
+           RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI
+           ){
+            line = ((RQ_VIP_Module.isSpSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI)? 0 : ((RQ_VIP_Module.isSpSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI)? 0 : 1));
+        }
         self.skill_bottom_layout.constant = 16.f;
         int tryCount = RQ_USER_MANAGER.tryLookCount;
         if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Recitation){//背题模式

jiaPei/Modules/OtherModules/ExerciseModule/ViewModel/ExercisePage/itemViewModel/RQExerciseAnswerItemViewModel.m

@@ -96,6 +96,11 @@
                 self.skillString = text;
 //                NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
                 NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+                if(RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI||
+                   RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI
+                   ){
+                    line = ((RQ_VIP_Module.isSpSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI)? 0 : ((RQ_VIP_Module.isSpSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI)? 0 : 1));
+                }
                 int tryCount = RQ_USER_MANAGER.tryLookCount;
                 if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Recitation){//背题模式
                     tryCount = 0;
@@ -119,6 +124,11 @@
     CGFloat skillH = _skillHeight;
 //    NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
     NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+    if(RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI||
+       RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI
+       ){
+        line = ((RQ_VIP_Module.isSpSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI)? 0 : ((RQ_VIP_Module.isSpSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI)? 0 : 1));
+    }
     int tryCount = RQ_USER_MANAGER.tryLookCount;
     if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Recitation){//背题模式
         tryCount = 0;
@@ -135,6 +145,11 @@
     CGFloat rowH = _exRowHeight + self.skillHeight;
 //    NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
     NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+    if(RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI||
+       RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI
+       ){
+        line = ((RQ_VIP_Module.isSpSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI)? 0 : ((RQ_VIP_Module.isSpSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI)? 0 : 1));
+    }
     int tryCount = RQ_USER_MANAGER.tryLookCount;
     if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Recitation){//背题模式
         tryCount = 0;
@@ -173,6 +188,11 @@
         //是vip
 //        NSInteger line = RQ_COMMON_MANAGER.APP_SWITCH? 0 : ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
         NSInteger line = ((RQ_VIP_Module.isSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne)? 0 : ((RQ_VIP_Module.isSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour)? 0 : 1));
+        if(RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI||
+           RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI
+           ){
+            line = ((RQ_VIP_Module.isSpSubject1Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectOne_LI)? 0 : ((RQ_VIP_Module.isSpSubject4Vip && RQ_YDTQuestion_Module.subject == RQHomePageSubjectType_SubjectFour_LI)? 0 : 1));
+        }
         int tryCount = RQ_USER_MANAGER.tryLookCount;
         if(RQ_Exercise_Module.currentExerciseType == RQExerciseType_Recitation){//背题模式
             tryCount = 0;
@@ -225,5 +245,8 @@
     });
     
 }
+
+
+
 @end
 

jiaPei/Modules/OtherModules/VIPModule/Model/RQVideoVipModel.h

@@ -20,6 +20,11 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , readwrite, assign) NSInteger              subject3Int;
 /// 科目4 0未开通 1已开通
 @property (nonatomic , readwrite, assign) NSInteger              subject4Int;
+/// 科目1特训 0未开通 1已开通
+@property (nonatomic , readwrite, assign) NSInteger              spSubject1Int;
+/// 科目4特训 0未开通 1已开通
+@property (nonatomic , readwrite, assign) NSInteger              spSubject4Int;
+
 /// 科目1 到期时间
 @property (nonatomic , readwrite, copy) NSString              * subject1;
 /// 科目2 到期时间
@@ -28,6 +33,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic , readwrite, copy) NSString              * subject3;
 /// 科目4 到期时间
 @property (nonatomic , readwrite, copy) NSString              * subject4;
+/// 科目1特训包 到期时间
+@property (nonatomic , readwrite, copy) NSString              * spSubject1;
+/// 科目4特训包 到期时间
+@property (nonatomic , readwrite, copy) NSString              * spSubject4;
 /// 用户ID
 @property (nonatomic , readwrite, assign) NSInteger              userId;
 /// 用户名

jiaPei/Modules/OtherModules/VIPModule/RQVIPModule.h

@@ -12,7 +12,7 @@
 
 #pragma mark - 常量定义区
 #define RQ_GET_VideoVip @"https://jsjp-admin.zzxcx.net/jsjp-admin/open-api/gzpt/videoVip"
-#define RQ_GET_Vip      @"https://jsjp-admin.zzxcx.net/jsjp-admin/open-api/userInfo/vip/info"
+#define RQ_GET_Vip      @"https://jsjp-admin.zzxcx.net/jsjp-admin/open-api/userInfo/vip/info2"
 
 /// VIP页面类型
 typedef NS_ENUM(NSUInteger, RQVIPPageType) {
@@ -40,8 +40,9 @@ typedef NS_ENUM(NSUInteger, RQVIPPageType) {
 #import "RQVipCenterViewModel.h"
 #import "RQVipCenterSubViewModel.h"
 #import "RQVipCenterSubListViewModel.h"
-
-
+#import "NYLIVipTipsItemViewModel.h"
+#import "NYLIVipContentItemViewModel.h"
+#import "NYLIVipContentItem03ViewModel.h"
 
 #pragma mark - View
 #import "RQVipSinglePriceCell.h"
@@ -69,7 +70,8 @@ typedef NS_ENUM(NSUInteger, RQVIPPageType) {
 #import "RQVipTimeCell.h"
 #import "RQVipCenterHeaderView.h"
 #import "RQVipTrainPriceCell.h"
-
+#import "NYLiVipContentNewCell02.h"
+#import "NYLiVipContentNewCell03.h"
 
 #pragma mark - ViewController
 #import "RQVipViewController.h"
@@ -93,6 +95,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readwrite, assign) BOOL isSubject3Vip;
 @property (nonatomic, readwrite, assign) BOOL isSubject4Vip;
 @property (nonatomic, readwrite, assign) BOOL isSubjectAllVip;
+@property (nonatomic, readwrite, assign) BOOL isSpSubject1Vip;
+@property (nonatomic, readwrite, assign) BOOL isSpSubject4Vip;
+@property (nonatomic, readwrite, assign) BOOL isSpSubjectAllVip;
+
 @property (nonatomic, readwrite, assign) NSUInteger freeLookSimExamNum;
 @property (nonatomic, readwrite, strong) RQActivationModel * _Nullable activationModel;
 @property (nonatomic, readwrite, strong, nullable) RQVideoVipModel * videoVipModel;

jiaPei/Modules/OtherModules/VIPModule/RQVIPModule.m

@@ -48,10 +48,11 @@ static id rq_VIPModule = nil;
                     [weakSelf gotoVipViewWithDictType:RQ_USER_MANAGER.currentUser.city subject:subject];
                 }
             } else {
+                NSString *typeStr = subject > 4? @"vip_coach_package": @"vip_package";
                 if (vipPageType == RQVIPPageType_Alert) {
-                    [weakSelf showVipAlertWithDictType:@"vip_package" subject:subject];
+                    [weakSelf showVipAlertWithDictType:typeStr subject:subject];
                 } else  {
-                    [weakSelf gotoVipViewWithDictType:@"vip_package" subject:subject];
+                    [weakSelf gotoVipViewWithDictType:typeStr subject:subject];
                 }
             }
         }
@@ -85,14 +86,25 @@ static id rq_VIPModule = nil;
 
 - (void)gotoVipViewWithDictType:(NSString *)dictType subject:(RQHomePageSubjectType)subject {
     if (RQ_USER_MANAGER.isShouldLogin) {
+
         [MBProgressHUD rq_showProgressHUD:@"获取VIP套餐..."];
         [[RQ_HTTP_Service getTypeWithDictType:dictType] subscribeNext:^(NSArray *typeModels) {
             [MBProgressHUD rq_hideHUD];
-            [RQ_APPDELEGATE.services pushViewModel:[[RQVipViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-                RQViewModelIDKey : @(RQVIPPageType_Full),
-                RQViewModelUtilKey : typeModels,
-                RQViewCommonValueKey : @(subject),
-            }] animated:YES];
+            if(subject>4){
+                NYLIVipCoachViewModel *livipCoachViewModel = [[NYLIVipCoachViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                    RQViewModelIDKey : @(RQVIPPageType_Full),
+                    RQViewModelUtilKey : typeModels,
+                    RQViewCommonValueKey : @(subject),
+                }];
+                [RQ_APPDELEGATE.services pushViewModel:livipCoachViewModel animated:YES];
+            }else{
+                [RQ_APPDELEGATE.services pushViewModel:[[RQVipViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                    RQViewModelIDKey : @(RQVIPPageType_Full),
+                    RQViewModelUtilKey : typeModels,
+                    RQViewCommonValueKey : @(subject),
+                }] animated:YES];
+            }
+
         } error:^(NSError * _Nullable error) {
             [MBProgressHUD rq_hideHUD];
             [MBProgressHUD rq_showErrorTips:error];
@@ -112,7 +124,9 @@ static id rq_VIPModule = nil;
             if (activationModel.isShare) {
                 [self gotoVipCenterWithDictType:RQ_USER_MANAGER.currentUser.city subject:subject];
             } else {
-                [self gotoVipCenterWithDictType:@"vip_package" subject:subject];
+//                NSString *typeStr = subject > 4? @"vip_coach_package": @"vip_package";
+                NSString *typeStr = @"vip_package";
+                [self gotoVipCenterWithDictType:typeStr subject:subject];
             }
         }
     }];
@@ -123,11 +137,21 @@ static id rq_VIPModule = nil;
         [MBProgressHUD rq_showProgressHUD:@"获取VIP套餐..."];
         [[RQ_HTTP_Service getTypeWithDictType:dictType] subscribeNext:^(NSArray *typeModels) {
             [MBProgressHUD rq_hideHUD];
-            RQVipCenterViewModel *vipCenterViewModel = [[RQVipCenterViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
-                RQViewModelUtilKey : [typeModels isKindOfClass:[NSArray class]]? typeModels : @[],
-                RQViewCommonValueKey : @(subject),
-            }];
-            [RQ_APPDELEGATE.services pushViewModel:vipCenterViewModel animated:YES];
+//            if(subject>4){
+//                NYLIVipCoachViewModel *livipCoachViewModel = [[NYLIVipCoachViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+//                    RQViewModelIDKey : @(RQVIPPageType_Full),
+//                    RQViewModelUtilKey : typeModels,
+//                    RQViewCommonValueKey : @(subject),
+//                }];
+//                [RQ_APPDELEGATE.services pushViewModel:livipCoachViewModel animated:YES];
+//            }else{
+                RQVipCenterViewModel *vipCenterViewModel = [[RQVipCenterViewModel alloc] initWithServices:RQ_APPDELEGATE.services params:@{
+                    RQViewModelUtilKey : [typeModels isKindOfClass:[NSArray class]]? typeModels : @[],
+                    RQViewCommonValueKey : @(subject),
+                }];
+                [RQ_APPDELEGATE.services pushViewModel:vipCenterViewModel animated:YES];
+//            }
+            
         } error:^(NSError * _Nullable error) {
             [MBProgressHUD rq_hideHUD];
             [MBProgressHUD rq_showErrorTips:error];
@@ -156,12 +180,20 @@ static id rq_VIPModule = nil;
             if (RQStringIsNotEmpty(videoVipModel.subject4)) {
                 [mutableVerifyString appendFormat:@"%ld",[RQ_SHARE_FUNCTION getTimeStampWithTimeStr:videoVipModel.subject4 formatter:@"yyyy-MM-dd HH:mm:ss"]];
             }
-            
+
             [mutableVerifyString appendFormat:@"%ld",videoVipModel.subject1Int];
             [mutableVerifyString appendFormat:@"%ld",videoVipModel.subject2Int];
             [mutableVerifyString appendFormat:@"%ld",videoVipModel.subject3Int];
             [mutableVerifyString appendFormat:@"%ld",videoVipModel.subject4Int];
             
+            if (RQStringIsNotEmpty(videoVipModel.spSubject1)) {
+                [mutableVerifyString appendFormat:@"%ld",[RQ_SHARE_FUNCTION getTimeStampWithTimeStr:videoVipModel.spSubject1 formatter:@"yyyy-MM-dd HH:mm:ss"]];
+            }
+            if (RQStringIsNotEmpty(videoVipModel.spSubject4)) {
+                [mutableVerifyString appendFormat:@"%ld",[RQ_SHARE_FUNCTION getTimeStampWithTimeStr:videoVipModel.spSubject4 formatter:@"yyyy-MM-dd HH:mm:ss"]];
+            }
+            [mutableVerifyString appendFormat:@"%ld",videoVipModel.spSubject1Int];
+            [mutableVerifyString appendFormat:@"%ld",videoVipModel.spSubject4Int];
             
             //公钥验签
             isVerify = [self verify:mutableVerifyString.copy signature:RQStringIsNotEmpty(videoVipModel.sign)? videoVipModel.sign : @"" withPublivKey:publicKey];
@@ -175,6 +207,9 @@ static id rq_VIPModule = nil;
                 RQ_VIP_Module.isSubject4Vip = videoVipModel.subject4Int;
                 RQ_VIP_Module.isSubjectAllVip = RQ_VIP_Module.isSubject1Vip && RQ_VIP_Module.isSubject2Vip && RQ_VIP_Module.isSubject3Vip && RQ_VIP_Module.isSubject4Vip;
                 self.videoVipModel = videoVipModel;
+                RQ_VIP_Module.isSpSubject1Vip = videoVipModel.spSubject1Int;
+                RQ_VIP_Module.isSpSubject4Vip = videoVipModel.spSubject4Int;
+                RQ_VIP_Module.isSpSubjectAllVip =  RQ_VIP_Module.isSpSubject1Vip && RQ_VIP_Module.isSpSubject4Vip;
                 NSInteger isAds = 0;
                 if (subject == 1) {
                     isAds ++;
@@ -188,8 +223,18 @@ static id rq_VIPModule = nil;
                 } else if (subject == 4) {
                     isAds ++;
                     result = isVerify? RQ_VIP_Module.isSubject4Vip : NO;
+                } else if (subject == 5) {//1-4全
+                    isAds ++;
+                    result = isVerify? RQ_VIP_Module.isSubjectAllVip : NO;
+                } else if (subject == 6) { //科一特
+                    isAds ++;
+                    result = isVerify? RQ_VIP_Module.isSpSubject1Vip : NO;
+                } else if (subject == 7) { //科四特
+                    isAds ++;
+                    result = isVerify? RQ_VIP_Module.isSpSubject4Vip : NO;
                 } else {
-                    result = isVerify? (RQ_VIP_Module.isSubject1Vip || RQ_VIP_Module.isSubject2Vip || RQ_VIP_Module.isSubject3Vip || RQ_VIP_Module.isSubject4Vip) : NO;
+                    result = isVerify? (RQ_VIP_Module.isSubject1Vip || RQ_VIP_Module.isSubject2Vip || RQ_VIP_Module.isSubject3Vip || RQ_VIP_Module.isSubject4Vip
+                                        ||RQ_VIP_Module.isSpSubject1Vip || RQ_VIP_Module.isSpSubject4Vip) : NO;
                 }
                 RQ_VIP_Module.isADVip = (isAds >=2);
                 RQ_VIP_Module.isVip = result;
@@ -204,7 +249,11 @@ static id rq_VIPModule = nil;
                 RQ_VIP_Module.isSubject2Vip = NO;
                 RQ_VIP_Module.isSubject3Vip = NO;
                 RQ_VIP_Module.isSubject4Vip = NO;
+                RQ_VIP_Module.isSubject4Vip = NO;
+                RQ_VIP_Module.isSpSubject1Vip = NO;
+                RQ_VIP_Module.isSpSubject4Vip = NO;
                 RQ_VIP_Module.isSubjectAllVip = NO;
+                RQ_VIP_Module.isSpSubjectAllVip = NO;
                 RQ_VIP_Module.isVip = NO;
                 RQ_VIP_Module.isADVip = NO;
                 self.videoVipModel = nil;
@@ -217,7 +266,10 @@ static id rq_VIPModule = nil;
             RQ_VIP_Module.isSubject2Vip = NO;
             RQ_VIP_Module.isSubject3Vip = NO;
             RQ_VIP_Module.isSubject4Vip = NO;
+            RQ_VIP_Module.isSpSubject1Vip = NO;
+            RQ_VIP_Module.isSpSubject4Vip = NO;
             RQ_VIP_Module.isSubjectAllVip = NO;
+            RQ_VIP_Module.isSpSubjectAllVip = NO;
             RQ_VIP_Module.isVip = NO;
             RQ_VIP_Module.isADVip = NO;
             self.videoVipModel = nil;
@@ -468,6 +520,34 @@ static id rq_VIPModule = nil;
     [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithBool:isSubject4Vip] ForKey:@"isSubject4Vip"];
 }
 
+- (BOOL)isSpSubject1Vip {
+    id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"isSpSubject1Vip"];
+    if (RQObjectIsNil(object)) {
+        return NO;
+    } else {
+        BOOL isSpSubject1Vip = [object boolValue];
+        return isSpSubject1Vip;
+    }
+}
+
+- (void)setIsSpSubject1Vip:(BOOL)isSpSubject1Vip {
+    [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithBool:isSpSubject1Vip] ForKey:@"isSpSubject1Vip"];
+}
+
+- (BOOL)isSpSubject4Vip {
+    id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"isSpSubject4Vip"];
+    if (RQObjectIsNil(object)) {
+        return NO;
+    } else {
+        BOOL isSpSubject4Vip = [object boolValue];
+        return isSpSubject4Vip;
+    }
+}
+
+- (void)setIsSpSubject4Vip:(BOOL)isSpSubject4Vip {
+    [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithBool:isSpSubject4Vip] ForKey:@"isSpSubject4Vip"];
+}
+
 - (BOOL)isSubjectAllVip {
     id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"isSubjectAllVip"];
     if (RQObjectIsNil(object)) {
@@ -482,6 +562,20 @@ static id rq_VIPModule = nil;
     [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithBool:isSubjectAllVip] ForKey:@"isSubjectAllVip"];
 }
 
+- (BOOL)isSpSubjectAllVip {
+    id object = [RQ_SHARE_FUNCTION getObjectWithKey:@"isSpSubjectAllVip"];
+    if (RQObjectIsNil(object)) {
+        return NO;
+    } else {
+        BOOL isSubjectAllVip = [object boolValue];
+        return isSubjectAllVip;
+    }
+}
+
+- (void)setIsSpSubjectAllVip:(BOOL)isSubjectAllVip {
+    [RQ_SHARE_FUNCTION saveObjectWithObject:[NSNumber numberWithBool:isSubjectAllVip] ForKey:@"isSpSubjectAllVip"];
+}
+
 
 - (NSUInteger)freeLookSimExamNum {
     id object = [RQ_COMMON_MANAGER getObjectWithKey:@"freeLookSimExamNum"];

jiaPei/Modules/OtherModules/VIPModule/View/会员中心/RQVipCenterItemView.h

@@ -20,6 +20,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet QMUIButton *openVipBtn;
 @property (weak, nonatomic) IBOutlet QMUIButton *dateVipBtn;
 @property (weak, nonatomic) IBOutlet QMUIButton *continueBtn;
+
+@property (weak, nonatomic) IBOutlet UIImageView *jxvipImageView;
+
 @property (nonatomic, readwrite, assign) RQHomePageSubjectType homePageSubjectType;
 @property (nonatomic, readwrite, copy) NSArray *typeModels;
 

jiaPei/Modules/OtherModules/VIPModule/View/会员中心/RQVipCenterItemView.m

@@ -99,7 +99,28 @@
 
                 break;
             }
-                
+            case RQHomePageSubjectType_SubjectOne_LI-1: {
+                self.leftVipBtn.selected = (videoVipModel.spSubject1Int == 1);
+                self.leftIconVipBtn.selected = (videoVipModel.spSubject1Int == 1);
+                self.rightVipBtn.selected = (videoVipModel.spSubject1Int == 1);
+                self.openVipBtn.hidden = (videoVipModel.spSubject1Int == 1);
+                self.dateVipBtn.hidden = (videoVipModel.spSubject1Int == 0);
+                self.continueBtn.hidden = (videoVipModel.spSubject1Int == 0);
+                [self.dateVipBtn setTitleNormal:[NSString stringWithFormat:@"%@到期",videoVipModel.spSubject1]];
+
+                break;
+            }
+            case RQHomePageSubjectType_SubjectFour_LI-1: {
+                self.leftVipBtn.selected = (videoVipModel.spSubject4Int == 1);
+                self.leftIconVipBtn.selected = (videoVipModel.spSubject4Int == 1);
+                self.rightVipBtn.selected = (videoVipModel.spSubject4Int == 1);
+                self.openVipBtn.hidden = (videoVipModel.spSubject4Int == 1);
+                self.dateVipBtn.hidden = (videoVipModel.spSubject4Int == 0);
+                self.continueBtn.hidden = (videoVipModel.spSubject4Int == 0);
+                [self.dateVipBtn setTitleNormal:[NSString stringWithFormat:@"%@到期",videoVipModel.spSubject4]];
+
+                break;
+            }
             default:
                 break;
         }
@@ -143,6 +164,7 @@
             [self.leftVipBtn setImage:RQImageNamed(@"科一银") forState:UIControlStateNormal];
             [self.leftVipBtn setImage:RQImageNamed(@"科一金") forState:UIControlStateSelected];
             [self.arrowImageView setImage:RQImageNamed(@"三角形1")];
+            [self.jxvipImageView setImage:RQImageNamed(@"极享VIP")];
             [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
                 graColor.fromColor = [UIColor qmui_colorWithHexString:@"#EBF9F5"];
                 graColor.toColor = [UIColor qmui_colorWithHexString:@"#9AFFE4"];
@@ -156,6 +178,7 @@
             [self.leftVipBtn setImage:RQImageNamed(@"科二银") forState:UIControlStateNormal];
             [self.leftVipBtn setImage:RQImageNamed(@"科二金") forState:UIControlStateSelected];
             [self.arrowImageView setImage:RQImageNamed(@"三角形2")];
+            [self.jxvipImageView setImage:RQImageNamed(@"极享VIP")];
             [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
                 graColor.fromColor = [UIColor qmui_colorWithHexString:@"#EBF1F9"];
                 graColor.toColor = [UIColor qmui_colorWithHexString:@"#9AC2FF"];
@@ -168,6 +191,7 @@
             [self.leftVipBtn setImage:RQImageNamed(@"科三银") forState:UIControlStateNormal];
             [self.leftVipBtn setImage:RQImageNamed(@"科三金") forState:UIControlStateSelected];
             [self.arrowImageView setImage:RQImageNamed(@"三角形3")];
+            [self.jxvipImageView setImage:RQImageNamed(@"极享VIP")];
             [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
                 graColor.fromColor = [UIColor qmui_colorWithHexString:@"#F9F4EB"];
                 graColor.toColor = [UIColor qmui_colorWithHexString:@"#FFDA9A"];
@@ -181,6 +205,37 @@
             [self.leftVipBtn setImage:RQImageNamed(@"科四银") forState:UIControlStateNormal];
             [self.leftVipBtn setImage:RQImageNamed(@"科四金") forState:UIControlStateSelected];
             [self.arrowImageView setImage:RQImageNamed(@"三角形4")];
+            [self.jxvipImageView setImage:RQImageNamed(@"极享VIP")];
+            [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
+                graColor.fromColor = [UIColor qmui_colorWithHexString:@"#F9EBEB"];
+                graColor.toColor = [UIColor qmui_colorWithHexString:@"#FF9A9D"];
+                graColor.type = QQGradualChangeTypeLeftToRight;
+            } size:CGSizeMake(RQ_FIT_HORIZONTAL(137.f), RQ_FIT_HORIZONTAL(25.f)) cornerRadius:QQRadiusMakeSame(RQ_FIT_HORIZONTAL(25.f) / 2.f)] forState:UIControlStateNormal];
+
+            break;
+        }
+        case RQHomePageSubjectType_SubjectOne_LI-1: {
+            self.bgImageView.image = RQImageNamed(@"1科一特训包");
+            [self.leftVipBtn setImage:RQImageNamed(@"科一银") forState:UIControlStateNormal];
+            [self.leftVipBtn setImage:RQImageNamed(@"科一金") forState:UIControlStateSelected];
+            [self.arrowImageView setImage:RQImageNamed(@"三角形5")];
+            [self.jxvipImageView setImage:RQImageNamed(@"特训包")];
+            
+            [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
+                graColor.fromColor = [UIColor qmui_colorWithHexString:@"#F9EBEB"];
+                graColor.toColor = [UIColor qmui_colorWithHexString:@"#FF9A9D"];
+                graColor.type = QQGradualChangeTypeLeftToRight;
+            } size:CGSizeMake(RQ_FIT_HORIZONTAL(137.f), RQ_FIT_HORIZONTAL(25.f)) cornerRadius:QQRadiusMakeSame(RQ_FIT_HORIZONTAL(25.f) / 2.f)] forState:UIControlStateNormal];
+
+            break;
+        }
+        case RQHomePageSubjectType_SubjectFour_LI-1: {
+            self.bgImageView.image = RQImageNamed(@"1科四特训包");
+            [self.leftVipBtn setImage:RQImageNamed(@"科四银") forState:UIControlStateNormal];
+            [self.leftVipBtn setImage:RQImageNamed(@"科四金") forState:UIControlStateSelected];
+            [self.arrowImageView setImage:RQImageNamed(@"三角形6")];
+            [self.jxvipImageView setImage:RQImageNamed(@"特训包")];
+            
             [self.openVipBtn setBackgroundImage:[UIImage imageWithGradualChangingColor:^(QQGradualChangingColor *graColor) {
                 graColor.fromColor = [UIColor qmui_colorWithHexString:@"#F9EBEB"];
                 graColor.toColor = [UIColor qmui_colorWithHexString:@"#FF9A9D"];