Răsfoiți Sursa

1.修改RedAnt Mobile Result界面,使用AutoLayout布局。

Pen Li 8 ani în urmă
părinte
comite
23b243155d

BIN
RedAnt Mobile/RedAnt Mobile.xcodeproj/project.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 17 - 14
RedAnt Mobile/RedAnt Mobile/Base.lproj/Main.storyboard

@@ -360,34 +360,37 @@
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="leading" secondItem="T1R-Fg-fPc" secondAttribute="leading" id="AE1-0B-nJw"/>
-                                            <constraint firstAttribute="trailing" secondItem="IdY-hf-Rfp" secondAttribute="trailing" id="Pgk-Vz-HOj"/>
-                                            <constraint firstAttribute="bottom" secondItem="IdY-hf-Rfp" secondAttribute="bottom" id="ReX-CE-BV9"/>
-                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="top" secondItem="T1R-Fg-fPc" secondAttribute="top" id="ma3-Fo-Xmb"/>
+                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="top" secondItem="T1R-Fg-fPc" secondAttribute="top" id="ffB-ZY-wqW"/>
+                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="leading" secondItem="T1R-Fg-fPc" secondAttribute="leading" id="fnq-P4-i3l"/>
+                                            <constraint firstAttribute="trailing" secondItem="IdY-hf-Rfp" secondAttribute="trailing" id="ilQ-7S-Ids"/>
+                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="width" secondItem="T1R-Fg-fPc" secondAttribute="width" id="uEz-7g-xYQ"/>
+                                            <constraint firstItem="IdY-hf-Rfp" firstAttribute="height" secondItem="T1R-Fg-fPc" secondAttribute="height" id="xqW-vV-smQ"/>
                                         </constraints>
                                     </view>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="top" secondItem="wBM-b0-JRO" secondAttribute="top" id="Bfi-Z7-Q3B"/>
-                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="centerX" secondItem="wBM-b0-JRO" secondAttribute="centerX" id="KDG-ZZ-2Br"/>
-                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="centerY" secondItem="wBM-b0-JRO" secondAttribute="centerY" id="OGq-h8-bLC"/>
-                                    <constraint firstAttribute="trailing" secondItem="T1R-Fg-fPc" secondAttribute="trailing" id="bDd-32-hxn"/>
-                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="leading" secondItem="wBM-b0-JRO" secondAttribute="leading" id="fsB-yd-suO"/>
-                                    <constraint firstAttribute="bottom" secondItem="T1R-Fg-fPc" secondAttribute="bottom" id="gWN-f9-WOl"/>
+                                    <constraint firstAttribute="bottom" secondItem="T1R-Fg-fPc" secondAttribute="bottom" id="IVr-s6-Zox"/>
+                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="width" secondItem="wBM-b0-JRO" secondAttribute="width" id="Mfg-Vj-d9e"/>
+                                    <constraint firstAttribute="trailing" secondItem="T1R-Fg-fPc" secondAttribute="trailing" id="R38-oj-vRo"/>
+                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="top" secondItem="wBM-b0-JRO" secondAttribute="top" id="ftU-0Y-p3n"/>
+                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="leading" secondItem="wBM-b0-JRO" secondAttribute="leading" id="ggp-dc-IJi"/>
+                                    <constraint firstItem="T1R-Fg-fPc" firstAttribute="height" secondItem="wBM-b0-JRO" secondAttribute="height" id="h6H-4T-JaL"/>
                                 </constraints>
                             </scrollView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstAttribute="trailing" secondItem="wBM-b0-JRO" secondAttribute="trailing" id="6sM-e4-XUU"/>
-                            <constraint firstItem="wBM-b0-JRO" firstAttribute="leading" secondItem="dFG-t0-Cuv" secondAttribute="leading" id="DOr-mq-TTJ"/>
-                            <constraint firstItem="wBM-b0-JRO" firstAttribute="top" secondItem="QN9-la-fqb" secondAttribute="bottom" id="KtP-8r-Gvw"/>
-                            <constraint firstAttribute="bottom" secondItem="wBM-b0-JRO" secondAttribute="bottom" id="Yvz-h1-Ef7"/>
+                            <constraint firstItem="wBM-b0-JRO" firstAttribute="leading" secondItem="dFG-t0-Cuv" secondAttribute="leading" id="CrH-SH-XYf"/>
+                            <constraint firstItem="wBM-b0-JRO" firstAttribute="top" secondItem="QN9-la-fqb" secondAttribute="bottom" id="K6f-HF-VmC"/>
+                            <constraint firstItem="ifv-Jz-opQ" firstAttribute="top" secondItem="wBM-b0-JRO" secondAttribute="bottom" id="RK9-9h-vfy"/>
+                            <constraint firstAttribute="trailing" secondItem="wBM-b0-JRO" secondAttribute="trailing" id="q00-pc-cPu"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="h_constraint" destination="h6H-4T-JaL" id="HAp-ey-n8l"/>
                         <outlet property="scrollview" destination="wBM-b0-JRO" id="8vF-OO-ThB"/>
                         <outlet property="tableview" destination="IdY-hf-Rfp" id="4uF-UP-C5a"/>
+                        <outlet property="w_constraint" destination="Mfg-Vj-d9e" id="WbW-SN-U1a"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wtL-wa-ubV" sceneMemberID="firstResponder"/>

+ 26 - 7
RedAnt Mobile/RedAnt Mobile/ResultViewController.m

@@ -20,6 +20,8 @@ static const int delta = 25;
 
 @property (nonatomic,assign) NSInteger offset;
 @property (nonatomic,strong) NSDictionary *params;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *w_constraint;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *h_constraint;
 
 @end
 
@@ -129,7 +131,16 @@ static const int delta = 25;
 }
 -(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
-    self.scrollview.contentSize=self.tableview.frame.size;
+    // auto resizing
+//    self.scrollview.contentSize=self.tableview.frame.size;
+    
+    // auto layout
+    int width=[self.content_layout[@"header"][@"width"] intValue];
+    if(width<self.view.frame.size.width)
+        width=self.view.frame.size.width;
+    self.w_constraint.constant = width - CGRectGetWidth(self.view.bounds);
+    self.h_constraint.constant = 0;
+    
 }
 #pragma mark - TableView DataSource
 
@@ -436,13 +447,21 @@ static const int delta = 25;
 }
 
 - (void)updateTableFrame {
-    int width=[self.content_layout[@"header"][@"width"] intValue];
-    if(width<self.tableview.frame.size.width)
-    width=self.tableview.frame.size.width;
+    // auto resizing
+//    int width=[self.content_layout[@"header"][@"width"] intValue];
+//    if(width<self.tableview.frame.size.width)
+//    width=self.tableview.frame.size.width;
+//
+//    CGRect frame = CGRectMake(self.tableview.frame.origin.x, self.tableview.frame.origin.y, width, self.tableview.frame.size.height);
+//    self.tableview.frame=frame;
+//    self.scrollview.contentSize=self.tableview.frame.size;
     
-    CGRect frame = CGRectMake(self.tableview.frame.origin.x, self.tableview.frame.origin.y, width, self.tableview.frame.size.height);
-    self.tableview.frame=frame;
-    self.scrollview.contentSize=self.tableview.frame.size;
+    // auto layout
+    int width=[self.content_layout[@"header"][@"width"] intValue];
+    if(width<self.view.frame.size.width)
+        width=self.view.frame.size.width;
+    self.w_constraint.constant = width - CGRectGetWidth(self.view.bounds);
+    self.h_constraint.constant = 0;
 }
 
 #pragma mark - RefreshDelegate