Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
X
xffruit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
xffruit
Commits
a38b0bed
Commit
a38b0bed
authored
9 years ago
by
陈俊俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
结束
parent
c637f307
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
7 deletions
+10
-7
ICRHTTPController.m
XFFruit/Controllers/HTTPController/ICRHTTPController.m
+1
-1
SurveyResultCell.m
XFFruit/ViewControllers/Survey/Views/SurveyResultCell.m
+1
-0
NewSurveyViewController.h
...wControllers/Survey/controllers/NewSurveyViewController.h
+1
-1
NewSurveyViewController.m
...wControllers/Survey/controllers/NewSurveyViewController.m
+6
-5
SurveyViewController.m
...ViewControllers/Survey/controllers/SurveyViewController.m
+1
-0
No files found.
XFFruit/Controllers/HTTPController/ICRHTTPController.m
View file @
a38b0bed
...
...
@@ -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
.
userCode
,
userUtil
.
displayName
];
NSString
*
encodeUrlStr
=
[
urlStr
stringByAddingPercentEscapesUsingEncoding
:
NSUTF8StringEncoding
];
[
self
POST
:
encodeUrlStr
parameters
:
nil
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Survey/Views/SurveyResultCell.m
View file @
a38b0bed
...
...
@@ -68,6 +68,7 @@
}
-
(
void
)
setSurveyResult
:
(
SurveyResult
*
)
surveyResult
{
//
[
self
.
imageBtn
setBackgroundImage
:[
UIImage
imageNamed
:
@"no_image_default"
]
forState
:
UIControlStateNormal
];
self
.
userNameLabel
.
text
=
[
NSString
stringWithFormat
:
@"反馈人:%@[%@]"
,
surveyResult
.
userName
,
surveyResult
.
feedbackTime
];
self
.
placeLabel
.
text
=
[
NSString
stringWithFormat
:
@"产地:%@"
,
surveyResult
.
place
];
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.h
View file @
a38b0bed
...
...
@@ -12,5 +12,5 @@
@interface
NewSurveyViewController
:
ICRBaseViewController
@property
(
nonatomic
,
strong
)
Survey
*
survey
;
@property
(
nonatomic
,
strong
)
NSString
*
navTitle
;
@end
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m
View file @
a38b0bed
...
...
@@ -60,7 +60,7 @@ typedef enum : NSUInteger {
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
self
.
title
=
@"新建行情调研"
;
self
.
title
=
self
.
navTitle
;
[
self
initData
];
[
self
createTableView
];
}
...
...
@@ -144,7 +144,10 @@ typedef enum : NSUInteger {
//成功
[
IBTLoadingView
showTips
:
@"操作成功"
];
[
self
clearAllInformation
];
if
(
self
.
survey
)
{
[
ICRUserUtil
sharedInstance
].
needFresh
=
YES
;
[
self
.
navigationController
popViewControllerAnimated
:
YES
];
}
}
else
{
[
IBTLoadingView
showTips
:
message
];
}
...
...
@@ -459,9 +462,7 @@ typedef enum : NSUInteger {
-
(
void
)
viewWillDisappear
:
(
BOOL
)
animated
{
[
super
viewWillDisappear
:
animated
];
if
(
self
.
survey
)
{
[
ICRUserUtil
sharedInstance
].
needFresh
=
YES
;
}
}
-
(
void
)
didReceiveMemoryWarning
{
...
...
This diff is collapsed.
Click to expand it.
XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m
View file @
a38b0bed
...
...
@@ -336,6 +336,7 @@ typedef enum : NSUInteger {
if
([
survey
.
state
isEqualToString
:
@"initial"
])
{
NewSurveyViewController
*
nvc
=
[[
NewSurveyViewController
alloc
]
init
];
nvc
.
survey
=
survey
;
nvc
.
navTitle
=
@"修改行情调研单"
;
[
self
PushViewController
:
nvc
animated
:
YES
];
}
else
if
([
survey
.
state
isEqualToString
:
@"submitted"
]
||
[
survey
.
state
isEqualToString
:
@"insurvey"
]
||
[
survey
.
state
isEqualToString
:
@"finished"
]){
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment