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
c6a6955a
Commit
c6a6955a
authored
Nov 29, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:学习详情开发
parent
5db12ac8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
52 additions
and
51 deletions
+52
-51
IntegralDetailsViewController.m
Class/IntegralDetailsViewController.m
+1
-0
LearningCenterMainViewController.h
...ter/LearningCenterMain/LearningCenterMainViewController.h
+8
-1
LearningCenterMainViewController.m
...ter/LearningCenterMain/LearningCenterMainViewController.m
+5
-2
VideoHelperViewController.m
...LearningCenter/OnlineLearning/VideoHelperViewController.m
+0
-1
PrizeExchangeDetailsViewController.m
Class/PrizeExchangeDetailsViewController.m
+2
-1
GuideIntegral.storyboard
Lighting/GuideIntegral.storyboard
+10
-10
LearningCenter.storyboard
Lighting/LearningCenter.storyboard
+26
-25
NetworkRequestClassManager.m
Tools/NetworkRequestClassManager.m
+0
-11
No files found.
Class/IntegralDetailsViewController.m
View file @
c6a6955a
...
@@ -196,6 +196,7 @@
...
@@ -196,6 +196,7 @@
PrizeExchangeDetailsViewController
*
exchangeDetails
=
[[[
self
class
]
getGuideIntegralStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"PrizeExchangeDetailsViewController"
];
PrizeExchangeDetailsViewController
*
exchangeDetails
=
[[[
self
class
]
getGuideIntegralStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"PrizeExchangeDetailsViewController"
];
RsPrizeBill
*
bill
=
self
.
datasArray
[
indexPath
.
row
];
RsPrizeBill
*
bill
=
self
.
datasArray
[
indexPath
.
row
];
exchangeDetails
.
isDelivery
=
!
[
bill
.
bill
.
state
isEqualToString
:
TOPRIZEBILLENTITYSTATE_REQUESTED
];
exchangeDetails
.
isDelivery
=
!
[
bill
.
bill
.
state
isEqualToString
:
TOPRIZEBILLENTITYSTATE_REQUESTED
];
exchangeDetails
.
prizeBillNumber
=
bill
.
bill
.
billnumber
;
[
self
.
navigationController
pushViewController
:
exchangeDetails
animated
:
YES
];
[
self
.
navigationController
pushViewController
:
exchangeDetails
animated
:
YES
];
}
}
break
;
break
;
...
...
Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.h
View file @
c6a6955a
...
@@ -40,8 +40,15 @@
...
@@ -40,8 +40,15 @@
*/
*/
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
breakthroughView
;
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
breakthroughView
;
/**
积分信息背景View
*/
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
IntegralInformationBackView
;
/**
导购头像
*/
@property
(
weak
,
nonatomic
)
IBOutlet
UIImageView
*
guideHeadImageView
;
...
...
Class/LearningCenter/LearningCenterMain/LearningCenterMainViewController.m
View file @
c6a6955a
...
@@ -60,8 +60,11 @@
...
@@ -60,8 +60,11 @@
-
(
void
)
setUpIntegral
:
(
RsScoreDetails
*
)
entity
-
(
void
)
setUpIntegral
:
(
RsScoreDetails
*
)
entity
{
{
self
.
currentScoreLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.0lf"
,
entity
.
currentScore
];
self
.
currentScoreLabel
.
text
=
[
NSString
stringWithFormat
:
@"%.0lf"
,
entity
.
currentScore
];
self
.
yearRankingLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld"
,
entity
.
annualRanking
];
self
.
yearRankingLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld"
,(
long
)
entity
.
annualRanking
];
self
.
quarterRankingLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld"
,
entity
.
quarterlyRanking
];
[
self
.
guideHeadImageView
sd_setImageWithURL
:[
NSURL
URLWithString
:[
Shoppersmanager
manager
].
Shoppers
.
employee
.
picture
]
placeholderImage
:
ReplaceImage
];
self
.
IntegralInformationBackView
.
backgroundColor
=
[[
UIColor
blackColor
]
colorWithAlphaComponent
:
0
.
5
];
self
.
quarterRankingLabel
.
text
=
[
NSString
stringWithFormat
:
@"%ld"
,(
long
)
entity
.
quarterlyRanking
];
}
}
#pragma mark - 综合讨论
#pragma mark - 综合讨论
...
...
Class/LearningCenter/OnlineLearning/VideoHelperViewController.m
View file @
c6a6955a
...
@@ -54,7 +54,6 @@
...
@@ -54,7 +54,6 @@
NSLog
(
@"缓存完成"
);
NSLog
(
@"缓存完成"
);
}
}
self
.
customPlayer
=
[[
AVPlayer
alloc
]
initWithPlayerItem
:
_playerItem
];
self
.
customPlayer
=
[[
AVPlayer
alloc
]
initWithPlayerItem
:
_playerItem
];
self
.
customPlayer
.
automaticallyWaitsToMinimizeStalling
=
YES
;
self
.
playerLayer
=
[
AVPlayerLayer
playerLayerWithPlayer
:
_customPlayer
];
self
.
playerLayer
=
[
AVPlayerLayer
playerLayerWithPlayer
:
_customPlayer
];
self
.
playerLayer
.
videoGravity
=
AVLayerVideoGravityResizeAspectFill
;
self
.
playerLayer
.
videoGravity
=
AVLayerVideoGravityResizeAspectFill
;
self
.
playerLayer
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
*
2
/
3
,
ScreenHeight
/
2
);
self
.
playerLayer
.
frame
=
CGRectMake
(
0
,
0
,
ScreenWidth
*
2
/
3
,
ScreenHeight
/
2
);
...
...
Class/PrizeExchangeDetailsViewController.m
View file @
c6a6955a
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
{
{
WS
(
weakSelf
);
WS
(
weakSelf
);
[
self
CreateMBProgressHUDLoding
];
[
self
CreateMBProgressHUDLoding
];
NSString
*
url
=
[
NSString
stringWithFormat
:
SERVERREQUESTURL
(
PRIZEBILLDETAILS
),
@"demo11611221750244"
];
NSString
*
url
=
[
NSString
stringWithFormat
:
SERVERREQUESTURL
(
PRIZEBILLDETAILS
),
self
.
prizeBillNumber
];
[[
NetworkRequestClassManager
Manager
]
NetworkWithDictionaryRequestWithURL
:
url
WithCallClass
:
weakSelf
WithRequestType
:
ONE
WithParameter
:
nil
WithReturnValueBlock
:^
(
id
returnValue
)
{
[[
NetworkRequestClassManager
Manager
]
NetworkWithDictionaryRequestWithURL
:
url
WithCallClass
:
weakSelf
WithRequestType
:
ONE
WithParameter
:
nil
WithReturnValueBlock
:^
(
id
returnValue
)
{
[
weakSelf
RemoveMBProgressHUDLoding
];
[
weakSelf
RemoveMBProgressHUDLoding
];
...
@@ -146,6 +146,7 @@
...
@@ -146,6 +146,7 @@
return
0
;
return
0
;
}
}
#pragma mark - lazy
#pragma mark - lazy
-
(
NSMutableArray
*
)
sectionTitleArray
-
(
NSMutableArray
*
)
sectionTitleArray
{
{
...
...
Lighting/GuideIntegral.storyboard
View file @
c6a6955a
This diff is collapsed.
Click to expand it.
Lighting/LearningCenter.storyboard
View file @
c6a6955a
This diff is collapsed.
Click to expand it.
Tools/NetworkRequestClassManager.m
View file @
c6a6955a
...
@@ -144,13 +144,10 @@ static NetworkRequestClassManager *manager = nil;
...
@@ -144,13 +144,10 @@ static NetworkRequestClassManager *manager = nil;
AFHTTPSessionManager
*
manager
=
[
self
baseHttpRequest
];
AFHTTPSessionManager
*
manager
=
[
self
baseHttpRequest
];
//网络检测
//网络检测
if
(
SHARED_APPDELEGATE
.
Networkstatus
==
false
)
{
if
(
SHARED_APPDELEGATE
.
Networkstatus
==
false
)
{
errorCodeBlock
(
BROKEN
);
errorCodeBlock
(
BROKEN
);
return
;
return
;
}
}
if
(
requestType
==
0
)
{
if
(
requestType
==
0
)
{
[
manager
POST
:
requestURLString
parameters
:
parameter
progress
:
nil
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
[
manager
POST
:
requestURLString
parameters
:
parameter
progress
:
nil
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
//登陆超时
//登陆超时
...
@@ -160,17 +157,12 @@ static NetworkRequestClassManager *manager = nil;
...
@@ -160,17 +157,12 @@ static NetworkRequestClassManager *manager = nil;
}
else
{
}
else
{
successBlock
(
responseObject
);
successBlock
(
responseObject
);
}
}
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
failureBlock
(
error
);
failureBlock
(
error
);
}];
}];
}
else
if
(
requestType
==
1
){
}
else
if
(
requestType
==
1
){
[
manager
GET
:
requestURLString
parameters
:
parameter
progress
:
nil
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
[
manager
GET
:
requestURLString
parameters
:
parameter
progress
:
nil
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
//登陆超时
//登陆超时
if
([
responseObject
[
@"code"
]
isEqualToNumber
:
@1
])
{
if
([
responseObject
[
@"code"
]
isEqualToNumber
:
@1
])
{
[
object
RemoveMBProgressHUDLoding
];
[
object
RemoveMBProgressHUDLoding
];
...
@@ -178,11 +170,8 @@ static NetworkRequestClassManager *manager = nil;
...
@@ -178,11 +170,8 @@ static NetworkRequestClassManager *manager = nil;
}
else
{
}
else
{
successBlock
(
responseObject
);
successBlock
(
responseObject
);
}
}
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
failureBlock
(
error
);
failureBlock
(
error
);
}];
}];
}
}
}
}
...
...
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