Skip to content

Commit 7560c68

Browse files
wanghenghengwanghengheng
committed
iPad Pro 适配 & 1.1.201512112000
1 parent f15e8c7 commit 7560c68

File tree

10 files changed

+21
-14
lines changed

10 files changed

+21
-14
lines changed

‎CodingForiPad/Base.lproj/Main.storyboard‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,9 @@
11381138
</containerView>
11391139
<containerView opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A6p-3Q-Vyx">
11401140
<rect key="frame" x="0.0" y="0.0" width="354" height="684"/>
1141+
<constraints>
1142+
<constraint firstAttribute="width" constant="354" id="xu7-ya-Cox"/>
1143+
</constraints>
11411144
<connections>
11421145
<segue destination="pHr-9h-qXR" kind="embed" identifier="userInfo" id="jQM-Fc-iOC"/>
11431146
</connections>
@@ -2387,8 +2390,11 @@
23872390
<rect key="frame" x="0.0" y="0.0" width="929" height="684"/>
23882391
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
23892392
<subviews>
2390-
<containerView opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WcT-5r-D4D">
2393+
<containerView opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WcT-5r-D4D">
23912394
<rect key="frame" x="0.0" y="0.0" width="355" height="684"/>
2395+
<constraints>
2396+
<constraint firstAttribute="width" constant="355" id="H41-VQ-Juv"/>
2397+
</constraints>
23922398
<connections>
23932399
<segue destination="niq-qC-pKx" kind="embed" identifier="projectList" id="KjO-9o-qcb"/>
23942400
</connections>
@@ -12218,7 +12224,7 @@
1221812224
<image name="triangle" width="12" height="11"/>
1221912225
</resources>
1222012226
<inferredMetricsTieBreakers>
12221-
<segue reference="lB1-gY-oI4"/>
12227+
<segue reference="lN2-Ad-31X"/>
1222212228
<segue reference="pYf-vo-7Wl"/>
1222312229
<segue reference="alL-dh-wcf"/>
1222412230
<segue reference="jyf-Qs-XG1"/>

‎CodingForiPad/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.0.1</string>
20+
<string>1.1</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>150916.2</string>
24+
<string>1.1.201512112000</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSAppTransportSecurity</key>

‎CodingForiPad/PrefixHeader.pch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#define selectedColor [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1];
2727

28+
#define kRightView_Width (kScreen_Width - 451)
2829
#define kPopWidth 480.0
2930
#define kPopHeight 600.0
3031
#define kPopWidthS 400.0

‎CodingForiPad/ViewController/Custom/MessageMediaItemCCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#import "UIView+Extension.h"
1212
#import "UIImageView+WebCache.h"
1313

14-
#define kMessageCell_ContentWidth (0.5 * 573)
14+
#define kMessageCell_ContentWidth (0.5 * kRightView_Width)
1515

1616
@implementation MessageMediaItemCCell
1717

‎CodingForiPad/ViewController/Message/MessageCell.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define kMessageCell_FontContent [UIFont systemFontOfSize:14]
2222
#define kMessageCell_PadingWidth 20.0
2323
#define kMessageCell_PadingHeight 17.0
24-
#define kMessageCell_ContentWidth (573*0.5)
24+
#define kMessageCell_ContentWidth (kRightView_Width*0.5)
2525
#define kMessageCell_TimeHeight 30.0
2626
#define kMessageCell_UserIconWith 50.0
2727
#define kPaddingLeftWidth 20.0
@@ -117,7 +117,7 @@ - (void)setCurPriMsg:(COConversation *)curPriMsg andPrePriMsg:(COConversation *)
117117
NSString *displayStr = [MessageCell displayTimeStrWithCurMsg:_curPriMsg preMsg:_prePriMsg];
118118
if (displayStr) {
119119
if (!_timeLabel) {
120-
_timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, (kMessageCell_TimeHeight - 20)/2, 573 - 2*kPaddingLeftWidth, 20)];
120+
_timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(kPaddingLeftWidth, (kMessageCell_TimeHeight - 20)/2, kRightView_Width - 2*kPaddingLeftWidth, 20)];
121121
_timeLabel.backgroundColor = [UIColor clearColor];
122122
_timeLabel.font = [UIFont systemFontOfSize:12];
123123
_timeLabel.textColor = [UIColor colorWithHexString:@"0x999999"];
@@ -191,8 +191,8 @@ - (void)setCurPriMsg:(COConversation *)curPriMsg andPrePriMsg:(COConversation *)
191191
[_contentLabel setX:kMessageCell_PadingWidth + 5];
192192
[_mediaView setX:kMessageCell_PadingWidth + 5];
193193

