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
9f093788
Commit
9f093788
authored
Nov 21, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:
parent
47a783ae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
131 additions
and
102 deletions
+131
-102
CardViewController.m
Class/CardViewController.m
+1
-1
GuideIntegralViewController.m
Class/GuideIntegralViewController.m
+10
-13
CustomTabbarController.m
Class/Tabbar/CustomTabbarController.m
+7
-3
OppleMain.storyboard
Lighting/OppleMain.storyboard
+75
-75
BaseViewController.h
Tools/BaseViewController.h
+4
-7
BaseViewController.m
Tools/BaseViewController.m
+24
-3
CYConstManager.h
Tools/CYConstManager.h
+5
-0
CYConstManager.m
Tools/CYConstManager.m
+5
-0
No files found.
Class/CardViewController.m
View file @
9f093788
...
@@ -139,7 +139,7 @@
...
@@ -139,7 +139,7 @@
WS
(
weakSelf
);
WS
(
weakSelf
);
TOJingdongEcardEntity
*
model
=
self
.
datasArray
[
indexPath
.
row
];
TOJingdongEcardEntity
*
model
=
self
.
datasArray
[
indexPath
.
row
];
if
([[
self
class
]
isBlankString
:
model
.
orderReceiptUrl
])
{
if
([[
self
class
]
isBlankString
:
model
.
orderReceiptUrl
])
{
[
self
promptCustomerTitle
:
@"不能查看未激活卡劵,请先上传小票激活卡劵"
finish
:
^
{
[
self
promptCustomerTitle
:
@"
我知道了"
withMessage
:
@"
不能查看未激活卡劵,请先上传小票激活卡劵"
finish
:^
{
CardDetailsViewController
*
cardDetails
=
[[[
weakSelf
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"CardDetailsViewController"
];
CardDetailsViewController
*
cardDetails
=
[[[
weakSelf
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"CardDetailsViewController"
];
[
weakSelf
.
navigationController
pushViewController
:
cardDetails
animated
:
YES
];
[
weakSelf
.
navigationController
pushViewController
:
cardDetails
animated
:
YES
];
}];
}];
...
...
Class/GuideIntegralViewController.m
View file @
9f093788
...
@@ -25,7 +25,16 @@
...
@@ -25,7 +25,16 @@
#pragma mark - 获取积分数据
#pragma mark - 获取积分数据
-
(
void
)
getIntegralDataAction
-
(
void
)
getIntegralDataAction
{
{
WS
(
weakSelf
);
[[
NetworkRequestClassManager
Manager
]
NetworkWithDictionaryRequestWithURL
:
SERVERREQUESTURL
(
INTEGRALQUERY
)
WithCallClass
:
weakSelf
WithRequestType
:
ONE
WithParameter
:
nil
WithReturnValueBlock
:^
(
id
returnValue
)
{
NSSLog
(
@"%@"
,
returnValue
);
}
WithErrorCodeBlock
:^
(
id
errorCodeValue
)
{
}
WithFailureBlock
:^
(
NSError
*
error
)
{
}];
}
}
#pragma mark - 添加积分明细、导购头像
#pragma mark - 添加积分明细、导购头像
...
@@ -40,18 +49,6 @@
...
@@ -40,18 +49,6 @@
[
self
.
guideHeaderView
sd_setImageWithURL
:[
NSURL
URLWithString
:
headerurl
]
placeholderImage
:
ReplaceImage
];
[
self
.
guideHeaderView
sd_setImageWithURL
:[
NSURL
URLWithString
:
headerurl
]
placeholderImage
:
ReplaceImage
];
}
}
#pragma mark - 礼品兑换
#pragma mark - 礼品兑换
-
(
IBAction
)
exchangeButtonClick
:
(
UIButton
*
)
sender
{
-
(
IBAction
)
exchangeButtonClick
:
(
UIButton
*
)
sender
{
}
}
...
...
Class/Tabbar/CustomTabbarController.m
View file @
9f093788
...
@@ -22,6 +22,10 @@
...
@@ -22,6 +22,10 @@
#import "QRViewController.h"
#import "QRViewController.h"
#import "ExperienceCentreViewController.h"
#import "ExperienceCentreViewController.h"
#import "RebateViewController.h"
#import "RebateViewController.h"
#import "GuideIntegralViewController.h"
#import "LearningCenterMainViewController.h"
#import "AnnouncementViewController.h"
@interface
CustomTabbarController
()
<
TabbarButtonClickdelegate
,
ChangpasswordDelegate
,
CancelButtondelegate
,
UITextFieldDelegate
>
@interface
CustomTabbarController
()
<
TabbarButtonClickdelegate
,
ChangpasswordDelegate
,
CancelButtondelegate
,
UITextFieldDelegate
>
...
@@ -55,7 +59,7 @@
...
@@ -55,7 +59,7 @@
{
{
if
(
_identifierArray
==
nil
)
{
if
(
_identifierArray
==
nil
)
{
_identifierArray
=
[
NSArray
arrayWithObjects
:
@"SearchViewController"
,
@"ShoppingViewController"
,
@"ClientViewController"
,
@"RebateViewController"
,
@"
SceneLibraryViewController"
,
@"ProductLibraryViewController"
,
@"AllCustomerViewController"
,
@"CustomerOrder
ViewController"
,
@"AboutViewController"
,
nil
];
_identifierArray
=
[
NSArray
arrayWithObjects
:
@"SearchViewController"
,
@"ShoppingViewController"
,
@"ClientViewController"
,
@"RebateViewController"
,
@"
GuideIntegralViewController"
,
@"AnnouncementViewController"
,
@"SceneLibraryViewController"
,
@"ProductLibraryViewController"
,
@"AllCustomerViewController"
,
@"CustomerOrderViewController"
,
@"LearningCenterMain
ViewController"
,
@"AboutViewController"
,
nil
];
}
}
return
_identifierArray
;
return
_identifierArray
;
}
}
...
@@ -121,7 +125,7 @@
...
@@ -121,7 +125,7 @@
-
(
void
)
addViewcontroller
-
(
void
)
addViewcontroller
{
{
NSMutableArray
*
controllerArray
=
[
NSMutableArray
array
];
NSMutableArray
*
controllerArray
=
[
NSMutableArray
array
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
StoryboardwithCYX
"
bundle
:
nil
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
OppleMain
"
bundle
:
nil
];
for
(
int
i
=
0
;
i
<
self
.
identifierArray
.
count
;
i
++
)
{
for
(
int
i
=
0
;
i
<
self
.
identifierArray
.
count
;
i
++
)
{
BaseViewController
*
control
=
[
storyboard
instantiateViewControllerWithIdentifier
:
self
.
identifierArray
[
i
]];
BaseViewController
*
control
=
[
storyboard
instantiateViewControllerWithIdentifier
:
self
.
identifierArray
[
i
]];
UINavigationController
*
nav
=
[[
UINavigationController
alloc
]
initWithRootViewController
:
control
];
UINavigationController
*
nav
=
[[
UINavigationController
alloc
]
initWithRootViewController
:
control
];
...
@@ -331,7 +335,7 @@
...
@@ -331,7 +335,7 @@
}
else
}
else
{
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
StoryboardwithCYX
"
bundle
:
nil
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
OppleMain
"
bundle
:
nil
];
ExperienceCentreViewController
*
ExperienceCenter
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"ExperienceCentre"
];
ExperienceCentreViewController
*
ExperienceCenter
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"ExperienceCentre"
];
ExperienceCenter
.
modalPresentationStyle
=
UIModalPresentationOverFullScreen
;
ExperienceCenter
.
modalPresentationStyle
=
UIModalPresentationOverFullScreen
;
UIPopoverPresentationController
*
popover
=
ExperienceCenter
.
popoverPresentationController
;
UIPopoverPresentationController
*
popover
=
ExperienceCenter
.
popoverPresentationController
;
...
...
Lighting/OppleMain.storyboard
View file @
9f093788
This diff is collapsed.
Click to expand it.
Tools/BaseViewController.h
View file @
9f093788
...
@@ -66,6 +66,10 @@
...
@@ -66,6 +66,10 @@
提示框
提示框
*/
*/
-
(
void
)
promptCustomerTitle
:(
NSString
*
)
title
withMessage
:(
NSString
*
)
message
finish
:(
void
(
^
)())
complete
;
-
(
void
)
promptCustomerTitle
:(
NSString
*
)
title
withMessage
:(
NSString
*
)
message
finish
:(
void
(
^
)())
complete
;
/**
判断相机权限
*/
+
(
BOOL
)
determineCameraPermissions
;
+
(
BOOL
)
determineCameraPermissions
;
/**
/**
...
@@ -94,13 +98,6 @@
...
@@ -94,13 +98,6 @@
*/
*/
-
(
void
)
RemovePromptinformationView
;
-
(
void
)
RemovePromptinformationView
;
/**
* 提示框
*
*/
-
(
void
)
promptCustomerTitle
:(
NSString
*
)
title
finish
:(
void
(
^
)())
complete
;
/**
/**
* 查询订单状态图片
* 查询订单状态图片
*/
*/
...
...
Tools/BaseViewController.m
View file @
9f093788
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
[
weakSelf
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[
weakSelf
dismissViewControllerAnimated
:
YES
completion
:
nil
];
[
Shoppersmanager
manager
].
currentCustomer
=
NO
;
[
Shoppersmanager
manager
].
currentCustomer
=
NO
;
[
Customermanager
manager
].
model
=
nil
;
[
Customermanager
manager
].
model
=
nil
;
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
StoryboardwithCYX
"
bundle
:
nil
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"
OppleMain
"
bundle
:
nil
];
LoginViewController
*
loginVC
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"Login"
];
LoginViewController
*
loginVC
=
[
storyboard
instantiateViewControllerWithIdentifier
:
@"Login"
];
[[
NSUserDefaults
standardUserDefaults
]
removeObjectForKey
:
USERNAME
];
[[
NSUserDefaults
standardUserDefaults
]
removeObjectForKey
:
USERNAME
];
[[
NSUserDefaults
standardUserDefaults
]
removeObjectForKey
:
PASSWORD
];
[[
NSUserDefaults
standardUserDefaults
]
removeObjectForKey
:
PASSWORD
];
...
@@ -230,9 +230,30 @@
...
@@ -230,9 +230,30 @@
}
}
#pragma mark -获得我的storyboard对象
#pragma mark -获得我的storyboard对象
-
(
UIStoryboard
*
)
getStoryboardWithName
+
(
UIStoryboard
*
)
getMainStoryboardClass
{
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"StoryboardwithCYX"
bundle
:
nil
];
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"OppleMain"
bundle
:
nil
];
return
storyboard
;
}
#pragma mark - 获得公告storyboard对象
+
(
UIStoryboard
*
)
getAnnouncementStoryboardClass
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"Announcement"
bundle
:
nil
];
return
storyboard
;
}
#pragma mark - 获得学习中心storyboard对象
+
(
UIStoryboard
*
)
getLearningCenterStoryboardClass
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"LearningCenter"
bundle
:
nil
];
return
storyboard
;
}
#pragma mark -获得积分storyboard对象
+
(
UIStoryboard
*
)
getGuideIntegralStoryboardClass
{
UIStoryboard
*
storyboard
=
[
UIStoryboard
storyboardWithName
:
@"GuideIntegral"
bundle
:
nil
];
return
storyboard
;
return
storyboard
;
}
}
...
...
Tools/CYConstManager.h
View file @
9f093788
...
@@ -282,6 +282,11 @@ extern NSString *const LOTTERYED;
...
@@ -282,6 +282,11 @@ extern NSString *const LOTTERYED;
* 使用微信卡劵
* 使用微信卡劵
*/
*/
extern
NSString
*
const
USEWECHATCARD
;
extern
NSString
*
const
USEWECHATCARD
;
/**
* 查询积分
*/
extern
NSString
*
const
INTEGRALQUERY
;
/*****************************************接口地址*****************************************/
/*****************************************接口地址*****************************************/
...
...
Tools/CYConstManager.m
View file @
9f093788
...
@@ -276,6 +276,11 @@ NSString *const LOTTERYED = @"/lottery/query";
...
@@ -276,6 +276,11 @@ NSString *const LOTTERYED = @"/lottery/query";
* 使用微信卡劵
* 使用微信卡劵
*/
*/
NSString
*
const
USEWECHATCARD
=
@"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@"
;
NSString
*
const
USEWECHATCARD
=
@"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@"
;
/**
* 查询积分
*/
NSString
*
const
INTEGRALQUERY
=
@"/score/details?employee=%@"
;
/*****************************************接口地址*****************************************/
/*****************************************接口地址*****************************************/
...
...
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