Skip to content

Commit 97a39b3

Browse files
wanghenghengwanghengheng
committed
改改改
1 parent d49bc83 commit 97a39b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+69
-23
lines changed

‎Coding_iOS.xcodeproj/project.pbxproj

+32
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@
119119
4E0849831A918A7F00BD27F6 /* coding_emoji_41@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E08497D1A918A7F00BD27F6 /* coding_emoji_41@2x.png */; };
120120
4E0849841A918A7F00BD27F6 /* coding_emoji_42@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E08497E1A918A7F00BD27F6 /* coding_emoji_42@2x.png */; };
121121
4E0849851A918A7F00BD27F6 /* coding_emoji_43@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E08497F1A918A7F00BD27F6 /* coding_emoji_43@2x.png */; };
122+
4E095A151D9534CB00E63D9E /* intro_page_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A111D9534CB00E63D9E /* intro_page_selected@2x.png */; };
123+
4E095A161D9534CB00E63D9E /* intro_page_selected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A121D9534CB00E63D9E /* intro_page_selected@3x.png */; };
124+
4E095A171D9534CB00E63D9E /* intro_page_unselected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A131D9534CB00E63D9E /* intro_page_unselected@2x.png */; };
125+
4E095A181D9534CB00E63D9E /* intro_page_unselected@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4E095A141D9534CB00E63D9E /* intro_page_unselected@3x.png */; };
122126
4E095A591B690494008DC439 /* CodingBanner.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E095A581B690494008DC439 /* CodingBanner.m */; };
123127
4E095A5C1B6907AA008DC439 /* CodingBannersView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E095A5B1B6907AA008DC439 /* CodingBannersView.m */; };
124128
4E095A661B6909F9008DC439 /* AutoSlideScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E095A5F1B6909F9008DC439 /* AutoSlideScrollView.m */; };
@@ -539,6 +543,10 @@
539543
4EAECBC61C44CB860096CA74 /* member_cell_edit_type@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBC01C44CB860096CA74 /* member_cell_edit_type@2x.png */; };
540544
4EAECBC71C44CB860096CA74 /* member_cell_edit_type@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EAECBC11C44CB860096CA74 /* member_cell_edit_type@3x.png */; };
541545
4EB0C2001A807ED00042FC4F /* NSURL+Common.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0C1FF1A807ED00042FC4F /* NSURL+Common.m */; };
546+
4EB119F81D953AE200A36341 /* intro_page2_ip4@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB119F41D953AE200A36341 /* intro_page2_ip4@2x.png */; };
547+
4EB119F91D953AE200A36341 /* intro_page2_ip5@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB119F51D953AE200A36341 /* intro_page2_ip5@2x.png */; };
548+
4EB119FA1D953AE200A36341 /* intro_page2_ip6@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB119F61D953AE200A36341 /* intro_page2_ip6@2x.png */; };
549+
4EB119FB1D953AE200A36341 /* intro_page2_ip6+@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB119F71D953AE200A36341 /* intro_page2_ip6+@3x.png */; };
542550
4EB52F0F1C74691B00B5EBEA /* password_look@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F0B1C74691B00B5EBEA /* password_look@2x.png */; };
543551
4EB52F101C74691B00B5EBEA /* password_look@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F0C1C74691B00B5EBEA /* password_look@3x.png */; };
544552
4EB52F111C74691B00B5EBEA /* password_unlook@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EB52F0D1C74691B00B5EBEA /* password_unlook@2x.png */; };
@@ -1330,6 +1338,10 @@
13301338
4E08497D1A918A7F00BD27F6 /* coding_emoji_41@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "coding_emoji_41@2x.png"; sourceTree = "<group>"; };
13311339
4E08497E1A918A7F00BD27F6 /* coding_emoji_42@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "coding_emoji_42@2x.png"; sourceTree = "<group>"; };
13321340
4E08497F1A918A7F00BD27F6 /* coding_emoji_43@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "coding_emoji_43@2x.png"; sourceTree = "<group>"; };
1341+
4E095A111D9534CB00E63D9E /* intro_page_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page_selected@2x.png"; sourceTree = "<group>"; };
1342+
4E095A121D9534CB00E63D9E /* intro_page_selected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page_selected@3x.png"; sourceTree = "<group>"; };
1343+
4E095A131D9534CB00E63D9E /* intro_page_unselected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page_unselected@2x.png"; sourceTree = "<group>"; };
1344+
4E095A141D9534CB00E63D9E /* intro_page_unselected@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page_unselected@3x.png"; sourceTree = "<group>"; };
13331345
4E095A571B690494008DC439 /* CodingBanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodingBanner.h; sourceTree = "<group>"; };
13341346
4E095A581B690494008DC439 /* CodingBanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CodingBanner.m; sourceTree = "<group>"; };
13351347
4E095A5A1B6907AA008DC439 /* CodingBannersView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodingBannersView.h; sourceTree = "<group>"; };
@@ -1966,6 +1978,10 @@
19661978
4EAECBC11C44CB860096CA74 /* member_cell_edit_type@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "member_cell_edit_type@3x.png"; sourceTree = "<group>"; };
19671979
4EB0C1FE1A807ED00042FC4F /* NSURL+Common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+Common.h"; sourceTree = "<group>"; };
19681980
4EB0C1FF1A807ED00042FC4F /* NSURL+Common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+Common.m"; sourceTree = "<group>"; };
1981+
4EB119F41D953AE200A36341 /* intro_page2_ip4@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page2_ip4@2x.png"; sourceTree = "<group>"; };
1982+
4EB119F51D953AE200A36341 /* intro_page2_ip5@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page2_ip5@2x.png"; sourceTree = "<group>"; };
1983+
4EB119F61D953AE200A36341 /* intro_page2_ip6@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page2_ip6@2x.png"; sourceTree = "<group>"; };
1984+
4EB119F71D953AE200A36341 /* intro_page2_ip6+@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "intro_page2_ip6+@3x.png"; sourceTree = "<group>"; };
19691985
4EB52F0B1C74691B00B5EBEA /* password_look@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "password_look@2x.png"; sourceTree = "<group>"; };
19701986
4EB52F0C1C74691B00B5EBEA /* password_look@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "password_look@3x.png"; sourceTree = "<group>"; };
19711987
4EB52F0D1C74691B00B5EBEA /* password_unlook@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "password_unlook@2x.png"; sourceTree = "<group>"; };
@@ -3072,6 +3088,10 @@
30723088
4E0022A11B7362EF005308DE /* intro_pages */ = {
30733089
isa = PBXGroup;
30743090
children = (
3091+
4E095A111D9534CB00E63D9E /* intro_page_selected@2x.png */,
3092+
4E095A121D9534CB00E63D9E /* intro_page_selected@3x.png */,
3093+
4E095A131D9534CB00E63D9E /* intro_page_unselected@2x.png */,
3094+
4E095A141D9534CB00E63D9E /* intro_page_unselected@3x.png */,
30753095
4E0022A21B7362EF005308DE /* intro_page0_ip4@2x.png */,
30763096
4E0022A31B7362EF005308DE /* intro_page0_ip5@2x.png */,
30773097
4E0022A41B7362EF005308DE /* intro_page0_ip6+@3x.png */,
@@ -3080,6 +3100,10 @@
30803100
4E6B070E1BA3D9B5007D6027 /* intro_page1_ip5@2x.png */,
30813101
4E6B070F1BA3D9B5007D6027 /* intro_page1_ip6@2x.png */,
30823102
4E6B07101BA3D9B5007D6027 /* intro_page1_ip6+@3x.png */,
3103+
4EB119F41D953AE200A36341 /* intro_page2_ip4@2x.png */,
3104+
4EB119F51D953AE200A36341 /* intro_page2_ip5@2x.png */,
3105+
4EB119F61D953AE200A36341 /* intro_page2_ip6@2x.png */,
3106+
4EB119F71D953AE200A36341 /* intro_page2_ip6+@3x.png */,
30833107
);
30843108
path = intro_pages;
30853109
sourceTree = "<group>";
@@ -5831,6 +5855,7 @@
58315855
4EA6791A1A14BFA0001A0324 /* icon_file_folder_normal@2x.png in Resources */,
58325856
8EA6D19919E240C40076D59C /* tipIcon_ProjectTopic@2x.png in Resources */,
58335857
4ED673261A8E127100DF2D1A /* SVWebViewControllerActivityReport@2x.png in Resources */,
5858+
4EB119FB1D953AE200A36341 /* intro_page2_ip6+@3x.png in Resources */,
58345859
8EA6D14A19E240C40076D59C /* InfoPlist.strings in Resources */,
58355860
4E6383C31B3265DC00D98648 /* mrpr_icon_accepted@2x.png in Resources */,
58365861
D0C447DE1C02DB8900DC1C4B /* privatemessage_normal@3x.png in Resources */,
@@ -5853,6 +5878,7 @@
58535878
7E8E59831B6F91C40083CA02 /* bubble_right_play_1@2x.png in Resources */,
58545879
8B3516511B6CE9460049BC45 /* search_tweet_colck@2x.png in Resources */,
58555880
8E97CE6A1A0A3424006F9AD7 /* keyboard_page_unselected@2x.png in Resources */,
5881+
4E095A161D9534CB00E63D9E /* intro_page_selected@3x.png in Resources */,
58565882
134116F01CB529E1005E6550 /* PR_more@2x.png in Resources */,
58575883
4E54C24C1D8FE19100A61023 /* user_info_edit@3x.png in Resources */,
58585884
4E07D3161A4D3CA6009EDDF2 /* logo_coding@2x.png in Resources */,
@@ -6015,6 +6041,7 @@
60156041
4EC480141C2A909D005F1772 /* register_step_un@3x.png in Resources */,
60166042
0A782FDE1AB5B78B00E96661 /* TweetSendCreateLocationCell.xib in Resources */,
60176043
8E8F7B3219EF6306006BA8BD /* btn_privateMsg_white@2x.png in Resources */,
6044+
4EB119F81D953AE200A36341 /* intro_page2_ip4@2x.png in Resources */,
60186045
8E97CEBB1A0C7E26006F9AD7 /* coding_emoji_36@2x.png in Resources */,
60196046
4E996C041ABBF56A00C704F1 /* n_btn_followed_yes@2x.png in Resources */,
60206047
4EAE06901B784E9200179F4B /* store_icon@2x.png in Resources */,
@@ -6057,6 +6084,7 @@
60576084
4E6383FE1B33C18700D98648 /* task_activity_icon_update@2x.png in Resources */,
60586085
4E0849831A918A7F00BD27F6 /* coding_emoji_41@2x.png in Resources */,
60596086
4ED4B4921D82646100EED8C6 /* user_info_topic@3x.png in Resources */,
6087+
4EB119F91D953AE200A36341 /* intro_page2_ip5@2x.png in Resources */,
60606088
4ED618211C3BD79B0017946C /* task_activity_icon_remove_watcher@2x.png in Resources */,
60616089
927AFF521BFF6DAD00AAE593 /* shop_nar_history_icon@2x.png in Resources */,
60626090
4E6383AD1B3262D300D98648 /* taskPriority3_small@2x.png in Resources */,
@@ -6087,6 +6115,7 @@
60876115
4E4972E01BB535B400F3AC15 /* tipIcon_ProjectTweetComment@2x.png in Resources */,
60886116
4E66EE261A28226000DA1B3E /* button_file_createFolder_enable@2x.png in Resources */,
60896117
D0C447A81C02A3C700DC1C4B /* project_selected@2x.png in Resources */,
6118+
4EB119FA1D953AE200A36341 /* intro_page2_ip6@2x.png in Resources */,
60906119
8EA6D19C19E240C40076D59C /* tipIcon_QcTask@2x.png in Resources */,
60916120
4E095A841B6B24DE008DC439 /* time_clock_icon@2x.png in Resources */,
60926121
4EB52F211C76BA3B00B5EBEA /* tag_button_randomColor@2x.png in Resources */,
@@ -6103,6 +6132,7 @@
61036132
4EF17ED61B3C3112003CDD2D /* intro_icon_3@3x.png in Resources */,
61046133
8EA6D17319E240C40076D59C /* placeholder_coding_square_150@2x.png in Resources */,
61056134
4EAECBC41C44CB860096CA74 /* member_cell_edit_remove@2x.png in Resources */,
6135+
4E095A181D9534CB00E63D9E /* intro_page_unselected@3x.png in Resources */,
61066136
134116F41CB54AF8005E6550 /* PR_TaskResource@2x.png in Resources */,
61076137
8EA6D17619E240C40076D59C /* placeholder_monkey_round_25@2x.png in Resources */,
61086138
4E2DB34A1BA6AEB4002F27C4 /* coding_emoji_gif_05@2x.png in Resources */,
@@ -6222,6 +6252,7 @@
62226252
4E94C4ED1B4A867A00EB668A /* scan_bg@2x.png in Resources */,
62236253
4E996C031ABBF56A00C704F1 /* n_btn_followed_not@2x.png in Resources */,
62246254
8EA6D17F19E240C40076D59C /* section_btn_open@2x.png in Resources */,
6255+
4E095A151D9534CB00E63D9E /* intro_page_selected@2x.png in Resources */,
62256256
4EB52F611C7C5C4F00B5EBEA /* task_resource_reference_ProjectTopic@3x.png in Resources */,
62266257
4EACB4411A2C448F0097ABB3 /* button_file_move_unable@2x.png in Resources */,
62276258
4E0BD8851B6C7F0A0061CAA6 /* mock_topicAdlist.geojson in Resources */,
@@ -6389,6 +6420,7 @@
63896420
8EA6D19419E240C40076D59C /* timeline_line_unread@2x.png in Resources */,
63906421
4E94C4F11B4B75DB00EB668A /* tip_2FA@2x.png in Resources */,
63916422
8E97CE9C1A0C7E26006F9AD7 /* coding_emoji_05@2x.png in Resources */,
6423+
4E095A171D9534CB00E63D9E /* intro_page_unselected@2x.png in Resources */,
63926424
4E6383A61B3262D300D98648 /* taskPriority0@2x.png in Resources */,
63936425
4E0EF6EC1BF42E4B00F2FCC8 /* task_activity_icon_update_label@2x.png in Resources */,
63946426
8E97CE621A0A3424006F9AD7 /* keyboard_add_camera@2x.png in Resources */,

‎Coding_iOS/.DS_Store

0 Bytes
Binary file not shown.

‎Coding_iOS/Coding_iOS-Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>4.0.201609221830</string>
39+
<string>4.0.201609231900</string>
4040
<key>ITSAppUsesNonExemptEncryption</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>

‎Coding_iOS/Images/intro_pages/intro_page0_ip4@2x.png

-19.9 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page0_ip5@2x.png

-25.2 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page0_ip6+@3x.png

-43.2 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page0_ip6@2x.png

-29 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page1_ip4@2x.png

18.8 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page1_ip5@2x.png

21.3 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page1_ip6+@3x.png

39.2 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page1_ip6@2x.png

18.7 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page2_ip4@2x.png

94.5 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page2_ip5@2x.png

93.1 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page2_ip6+@3x.png

224 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page2_ip6@2x.png

113 KB
Loading

‎Coding_iOS/Images/intro_pages/intro_page_selected@2x.png

263 Bytes
Loading

‎Coding_iOS/Images/intro_pages/intro_page_selected@3x.png

370 Bytes
Loading

‎Coding_iOS/Images/intro_pages/intro_page_unselected@2x.png

333 Bytes
Loading

‎Coding_iOS/Images/intro_pages/intro_page_unselected@3x.png

494 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_add@2x.png

100755100644
-204 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_add_camera@2x.png

100755100644
-249 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_add_photo@2x.png

100755100644
-992 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_arrow_down@2x.png

546 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_at@2x.png

100755100644
334 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_emotion@2x.png

100755100644
48 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_keyboard@2x.png

100755100644
-154 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_photo@2x.png

-250 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_topic@2x.png

-484 Bytes
Loading

‎Coding_iOS/Images/keyboard/keyboard_voice@2x.png

-2.38 KB
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_comment@2x.png

116 Bytes
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_comment@3x.png

286 Bytes
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_like@2x.png

150 Bytes
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_like@3x.png

319 Bytes
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_reward@2x.png

166 Bytes
Loading

‎Coding_iOS/Images/tweet_btn/tweet_btn_reward@3x.png

258 Bytes
Loading

‎Coding_iOS/Util/Manager/FunctionIntroManager.m

+19-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
//
88

99
#define kIntroPageKey @"intro_page_version"
10-
#define kIntroPageNum 4
10+
#define kIntroPageNum 3
1111

1212
#import "FunctionIntroManager.h"
1313
#import "EAIntroView.h"
1414
#import "SMPageControl.h"
1515
#import <NYXImagesKit/NYXImagesKit.h>
1616

17-
@interface FunctionIntroManager ()
17+
@interface FunctionIntroManager ()<EAIntroDelegate>
1818
@property (strong, nonatomic) EAIntroView *introView;
1919
@end
2020

@@ -29,6 +29,7 @@ + (void)showIntroPage{
2929
}
3030

3131
+ (BOOL)needToShowIntro{
32+
return YES;
3233
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
3334
NSString *preVersion = [defaults stringForKey:kIntroPageKey];
3435
BOOL needToShow = ![preVersion isEqualToString:kVersionBuild_Coding];
@@ -66,27 +67,26 @@ - (instancetype)init
6667
_introView.swipeToExit = YES;
6768
_introView.scrollView.bounces = YES;
6869
_introView.skipButton = nil;
70+
_introView.delegate = self;
6971
if (pages.count <= 1) {
7072
_introView.pageControl.hidden = YES;
7173
}else{
7274
_introView.pageControl = [self p_pageControl];
73-
_introView.pageControlY = 10.f + CGRectGetHeight(_introView.pageControl.frame);
75+
_introView.pageControlY = 30.f + CGRectGetHeight(_introView.pageControl.frame);
7476
}
7577
}
7678
return self;
7779
}
7880

