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
b87c448f
Commit
b87c448f
authored
Oct 11, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
3c7688b8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
85 additions
and
58 deletions
+85
-58
ChangePasswordViewController.m
Class/ChangePasswordViewController.m
+0
-4
CustomerOrderViewController.m
Class/CustomerOrderViewController.m
+1
-1
LoginViewController.m
Class/Login/LoginViewController.m
+22
-0
SearchViewController.m
Class/SearchViewController.m
+3
-1
project.pbxproj
Lighting.xcodeproj/project.pbxproj
+6
-6
AppDelegate.m
Lighting/AppDelegate.m
+1
-0
Info.plist
Lighting/Info.plist
+3
-3
StoryboardwithCYX.storyboard
Lighting/StoryboardwithCYX.storyboard
+41
-41
ExperienceCentreViewController.m
Tools/ExperienceCentreViewController.m
+4
-0
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
SceneViewController.m
Tools/SceneViewController.m
+2
-0
No files found.
Class/ChangePasswordViewController.m
View file @
b87c448f
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
-
(
void
)
viewDidLoad
{
-
(
void
)
viewDidLoad
{
[
super
viewDidLoad
];
[
super
viewDidLoad
];
// Do any additional setup after loading the view from its nib.
[
self
uiConfigAction
];
[
self
uiConfigAction
];
}
}
...
@@ -28,9 +27,6 @@
...
@@ -28,9 +27,6 @@
}
}
#pragma mark - UI
#pragma mark - UI
-
(
void
)
uiConfigAction
-
(
void
)
uiConfigAction
{
{
...
...
Class/CustomerOrderViewController.m
View file @
b87c448f
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
{
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"StoryboardwithCYX"
bundle
:
nil
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"StoryboardwithCYX"
bundle
:
nil
];
OrderdetailsViewController
*
orderdetails
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"orderdetails"
];
OrderdetailsViewController
*
orderdetails
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"orderdetails"
];
TOOrderEntity
*
model
=
[[
self
.
datasArray
objectAtIndex_opple
:
cellindex
]
order
];
TOOrderEntity
*
model
=
(
TOOrderEntity
*
)
[[
self
.
datasArray
objectAtIndex_opple
:
cellindex
]
order
];
orderdetails
.
orderCode
=
model
.
orderNumber
;
orderdetails
.
orderCode
=
model
.
orderNumber
;
orderdetails
.
sectionTitle
=
@[
@"订单信息"
,
@"客户信息"
,
@"收货信息"
,
@"商品信息"
,
@"附件信息"
];
orderdetails
.
sectionTitle
=
@[
@"订单信息"
,
@"客户信息"
,
@"收货信息"
,
@"商品信息"
,
@"附件信息"
];
orderdetails
.
isShowattachment
=
YES
;
orderdetails
.
isShowattachment
=
YES
;
...
...
Class/Login/LoginViewController.m
View file @
b87c448f
...
@@ -74,8 +74,30 @@
...
@@ -74,8 +74,30 @@
// Do any additional setup after loading the view.
// Do any additional setup after loading the view.
[
self
uiConfigAction
];
[
self
uiConfigAction
];
// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
// [self exitApplication];
// });
}
}
//#pragma mark - 强制退出app
//- (void)exitApplication {
//
// [UIView beginAnimations:@"exitApplication" context:nil];
// [UIView setAnimationDuration:0.5];
// [UIView setAnimationDelegate:self];
// [UIView setAnimationTransition:UIViewAnimationTransitionFlipFromLeft forView:SHARED_APPDELEGATE.window cache:NO];
// [UIView setAnimationDidStopSelector:@selector(animationFinished:finished:context:)];
// SHARED_APPDELEGATE.window.bounds = CGRectMake(0, 0, 0, 0);
// [UIView commitAnimations];
//}
//
//- (void)animationFinished:(NSString *)animationID finished:(NSNumber *)finished context:(void *)context {
// if ([animationID compare:@"exitApplication"] == 0) {
// exit(0);
// }
//}
#pragma mark - 布局
#pragma mark - 布局
...
...
Class/SearchViewController.m
View file @
b87c448f
...
@@ -98,7 +98,9 @@
...
@@ -98,7 +98,9 @@
#pragma mark -输入内容
#pragma mark -输入内容
-
(
void
)
searchInputString
:
(
NSNotification
*
)
not
-
(
void
)
searchInputString
:
(
NSNotification
*
)
not
{
{
[
self
.
localSearchArray
addObject
:
not
.
object
];
if
(
!
[
self
.
localSearchArray
containsObject
:
not
.
object
])
{
[
self
.
localSearchArray
addObject
:
not
.
object
];
}
//调用商品控制器
//调用商品控制器
ProductLibraryViewController
*
productVC
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"productlibrary"
];
ProductLibraryViewController
*
productVC
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"productlibrary"
];
productVC
.
selectedCode
=
not
.
object
;
productVC
.
selectedCode
=
not
.
object
;
...
...
Lighting.xcodeproj/project.pbxproj
View file @
b87c448f
...
@@ -1821,8 +1821,8 @@
...
@@ -1821,8 +1821,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
CODE_SIGN_IDENTITY
=
"iPhone Developer
: 云霄 曹 (WM8ZU7YY98)
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer
: 云霄 曹 (WM8ZU7YY98)
"
;
COMPRESS_PNG_FILES
=
NO
;
COMPRESS_PNG_FILES
=
NO
;
ENABLE_BITCODE
=
NO
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
...
@@ -1868,7 +1868,7 @@
...
@@ -1868,7 +1868,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.opple
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.opple
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
"
ce8104e7-12c7-4aa2-a135-c4d3731e559c
"
;
STRIP_PNG_TEXT
=
NO
;
STRIP_PNG_TEXT
=
NO
;
TARGETED_DEVICE_FAMILY
=
2
;
TARGETED_DEVICE_FAMILY
=
2
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
...
@@ -1882,8 +1882,8 @@
...
@@ -1882,8 +1882,8 @@
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_APPICON_NAME
=
AppIcon
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME
=
"Brand Assets"
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CLANG_ENABLE_OBJC_WEAK
=
YES
;
CODE_SIGN_IDENTITY
=
"iPhone Developer"
;
CODE_SIGN_IDENTITY
=
"iPhone Developer
: 云霄 曹 (WM8ZU7YY98)
"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer"
;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]"
=
"iPhone Developer
: 云霄 曹 (WM8ZU7YY98)
"
;
COMPRESS_PNG_FILES
=
NO
;
COMPRESS_PNG_FILES
=
NO
;
ENABLE_BITCODE
=
NO
;
ENABLE_BITCODE
=
NO
;
FRAMEWORK_SEARCH_PATHS
=
(
FRAMEWORK_SEARCH_PATHS
=
(
...
@@ -1929,7 +1929,7 @@
...
@@ -1929,7 +1929,7 @@
);
);
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.opple
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.gomore.opple
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
PROVISIONING_PROFILE
=
""
;
PROVISIONING_PROFILE
=
"
ce8104e7-12c7-4aa2-a135-c4d3731e559c
"
;
STRIP_PNG_TEXT
=
NO
;
STRIP_PNG_TEXT
=
NO
;
TARGETED_DEVICE_FAMILY
=
2
;
TARGETED_DEVICE_FAMILY
=
2
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
USER_HEADER_SEARCH_PATHS
=
"$(PODS_ROOT)/**"
;
...
...
Lighting/AppDelegate.m
View file @
b87c448f
...
@@ -28,6 +28,7 @@
...
@@ -28,6 +28,7 @@
[
self
RootViewcontroller
];
[
self
RootViewcontroller
];
[
self
setUMShare
];
[
self
setUMShare
];
return
YES
;
return
YES
;
}
}
...
...
Lighting/Info.plist
View file @
b87c448f
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
!
D
O
C
TYP
E
plist
PU
B
LI
C
"-//
A
ppl
e
//
D
T
D
PLIST
1
.
0
//
E
N"
"http://www.
a
ppl
e
.
c
om/
D
T
D
s/Prop
e
rtyList-
1
.
0
.
d
t
d
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
plist
v
e
rsion="
1
.
0
"
>
<
d
i
c
t
>
<
d
i
c
t
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
><
/string
>
<
k
e
y
>
CFBundleDevelopmentRegion
<
/k
e
y
>
<
k
e
y
>
CFBundleDevelopmentRegion
<
/k
e
y
>
<
string
>
China
(
zh_CN
)<
/string
>
<
string
>
China
(
zh_CN
)<
/string
>
<
k
e
y
>
CFBundleExecutable
<
/k
e
y
>
<
k
e
y
>
CFBundleExecutable
<
/k
e
y
>
...
@@ -15,7 +13,7 @@
...
@@ -15,7 +13,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.0.
7
<
/string
>
<
string
>
1.0.
8
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
<
d
i
c
t
>
...
@@ -47,6 +45,8 @@
...
@@ -47,6 +45,8 @@
<
/
a
rr
a
y
>
<
/
a
rr
a
y
>
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
a
rr
a
y
>
<
/
a
rr
a
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
><
/string
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
string
>
wechat
<
/string
>
<
string
>
wechat
<
/string
>
...
...
Lighting/StoryboardwithCYX.storyboard
View file @
b87c448f
This diff is collapsed.
Click to expand it.
Tools/ExperienceCentreViewController.m
View file @
b87c448f
...
@@ -620,5 +620,9 @@
...
@@ -620,5 +620,9 @@
sender
.
selected
=
!
sender
.
selected
;
sender
.
selected
=
!
sender
.
selected
;
}
}
-
(
void
)
didReceiveMemoryWarning
{
[
super
didReceiveMemoryWarning
];
// Dispose of any resources that can be recreated.
}
@end
@end
Tools/PrefixHeader.pch
View file @
b87c448f
...
@@ -117,12 +117,12 @@
...
@@ -117,12 +117,12 @@
/**
/**
* 服务器测试地址
* 服务器测试地址
*/
*/
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
///**
///**
// * 服务器正式地址
// * 服务器正式地址
// */
// */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/**
/**
* 搜索框输入通知
* 搜索框输入通知
...
...
Tools/SceneViewController.m
View file @
b87c448f
...
@@ -300,6 +300,7 @@
...
@@ -300,6 +300,7 @@
//默认数据
//默认数据
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
Newpage
.
rows
=
KROWS
;
Newpage
.
rows
=
KROWS
;
Newpage
.
page
=
weakSelf
.
indexPage
;
weakSelf
.
conditionModel
.
page
=
Newpage
;
weakSelf
.
conditionModel
.
page
=
Newpage
;
[
weakSelf
getSceneLibrarydatas
:
weakSelf
.
conditionModel
isRemove
:
NO
];
[
weakSelf
getSceneLibrarydatas
:
weakSelf
.
conditionModel
isRemove
:
NO
];
}
}
...
@@ -391,6 +392,7 @@
...
@@ -391,6 +392,7 @@
//分页数据
//分页数据
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
DataPage
*
Newpage
=
[[
DataPage
alloc
]
init
];
Newpage
.
rows
=
KROWS
;
Newpage
.
rows
=
KROWS
;
Newpage
.
page
=
weakSelf
.
indexPage
;
weakSelf
.
goodsModel
.
page
=
Newpage
;
weakSelf
.
goodsModel
.
page
=
Newpage
;
[
weakSelf
getGoodsListDatasisRemove
:
NO
Withobject
:
weakSelf
.
goodsModel
];
[
weakSelf
getGoodsListDatasisRemove
:
NO
Withobject
:
weakSelf
.
goodsModel
];
}
}
...
...
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