From f4a79001e4d32df806dad7506ac176e1df5403b7 Mon Sep 17 00:00:00 2001
From: n22 <n22@n22tekiiMac.local>
Date: Thu, 20 Aug 2015 16:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=83=85=E8=B0=83=E7=A0=94=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
XFFruit.xcodeproj/project.pbxproj | 18 ++++---
.../HTTPController/ICRHTTPController.m | 4 +-
.../Survey/finish.imageset/finish.png | Bin 4005 -> 1148 bytes
.../Survey/finish.imageset/finish@2x.png | Bin 4573 -> 1400 bytes
.../Survey/initial.imageset/initial.png | Bin 4230 -> 1153 bytes
.../Survey/initial.imageset/initial@2x.png | Bin 4894 -> 1403 bytes
.../Survey/insurvey.imageset/insurvey.png | Bin 4257 -> 1155 bytes
.../Survey/insurvey.imageset/insurvey@2x.png | Bin 4507 -> 1402 bytes
.../Home/ICRHomeViewController.m | 10 ++--
.../Survey/Views/SurveyListCell.m | 28 +++++------
.../Survey/controllers/SurveyViewController.m | 46 +++++++++---------
.../Survey/models/QueryOrder.h | 14 ++++++
.../Survey/models/QueryOrder.m | 13 +++++
.../Controllers/MaterialVIewController.m | 3 +-
14 files changed, 83 insertions(+), 53 deletions(-)
create mode 100644 XFFruit/ViewControllers/Survey/models/QueryOrder.h
create mode 100644 XFFruit/ViewControllers/Survey/models/QueryOrder.m
diff --git a/XFFruit.xcodeproj/project.pbxproj b/XFFruit.xcodeproj/project.pbxproj
index 7b9cc68..dab8084 100644
--- a/XFFruit.xcodeproj/project.pbxproj
+++ b/XFFruit.xcodeproj/project.pbxproj
@@ -346,6 +346,7 @@
C1FE50561AE3587F00C18080 /* 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 */; };
+ FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */ = {isa = PBXBuildFile; fileRef = FE17F6781B85847D0078CE96 /* QueryOrder.m */; };
FE2FCC7F1B74511000BBC6FB /* ChooseProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */; };
FE2FCC821B745E1A00BBC6FB /* SurveyDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC811B745E1A00BBC6FB /* SurveyDetailViewController.m */; };
FE2FCC881B7492C500BBC6FB /* ResultDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FE2FCC871B7492C500BBC6FB /* ResultDetailViewController.m */; };
@@ -748,6 +749,8 @@
C1FE50551AE3587F00C18080 /* ICRAttachmentUnit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ICRAttachmentUnit.m; sourceTree = "<group>"; };
FE0C9B071B7C543D00335B39 /* User.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = User.h; path = ../Views/User.h; 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>"; };
+ FE17F6781B85847D0078CE96 /* QueryOrder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QueryOrder.m; sourceTree = "<group>"; };
FE2FCC7D1B74511000BBC6FB /* ChooseProductViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChooseProductViewController.h; sourceTree = "<group>"; };
FE2FCC7E1B74511000BBC6FB /* ChooseProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChooseProductViewController.m; sourceTree = "<group>"; };
FE2FCC801B745E1A00BBC6FB /* SurveyDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SurveyDetailViewController.h; sourceTree = "<group>"; };
@@ -873,6 +876,8 @@
72F56CB11B76EC200077F0C9 /* SurveyUser.m */,
FE7155D71B7B328400595B0A /* Product.h */,
FE7155D81B7B328400595B0A /* Product.m */,
+ FE17F6771B85847D0078CE96 /* QueryOrder.h */,
+ FE17F6781B85847D0078CE96 /* QueryOrder.m */,
);
name = Models;
path = models;
@@ -2148,6 +2153,7 @@
30ECD6241B00948A0088C57A /* ICRPatrolPlanCellContentView.m in Sources */,
C123A9291B26EDDA003C0C36 /* ICRQInputPopup.m in Sources */,
30D702421ADE37D3008DC0BF /* ICRAnnouncementDetailViewController.m in Sources */,
+ FE17F6791B85847D0078CE96 /* QueryOrder.m in Sources */,
C15039221ADE39190081A686 /* IBTUIControl.m in Sources */,
C112BC4D1AD91CF800F75F58 /* ICRPatrolDetailViewController.m in Sources */,
C142D2BC1AC3A155000109A7 /* UITableViewCell+Helper.m in Sources */,
@@ -2368,7 +2374,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2406,7 +2412,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
@@ -2430,7 +2436,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Debug;
@@ -2451,7 +2457,7 @@
"$(PROJECT_DIR)",
);
PRODUCT_NAME = XFFruit;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
name = Release;
@@ -2474,7 +2480,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
@@ -2494,7 +2500,7 @@
INFOPLIST_FILE = XFFruitTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_NAME = XFFruitTests;
- PROVISIONING_PROFILE = "a12432a9-50b3-4cef-bae7-dcb35f965ce4";
+ PROVISIONING_PROFILE = "251ce065-a08f-44fd-bd52-f79372f4e47e";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/XFFruit.app/XFFruit";
USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
};
diff --git a/XFFruit/Controllers/HTTPController/ICRHTTPController.m b/XFFruit/Controllers/HTTPController/ICRHTTPController.m
index e9f5327..f8f6542 100644
--- a/XFFruit/Controllers/HTTPController/ICRHTTPController.m
+++ b/XFFruit/Controllers/HTTPController/ICRHTTPController.m
@@ -1327,7 +1327,7 @@ acceptTypeJson:YES
NSDictionary *dict = data;
NSString *currentTime = [[NSDate date] httpParameterString];
ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
- NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userCode,userUtil.displayName];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveySave] stringByAppendingFormat:@"?time=%@&operId=%@&operName=%@",currentTime,userUtil.userId,userUtil.displayName];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self POST:encodeUrlStr
parameters:dict
@@ -1559,7 +1559,7 @@ acceptTypeJson:YES
};
NSString *currentTime = [[NSDate date] httpParameterString];
ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
- NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userCode,userUtil.displayName];
+ NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userId,userUtil.displayName];
NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
[self POST:encodeUrlStr
parameters:nil
diff --git a/XFFruit/Images.xcassets/Survey/finish.imageset/finish.png b/XFFruit/Images.xcassets/Survey/finish.imageset/finish.png
index 6edc0d5b8938f2a365d98fb12db4ced565745c24..487986da995c52da55adf465536edd48e084e536 100644
GIT binary patch
literal 1148
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Y#!3HFYIj6_~DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%axrprF*7xCHZd|YH8gZJbu=(Db2BtBFg10u
zFf=kThUs<5PcF?(%`1WFO+n~&!KoLN6mkoIHoK%2WtOF;xE1B+DuBIgm5JLejyTPO
z>P^Az7AKr~^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5>U~RxSr-i4UGGjv*Dd
z-rTU~b_|qh|5$9;r7}BEY_-wq$D%XVh%NSc#Ht{ywufPM?A_?HNY$sT1}El6R-8+-
z{Px>=-`AOUo_h9O{#tWCT&JDUWRljN>PHQo*Q)ZWHJWV9R<zmN&}m~za}@Ye=lXqO
z(5Gu^HtF5hyq@_)-~8t2bTamq*xNh*E;3CoG~9KR)6VJ6(hPpzH=OGa7QZx~dz2~q
zkoG#+lxMU1b_vxw$-2IKvU<jc8|KSi2vz^yx4`?}j2qLk>m#54?>+PNMf-z&-MUr+
zQhyHJ61#geG~vsH$-gtY&GavMMLd%G6!1Bzpq=fY>}_XxMmB~hPxGMJOLxVB$^%bV
KKbLh*2~7Y(0E{#M
literal 4005
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
LNkvXXu0mjfb8xs@
diff --git a/XFFruit/Images.xcassets/Survey/finish.imageset/finish@2x.png b/XFFruit/Images.xcassets/Survey/finish.imageset/finish@2x.png
index c833da75a4e21043fb7d47702bca1a1090ce3a1e..bc1b43a770d5b6052a51347344c743792206c979 100644
GIT binary patch
literal 1400
zcmeAS@N?(olHy`uVBq!ia0vp^l|Zb+!3HE9cZ%}@DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%axpS;F>rHoGBGkUH8gZJb+m9ab2W8#Hg`2O
zHF2>tgXwk2PcF?(%`1WFO+n~&#;F&S6mkoIHoK%2WtOF;xE1B+DuBIgm5JLemN?CW
z>P^Az7Dt?V^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5^IO^PXg2V0`20;uunK
z>&+ZnZ>K<+_Vt-=+4mI`U%0;FHaRNWGwXKqf{wO3N*S41n-(>(NYCl|c3{W!HaiF2
zy$;<8-rkE9B{TOos|y&uzO(T4{~y&47+1cQ{da!v^<stYih0ks81PMhpd-`9%*WYW
z9?`-&qq+YrUs3G$>%w16_x2rju3*1hFs0Gi^=zHb_5k0$hY1sekIrI>U%}nH`K{NL
zvpaa)zX)&3`jvK6kGVU6Ev+d=QTUgZqEW=fvpq_yUBjkq7IqFXH}0DA=+2ReM!j<$
zoH;VlpjYPknInScy*^b5|6L_!8W<&}96Hf5(UV<F;%1%S!)@<>|Lw{79$dkFPvMJ+
z@@-$CIOP&PzOB{@k1FHl7H?_`-@(iubA7GRrn^%fsM$Ebky5^WR`<?>^i6lKB-kFa
zj5xV@SM%4$vnJ{;ULzhSd1P(P{|OV{K9pIf{LcHezC@(mt7x&+9o0WCGsaY$bbZ_P
zEn!n|!o8E5B3mjizjqRheDc3aLHRpF&l#YbIF*In)c#BCJZ0FiI7e#diJ6^?Q>1nt
znAv&QytjtQ-qPG~MVRH~6W<L^-|SReJzH}9y35P@8HBjPcZDv{of4IJ{-E;mkL8X_
zcCUD8U14`3Z$;(&HTU+gsXw%<X_B9lpRwm4``x5dnSZjEdrc6o<uqVebRl_T_Zi-+
Ppt8`@)z4*}Q$iB}pjHOy
literal 4573
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
Hu0mjfO2Ngv
diff --git a/XFFruit/Images.xcassets/Survey/initial.imageset/initial.png b/XFFruit/Images.xcassets/Survey/initial.imageset/initial.png
index 88972ad4e4aa5c7865a3ddfe3f68dfc0a22377a7..8f8e3d7f422af5855578ccc37a4e744ffd588bdd 100644
GIT binary patch
literal 1153
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Y#!3HFYIj6_~DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%axph{v~)9fGBGkUH8gZJwQzJZb2M>vayD>w
zc62dyhUs<5PcF?(%`1WFO+n~&#;F&S6mkoIHoK%2WtOF;xE1B+DuBIgm5JLemN?CW
z>P^Az7Dt?V^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*n5-}RiQE8YiLah6jv*Dd
z-rTU|V|0{gco?}&L}^iQ*D=N`ldcL+71l`Ae#p?lC2G~{_l-$tZ-%Q1pMzpuR8zUt
z*%#lX<3EL2pPhX6oX@q&DW|(m2KC!`t@v<m@;8&B=7g*$k%cmAS4tIakemL=q%urv
zZu|>9)v0?jna<C;FmICOtuPbY4(*+jjTWw*Z6EbuNv_N9HxHP*Znl)IaI}74T9or^
znX$=o-Vc*<rDxV%4!kb(X5uZA$A14N_0?UDXg(OXU;o9VbdGD=-=47go1e06@%yIQ
zbm1yZkw1&3a;`nUzT2T>{@mXQPOs%NS)(rKJ_-1nT;N@LK=<;Zeg<ZSRpDlzw{A6I
P1{DgPu6{1-oD!M<_WF$6
literal 4230
zcmV;15P9#3P)<h;3K|Lk000e1NJLTq002Ay000&U1^@s6oXh_r00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z1+z&+K~#9!+?Ri7l~owWKj*yn?)Sazhr2TF{DJ0}sf;B$(MocL#vpc`PJ)s)Vdzju
zT%rq8Ok{<EMBooF#hg$fuVq<;n?JC~bTt)8-DGZ3&RuKergYnV&*_ij?%i~EZqYyb
zz~$vV?{lB`e9!ZJzR&ZDp5kJFiNF@15b*GLngUvYJ;3`e+ja(Wasj!(_dqI-w@G09
z{lrZKmc(+}@&tf=&|VJ*0yAR)F67Cy!dQU4!wQp@hJ51<u&lxT+-_t^33%^^ce%jh
zfv28|{!&r~kK^$m%gP`z@xK60idDnIlm>-(_F34s?-3Ox5qWuV>Xf-HFGq|Y4|neL
zJ3M{n4C=Gb29D9yh4A~4ix#2w@Bd%Y{z$;0pa3y#8fa}65)u$zFLK3-=$a7dbLY@M
z{15?4TpaZDfZGj1AhNR1=g*@X8lti1&IO+@djHBRh>Q$yoJef__ut5(A`>SRGO>j)
z@4R#gefI4C3z$#{?%p+<0CQCey1UJ_m#(2uG`UNcBC@j)qefv>R-zjk(0A`5^7A1(
z+iY4XM0Pg%;>9T7<YY)rHgTmial5-w$Br3V`+V^G?~y|!K7O#BXAPLZp5kIXJn@%U
zH8nVE*2MP7%tWN5Aj`^7wYBJ$7Od)O^o<)P!!8$u!-&E{2!&7|e)#Zf-h2~XUyr_U
zA+lywSEH|8Lw)keP<Q(gQ021i&LL%3%$$kH&4qBd4<}rZo{oI=RddpP*7en^=+mbm
z7)1Z^2m0PUL+4qu(2b3VDO14bLkNM^8sT=Me)_5ZOH)#?-g*li4E6&Hpbj5KR#qaj
zvr*f&4FzyHP!tXX)&l!owyor#?g<Hylw{P^<AKCP<m}mqj10t_IfiDv&ytdif3G<X
zA|nG?QGu8`6%rEAO-<0+8of3*Bm90NZh#m)8f()gbVmoesR<bfMB^nVBTGwB+qWY|
zjKJEo39_<=0(vB{7dRIV1m+EzVO?L3uCI?~{Dl|LPd{yxw!Izw^UvrXe|&%z0#Q(a
zoIfAo^WoIgKwKPR#*7G4#EUPYj~|bUTCe5iqOV**?b?NyGzqb46*M$JTO0DV*Njj#
zH{)#BU=A`P1AX)6Q0W~Hh#|KnF>fC7rI%2(wWduRJcwMr9F>@eK6x_gXjzE-d?Q9Z
zJ?Qp!=<Gy1^9=g-ZS?8WSQ93ozWNHfx}w4d=x@KJS5Wk&OXw3PuqrB0Uw@6r%fs2c
z**yH`p8@MWhTR6%0(&1#>0SXTEkza=qjv5@U%w8CiRhLV)b8ELk`m;?g;D2l7`0;u
z>d>L6(t@FFYpbDsYARM$71qX$$nx^oE&sp)PztN63U%ZN{Px>$+ioo|(Pi6vT(+$q
z-ImhQ%)l^a3~JjpbaONK{ia8{-G*LUw_>eaiItOsvu6+7x)qtU0O;;UOrMSzHx5xy
zfd1wi=<LM#-~+gK&(J#7yGu(UB?a}}cgUAtM#aUUj~wa8ib3pSmu)W@Xta!-*|IW(
z$Ahzey#d>&P9xUVhO>UXVRJ>r{c4Ga)KoKV`TfYni*a`Cg3L^;)vF;r9g&u1M9=Gm
z^z?|*i<}(fvSnCXwjf51#M!<bwRJ1%(@&AlKacg^d&mU~%xEeH-Ttq`@57my5DfNT
z^ZT)?s!Sh#FgrdUbaWsC0W(DfgQkW7wR2}=nv#<zn*(vXK}z)H%cvbYkn7eVCrm&!
zHKC6kdw7Zx0#Q_ioIM-7UexEGqmLeqwfh>EZLb^Nr1c=!`}3_nbt*b}^|g);BRGwX
zrU&=dd!O3VUwna6SBDro)?`=+Gd%%Zy^3?@jEUd3_ecJ$(O-Uv)7Xf7?l~B`Lifw?
zU&H=ldOYkMmu<g0Pz~2Tq2I%GvA&1j2L61)z<%tq?eAj&{sou`90s}`V~`rS22=xO
cv7G)L0IH!HyM@#jXaE2J07*qoM6N<$g7CF4%K!iX
diff --git a/XFFruit/Images.xcassets/Survey/initial.imageset/initial@2x.png b/XFFruit/Images.xcassets/Survey/initial.imageset/initial@2x.png
index 10af0deb3a056263745dc745de68dabaaaf5511f..a5b326c1586b9d4357cee65f83ded498e1b4225f 100644
GIT binary patch
literal 1403
zcmeAS@N?(olHy`uVBq!ia0vp^l|Zb+!3HE9cZ%}@DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%axrr<H#2rIFflSSH8gZJwKOv_buo0bFfuiC
zF>!Quh3R$4PcF?(%`1WFO+n~2#HkmQ6mkoIHoK%2WtOF;xE1B+DuBIgm5I|W&aODk
zgX&Ge=@w@<oO<<vj?o82EK)?ngn+3B#DphXAP1iCQ}ckSy$G1B-zsv)F)%Q`_jGX#
zskrrKj;*&-piH}IzFYQv1;rPxueeQIn*$G*X7V>FNfmW3Si16L7ne{@fmYNUrsj+n
z%vUaOZ{gUs#YAe-v~SiGOoE%w$?p2szn@*MW7oZh|10vJH(XCRTFUI(bI8?#nLRPS
z;m1MiGlyk-4j&I=x4ijgz51)nAC^4)4`h7~B(i-IHT^Ak*U8kf>2I9h6B8D@_RDi}
z-52Q{Q?*#~enaYIaqTjR2$o=jmrrGlmfcr%VLQERW?;(J6I_L5NgOZJ+$JW^nQf7@
zY@+g<nHEaRCLRV-hn7wB6o0dyLs{5Ot;a`Vrh!rBVH@S!=Q;2E>Ns94dGp=w4{CcH
zUwFE0o2{|O?S+X<MybPwN4reVos^1uXm+Q3(@i7g+rEr>2ZE2RGum|b&Y{wO{@Z42
zt+AZbJk@5kcEtU4k~fXIsvb^txpV2ezT{20a}T5*?KAn`IPvM?d7B~}?{v@SdvM5G
zFDrZt_u{uqpS`A?WjZs%j@vb5;?LKOJ$G0Qj9^atll;W!xI*8e%qKSKYJE+aPh^0U
z_vI7EKTIwbZqAx&)?33LJZG*%(5{&uUs)wqaVzXASQ=e<%W0+PHys<EEB4|pR^6-i
zH9g<+rcLVm$yY~L7s$Ljs2=gKruH$f-3u|{#$VyqQ}@hy;oZQ<pgb|feVOnQ8BlTP
M>FVdQ&MBb@0G4$CPXGV_
literal 4894
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
QjQ{`u07*qoM6N<$f@LFz`~Uy|
diff --git a/XFFruit/Images.xcassets/Survey/insurvey.imageset/insurvey.png b/XFFruit/Images.xcassets/Survey/insurvey.imageset/insurvey.png
index 2c600f027a356f895f8d3fc839e82c9513551f21..e907f0f08ef67f25e0d5a6b9eb3ccc2479edb6a6 100644
GIT binary patch
literal 1155
zcmeAS@N?(olHy`uVBq!ia0vp^wm>Y#!3HFYIj6_~DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%a&a<ua&fY7H8C<XH8gZJwQw{C@{ECmp{b#P
zsWVKkOMY@`Zfaf$Om7N8uNzLiprnvn0JPa9wJ5VJHN~wcKUV?lWvfiwZgIwG9#n4%
zZnwDL)T<A4j6Nu0ks=x<1WY|3COp{!Iq-y^ng>knMZjcjXY>9HFiU**ba4!+xb<en
zZazmx5!dI7M3f$JcerT>PV{&uzhaBj(iJv#2Ua_^)?d(85nAe`uC#EuK!4N*x22MQ
zZIjhk&zzZ-T6Ats&*huxqMi=yF&x_OpD|iXTzho7^W_BoNgJA)j<=RFO=v3oJ|X+>
zq&#Prlis`^TRd-t8ZEy2X<6@tNwZgY-rDtNDXUuA;*zO+_u3cuUg8T$=&lf)b6!dK
z=IKR6an5(Qxh>1TmEZkE&}%}P+I-fQ)2}YcItt%>{k=iYk~wAdHrvSM|6S5{e~I02
z|E7wqxYnPRR?l6W;*FPVt-jw=S!;jE$e?xhao4ZMAF!R`F!yP{$Hc>s!Ed%;{c*Q4
PP_f|Y>gTe~DWM4fr%Z~?
literal 4257
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
DVAw6E
diff --git a/XFFruit/Images.xcassets/Survey/insurvey.imageset/insurvey@2x.png b/XFFruit/Images.xcassets/Survey/insurvey.imageset/insurvey@2x.png
index d47faffd9e62903e8a7865d598bc658efc7bb1dd..ac1cf9500cc859bf4be898d2b9f902e7763063d1 100644
GIT binary patch
literal 1402
zcmeAS@N?(olHy`uVBq!ia0vp^l|Zb+!3HE9cZ%}@DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_cg49rTIArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8
zNvY|XdA3ULckfqH$V{<S3ODsN@GWpo&B*kqDoPEm@(W3>%1*XSQL?vFu&J;D8jzb>
zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XRMoSU}&gdW~OIo
zVrph)sH0$HU}&Uo07PcGh9*{~W>!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qX
zu2*iXmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2Ntn
zTP2`NAzsKWfE$}v3=Jk=fazBx7U&!58GyV5Q|Rl9UukYGTy=3tP%6T`SPd=?sVqp<
z4@xc0FD*(2MqHXQ$f^P>=c3falKi5O{QMkPC<bKYm*f{`<QFJ72b(EqglFcZ<d+v~
zg4O%_T6yLbmn7yTr+T{BDgjN<%gju%a&dHZvve~wG%+$WH8gZJwKTUdb9OX0ax--`
zHMX>{fa!I~PcF?(%`1WFO+n~2!l@UO6mkoIHoK%2WtOF;xE1B+DuBIgm5I|W25vab
zgX&Ge?G^)^di8;h(Fa8=QbfaqfT;(>geO}d2cGa#^MI+n2$-x(`**uCFfhLJba4!+
zxb<d^t+!L4OuOmXjJMKDSoV6<Hs*A&Eq?Y*L1U4kx^hP5rlVb4LOBImx0;(WJ}_Uo
zz|Ep|<I<%J54T(IA8@*yu_}M@%l@BSg~F?<_WzIf&Sj3<+Zl7@@&SXGhRYk|zg2Wd
z?>TH^)1LX`!kYyZ8oyt6?s`?ncc8X{JGo#&W321hI*;uEzI=)6Cky|4%{2d@=DBUU
zf#Q#qWG<B7*z~en^fr%9ljn?*PkfRW-wP=<tKL1Mu_-F$r-ilQj}qg>Cj!s;$^>3M
z;dstR#_{qAMj*v_`NR_DZ}BY?IhBRo)Ovg*W^PI7oA~y*L|&e)Z;A1yyX6mgD|#<H
z?#VGvoZ<Sy<V|*2gZaen5KHy!idN1Y;{2(nfl{nH`1}QSA39N1%zXWa{mneB4X>Wd
zta%a{d+=A;*%Q+OuW+wdc{FWb{mB#G3b?`rzc2mB-=ib{b;?nrM{$2j7{ud>0(UQx
zmB<sF5xyzsS>mxTks3<fXX5!&p71qHl$>c`l$dhp#1nbt>6UDTBEHJcEsYCBe3a)G
zr#;$X(p$q~Z)tA0A}sUriE@LZH#-%V&X!!iE_vB@hDTiCyQVJIof4IJ{s6Q8+hWHh
zdsn>BuDEtGZ$;hwHF0~G+#l-Iw8+m{pS|Z`_1&a1!N0SXPns-T%W1%1Y?tEL9&mR)
Ps5JC+^>bP0l+XkK3PAzT
literal 4507
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
diff --git a/XFFruit/ViewControllers/Home/ICRHomeViewController.m b/XFFruit/ViewControllers/Home/ICRHomeViewController.m
index bcb5cb8..1cc74a9 100644
--- a/XFFruit/ViewControllers/Home/ICRHomeViewController.m
+++ b/XFFruit/ViewControllers/Home/ICRHomeViewController.m
@@ -143,11 +143,11 @@
break;
case kFunctionMyShop:
{
-// ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
-// sVC.title = [IBTCommon localizableString:@"MyStore"];
-// sVC.m_delegate = self;
-// [self PushViewController:sVC animated:YES];
- AddWorkSheetViewController *sVC = [[AddWorkSheetViewController alloc] init];
+ ICRStoreListViewController *sVC = [[ICRStoreListViewController alloc] initWithBHaveToChooseOne:NO];
+ sVC.title = [IBTCommon localizableString:@"MyStore"];
+ sVC.m_delegate = self;
+ [self PushViewController:sVC animated:YES];
+// AddWorkSheetViewController *sVC = [[AddWorkSheetViewController alloc] init];
[self PushViewController:sVC animated:YES];
}
break;
diff --git a/XFFruit/ViewControllers/Survey/Views/SurveyListCell.m b/XFFruit/ViewControllers/Survey/Views/SurveyListCell.m
index 1ce1463..98b7d8a 100644
--- a/XFFruit/ViewControllers/Survey/Views/SurveyListCell.m
+++ b/XFFruit/ViewControllers/Survey/Views/SurveyListCell.m
@@ -31,8 +31,8 @@
{
self.stateBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.stateBtn.frame = CGRectMake(TopMargin *2 , TopMargin, LeftMargin - TopMargin*3, 20);
-// self.stateBtn.titleLabel.font = FontSize(ContentSize);
-// [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ self.stateBtn.titleLabel.font = FontSize(ContentSize);
+ [self.stateBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
self.stateBtn.enabled = NO;
self.titleLabel = [[UILabel alloc]initWithFrame:(CGRectMake(LeftMargin, TopMargin, ScreenSize.width - LeftMargin, TitleHeight))];
@@ -76,26 +76,22 @@
self.productnameLabel.text = [NSString stringWithFormat:@"商å“：%@[%@]",survey.productName,survey.productCode];
self.begindateLabel.text = [NSString stringWithFormat:@"开始时间：%@",[survey.beginDate substringToIndex:10]];
self.enddateLabel.text = [NSString stringWithFormat:@"结æŸæ—¶é—´ï¼š%@",[survey.endDate substringToIndex:10]];
-// NSString *stateStr = @"";
+ NSString *stateStr = @"";
if ([survey.state isEqualToString:@"initial"]) {
-// [self.stateBtn setBackgroundColor:[UIColor redColor]];
-// stateStr = @"未æ交";
- [self.stateBtn setImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
+ stateStr = @"未æ交";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"initial"] forState:UIControlStateDisabled];
}else if ([survey.state isEqualToString:@"submitted"]) {
-// [self.stateBtn setBackgroundColor:[UIColor greenColor]];
-// stateStr = @"å·²æ交";
- [self.stateBtn setImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+ stateStr = @"å·²æ交";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([survey.state isEqualToString:@"insurvey"]) {
-// [self.stateBtn setBackgroundColor:[UIColor grayColor]];
-// stateStr = @"è°ƒç ”ä¸";
- [self.stateBtn setImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
+ stateStr = @"è°ƒç ”ä¸";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"insurvey"] forState:UIControlStateDisabled];
}else if ([survey.state isEqualToString:@"finished"]) {
-// [self.stateBtn setBackgroundColor:[UIColor blackColor]];
-// stateStr = @"已完æˆ";
- [self.stateBtn setImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
+ stateStr = @"已完æˆ";
+ [self.stateBtn setBackgroundImage:[UIImage imageNamed:@"finish"] forState:UIControlStateDisabled];
}
-// [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
+ [self.stateBtn setTitle:stateStr forState:UIControlStateNormal];
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
diff --git a/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m b/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m
index ef2b5a6..b79e12b 100644
--- a/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m
+++ b/XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m
@@ -13,6 +13,8 @@
#import "BoltMaskView.h"
#import "SurveyDetailViewController.h"
#import "NewSurveyViewController.h"
+#import "QueryOrder.h"
+
#define TopMargin 44
#define TableHeight 120
@@ -84,53 +86,51 @@ typedef enum : NSUInteger {
ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
id orderFieldObject = [NSNull null];
- NSString *firstOrder = @"";
- id orderObject = [NSNull null];
NSMutableArray *orderArr =[NSMutableArray array];
if (self.orderDirection.length > 0) {
- orderObject = self.orderDirection;
- firstOrder = @"lastModified";
- [orderArr addObject:@"lastModified"];
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"lastModified";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
}
id billObject = [NSNull null];
if (self.billNumberLike.length > 0) {
billObject = self.billNumberLike;
- if ([firstOrder isEqualToString: @"lastModified"]) {
- [orderArr addObject:@"billNumber"];
+ if (self.orderDirection.length > 0) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"billNumber";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
}
}
id stateObject = [NSNull null];
if (self.state.length > 0 && ![self.state isEqualToString:@"none"]) {
stateObject = self.state;
- if ([firstOrder isEqualToString: @"lastModified"]) {
- [orderArr addObject:@"state"];
+ if (self.orderDirection.length > 0) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"state";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
}
}
id titleObject = [NSNull null];
if (self.titleLike.length > 0) {
titleObject = self.titleLike;
- if ([firstOrder isEqualToString: @"lastModified"]) {
- [orderArr addObject:@"title"];
- }
- }
-
- if (orderArr.count > 0) {
- NSString *str = @"";
- for (NSString *order in orderArr) {
- str = [str stringByAppendingFormat:@"%@,",order];
+ if (self.orderDirection.length > 0) {
+ QueryOrder *order = [QueryOrder new];
+ order.field = @"title";
+ order.direction = self.orderDirection;
+ [orderArr addObject:[order dictForCommit]];
}
- orderFieldObject = str;
}
- NSLog(@"%@",orderFieldObject);
NSDictionary *dict = @{
@"billNumberLike":billObject,
@"state":stateObject,
@"titleLike":titleObject,
- @"orderField":[NSNull null],
- @"orderDirection":orderObject,
+ @"queryOrders":orderArr,
@"userUuid":userUtil.userId,
@"pageNumber":@(0),
- @"pageSize":@(20)};
+ @"pageSize":@(100)};
[[ICRHTTPController sharedController] querySurveyWithBillData:dict success:succ failure:fail];
}
#pragma mark -æˆåŠŸ
diff --git a/XFFruit/ViewControllers/Survey/models/QueryOrder.h b/XFFruit/ViewControllers/Survey/models/QueryOrder.h
new file mode 100644
index 0000000..0c1a408
--- /dev/null
+++ b/XFFruit/ViewControllers/Survey/models/QueryOrder.h
@@ -0,0 +1,14 @@
+//
+// QueryOrder.h
+// XFFruit
+//
+// Created by n22 on 15/8/20.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "IBTModel.h"
+
+@interface QueryOrder : IBTModel
+@property (nonatomic,strong)NSString *field;
+@property (nonatomic,strong)NSString *direction;//å‡åº
+@end
diff --git a/XFFruit/ViewControllers/Survey/models/QueryOrder.m b/XFFruit/ViewControllers/Survey/models/QueryOrder.m
new file mode 100644
index 0000000..2eab576
--- /dev/null
+++ b/XFFruit/ViewControllers/Survey/models/QueryOrder.m
@@ -0,0 +1,13 @@
+//
+// QueryOrder.m
+// XFFruit
+//
+// Created by n22 on 15/8/20.
+// Copyright (c) 2015å¹´ Xummer. All rights reserved.
+//
+
+#import "QueryOrder.h"
+
+@implementation QueryOrder
+
+@end
diff --git a/XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m b/XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m
index 29111eb..905cebe 100644
--- a/XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m
+++ b/XFFruit/ViewControllers/WorkSheet/Controllers/MaterialVIewController.m
@@ -69,6 +69,7 @@
MaterialCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
if (cell == nil) {
cell = [[MaterialCell alloc]initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
}
if (indexPath.row != _currentRow) {
CGRect Linefrmame = cell.lineLabel.frame;
@@ -113,7 +114,7 @@
Linefrmame.origin.y = TableHeight -1;
showfrmame.size.height = 0;
cell.showView.hidden = YES;
- cell.backgroundColor = XXFBgColor;
+ cell.backgroundColor = [UIColor whiteColor];
}
cell.lineLabel.frame = Linefrmame;
--
2.18.1