7981
- (UIPageControl *)p_pageControl{
80-
UIImage *pageIndicatorImage = [UIImage imageNamed:@"intro_dot_unselected"];
81-
UIImage *currentPageIndicatorImage = [UIImage imageNamed:@"intro_dot_selected"];
82-
82+
UIImage *pageIndicatorImage = [UIImage imageNamed:@"intro_page_unselected"];
83+
UIImage *currentPageIndicatorImage = [UIImage imageNamed:@"intro_page_selected"];
8384
if (!kDevice_Is_iPhone6 && !kDevice_Is_iPhone6Plus) {
8485
CGFloat desginWidth = 375.0;//iPhone6 的设计尺寸
8586
CGFloat scaleFactor = kScreen_Width/desginWidth;
8687
pageIndicatorImage = [pageIndicatorImage scaleByFactor:scaleFactor];
8788
currentPageIndicatorImage = [currentPageIndicatorImage scaleByFactor:scaleFactor];
8889
}
89-
9090
SMPageControl *pageControl = [SMPageControl new];
9191
pageControl.pageIndicatorImage = pageIndicatorImage;
9292
pageControl.currentPageIndicatorImage = currentPageIndicatorImage;
@@ -148,11 +148,22 @@ - (EAIntroPage *)p_pageWithIndex:(NSInteger)index{
148148
[button mas_makeConstraints:^(MASConstraintMaker *make) {
149149
make.size.mas_equalTo(CGSizeMake(200, 44));
150150
make.centerX.equalTo(imageView);
151-
make.bottom.equalTo(imageView).offset(-70);
151+
make.bottom.equalTo(imageView).offset(kDevice_Is_iPhone4? -30: -40);
152152
}];
153153
}
154154
EAIntroPage *page = [EAIntroPage pageWithCustomView:imageView];
155155
return page;
156156
}
157157

