Commit 50948233 authored by zhu's avatar zhu

no message

parent 27f380e1
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
04040E001B6FE75800326D12 /* ICRPerson.m in Sources */ = {isa = PBXBuildFile; fileRef = 04040DFF1B6FE75800326D12 /* ICRPerson.m */; }; 04040E001B6FE75800326D12 /* ICRPerson.m in Sources */ = {isa = PBXBuildFile; fileRef = 04040DFF1B6FE75800326D12 /* ICRPerson.m */; };
0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFD81B7C97E700DD65A7 /* BusinessViewController.m */; }; 0406BFD91B7C97E700DD65A7 /* BusinessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0406BFD81B7C97E700DD65A7 /* BusinessViewController.m */; };
04703FAC1B8EA50400C72846 /* NewPurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04703FA91B8EA50400C72846 /* NewPurchaseNoticeViewController.m */; };
04703FAD1B8EA50400C72846 /* SeePurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 04703FAB1B8EA50400C72846 /* SeePurchaseNoticeViewController.m */; };
04703FB01B8EA54000C72846 /* PurchaseNoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 04703FAF1B8EA54000C72846 /* PurchaseNoticeCell.m */; };
300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; }; 300DD94A1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; };
300DD94B1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; }; 300DD94B1B184B450080EE12 /* ICRPatrolPlan.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */; };
300DD94E1B184EA70080EE12 /* ICRQuestion.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD94D1B184EA70080EE12 /* ICRQuestion.m */; }; 300DD94E1B184EA70080EE12 /* ICRQuestion.m in Sources */ = {isa = PBXBuildFile; fileRef = 300DD94D1B184EA70080EE12 /* ICRQuestion.m */; };
...@@ -357,9 +360,6 @@ ...@@ -357,9 +360,6 @@
C1FE50571AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */; }; C1FE50571AE3587F00C18080 /* ICRAttachmentUnit.m in Sources */ = {isa = PBXBuildFile; fileRef = C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */; };
FE0C9B091B7C543D00335B39 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = FE0C9B081B7C543D00335B39 /* User.m */; }; FE0C9B091B7C543D00335B39 /* User.m in Sources */ = {isa = PBXBuildFile; fileRef = FE0C9B081B7C543D00335B39 /* User.m */; };
FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6781B85847D0078CE96 /* QueryOrder.m */; }; FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6781B85847D0078CE96 /* QueryOrder.m */; };
FE17F6831B85CA5B0078CE96 /* NewPurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F67C1B85CA5B0078CE96 /* NewPurchaseNoticeViewController.m */; };
FE17F6841B85CA5B0078CE96 /* PurchaseNoticeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F67E1B85CA5B0078CE96 /* PurchaseNoticeCell.m */; };
FE17F6851B85CA5B0078CE96 /* SeePurchaseNoticeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6801B85CA5B0078CE96 /* SeePurchaseNoticeViewController.m */; };
FE17F6861B85CA5B0078CE96 /* ShopDetaileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */; }; FE17F6861B85CA5B0078CE96 /* ShopDetaileViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */; };
FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */; }; FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */; };
FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */; }; FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */; };
...@@ -394,6 +394,12 @@ ...@@ -394,6 +394,12 @@
04040DFF1B6FE75800326D12 /* ICRPerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPerson.m; sourceTree = "<group>"; }; 04040DFF1B6FE75800326D12 /* ICRPerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPerson.m; sourceTree = "<group>"; };
0406BFD71B7C97E700DD65A7 /* BusinessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BusinessViewController.h; path = ../ViewControllers/Business/BusinessViewController.h; sourceTree = "<group>"; }; 0406BFD71B7C97E700DD65A7 /* BusinessViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BusinessViewController.h; path = ../ViewControllers/Business/BusinessViewController.h; sourceTree = "<group>"; };
0406BFD81B7C97E700DD65A7 /* BusinessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BusinessViewController.m; path = ../ViewControllers/Business/BusinessViewController.m; sourceTree = "<group>"; }; 0406BFD81B7C97E700DD65A7 /* BusinessViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BusinessViewController.m; path = ../ViewControllers/Business/BusinessViewController.m; sourceTree = "<group>"; };
04703FA81B8EA50400C72846 /* NewPurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPurchaseNoticeViewController.h; sourceTree = "<group>"; };
04703FA91B8EA50400C72846 /* NewPurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPurchaseNoticeViewController.m; sourceTree = "<group>"; };
04703FAA1B8EA50400C72846 /* SeePurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeePurchaseNoticeViewController.h; sourceTree = "<group>"; };
04703FAB1B8EA50400C72846 /* SeePurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeePurchaseNoticeViewController.m; sourceTree = "<group>"; };
04703FAE1B8EA54000C72846 /* PurchaseNoticeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseNoticeCell.h; sourceTree = "<group>"; };
04703FAF1B8EA54000C72846 /* PurchaseNoticeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseNoticeCell.m; sourceTree = "<group>"; };
1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; }; 1B0B22845F5CD40B5CF655F2 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
300DD9481B184B450080EE12 /* ICRPatrolPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRPatrolPlan.h; sourceTree = "<group>"; }; 300DD9481B184B450080EE12 /* ICRPatrolPlan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ICRPatrolPlan.h; sourceTree = "<group>"; };
300DD9491B184B450080EE12 /* ICRPatrolPlan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPatrolPlan.m; sourceTree = "<group>"; }; 300DD9491B184B450080EE12 /* ICRPatrolPlan.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRPatrolPlan.m; sourceTree = "<group>"; };
...@@ -785,12 +791,6 @@ ...@@ -785,12 +791,6 @@
FE0C9B081B7C543D00335B39 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = User.m; path = ../Views/User.m; sourceTree = "<group>"; }; FE0C9B081B7C543D00335B39 /* User.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = User.m; path = ../Views/User.m; sourceTree = "<group>"; };
FE17F6771B85847D0078CE96 /* QueryOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryOrder.h; sourceTree = "<group>"; }; FE17F6771B85847D0078CE96 /* QueryOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryOrder.h; sourceTree = "<group>"; };
FE17F6781B85847D0078CE96 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; }; FE17F6781B85847D0078CE96 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; };
FE17F67B1B85CA5B0078CE96 /* NewPurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewPurchaseNoticeViewController.h; sourceTree = "<group>"; };
FE17F67C1B85CA5B0078CE96 /* NewPurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewPurchaseNoticeViewController.m; sourceTree = "<group>"; };
FE17F67D1B85CA5B0078CE96 /* PurchaseNoticeCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurchaseNoticeCell.h; sourceTree = "<group>"; };
FE17F67E1B85CA5B0078CE96 /* PurchaseNoticeCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PurchaseNoticeCell.m; sourceTree = "<group>"; };
FE17F67F1B85CA5B0078CE96 /* SeePurchaseNoticeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SeePurchaseNoticeViewController.h; sourceTree = "<group>"; };
FE17F6801B85CA5B0078CE96 /* SeePurchaseNoticeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SeePurchaseNoticeViewController.m; sourceTree = "<group>"; };
FE17F6811B85CA5B0078CE96 /* ShopDetaileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopDetaileViewController.h; sourceTree = "<group>"; }; FE17F6811B85CA5B0078CE96 /* ShopDetaileViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopDetaileViewController.h; sourceTree = "<group>"; };
FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopDetaileViewController.m; sourceTree = "<group>"; }; FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopDetaileViewController.m; sourceTree = "<group>"; };
FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; }; FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; };
...@@ -861,6 +861,33 @@ ...@@ -861,6 +861,33 @@
name = Business; name = Business;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
04703FA51B8EA49100C72846 /* Controllers */ = {
isa = PBXGroup;
children = (
04703FA81B8EA50400C72846 /* NewPurchaseNoticeViewController.h */,
04703FA91B8EA50400C72846 /* NewPurchaseNoticeViewController.m */,
04703FAA1B8EA50400C72846 /* SeePurchaseNoticeViewController.h */,
04703FAB1B8EA50400C72846 /* SeePurchaseNoticeViewController.m */,
);
path = Controllers;
sourceTree = "<group>";
};
04703FA61B8EA49100C72846 /* Models */ = {
isa = PBXGroup;
children = (
);
path = Models;
sourceTree = "<group>";
};
04703FA71B8EA49100C72846 /* Views */ = {
isa = PBXGroup;
children = (
04703FAE1B8EA54000C72846 /* PurchaseNoticeCell.h */,
04703FAF1B8EA54000C72846 /* PurchaseNoticeCell.m */,
);
path = Views;
sourceTree = "<group>";
};
35C3C0BA1AE9587F0035AC8A /* Navigation */ = { 35C3C0BA1AE9587F0035AC8A /* Navigation */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -1919,12 +1946,9 @@ ...@@ -1919,12 +1946,9 @@
FE17F67A1B85CA5B0078CE96 /* PurchaseNotice */ = { FE17F67A1B85CA5B0078CE96 /* PurchaseNotice */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
FE17F67B1B85CA5B0078CE96 /* NewPurchaseNoticeViewController.h */, 04703FA51B8EA49100C72846 /* Controllers */,
FE17F67C1B85CA5B0078CE96 /* NewPurchaseNoticeViewController.m */, 04703FA61B8EA49100C72846 /* Models */,
FE17F67D1B85CA5B0078CE96 /* PurchaseNoticeCell.h */, 04703FA71B8EA49100C72846 /* Views */,
FE17F67E1B85CA5B0078CE96 /* PurchaseNoticeCell.m */,
FE17F67F1B85CA5B0078CE96 /* SeePurchaseNoticeViewController.h */,
FE17F6801B85CA5B0078CE96 /* SeePurchaseNoticeViewController.m */,
FE17F6811B85CA5B0078CE96 /* ShopDetaileViewController.h */, FE17F6811B85CA5B0078CE96 /* ShopDetaileViewController.h */,
FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */, FE17F6821B85CA5B0078CE96 /* ShopDetaileViewController.m */,
); );
...@@ -2091,7 +2115,6 @@ ...@@ -2091,7 +2115,6 @@
FE4F17251B72FAAB00924DED /* ChosePersonViewController.m in Sources */, FE4F17251B72FAAB00924DED /* ChosePersonViewController.m in Sources */,
30D7495F1ACE8F4400C63BA1 /* ICRConfigurationViewController.m in Sources */, 30D7495F1ACE8F4400C63BA1 /* ICRConfigurationViewController.m in Sources */,
C15918631AC19FB30013B391 /* ICRHomeViewController.m in Sources */, C15918631AC19FB30013B391 /* ICRHomeViewController.m in Sources */,
FE17F6841B85CA5B0078CE96 /* PurchaseNoticeCell.m in Sources */,
FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */, FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */,
FE2FCC8B1B74A9EE00BBC6FB /* SurveyResultCell.m in Sources */, FE2FCC8B1B74A9EE00BBC6FB /* SurveyResultCell.m in Sources */,
C182E40E1AD4CE0B009BB9DB /* IBTModel.m in Sources */, C182E40E1AD4CE0B009BB9DB /* IBTModel.m in Sources */,
...@@ -2101,10 +2124,10 @@ ...@@ -2101,10 +2124,10 @@
C159184B1AC062460013B391 /* IBTTabBarController.m in Sources */, C159184B1AC062460013B391 /* IBTTabBarController.m in Sources */,
C142D2BE1AC3A155000109A7 /* UIView+FindUIViewController.m in Sources */, C142D2BE1AC3A155000109A7 /* UIView+FindUIViewController.m in Sources */,
35C3C0BF1AE95F1D0035AC8A /* UIImage+Rotate.m in Sources */, 35C3C0BF1AE95F1D0035AC8A /* UIImage+Rotate.m in Sources */,
04703FAD1B8EA50400C72846 /* SeePurchaseNoticeViewController.m in Sources */,
7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */, 7281A0C51B89BF1C0052B1AC /* ChooseVendorViewController.m in Sources */,
C11A344D1B1BE27200079129 /* ICRPatrolAllStoreViewController.m in Sources */, C11A344D1B1BE27200079129 /* ICRPatrolAllStoreViewController.m in Sources */,
C10214DD1AD90A3F0024637E /* ICRFunctionEntity.m in Sources */, C10214DD1AD90A3F0024637E /* ICRFunctionEntity.m in Sources */,
FE17F6831B85CA5B0078CE96 /* NewPurchaseNoticeViewController.m in Sources */,
30DB92A61ADD039F00271835 /* ICRAnnocementContentView.m in Sources */, 30DB92A61ADD039F00271835 /* ICRAnnocementContentView.m in Sources */,
C142D2B21AC3A155000109A7 /* UIFont+Custom.m in Sources */, C142D2B21AC3A155000109A7 /* UIFont+Custom.m in Sources */,
C15295CE1B24741400DF60D1 /* ASValuePopUpView.m in Sources */, C15295CE1B24741400DF60D1 /* ASValuePopUpView.m in Sources */,
...@@ -2168,6 +2191,7 @@ ...@@ -2168,6 +2191,7 @@
FE7155D91B7B328400595B0A /* Product.m in Sources */, FE7155D91B7B328400595B0A /* Product.m in Sources */,
C159188A1AC4615D0013B391 /* ICRHTTPController.m in Sources */, C159188A1AC4615D0013B391 /* ICRHTTPController.m in Sources */,
C123A90D1B25CBAD003C0C36 /* ASStarRatingView.m in Sources */, C123A90D1B25CBAD003C0C36 /* ASStarRatingView.m in Sources */,
04703FAC1B8EA50400C72846 /* NewPurchaseNoticeViewController.m in Sources */,
C15295AF1B24296500DF60D1 /* ICRQSingleSelectViewController.m in Sources */, C15295AF1B24296500DF60D1 /* ICRQSingleSelectViewController.m in Sources */,
C167F9C11AC8615B00D2A098 /* ICRLoginContentView.m in Sources */, C167F9C11AC8615B00D2A098 /* ICRLoginContentView.m in Sources */,
C142D2BA1AC3A155000109A7 /* UITabBarItem+Universal.m in Sources */, C142D2BA1AC3A155000109A7 /* UITabBarItem+Universal.m in Sources */,
...@@ -2232,7 +2256,6 @@ ...@@ -2232,7 +2256,6 @@
FEAE16E91B79C9F9009D9E01 /* ResultView.m in Sources */, FEAE16E91B79C9F9009D9E01 /* ResultView.m in Sources */,
FEA2F30C1B84687D00D64735 /* FooterCell.m in Sources */, FEA2F30C1B84687D00D64735 /* FooterCell.m in Sources */,
C142D2C01AC3A155000109A7 /* UIView+ViewFrameGeometry.m in Sources */, C142D2C01AC3A155000109A7 /* UIView+ViewFrameGeometry.m in Sources */,
FE17F6851B85CA5B0078CE96 /* SeePurchaseNoticeViewController.m in Sources */,
C1FE50451AE0249A00C18080 /* IBTImagePicker.m in Sources */, C1FE50451AE0249A00C18080 /* IBTImagePicker.m in Sources */,
FEA2F3091B8459DA00D64735 /* HeaderCell.m in Sources */, FEA2F3091B8459DA00D64735 /* HeaderCell.m in Sources */,
C1E108611ADA8D3800620375 /* ICRAttachment.m in Sources */, C1E108611ADA8D3800620375 /* ICRAttachment.m in Sources */,
...@@ -2270,6 +2293,7 @@ ...@@ -2270,6 +2293,7 @@
FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */, FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */,
7281A0B41B8974120052B1AC /* ProductViewController.m in Sources */, 7281A0B41B8974120052B1AC /* ProductViewController.m in Sources */,
C159183D1AC062460013B391 /* IBTTableViewCellInfo.m in Sources */, C159183D1AC062460013B391 /* IBTTableViewCellInfo.m in Sources */,
04703FB01B8EA54000C72846 /* PurchaseNoticeCell.m in Sources */,
C1FE504E1AE024FA00C18080 /* RIButtonItem.m in Sources */, C1FE504E1AE024FA00C18080 /* RIButtonItem.m in Sources */,
C18AEA9A1AD2749200A1DB7B /* ICRStoreListViewController.m in Sources */, C18AEA9A1AD2749200A1DB7B /* ICRStoreListViewController.m in Sources */,
7217E9F11B72364300FE5C1D /* SortMaskView.m in Sources */, 7217E9F11B72364300FE5C1D /* SortMaskView.m in Sources */,
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
#import "Survey.h" #import "Survey.h"
#import "PurchaseNoticeCell.h" #import "PurchaseNoticeCell.h"
#import "ShopDetaileViewController.h" #import "ShopDetaileViewController.h"
#define LeftMargin 15 #define LeftMargin 15
#define BtnHeight 44 #define BtnHeight 44
#define TableHeight 46 #define TableHeight 46
...@@ -30,6 +26,12 @@ ...@@ -30,6 +26,12 @@
#define KeyboardHeight 258 #define KeyboardHeight 258
#define DateViewHeight 300 #define DateViewHeight 300
#define FootOfsetHeight 140 #define FootOfsetHeight 140
#define BottomViewHeight 60
typedef enum : NSUInteger {
SaveTag = 8000,
CommitTag,
} BtnTag;
@interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate> @interface NewPurchaseNoticeViewController()<UITableViewDataSource,UITableViewDelegate,UITextFieldDelegate,HPGrowingTextViewDelegate>
{ {
UITableView *_tableView; UITableView *_tableView;
...@@ -41,6 +43,7 @@ ...@@ -41,6 +43,7 @@
UILabel *_personLabel; UILabel *_personLabel;
HPGrowingTextView *_noteTextView; HPGrowingTextView *_noteTextView;
NSIndexPath *selectedCellIndexPath; NSIndexPath *selectedCellIndexPath;
NSMutableArray *selectCellAry;
BOOL _isClickStart; BOOL _isClickStart;
...@@ -76,6 +79,7 @@ ...@@ -76,6 +79,7 @@
} }
-(void)setupSubviews -(void)setupSubviews
{ {
selectCellAry=[[NSMutableArray alloc]initWithCapacity:1000];
_dataArr=[[NSMutableArray alloc]initWithObjects:@"标题:",@"采购员:",@"备注:", nil]; _dataArr=[[NSMutableArray alloc]initWithObjects:@"标题:",@"采购员:",@"备注:", nil];
self.view.backgroundColor = XXFBgColor; self.view.backgroundColor = XXFBgColor;
...@@ -115,6 +119,15 @@ ...@@ -115,6 +119,15 @@
self.HeardLabel.font = FontSize(TitleSize); self.HeardLabel.font = FontSize(TitleSize);
//HexColor(@"e5e5e5") //HexColor(@"e5e5e5")
UIView *footView4 = [[UIView alloc]initWithFrame:CGRectMake(0, ScreenSize.height - BottomViewHeight - 64, ScreenSize.width, BottomViewHeight)];
UIButton *saveBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(15, 8, (ScreenSize.width - 15*3)/2, 44) target:self sel:@selector(btnClick:) tag:SaveTag image:nil title:@"保存" titleColor: [UIColor whiteColor] isCorner:YES corner:5 bgColor:HexColor(@"50bd62")];
[footView4 addSubview:saveBtn];
UIButton *commitBtn = [IBTCustomButtom creatButtonWithFrame:CGRectMake(CGRectGetMaxX(saveBtn.frame) + 15, 8, (ScreenSize.width - 15*3)/2, 44) target:self sel:@selector(btnClick:) tag:CommitTag image:nil title:@"提交" titleColor: [UIColor whiteColor] isCorner:YES corner:5 bgColor:HexColor(@"f69100")];
[footView4 addSubview:commitBtn];
[self.view addSubview:footView4];
[footView3 addSubview:self.addDetailedButton]; [footView3 addSubview:self.addDetailedButton];
[footView3 addSubview:self.HeardLabel]; [footView3 addSubview:self.HeardLabel];
[footView3 addSubview:self.FootLabel]; [footView3 addSubview:self.FootLabel];
...@@ -125,6 +138,7 @@ ...@@ -125,6 +138,7 @@
mingXiTableView.tableHeaderView=footView2; mingXiTableView.tableHeaderView=footView2;
[self.view addSubview:_tableView]; [self.view addSubview:_tableView];
[self.view addSubview:mingXiTableView]; [self.view addSubview:mingXiTableView];
[self.view addSubview:footView4];
} }
...@@ -177,17 +191,18 @@ ...@@ -177,17 +191,18 @@
// Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;向左箭头 // Cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;向左箭头
} }
if(selectedCellIndexPath != nil&[selectedCellIndexPath compare:indexPath] == NSOrderedSame){ if (Cell.isSelected==YES) {
Cell.backgroundColor=XXFBgColor; Cell.arrowView.image = [UIImage imageNamed:@"arrowdown"];
Cell.subSview.hidden=NO; Cell.backgroundColor=XXFBgColor;
}else Cell.subSview.hidden=NO;
{ }else
Cell.subSview.hidden=YES; {
Cell.backgroundColor=[UIColor whiteColor]; Cell.arrowView.image = [UIImage imageNamed:@"arrowright"];
Cell.backgroundColor=[UIColor whiteColor];
} Cell.subSview.hidden=YES;
}
[Cell.button addTarget:self action:@selector(didtoucher) forControlEvents:UIControlEventTouchUpInside]; [Cell.button addTarget:self action:@selector(didtoucher) forControlEvents:UIControlEventTouchUpInside];
// [cell setTitleStr:_dataArr[indexPath.row]];
return Cell; return Cell;
} }
...@@ -204,15 +219,14 @@ ...@@ -204,15 +219,14 @@
}else if ([tableView isEqual:mingXiTableView]) }else if ([tableView isEqual:mingXiTableView])
{ {
if(selectedCellIndexPath != nil&[selectedCellIndexPath compare:indexPath] == NSOrderedSame){
return TableHeight*3;
}
return TableHeight; if ([self comperIndexpath:indexPath]) {
return TableHeight*3;
}else
{
return TableHeight;
}
} }
return TableHeight; return TableHeight;
} }
...@@ -252,11 +266,16 @@ ...@@ -252,11 +266,16 @@
}else if ([tableView isEqual:mingXiTableView]) }else if ([tableView isEqual:mingXiTableView])
{ {
PurchaseNoticeCell *Cell=(PurchaseNoticeCell*)[mingXiTableView cellForRowAtIndexPath:indexPath ]; PurchaseNoticeCell *Cell=(PurchaseNoticeCell*)[mingXiTableView cellForRowAtIndexPath:indexPath ];
Cell.isSelected=YES; if (Cell.isSelected==NO) {
Cell.isSelected=YES;
[selectCellAry addObject:indexPath];
}else{
Cell.isSelected=NO;
[selectCellAry removeObject:indexPath];
}
selectedCellIndexPath = indexPath; selectedCellIndexPath = indexPath;
// [Cell setTitleStr:@"selected"];
// [tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationNone];
[mingXiTableView reloadData]; [mingXiTableView reloadData];
} }
...@@ -273,11 +292,7 @@ ...@@ -273,11 +292,7 @@
_titleField.returnKeyType = UIReturnKeyDone; _titleField.returnKeyType = UIReturnKeyDone;
_titleField.delegate = self; _titleField.delegate = self;
[cell.contentView addSubview:_titleField]; [cell.contentView addSubview:_titleField];
// if (self.survey) {
// _titleField.text = [IBTCommon checkString:self.survey.title];
// self.titleStr = [IBTCommon checkString:self.survey.title];
// }
// }else
}else if (indexPath.row == _dataArr.count -1){ }else if (indexPath.row == _dataArr.count -1){
_noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)]; _noteTextView = [[HPGrowingTextView alloc] initWithFrame:CGRectMake(100+LeftMargin, 0, ScreenSize.width - 100 - LeftMargin*2-10, TableHeight)];
_noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0); _noteTextView.contentInset = UIEdgeInsetsMake(5, 5, 5, 0);
...@@ -289,10 +304,6 @@ ...@@ -289,10 +304,6 @@
_noteTextView.returnKeyType = UIReturnKeyDone; _noteTextView.returnKeyType = UIReturnKeyDone;
_noteTextView.placeholder = @"输入备注内容"; _noteTextView.placeholder = @"输入备注内容";
[cell.contentView addSubview:_noteTextView]; [cell.contentView addSubview:_noteTextView];
// if (self.survey) {
// _noteTextView.text = [IBTCommon checkString:self.survey.remark];
// self.remarkStr = [IBTCommon checkString:self.survey.remark];
// }
CGRect lineFrame = cell.lineLabel.frame; CGRect lineFrame = cell.lineLabel.frame;
lineFrame.origin.y = TableHeight*2-1; lineFrame.origin.y = TableHeight*2-1;
cell.lineLabel.frame = lineFrame; cell.lineLabel.frame = lineFrame;
...@@ -309,7 +320,15 @@ ...@@ -309,7 +320,15 @@
} }
} }
} }
-(BOOL)comperIndexpath:(NSIndexPath *)indexPath
{
for (NSIndexPath *path in selectCellAry) {
if (path.row == indexPath.row) {
return YES;
}
}
return NO;
}
- (void)preferDataInPersonLabel{ - (void)preferDataInPersonLabel{
if (self.survey) { if (self.survey) {
if (self.survey.users.count > 0) { if (self.survey.users.count > 0) {
...@@ -373,6 +392,26 @@ ...@@ -373,6 +392,26 @@
[_noteTextView resignFirstResponder]; [_noteTextView resignFirstResponder];
[self setTableFrame:LeftMargin]; [self setTableFrame:LeftMargin];
} }
- (void)btnClick:(UIButton *)btn{
switch (btn.tag) {
case SaveTag:
{
// if ([self checkSurvey]) {
// [self saveSurvey:@"initial" message:@"正在保存..."];
// }
}
break;
case CommitTag:
{
// if ([self checkSurvey]) {
// [self saveSurvey:@"submitted" message:@"正在提交..."];
// }
}
break;
default:
break;
}
}
- (void)didReceiveMemoryWarning { - (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
@interface PurchaseNoticeCell : UITableViewCell @interface PurchaseNoticeCell : UITableViewCell
@property (nonatomic,strong)UILabel *HeardLabel; @property (nonatomic,strong)UILabel *HeardLabel;
@property (nonatomic,strong)UILabel *FootLabel; @property (nonatomic,strong)UILabel *FootLabel;
@property (nonatomic,strong)UIImageView *arrowView;
@property (nonatomic,strong)UILabel *SpLabel; @property (nonatomic,strong)UILabel *SpLabel;
@property (nonatomic,strong)UILabel *DjLabel; @property (nonatomic,strong)UILabel *DjLabel;
@property (nonatomic,strong)UILabel *BzggLabel; @property (nonatomic,strong)UILabel *BzggLabel;
......
...@@ -32,8 +32,12 @@ ...@@ -32,8 +32,12 @@
self.HeardLabel.font = FontSize(TitleSize); self.HeardLabel.font = FontSize(TitleSize);
self.FootLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, self.size.height-1, ScreenSize.width - LeftMargin * 2, 1))]; self.FootLabel=[[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, self.size.height-1, ScreenSize.width - LeftMargin * 2, 1))];
self.HeardLabel.backgroundColor = HexColor(@"e5e5e5"); self.FootLabel.backgroundColor = HexColor(@"e5e5e5");
self.HeardLabel.font = FontSize(TitleSize); self.FootLabel.font = FontSize(TitleSize);
self.arrowView=[[UIImageView alloc]initWithFrame:CGRectMake(LeftMargin, (TableHeight - 10)/2 , 10, 10)];
self.arrowView.image = [UIImage imageNamed:@"arrowright"];
self.arrowView.contentMode = UIViewContentModeScaleAspectFit;
self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+20, 0, TableWidth, TableHeight))]; self.SpLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin+20, 0, TableWidth, TableHeight))];
self.SpLabel.textAlignment= NSTextAlignmentLeft; self.SpLabel.textAlignment= NSTextAlignmentLeft;
...@@ -84,9 +88,7 @@ ...@@ -84,9 +88,7 @@
self.button=[UIButton buttonWithType:UIButtonTypeCustom]; self.button=[UIButton buttonWithType:UIButtonTypeCustom];
[self.button setFrame:CGRectMake(310, 0, 50, 50)]; [self.button setFrame:CGRectMake(310, 0, 50, 50)];
[self.button setImage:[UIImage imageNamed:@"AttachHide"] forState:UIControlStateNormal]; [self.button setImage:[UIImage imageNamed:@"edit"] forState:UIControlStateNormal];
// [self.button setTitle:@"编辑" forState:UIControlStateNormal];
// [self.button setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
[self.contentView addSubview:self.button]; [self.contentView addSubview:self.button];
[self.contentView addSubview:self.subSview]; [self.contentView addSubview:self.subSview];
[self.contentView addSubview:self.SpLabel]; [self.contentView addSubview:self.SpLabel];
...@@ -94,6 +96,7 @@ ...@@ -94,6 +96,7 @@
[self.contentView addSubview:self.BzslLabel]; [self.contentView addSubview:self.BzslLabel];
[self.contentView addSubview:self.BzggLabel]; [self.contentView addSubview:self.BzggLabel];
[self.contentView addSubview:self.HeardLabel]; [self.contentView addSubview:self.HeardLabel];
[self.contentView addSubview:self.arrowView];
// [self.contentView addSubview:self.FootLabel]; // [self.contentView addSubview:self.FootLabel];
} }
- (void)setTitleStr:(NSString *)str - (void)setTitleStr:(NSString *)str
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment