Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
T
total
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
张杰
total
Commits
3b8a41c9
Commit
3b8a41c9
authored
Feb 27, 2018
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
d1a07089
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
14 deletions
+17
-14
BusinessViewController.m
total/GTOApp/Business/BusinessViewController.m
+1
-1
PatrolExamViewController.m
...lOnline(VI巡检)/ViewConstrollers/PatrolExamViewController.m
+6
-4
ZJAddPictureCollectionCell.m
.../GTOApp/UserUtil/PictureCell/ZJAddPictureCollectionCell.m
+1
-0
HttpRequestManager.m
total/GTOApp/UserUtil/RequestNetwork/HttpRequestManager.m
+1
-1
GTOAppMacro.h
total/Macro/GTOAppMacro.h
+8
-8
No files found.
total/GTOApp/Business/BusinessViewController.m
View file @
3b8a41c9
...
...
@@ -293,7 +293,7 @@
-
(
void
)
getStoreArray
{
[
IBTLoadingView
showProgressLabel
:
@"获取门店中"
];
[
HttpRequestManager
requestNetworkwithURL
:[
NSString
stringWithFormat
:
@"%@/mdata/store/getsByUser2/%@"
,
HTTP_REST_API_BASE_URL
,[
ICRUserUtil
sharedInstance
].
f_user_uuid
]
withRequestType
:
ONE
withParameter
:
nil
withSuccess
:^
(
id
returnValue
)
{
[
HttpRequestManager
requestNetworkwithURL
:[
NSString
stringWithFormat
:
@"%@/mdata/store/getsByUser2/%@"
,
VI
HTTP_REST_API_BASE_URL
,[
ICRUserUtil
sharedInstance
].
f_user_uuid
]
withRequestType
:
ONE
withParameter
:
nil
withSuccess
:^
(
id
returnValue
)
{
[
IBTLoadingView
hideHUDWithText
:
nil
];
if
([
returnValue
[
@"success"
]
isEqualToNumber
:
@1
])
{
[
ICRUserUtil
sharedInstance
].
storeArray
=
returnValue
[
@"data"
];
...
...
total/GTOApp/Business/PatrolOnline(VI巡检)/ViewConstrollers/PatrolExamViewController.m
View file @
3b8a41c9
...
...
@@ -365,10 +365,12 @@
}
for
(
NSInteger
i
=
0
;
i
<
self
.
viewModel
.
arrCellData
.
count
;
i
++
)
{
PatrolExamCellViewModel
*
vm
=
self
.
viewModel
.
arrCellData
[
i
];
if
([
questionArray
containsObject
:
vm
.
question
.
uuid
])
{
NSIndexPath
*
indexPath
=
[
NSIndexPath
indexPathForRow
:
i
inSection
:
0
];
[
self
.
tableView
scrollToRowAtIndexPath
:
indexPath
atScrollPosition
:(
UITableViewScrollPositionMiddle
)
animated
:
YES
];
break
;
if
(
photoType
(
vm
.
question
.
photoType
)
!=
PHOTO_TYPE_NO
)
{
if
([
questionArray
containsObject
:
vm
.
question
.
uuid
])
{
NSIndexPath
*
indexPath
=
[
NSIndexPath
indexPathForRow
:
i
inSection
:
0
];
[
self
.
tableView
scrollToRowAtIndexPath
:
indexPath
atScrollPosition
:(
UITableViewScrollPositionMiddle
)
animated
:
YES
];
return
;
}
}
}
if
(
questionArray
.
count
)
{
...
...
total/GTOApp/UserUtil/PictureCell/ZJAddPictureCollectionCell.m
View file @
3b8a41c9
...
...
@@ -16,6 +16,7 @@
action
:
@selector
(
actionDelete
:
)];
[
self
addGestureRecognizer
:
self
.
longPress
];
self
.
img
.
image
=
TCImage
(
@"addimage"
);
self
.
imgPicture
.
contentMode
=
UIViewContentModeScaleAspectFill
;
}
-
(
void
)
configCellWithArr
:
(
NSMutableArray
*
)
array
indexPath
:
(
NSIndexPath
*
)
indexPath
viewModel
:
(
PicViewModel
*
)
viewModel
{
...
...
total/GTOApp/UserUtil/RequestNetwork/HttpRequestManager.m
View file @
3b8a41c9
...
...
@@ -39,7 +39,7 @@
[
manager
.
requestSerializer
setValue
:
user
.
f_enterprise_uuid
forHTTPHeaderField
:
@"enterprise"
];
}
[
manager
.
requestSerializer
setValue
:
user
.
f_authenticode
forHTTPHeaderField
:
@"authorization"
];
NSLog
(
@"%@"
,
requestString
);
if
(
requestType
)
{
[
manager
GET
:
requestString
parameters
:
parameter
success
:^
(
NSURLSessionDataTask
*
task
,
id
responseObject
)
{
success
(
responseObject
);
...
...
total/Macro/GTOAppMacro.h
View file @
3b8a41c9
...
...
@@ -204,20 +204,20 @@ typedef NS_ENUM(NSInteger,ATTACHMENT_LOCATION){
//#define HTTP_LOCAL_BASE_URL @"http://218.244.151.129:7580"
//正式环境
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
//
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:7080/total-server/rest"
//
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:7080"
//测试环境
//
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
//
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180"
#define HTTP_REST_API_BASE_URL @"http://139.196.39.77:8180/total-server/rest"
#define HTTP_LOCAL_BASE_URL @"http://139.196.39.77:8180"
//测试VI检查、VI抽查、VI检查结果模块使用
//
#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:8280/total-server/rest"
//
#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:8280"
#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:8280/total-server/rest"
#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:8280"
//正式VI检查、VI抽查、VI检查结果模块使用
#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:7280/total-server/rest"
#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:7280"
//
#define VIHTTP_REST_API_BASE_URL @"http://139.196.39.77:7280/total-server/rest"
//
#define VIHTTP_LOCAL_BASE_URL @"http://139.196.39.77:7280"
////开发环境
//#define HTTP_LOCAL_BASE_URL @"http://192.168.1.176:8083"
...
...
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