158+
#pragma mark EAIntroDelegate
159+
- (void)intro:(EAIntroView *)introView pageStartScrolling:(EAIntroPage *)page withIndex:(NSUInteger)pageIndex{
160+
introView.pageControl.hidden = (pageIndex >= kIntroPageNum - 2);
161+
}
162+
- (void)intro:(EAIntroView *)introView pageAppeared:(EAIntroPage *)page withIndex:(NSUInteger)pageIndex{
163+
introView.pageControl.hidden = (pageIndex == kIntroPageNum - 1);
164+
}
165+
- (void)intro:(EAIntroView *)introView pageEndScrolling:(EAIntroPage *)page withIndex:(NSUInteger)pageIndex{
166+
introView.pageControl.hidden = (pageIndex == kIntroPageNum - 1);
167+
}
168+
158169
@end

‎Coding_iOS/Vendor/RDVTabBarController/RDVTabBarItem.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ - (void)commonInitialization {
6969

7070
_unselectedTitleAttributes = @{
7171
NSFontAttributeName: [UIFont systemFontOfSize:10],
72-
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x808080"],
72+
NSForegroundColorAttributeName: [UIColor colorWithHexString:@"0x76808E"],
7373
};
7474
_selectedTitleAttributes = @{
7575
NSFontAttributeName: [UIFont systemFontOfSize:10],

‎Coding_iOS/Views/Cell/TopicCommentCell.m

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
3333
// Initialization code
3434
if (!_bestAnswerV) {
3535
_bestAnswerV = [[UIView alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, 0, 80, 24)];
36-
_bestAnswerV.backgroundColor = kColorBrandGreen;
36+
_bestAnswerV.backgroundColor = [UIColor colorWithHexString:@"0x2FAEEA"];
3737
UIImageView *imageV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"icon_best_answer"]];
3838
[_bestAnswerV addSubview:imageV];
3939
UILabel *label = [UILabel labelWithSystemFontSize:11 textColorHexString:@"0xFFFFFF"];
@@ -60,7 +60,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
6060
}
6161
if (!_voteBtn) {
6262
_voteBtn = [[UIButton alloc] initWithFrame:CGRectMake(kPaddingLeftWidth + 1.5, _ownerIconView.bottom, 30, 18)];
63-
[_voteBtn doBorderWidth:0.5 color:nil cornerRadius:2.0];
63+
[_voteBtn doBorderWidth:0.5 color:kColorCCC cornerRadius:2.0];
6464
_voteBtn.titleLabel.font = [UIFont systemFontOfSize:11];
6565
[_voteBtn addTarget:self action:@selector(voteBtnClicked) forControlEvents:UIControlEventTouchUpInside];
6666
[self.contentView addSubview:_voteBtn];
@@ -109,8 +109,8 @@ - (void)voteBtnClicked{
109109
}
110110

111111
- (void)setVoteCount:(NSNumber *)voteCount isVoted:(BOOL)isVoted{
112-
[_voteBtn setBackgroundColor:isVoted? kColorBrandGreen: [UIColor whiteColor]];
113-
[_voteBtn setTitleColor:[UIColor colorWithHexString:isVoted? @"0xFFFFFF": @"0x999999"] forState:UIControlStateNormal];
112+
[_voteBtn setBackgroundColor:[UIColor colorWithHexString:isVoted? @"0x2FAEEA": @"0xFFFFFF"]];
113+
[_voteBtn setTitleColor:[UIColor colorWithHexString:isVoted? @"0xFFFFFF": @"0x666666"] forState:UIControlStateNormal];
114114
[_voteBtn setTitle:[NSString stringWithFormat:@"+%@", voteCount] forState:UIControlStateNormal];
115115
}
116116

‎Coding_iOS/Views/CodingBannersView.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ - (void)setCurBannerList:(NSArray *)curBannerList{
120120
[_typeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
121121
make.left.equalTo(self).offset(kPaddingLeftWidth);
122122
make.centerY.equalTo(_myPageControl);
123-
make.height.mas_equalTo(15);
123+
make.height.mas_equalTo(18);
124124
}];
125125
[_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
126126
make.left.equalTo(_typeLabel.mas_right).offset(5);

0 commit comments

Comments
 (0)