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
f0c7e202
Commit
f0c7e202
authored
Nov 11, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:优化
parent
ceb5b36e
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
1344 additions
and
1245 deletions
+1344
-1245
CardCollectionViewCell.m
Class/CardCollectionViewCell.m
+1
-0
ClientViewController.m
Class/ClientViewController.m
+1
-2
ClientdetailsViewController.m
Class/ClientdetailsViewController.m
+2
-3
authenticateView.m
Class/Login/authenticateView.m
+1
-0
LuckyDrawDetailsViewController.m
Class/LuckyDrawDetailsViewController.m
+3
-2
PaymentsTableViewCell.m
Class/PaymentsTableViewCell.m
+1
-0
ProductDetailsHeaderView.m
Class/ProductDetailsHeaderView.m
+1
-0
ProductDetailsViewController.m
Class/ProductDetailsViewController.m
+1
-1
ProductLibraryViewController.m
Class/ProductLibraryViewController.m
+1
-1
ScreeningView.m
Class/ScreeningView.m
+1
-0
ModifyShippingAddressView.m
Class/Shoppingcart/ModifyShippingAddressView.m
+1
-0
WithdrawalTableViewCell.m
Class/WithdrawalTableViewCell.m
+1
-0
goodsDetailsTableViewCell.m
Class/goodsDetailsTableViewCell.m
+1
-1
screeningFirstView.m
Class/screeningFirstView.m
+1
-0
screeningSecondView.m
Class/screeningSecondView.m
+1
-1
project.pbxproj
Lighting.xcodeproj/project.pbxproj
+9
-3
Lighting.xcscheme
Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme
+1
-1
Info.plist
Lighting/Info.plist
+5
-1
StoryboardwithCYX.storyboard
Lighting/StoryboardwithCYX.storyboard
+1195
-1223
BaseViewController.h
Tools/BaseViewController.h
+0
-4
SceneViewController.m
Tools/SceneViewController.m
+1
-1
UIView+cornerRadius.h
Tools/UIView+cornerRadius.h
+10
-1
UIView+cornerRadius.m
Tools/UIView+cornerRadius.m
+105
-0
No files found.
Class/CardCollectionViewCell.m
View file @
f0c7e202
...
...
@@ -13,6 +13,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
self
.
layer
.
shadowColor
=
[
UIColor
grayColor
].
CGColor
;
self
.
layer
.
shadowRadius
=
4
;
self
.
layer
.
shadowOpacity
=
0
.
3
;
...
...
Class/ClientViewController.m
View file @
f0c7e202
...
...
@@ -246,8 +246,7 @@
-
(
void
)
tableView
:
(
UITableView
*
)
tableView
didSelectRowAtIndexPath
:
(
NSIndexPath
*
)
indexPath
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"StoryboardwithCYX"
bundle
:
nil
];
ClientdetailsViewController
*
clientdetails
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"clientdetails"
];
ClientdetailsViewController
*
clientdetails
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"clientdetails"
];
clientdetails
.
model
=
[
self
.
CustomerresultArray
objectAtIndex_opple
:
indexPath
.
row
];
clientdetails
.
cellindex
=
indexPath
.
row
;
//设置当前客户
...
...
Class/ClientdetailsViewController.m
View file @
f0c7e202
...
...
@@ -74,13 +74,12 @@
self
.
shoppingCar
.
model
=
self
.
model
;
[
self
addChildViewController
:
self
.
shoppingCar
];
self
.
currentVC
=
self
.
shoppingCar
;
self
.
shoppingCar
.
view
.
frame
=
CGRectMake
(
self
.
controllerBackgroundView
.
mj_x
,
self
.
shoppingAndRecordBackview
.
mj_y
+
self
.
shoppingAndRecordBackview
.
mj_h
,
self
.
controllerBackgroundView
.
mj_w
,
self
.
controllerBackgroundView
.
mj_h
-
self
.
shoppingAndRecordBackview
.
mj_y
-
self
.
shoppingAndRecordBackview
.
mj_h
);
self
.
shoppingCar
.
view
.
frame
=
CGRectMake
(
self
.
controllerBackgroundView
.
x
,
self
.
shoppingAndRecordBackview
.
bottom
,
self
.
controllerBackgroundView
.
width
-
25
,
self
.
controllerBackgroundView
.
mj_h
-
self
.
shoppingAndRecordBackview
.
mj_y
-
self
.
shoppingAndRecordBackview
.
mj_h
);
[
self
.
controllerBackgroundView
addSubview
:
self
.
shoppingCar
.
view
];
self
.
orderRecord
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"OrderRecordViewController"
];
[
self
addChildViewController
:
self
.
orderRecord
];
self
.
orderRecord
.
model
=
self
.
model
;
self
.
orderRecord
.
view
.
frame
=
CGRectMake
(
self
.
controllerBackgroundView
.
mj_x
,
self
.
shoppingAndRecordBackview
.
mj_y
+
self
.
shoppingAndRecordBackview
.
mj_h
,
self
.
controllerBackgroundView
.
mj_w
,
self
.
controllerBackgroundView
.
mj_h
-
self
.
shoppingAndRecordBackview
.
mj_y
-
self
.
shoppingAndRecordBackview
.
mj_h
);
self
.
orderRecord
.
view
.
frame
=
CGRectMake
(
self
.
controllerBackgroundView
.
x
,
self
.
shoppingAndRecordBackview
.
bottom
,
self
.
controllerBackgroundView
.
width
-
25
,
self
.
controllerBackgroundView
.
mj_h
-
self
.
shoppingAndRecordBackview
.
mj_y
-
self
.
shoppingAndRecordBackview
.
mj_h
);
}
#pragma mark - 切换子视图
...
...
Class/Login/authenticateView.m
View file @
f0c7e202
...
...
@@ -21,6 +21,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
[
self
uiConfigAction
];
}
...
...
Class/LuckyDrawDetailsViewController.m
View file @
f0c7e202
...
...
@@ -39,7 +39,7 @@
_drawModel
=
[[
RsLotteryRequest
alloc
]
init
];
_drawModel
.
winnerIdEquals
=
[
Shoppersmanager
manager
].
Shoppers
.
employee
.
fid
;
DataPage
*
page
=
[[
DataPage
alloc
]
init
];
page
.
rows
=
10
;
page
.
rows
=
KROWS
;
page
.
page
=
ZERO
;
page
.
order
=
SORTDIRECTION_DESC
;
_drawModel
.
page
=
page
;
...
...
@@ -105,7 +105,7 @@
{
WS
(
weakSelf
);
MjRefreshHeaderCustom
*
headerRefresh
=
[
MjRefreshHeaderCustom
headerWithRefreshingBlock
:
^
{
weakSelf
.
drawModel
.
page
.
page
=
0
;
weakSelf
.
drawModel
.
page
.
page
=
ZERO
;
[
weakSelf
.
drawDetailsTableView
.
mj_footer
resetNoMoreData
];
[
weakSelf
getDrawDatas
:
YES
];
}];
...
...
@@ -143,6 +143,7 @@
RsLotteryResponse
*
drawRecord
=
[[
RsLotteryResponse
alloc
]
initWithDictionary
:
returnValue
[
@"data"
]
error
:
nil
];
[
weakSelf
.
datasArray
addObjectsFromArray
:
drawRecord
.
list
];
weakSelf
.
totalPage
=
[
returnValue
[
@"data"
][
@"totalpages"
]
integerValue
];
NSLog
(
@"%ld"
,
weakSelf
.
datasArray
.
count
);
[
weakSelf
.
drawDetailsTableView
reloadData
];
}
else
{
[
weakSelf
SHOWPrompttext
:
returnValue
[
@"message"
]];
...
...
Class/PaymentsTableViewCell.m
View file @
f0c7e202
...
...
@@ -12,6 +12,7 @@
-
(
void
)
awakeFromNib
{
// Initialization code
[
super
awakeFromNib
];
}
-
(
void
)
setSelected
:
(
BOOL
)
selected
animated
:
(
BOOL
)
animated
{
...
...
Class/ProductDetailsHeaderView.m
View file @
f0c7e202
...
...
@@ -39,6 +39,7 @@
#pragma mark -初始化Nib文件
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
[
self
uiConfigAction
];
}
...
...
Class/ProductDetailsViewController.m
View file @
f0c7e202
...
...
@@ -15,7 +15,7 @@
@interface
ProductDetailsViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
,
UITextFieldDelegate
>
@interface
ProductDetailsViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
,
UITextFieldDelegate
,
CAAnimationDelegate
>
@property
(
nonatomic
,
strong
)
ProductDetailsHeaderView
*
headerView
;
...
...
Class/ProductLibraryViewController.m
View file @
f0c7e202
...
...
@@ -15,7 +15,7 @@
#import "ExperienceCentreViewController.h"
@interface
ProductLibraryViewController
()
<
UICollectionViewDelegate
,
UICollectionViewDataSource
,
UIGestureRecognizerDelegate
,
ScreeningButtonClickdelegate
,
TableviewSelectedIndexdelegate
,
SelectedCollectionItemDelegate
,
DZNEmptyDataSetSource
,
DZNEmptyDataSetDelegate
>
@interface
ProductLibraryViewController
()
<
UICollectionViewDelegate
,
UICollectionViewDataSource
,
UIGestureRecognizerDelegate
,
ScreeningButtonClickdelegate
,
TableviewSelectedIndexdelegate
,
SelectedCollectionItemDelegate
,
DZNEmptyDataSetSource
,
DZNEmptyDataSetDelegate
,
CAAnimationDelegate
>
/**
* 筛选背景框View
...
...
Class/ScreeningView.m
View file @
f0c7e202
...
...
@@ -21,6 +21,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
[
self
uiConfigAction
];
}
...
...
Class/Shoppingcart/ModifyShippingAddressView.m
View file @
f0c7e202
...
...
@@ -28,6 +28,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
[
self
uiConfigAction
];
}
...
...
Class/WithdrawalTableViewCell.m
View file @
f0c7e202
...
...
@@ -12,6 +12,7 @@
-
(
void
)
awakeFromNib
{
// Initialization code
[
super
awakeFromNib
];
}
-
(
void
)
setSelected
:
(
BOOL
)
selected
animated
:
(
BOOL
)
animated
{
...
...
Class/goodsDetailsTableViewCell.m
View file @
f0c7e202
...
...
@@ -17,7 +17,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
}
-
(
void
)
setSelected
:
(
BOOL
)
selected
animated
:
(
BOOL
)
animated
{
...
...
Class/screeningFirstView.m
View file @
f0c7e202
...
...
@@ -24,6 +24,7 @@
-
(
void
)
awakeFromNib
{
[
super
awakeFromNib
];
[
self
uiConfigAction
];
}
...
...
Class/screeningSecondView.m
View file @
f0c7e202
...
...
@@ -26,7 +26,7 @@
-
(
void
)
awakeFromNib
{
// [self uiConfigAction
];
[
super
awakeFromNib
];
self
.
defaultDatasArray
=
[
NSMutableArray
array
];
for
(
int
i
=
0
;
i
<
5
;
i
++
)
{
...
...
Lighting.xcodeproj/project.pbxproj
View file @
f0c7e202
...
...
@@ -1730,7 +1730,7 @@
29706D991CD082980003C412
/* Project object */
=
{
isa
=
PBXProject
;
attributes
=
{
LastUpgradeCheck
=
0
73
0
;
LastUpgradeCheck
=
0
80
0
;
ORGANIZATIONNAME
=
"上海勾芒科技有限公司"
;
TargetAttributes
=
{
29706DA01CD082980003C412
=
{
...
...
@@ -2015,6 +2015,7 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
ALWAYS_SEARCH_USER_PATHS
=
NO
;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED
=
YES
;
CLANG_ANALYZER_NONNULL
=
YES
;
CLANG_CXX_LANGUAGE_STANDARD
=
"gnu++0x"
;
CLANG_CXX_LIBRARY
=
"libc++"
;
...
...
@@ -2025,8 +2026,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CODE_SIGN_IDENTITY
=
""
;
...
...
@@ -2061,6 +2064,7 @@
isa
=
XCBuildConfiguration
;
buildSettings
=
{
ALWAYS_SEARCH_USER_PATHS
=
NO
;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED
=
YES
;
CLANG_ANALYZER_NONNULL
=
YES
;
CLANG_CXX_LANGUAGE_STANDARD
=
"gnu++0x"
;
CLANG_CXX_LIBRARY
=
"libc++"
;
...
...
@@ -2071,8 +2075,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE
=
YES_ERROR
;
CLANG_WARN_EMPTY_BODY
=
YES
;
CLANG_WARN_ENUM_CONVERSION
=
YES
;
CLANG_WARN_INFINITE_RECURSION
=
YES
;
CLANG_WARN_INT_CONVERSION
=
YES
;
CLANG_WARN_OBJC_ROOT_CLASS
=
YES_ERROR
;
CLANG_WARN_SUSPICIOUS_MOVE
=
YES
;
CLANG_WARN_UNREACHABLE_CODE
=
YES
;
CLANG_WARN__DUPLICATE_METHOD_MATCH
=
YES
;
CODE_SIGN_IDENTITY
=
""
;
...
...
@@ -2107,7 +2113,7 @@
CODE_SIGN_IDENTITY
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COMPRESS_PNG_FILES
=
NO
;
DEVELOPMENT_TEAM
=
W54V2VB863
;
DEVELOPMENT_TEAM
=
""
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
"$(inherited)"
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
...
...
@@ -2166,7 +2172,7 @@
CODE_SIGN_IDENTITY
=
"iPhone Developer: 云霄 曹 (WM8ZU7YY98)"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
COMPRESS_PNG_FILES
=
NO
;
DEVELOPMENT_TEAM
=
W54V2VB863
;
DEVELOPMENT_TEAM
=
""
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
"$(inherited)"
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
...
...
Lighting.xcodeproj/xcshareddata/xcschemes/Lighting.xcscheme
View file @
f0c7e202
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion =
"0
73
0"
LastUpgradeVersion =
"0
80
0"
version =
"1.3"
>
<BuildAction
parallelizeBuildables =
"YES"
...
...
Lighting/Info.plist
View file @
f0c7e202
...
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.
1.9
<
/string
>
<
string
>
1.
2.0
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
...
...
@@ -68,6 +68,10 @@
<
k
e
y
>
NSAllowsArbitraryLoads
<
/k
e
y
>
<
tru
e
/
>
<
/
d
i
c
t
>
<
k
e
y
>
NSCameraUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问相机
<
/string
>
<
k
e
y
>
NSPhotoLibraryUsageDescription
<
/k
e
y
>
<
string
>
App
需要您的同意,才能访问相册
<
/string
>
<
k
e
y
>
UILaunchStoryboardName
<
/k
e
y
>
<
string
>
LaunchScreen
<
/string
>
<
k
e
y
>
UIMainStoryboardFile
<
/k
e
y
>
...
...
Lighting/StoryboardwithCYX.storyboard
View file @
f0c7e202
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Tools/BaseViewController.h
View file @
f0c7e202
...
...
@@ -66,10 +66,6 @@
*/
-
(
void
)
SHOWPrompttext
:(
NSString
*
)
Text
;
/**
* 调用无线打印机......成功回调、失败回调
*/
-
(
void
)
callAirprintWithURL
:(
NSURL
*
)
datasurl
SuccessBlock
:(
void
(
^
)())
success
ErrorBlock
:(
void
(
^
)())
failed
;
/**
* 显示提示图片、文本
...
...
Tools/SceneViewController.m
View file @
f0c7e202
...
...
@@ -16,7 +16,7 @@
#import "ProductScreeningCollectionViewCell.h"
#import "GoodsCategoryModel.h"
@interface
SceneViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
,
UIGestureRecognizerDelegate
,
UICollectionViewDelegate
,
UICollectionViewDataSource
,
DZNEmptyDataSetSource
,
UITextFieldDelegate
>
@interface
SceneViewController
()
<
UITableViewDelegate
,
UITableViewDataSource
,
UIGestureRecognizerDelegate
,
UICollectionViewDelegate
,
UICollectionViewDataSource
,
DZNEmptyDataSetSource
,
UITextFieldDelegate
,
CAAnimationDelegate
>
/**
* 场景数据源
...
...
Tools/UIView+cornerRadius.h
View file @
f0c7e202
...
...
@@ -15,6 +15,15 @@
*/
@property
(
nonatomic
,
assign
)
IBInspectable
CGFloat
cornerRadius
;
@property
(
assign
)
CGFloat
x
;
@property
(
assign
)
CGFloat
y
;
@property
(
assign
)
CGFloat
width
;
@property
(
assign
)
CGFloat
height
;
@property
(
assign
)
CGSize
size
;
@property
(
assign
)
CGPoint
origin
;
@property
(
assign
)
CGFloat
left
;
@property
(
assign
)
CGFloat
right
;
@property
(
assign
)
CGFloat
top
;
@property
(
assign
)
CGFloat
bottom
;
@end
Tools/UIView+cornerRadius.m
View file @
f0c7e202
...
...
@@ -21,6 +21,111 @@
return
self
.
layer
.
cornerRadius
;
}
-
(
CGFloat
)
x
{
return
self
.
frame
.
origin
.
x
;
}
-
(
void
)
setX
:
(
CGFloat
)
x
{
CGRect
nframe
=
self
.
frame
;
nframe
.
origin
.
x
=
x
;
self
.
frame
=
nframe
;
}
-
(
CGFloat
)
y
{
return
self
.
frame
.
origin
.
y
;
}
-
(
void
)
setY
:
(
CGFloat
)
y
{
CGRect
nframe
=
self
.
frame
;
nframe
.
origin
.
y
=
y
;
self
.
frame
=
nframe
;
}
// Retrieve and set height, width
-
(
CGFloat
)
width
{
return
self
.
frame
.
size
.
width
;
}
-
(
void
)
setWidth
:
(
CGFloat
)
width
{
CGRect
nframe
=
self
.
frame
;
nframe
.
size
.
width
=
width
;
self
.
frame
=
nframe
;
}
-
(
CGFloat
)
height
{
return
self
.
frame
.
size
.
height
;
}
-
(
void
)
setHeight
:
(
CGFloat
)
height
{
CGRect
nframe
=
self
.
frame
;
nframe
.
size
.
height
=
height
;
self
.
frame
=
nframe
;
}
// Retrieve and set the origin, size
-
(
CGPoint
)
origin
{
return
self
.
frame
.
origin
;
}
-
(
void
)
setOrigin
:
(
CGPoint
)
aPoint
{
CGRect
nframe
=
self
.
frame
;
nframe
.
origin
=
aPoint
;
self
.
frame
=
nframe
;
}
-
(
CGSize
)
size
{
return
self
.
frame
.
size
;
}
-
(
void
)
setSize
:
(
CGSize
)
aSize
{
CGRect
nframe
=
self
.
frame
;
nframe
.
size
=
aSize
;
self
.
frame
=
nframe
;
}
-
(
CGFloat
)
left
{
return
self
.
x
;
}
-
(
void
)
setLeft
:
(
CGFloat
)
left
{
self
.
x
=
left
;
}
-
(
CGFloat
)
right
{
return
CGRectGetMaxX
(
self
.
frame
);
}
-
(
void
)
setRight
:
(
CGFloat
)
right
{
self
.
x
=
right
-
self
.
width
;
}
-
(
CGFloat
)
top
{
return
self
.
y
;
}
-
(
void
)
setTop
:
(
CGFloat
)
top
{
self
.
y
=
top
;
}
-
(
CGFloat
)
bottom
{
return
CGRectGetMaxY
(
self
.
frame
);
}
-
(
void
)
setBottom
:
(
CGFloat
)
bottom
{
self
.
y
=
bottom
-
self
.
height
;
}
...
...
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