Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
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
张杰
Opple-iOS
Commits
f2c5518d
Commit
f2c5518d
authored
Mar 01, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试虚拟文件夹直接转实体文件夹
parent
78548095
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
66 additions
and
9 deletions
+66
-9
MessageViewController.m
Class/Message/Controllers/MessageViewController.m
+24
-4
ProductLibraryViewController.m
Class/ProductLibraryViewController.m
+2
-1
CustomTabbarController.m
Class/Tabbar/CustomTabbar/CustomTabbarController.m
+3
-2
project.pbxproj
Lighting.xcodeproj/project.pbxproj
+24
-0
Info.plist
Lighting/Info.plist
+1
-1
opple_objc_json_client.h
Tools/opple_objc_json_client.h
+12
-1
No files found.
Class/Message/Controllers/MessageViewController.m
View file @
f2c5518d
...
...
@@ -10,7 +10,7 @@
#import "MessageTableViewCell.h"
#import "UITableView+FDTemplateLayoutCell.h"
@interface
MessageViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
>
@interface
MessageViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
,
DZNEmptyDataSetSource
,
DZNEmptyDataSetDelegate
>
/**
...
...
@@ -84,6 +84,8 @@
[
HTTP
networkRequestWithURL
:
SERVERREQUESTURL
(
MESSAGELIST
)
withRequestType
:
0
withParameter
:
self
.
messageModel
withReturnValueBlock
:^
(
id
returnValue
)
{
[
XBLoadingView
hideHUDViewWithDefault
];
weakSelf
.
meesageTableView
.
emptyDataSetSource
=
weakSelf
;
weakSelf
.
meesageTableView
.
emptyDataSetDelegate
=
weakSelf
;
[
weakSelf
endRefreshingForTableView
:
weakSelf
.
meesageTableView
];
if
(
RESULT
(
returnValue
))
{
if
(
isRemove
)
{
...
...
@@ -92,6 +94,8 @@
weakSelf
.
resultModel
=
[[
NoticeResponse
alloc
]
initWithDictionary
:
returnValue
[
@"data"
]
error
:
nil
];
[
weakSelf
.
messageArray
addObjectsFromArray
:
weakSelf
.
resultModel
.
noticeEntity
];
[
weakSelf
.
meesageTableView
reloadData
];
}
else
{
[
XBLoadingView
showHUDViewWithText
:
returnValue
[
@"message"
]];
}
}
withFailureBlock
:^
(
NSError
*
error
)
{
...
...
@@ -174,10 +178,26 @@
-
(
void
)
timeOrderClickAction
:
(
UIButton
*
)
sender
{
sender
.
selected
=
!
sender
.
selected
;
self
.
messageModel
.
page
.
order
=
sender
.
selected
?
SORTDIRECTION_DESC
:
SORTDIRECTION_A
SC
;
self
.
messageModel
.
order
=
sender
.
selected
?
SORTDIRECTION_ASC
:
SORTDIRECTION_DE
SC
;
[
self
.
meesageTableView
.
mj_header
beginRefreshing
];
}
#pragma mark -友好界面
-
(
UIImage
*
)
imageForEmptyDataSet
:
(
UIScrollView
*
)
scrollView
{
return
kNoDataImage
;
}
-
(
BOOL
)
emptyDataSetShouldAllowScroll
:
(
UIScrollView
*
)
scrollView
{
return
YES
;
}
-
(
NSAttributedString
*
)
titleForEmptyDataSet
:
(
UIScrollView
*
)
scrollView
{
return
[[
NSAttributedString
alloc
]
initWithString
:
@"暂无数据"
attributes
:
nil
];
}
#pragma mark -lazy
-
(
NoticeCondition
*
)
messageModel
{
...
...
@@ -186,9 +206,9 @@
DataPage
*
page
=
[[
DataPage
alloc
]
init
];
page
.
page
=
ZERO
;
page
.
rows
=
KROWS
;
page
.
sort
=
SORTDIRECTION_DESC
;
_messageModel
.
sort
=
@"createDate"
;
_messageModel
.
order
=
SORTDIRECTION_DESC
;
_messageModel
.
page
=
page
;
_messageModel
.
employeeId
=
[
Shoppersmanager
manager
].
Shoppers
.
employee
.
fid
;
}
return
_messageModel
;
...
...
Class/ProductLibraryViewController.m
View file @
f2c5518d
...
...
@@ -343,7 +343,8 @@
{
WS
(
weakSelf
);
[
XBLoadingView
showHUDViewWithDefault
];
[
HTTP
networkWithDictionaryRequestWithURL
:[
NSString
stringWithFormat
:
@"%@%@"
,
SERVERREQUESTURL
(
BARCODESEARCH
),
_barcode
]
withRequestType
:
ONE
withParameter
:
nil
withReturnValueBlock
:^
(
id
returnValue
)
{
NSString
*
urlString
=
[
NSString
stringWithFormat
:
@"%@%@"
,
SERVERREQUESTURL
(
BARCODESEARCH
),
self
.
barcode
];
[
HTTP
networkWithDictionaryRequestWithURL
:[
self
returnUrlString
:
urlString
]
withRequestType
:
ONE
withParameter
:
nil
withReturnValueBlock
:^
(
id
returnValue
)
{
[
weakSelf
endRefreshingForTableView
:
self
.
productCollectionView
];
[
XBLoadingView
hideHUDViewWithDefault
];
...
...
Class/Tabbar/CustomTabbar/CustomTabbarController.m
View file @
f2c5518d
...
...
@@ -289,9 +289,10 @@
QRViewController
*
qrVC
=
[[
QRViewController
alloc
]
initWithScanCompleteHandler
:
^
(
NSString
*
url
)
{
[
weakSelf
dismissViewControllerAnimated
:
YES
completion
:
^
{
ProductLibraryViewController
*
product
=
[
SHARED_APPDELEGATE
.
allControllerArray
objectAtIndex_opple
:
4
];
ProductLibraryViewController
*
product
=
[
SHARED_APPDELEGATE
.
allControllerArray
objectAtIndex_opple
:
8
];
product
.
barcode
=
url
;
weakSelf
.
selectedIndex
=
3
;
SHARED_APPDELEGATE
.
lineView
.
hidden
=
YES
;
weakSelf
.
selectedIndex
=
8
;
}];
}];
dispatch_async
(
dispatch_get_main_queue
(),
^
{
...
...
Lighting.xcodeproj/project.pbxproj
View file @
f2c5518d
...
...
@@ -1053,6 +1053,7 @@
2928F7DD1CD085430036D761
/* Class */
=
{
isa
=
PBXGroup
;
children
=
(
29CA910E1E665F38002EA601
/* Home */
,
29AB91DA1E553A31003A3A08
/* Message */
,
29AB91E61E553B7C003A3A08
/* PerfectInformation */
,
29C0E7411DD98917006CCCF9
/* Announcement */
,
...
...
@@ -2244,6 +2245,29 @@
name
=
view
;
sourceTree
=
"<group>"
;
};
29CA910E1E665F38002EA601
/* Home */
=
{
isa
=
PBXGroup
;
children
=
(
29CA910F1E665F38002EA601
/* Cells */
,
29CA91101E665F38002EA601
/* Controllers */
,
);
path
=
Home
;
sourceTree
=
"<group>"
;
};
29CA910F1E665F38002EA601
/* Cells */
=
{
isa
=
PBXGroup
;
children
=
(
);
path
=
Cells
;
sourceTree
=
"<group>"
;
};
29CA91101E665F38002EA601
/* Controllers */
=
{
isa
=
PBXGroup
;
children
=
(
);
path
=
Controllers
;
sourceTree
=
"<group>"
;
};
29D260EF1CEEAA5000A9787D
/* FullScreen */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
Lighting/Info.plist
View file @
f2c5518d
...
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.0.
4
<
/string
>
<
string
>
2.0.
5
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
...
...
Tools/opple_objc_json_client.h
View file @
f2c5518d
...
...
@@ -2058,9 +2058,20 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
employeeId
;
/**
* (no documentation provided)
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
order
;
/**
* (no documentation provided)
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
sort
;
@end
/* interface NoticeCondition */
/**
* (no documentation provided)
*/
...
...
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