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
99c9081e
Commit
99c9081e
authored
Jun 06, 2016
by
mei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
全部产品
parent
a260b730
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
14 deletions
+19
-14
ProductLibraryView.m
Lighting/Class/ProductLibraryView.m
+7
-3
SeceneLibraryView.m
Lighting/Class/SeceneLibraryView.m
+2
-1
project.pbxproj
Lighting/Lighting.xcodeproj/project.pbxproj
+10
-10
No files found.
Lighting/Class/ProductLibraryView.m
View file @
99c9081e
...
...
@@ -128,7 +128,7 @@
self
.
collectionView
.
mj_footer
=
[
MJRefreshAutoNormalFooter
footerWithRefreshingBlock
:
^
{
if
(
self
.
indexPage
++
>
self
.
totalPages
)
{
if
(
++
self
.
indexPage
>
self
.
totalPages
)
{
[
self
.
collectionView
.
mj_footer
endRefreshingWithNoMoreData
];
}
else
{
...
...
@@ -241,6 +241,7 @@
if
([
returnValue
[
@"code"
]
isEqualToNumber
:
@0
])
{
GoodsResponse
*
sponse
=
[[
GoodsResponse
alloc
]
initWithDictionary
:
returnValue
[
@"data"
]
error
:
nil
];
self
.
totalPages
=
[
returnValue
[
@"data"
][
@"totalpages"
]
intValue
];
//返回结果
finish
(
sponse
);
}
...
...
@@ -411,7 +412,7 @@
break
;
case
101
:
//类型
{
if
([[
NSString
stringWithFormat
:
@"%
l
d"
,
sender
.
tag
-
100
]
isEqualToString
:[
NSString
stringWithFormat
:
@"%@"
,[
self
.
showSection
firstObject
]]])
{
if
([[
NSString
stringWithFormat
:
@"%d"
,
sender
.
tag
-
100
]
isEqualToString
:[
NSString
stringWithFormat
:
@"%@"
,[
self
.
showSection
firstObject
]]])
{
[
self
.
cellArray
removeAllObjects
];
[
self
.
showSection
removeAllObjects
];
[
self
.
seceneTableView
reloadData
];
...
...
@@ -422,7 +423,7 @@
self
.
selectedCode
=
[[
self
.
arrayData
objectAtIndex_opple
:
sender
.
tag
-
100
]
fid
]
;
[
self
.
collectionView
.
mj_header
beginRefreshing
];
self
.
cellArray
=
[
NSMutableArray
arrayWithArray
:[[
self
.
arrayData
objectAtIndex_opple
:
sender
.
tag
-
100
]
children
]];
[
self
.
showSection
addObject
:[
NSString
stringWithFormat
:
@"%
l
d"
,
sender
.
tag
-
100
]];
[
self
.
showSection
addObject
:[
NSString
stringWithFormat
:
@"%d"
,
sender
.
tag
-
100
]];
[
self
.
seceneTableView
reloadData
];
}
...
...
@@ -448,7 +449,10 @@
}
break
;
default
:
self
.
condtionModel
.
nameLike
=
self
.
selectedCode
;
break
;
break
;
}
...
...
Lighting/Class/SeceneLibraryView.m
View file @
99c9081e
...
...
@@ -61,7 +61,7 @@
//上拉加载
self
.
collectionView
.
mj_footer
=
[
MJRefreshAutoNormalFooter
footerWithRefreshingBlock
:
^
{
if
(
self
.
indexPage
++
>
self
.
totalPages
)
{
if
(
++
self
.
indexPage
>
self
.
totalPages
)
{
[
self
.
collectionView
.
mj_footer
endRefreshingWithNoMoreData
];
}
else
{
...
...
@@ -115,6 +115,7 @@
// [self.responseArray removeAllObjects];
// }
self
.
response
=
[[
SceneResponse
alloc
]
initWithDictionary
:
returnValue
[
@"data"
]
error
:
nil
];
self
.
totalPages
=
[
returnValue
[
@"data"
][
@"totalpages"
]
intValue
];
NSArray
*
array
=
[[
NSArray
alloc
]
init
];
array
=
self
.
response
.
list
;
[
self
.
collectionView
reloadData
];
...
...
Lighting/Lighting.xcodeproj/project.pbxproj
View file @
99c9081e
...
...
@@ -1861,15 +1861,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CODE_SIGN_IDENTITY
=
"
iPhone Distribution: Taiping E-Commerce Co., Ltd
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"
iPhone Distribution: Taiping E-Commerce Co., Ltd
"
;
CODE_SIGN_IDENTITY
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
""
;
COMPRESS_PNG_FILES
=
NO
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
"$(inherited)"
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
GCC_PREFIX_HEADER
=
"$(SRCROOT)/Tools/PrefixHeader.pch"
;
INFOPLIST_FILE
=
Lighting/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.
0
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.
3
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
ONLY_ACTIVE_ARCH
=
YES
;
...
...
@@ -1902,9 +1902,9 @@
"\"UIKit\""
,
"$(inherited)"
,
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.
cntaiping.life.TPLAppResuIPad
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
gomore.opple
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
3673c575-9d7a-473e-895c-f080dcdf5802
"
;
PROVISIONING_PROFILE
=
"
1984600d-9582-4f80-b666-2975a03aee8f
"
;
STRIP_PNG_TEXT
=
NO
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
};
...
...
@@ -1917,15 +1917,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CODE_SIGN_IDENTITY
=
"
iPhone Distribution: Taiping E-Commerce Co., Ltd
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"
iPhone Distribution: Taiping E-Commerce Co., Ltd
"
;
CODE_SIGN_IDENTITY
=
""
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
""
;
COMPRESS_PNG_FILES
=
NO
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
"$(inherited)"
;
GCC_PRECOMPILE_PREFIX_HEADER
=
YES
;
GCC_PREFIX_HEADER
=
"$(SRCROOT)/Tools/PrefixHeader.pch"
;
INFOPLIST_FILE
=
Lighting/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.
0
;
IPHONEOS_DEPLOYMENT_TARGET
=
9.
3
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
LIBRARY_SEARCH_PATHS
=
"$(inherited)"
;
ONLY_ACTIVE_ARCH
=
NO
;
...
...
@@ -1958,9 +1958,9 @@
"\"UIKit\""
,
"$(inherited)"
,
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.
cntaiping.life.TPLAppResuIPad
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
gomore.opple
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
"
3673c575-9d7a-473e-895c-f080dcdf5802
"
;
PROVISIONING_PROFILE
=
"
1984600d-9582-4f80-b666-2975a03aee8f
"
;
STRIP_PNG_TEXT
=
NO
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
};
...
...
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