194-
bgImgViewFrame = CGRectMake((573 - kPaddingLeftWidth - kMessageCell_UserIconWith - 10) - bgImgViewSize.width, curBottomY + kMessageCell_PadingHeight, bgImgViewSize.width, bgImgViewSize.height);
195-
[_userIconView setCenter:CGPointMake(573 - kPaddingLeftWidth - kMessageCell_UserIconWith/2, CGRectGetMaxY(bgImgViewFrame)- kMessageCell_UserIconWith/2)];
194+
bgImgViewFrame = CGRectMake((kRightView_Width - kPaddingLeftWidth - kMessageCell_UserIconWith - 10) - bgImgViewSize.width, curBottomY + kMessageCell_PadingHeight, bgImgViewSize.width, bgImgViewSize.height);
195+
[_userIconView setCenter:CGPointMake(kRightView_Width - kPaddingLeftWidth - kMessageCell_UserIconWith/2, CGRectGetMaxY(bgImgViewFrame)- kMessageCell_UserIconWith/2)];
196196
bgImg = [UIImage imageNamed:@"background_message_text_blue"];
197197
_bgImgView.frame = bgImgViewFrame;
198198
}

‎CodingForiPad/ViewController/Project/ProjectTopicLabelView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "COTopic.h"
1111
#import "COTagView.h"
1212

13-
#define kCell_Width 573
13+
#define kCell_Width kRightView_Width
1414
#define kPaddingLeftWidth 20
1515

1616
@interface ProjectTopicLabelView () <COTagViewDelegate>

‎CodingForiPad/ViewController/Project/TopicCommentCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#import "NSString+Common.h"
2121
#import "ZLPhoto.h"
2222

23-
#define kCell_Width 573
23+
#define kCell_Width kRightView_Width
2424
#define kPaddingLeftWidth 20
2525

2626
@interface TopicCommentCell ()<UICollectionViewDataSource, UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, ZLPhotoPickerBrowserViewControllerDataSource, ZLPhotoPickerBrowserViewControllerDelegate>

‎CodingForiPad/ViewController/Project/TopicContentCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define kTopicContentCell_ColorTitle [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0]
2424
#define kTopicContentCell_ColorContent [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:1.0]
2525

26-
#define kCell_Width 573
26+
#define kCell_Width kRightView_Width
2727
#define kPaddingLeftWidth 20
2828

2929
@implementation UIView (Common)

‎CodingForiPad/ViewController/Setting/COFeedbackViewCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define kTopicContentCell_ColorTitle [UIColor colorWithRed:34/255.0 green:34/255.0 blue:34/255.0 alpha:1.0]
2222
#define kTopicContentCell_ColorContent [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:1.0]
2323

24-
#define kCell_Width 573
24+
#define kCell_Width kRightView_Width
2525
#define kPaddingLeftWidth 20
2626

2727
@implementation UIView (Common)

‎CodingForiPad/ViewController/Task/TaskCommentCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#import "NSString+Common.h"
1919
#import "ZLPhoto.h"
2020

21-
#define kCell_Width 573
21+
#define kCell_Width kRightView_Width
2222

2323
#define kTaskCommentCell_FontContent [UIFont systemFontOfSize:14]
2424
#define kTaskCommentCell_LeftPading 20.0

0 commit comments

Comments
 (0)