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
b60e4aea
Commit
b60e4aea
authored
Mar 09, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发布2.0.6正式版
parent
9714aa24
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
93 additions
and
53 deletions
+93
-53
CommentTagTableViewCell.m
...r/ComprehensiveDiscussion/Cells/CommentTagTableViewCell.m
+1
-1
ForumItemTableViewCell.m
...er/ComprehensiveDiscussion/Cells/ForumItemTableViewCell.m
+2
-1
EmigratedMainViewController.m
...killsAssessment/Controllers/EmigratedMainViewController.m
+1
-0
OrderdetailsViewController.m
...ient/Orderdetails/controller/OrderdetailsViewController.m
+2
-1
LuckyDrawDetailsViewController.m
...erController/MyLuckyDraw/LuckyDrawDetailsViewController.m
+1
-5
RebateViewController.m
Class/XXuserController/RebateVC/RebateViewController.m
+1
-1
LearningCenter.storyboard
Lighting/LearningCenter.storyboard
+19
-10
OppleMain.storyboard
Lighting/OppleMain.storyboard
+63
-31
Info.plist
Lighting/Supporting Files/Info.plist
+1
-1
CYConstManager.h
Tools/CYConst/CYConstManager.h
+2
-2
No files found.
Class/LearningCenter/ComprehensiveDiscussion/Cells/CommentTagTableViewCell.m
View file @
b60e4aea
...
...
@@ -24,7 +24,7 @@
self
.
essenceLayoutConstraint
.
constant
=
topicModel
.
bestTopic
?
5
:
0
;
self
.
managerLayoutConstraint
.
constant
=
topicModel
.
backEnd
?
5
:
0
;
self
.
contentLabel
.
text
=
topicModel
.
title
;
self
.
backgroundColor
=
topicModel
.
isRead
?
RGB
(
255
,
250
,
250
,
1
):[
UIColor
white
Color
];
self
.
contentLabel
.
textColor
=
topicModel
.
isRead
?[
UIColor
grayColor
]:[
UIColor
black
Color
];
}
@end
Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumItemTableViewCell.m
View file @
b60e4aea
...
...
@@ -24,7 +24,8 @@
*/
-
(
void
)
refreshCell
:
(
NSIndexPath
*
)
indexPath
withTopicEntity
:
(
CustomTOForumTopicEntity
*
)
topicEntity
withDelegate
:
(
id
<
TapClickImageViewDelegate
>
)
delegate
{
self
.
contentBackView
.
backgroundColor
=
topicEntity
.
isRead
?
RGB
(
255
,
250
,
250
,
1
):[
UIColor
whiteColor
];
self
.
contentLabel
.
textColor
=
topicEntity
.
isRead
?[
UIColor
grayColor
]:[
UIColor
blackColor
];
self
.
titleLabel
.
textColor
=
topicEntity
.
isRead
?[
UIColor
grayColor
]:[
UIColor
blackColor
];
self
.
titleLabel
.
text
=
topicEntity
.
title
;
self
.
contentLabel
.
text
=
topicEntity
.
content
;
self
.
userNameLabel
.
text
=
topicEntity
.
posterName
;
...
...
Class/LearningCenter/SkillsAssessment/Controllers/EmigratedMainViewController.m
View file @
b60e4aea
...
...
@@ -38,6 +38,7 @@
-
(
void
)
uiConfigAction
{
self
.
throughHistoryFlowLayout
.
itemSize
=
CGSizeMake
(
130
,
150
);
self
.
throughHistoryCollectionView
.
alwaysBounceVertical
=
YES
;
self
.
throughHistoryFlowLayout
.
minimumInteritemSpacing
=
30
;
self
.
throughHistoryCollectionView
.
alpha
=
0
;
}
...
...
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @
b60e4aea
...
...
@@ -580,7 +580,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
// 我知道了
}
else
if
(
indexPath
.
row
==
0
)
{
[
SHARED_APPDELEGATE
.
tabBarController
switchSelectedIndex
:
3
];
[
SHARED_APPDELEGATE
.
tabBarController
switchSelectedIndex
:
103
];
[
SHARED_APPDELEGATE
.
tabBarController
setSelectedIndex
:
4
];
}
}];
success
.
preferredContentSize
=
CGSizeMake
(
315
,
320
);
...
...
Class/XXuserController/MyLuckyDraw/LuckyDrawDetailsViewController.m
View file @
b60e4aea
...
...
@@ -77,11 +77,7 @@
-
(
void
)
viewDidAppear
:
(
BOOL
)
animated
{
[
super
viewDidAppear
:
animated
];
if
(
self
.
drawValue
)
{
[
self
.
drawDetailsTableView
.
mj_header
beginRefreshing
];
}
else
{
[
self
getDrawDatas
:
YES
];
}
[
self
.
drawDetailsTableView
.
mj_header
beginRefreshing
];
}
-
(
void
)
viewDidLoad
{
...
...
Class/XXuserController/RebateVC/RebateViewController.m
View file @
b60e4aea
...
...
@@ -134,7 +134,7 @@
// 我的抽奖
LuckyDrawDetailsViewController
*
draw
=
[[[
self
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"LuckyDrawDetailsViewController"
];
[
self
addChildViewController
:
draw
];
draw
.
drawValue
=
ZERO
;
draw
.
drawValue
=
ALLDRAW
;
[
self
.
drawBackgroundView
addSubview
:
draw
.
view
];
}
...
...
Lighting/LearningCenter.storyboard
View file @
b60e4aea
This diff is collapsed.
Click to expand it.
Lighting/OppleMain.storyboard
View file @
b60e4aea
This diff is collapsed.
Click to expand it.
Lighting/Supporting Files/Info.plist
View file @
b60e4aea
...
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.0.
5
<
/string
>
<
string
>
2.0.
6
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
...
...
Tools/CYConst/CYConstManager.h
View file @
b60e4aea
...
...
@@ -96,7 +96,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/**
* 服务器开发地址
*/
//http://139.196.195.30:8090
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/**
* 服务器测试地址
...
...
@@ -106,7 +106,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
//**
// * 服务器正式地址
// */
//
#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]
/*****************************************接口地址*****************************************/
...
...
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