修正评估函数的BUG，以及添加屏幕尺寸缩放计算工具类。

Author: @欧柏泉

MyLayout.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "MyLayout"
-  s.version      = "1.1.3"
+  s.version      = "1.1.4"
   s.summary      = "A powerful iOS view layout library, suitable for all kinds of screen size. Don't need to learn AutoLayout and SizeClass. "
 
   s.description  = <<-DESC
@@ -79,7 +79,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.1.3" }
+  s.source       = { :git => "https://github.com/youngsoft/MyLinearLayout.git", :tag => "1.1.4" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

MyLayout.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		18014BA51C9079DA0088133B /* MyDimeScale.m in Sources */ = {isa = PBXBuildFile; fileRef = 18014BA41C9079DA0088133B /* MyDimeScale.m */; };
 		188261CF1C647CB300996C2C /* AllTest6ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188261CE1C647CB300996C2C /* AllTest6ViewController.m */; };
 		1890A22F1C6DD71600373B8B /* FLLTest2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1890A22D1C6DD71600373B8B /* FLLTest2ViewController.m */; };
 		1890A2301C6DD71600373B8B /* FLLTest2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1890A22E1C6DD71600373B8B /* FLLTest2ViewController.xib */; };
@@ -61,6 +62,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		18014BA31C9079DA0088133B /* MyDimeScale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyDimeScale.h; sourceTree = "<group>"; };
+		18014BA41C9079DA0088133B /* MyDimeScale.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyDimeScale.m; sourceTree = "<group>"; };
 		1840828D1B2C46E8003F378B /* MyLayout.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MyLayout.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		184082A61B2C46E8003F378B /* MyLayout.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MyLayout.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		188261CD1C647CB300996C2C /* AllTest6ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllTest6ViewController.h; sourceTree = "<group>"; };
@@ -273,6 +276,8 @@
 				46D45B151C525FC400A8362C /* MyLayoutSizeClass.m */,
 				18D684081C4F421400A48BB4 /* MyLayoutMeasure.h */,
 				18D684091C4F421400A48BB4 /* MyLayoutMeasure.m */,
+				18014BA31C9079DA0088133B /* MyDimeScale.h */,
+				18014BA41C9079DA0088133B /* MyDimeScale.m */,
 				18D6840F1C4F421400A48BB4 /* MyMaker.h */,
 				18D684101C4F421400A48BB4 /* MyMaker.m */,
 			);
@@ -424,6 +429,7 @@
 				18D684411C4F421400A48BB4 /* MyLinearLayout.m in Sources */,
 				18D6844A1C4F421400A48BB4 /* LLTest6ViewController.m in Sources */,
 				18D684341C4F421400A48BB4 /* AppDelegate.m in Sources */,
+				18014BA51C9079DA0088133B /* MyDimeScale.m in Sources */,
 				18D684381C4F421400A48BB4 /* FLTest2ViewController.m in Sources */,
 				18D6844D1C4F421400A48BB4 /* RLTest1ViewController.m in Sources */,
 				18D684501C4F421400A48BB4 /* TLTest1ViewController.m in Sources */,

MyLayout/Lib/MyBaseLayout.h

@@ -53,6 +53,7 @@
 @property(nonatomic, assign) IBInspectable CGFloat myTopMargin;
 @property(nonatomic, assign) IBInspectable CGFloat myRightMargin;
 @property(nonatomic, assign) IBInspectable CGFloat myBottomMargin;
+@property(nonatomic, assign) IBInspectable CGFloat myMargin;      //前面四个简易设置。
 
 //如果您要使用下面的方法请定义MY_USEOLDMETHODDEF这个宏，如果想用老的方法不告警则定义MY_USEOLDMETHODNOWARNING这个宏
 #ifdef MY_USEOLDMETHODDEF

MyLayout/Lib/MyBaseLayout.m

@@ -141,7 +141,18 @@ -(void)setMyBottomMargin:(CGFloat)bottomMargin
     self.bottomPos.equalTo(@(bottomMargin));
 }
 
+-(CGFloat)myMargin
+{
+    return self.leftPos.margin;
+}
 
+-(void)setMyMargin:(CGFloat)myMargin
+{
+    self.topPos.equalTo(@(myMargin));
+    self.leftPos.equalTo(@(myMargin));
+    self.rightPos.equalTo(@(myMargin));
+    self.bottomPos.equalTo(@(myMargin));
+}
 
 -(MyLayoutDime*)widthDime
 {
@@ -979,13 +990,17 @@ -(CGRect)estimateLayoutRect:(CGSize)size inSizeClass:(MySizeClass)sizeClass
     if (!hasSubLayout)
         rect = self.absPos.frame;
     else
+    {
         rect = [self calcLayoutRect:CGSizeZero isEstimate:YES pHasSubLayout:&hasSubLayout sizeClass:sizeClass];
+        self.absPos.frame = rect;
+    }
 
 
     //计算后还原为默认sizeClass
     for (UIView *sbv in self.subviews)
     {
         sbv.absPos.sizeClass = self.myDefaultSizeClass;
+        
     }
     self.absPos.sizeClass = self.myDefaultSizeClass;
 

MyLayout/Lib/MyDimeScale.h

@@ -0,0 +1,31 @@
+//
+//  MyDimeScale.h
+//  MyLayout
+//
+//  Created by apple on 16/2/23.
+//  Copyright (c) 2015年 欧阳大哥. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+/**一个简单的用于计算不同屏幕的伸缩尺寸的辅助类，用于实现不同大小屏幕之间的位置和尺寸的适配**/
+@interface MyDimeScale : NSObject
+
+//请在- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions函数中
+//设置你的UI设计人员设计的图片的尺寸的点数，如果用iPhone6的设备制作的UI图则size设置为375,667
++(void)setUITemplateSize:(CGSize)size;
+
+
++(CGFloat)scale:(CGFloat)val;  //返回对角线缩放的比例
+
++(CGFloat)scaleW:(CGFloat)val;  //返回宽度缩放的比例
+
++(CGFloat)scaleH:(CGFloat)val;  //返回高度缩放的比例
+
+@end
+
+
+#define MYDIMESCALE(val)   ([MyDimeScale scale:val])
+#define MYDIMESCALEW(val)  ([MyDimeScale scaleW:val])
+#define MYDIMESCALEH(val)  ([MyDimeScale scaleH:val])

MyLayout/Lib/MyDimeScale.m

@@ -0,0 +1,44 @@
+//
+//  MyDimeScale.m
+//  MyLayout
+//
+//  Created by apple on 16/2/23.
+//  Copyright (c) 2015年 欧阳大哥. All rights reserved.
+//
+
+#import "MyDimeScale.h"
+
+@implementation MyDimeScale
+
+CGFloat _rate = 1;
+CGFloat _wrate = 1;
+CGFloat _hrate = 1;
+
+
++(void)setUITemplateSize:(CGSize)size
+{
+    CGSize screenSize = [UIScreen mainScreen].bounds.size;
+    
+    _wrate = screenSize.width / size.width;
+    _hrate = screenSize.height / size.height;
+    _rate = sqrt((screenSize.width * screenSize.width + screenSize.height * screenSize.height) / (size.width * size.width + size.height * size.height));
+}
+
++(CGFloat)scale:(CGFloat)val
+{
+    return val * _rate;
+}
+
++(CGFloat)scaleW:(CGFloat)val
+{
+    return val * _wrate;
+}
+
++(CGFloat)scaleH:(CGFloat)val
+{
+    return  val * _hrate;
+}
+
+
+
+@end

MyLayout/Lib/MyLayout.h

@@ -36,6 +36,7 @@
 #define MyLayout_MyLayout_h
 
 #import "MyLayoutDef.h"
+#import "MyDimeScale.h"
 #import "MyLayoutPos.h"
 #import "MyLayoutDime.h"
 #import "MyLinearLayout.h"

MyLayout/Lib/MyLayoutSizeClass.h

@@ -118,6 +118,7 @@ typedef enum : unsigned char{
 @property(nonatomic, assign) CGFloat myTopMargin;
 @property(nonatomic, assign) CGFloat myRightMargin;
 @property(nonatomic, assign) CGFloat myBottomMargin;
+@property(nonatomic, assign) CGFloat myMargin;
 @property(nonatomic, assign) CGFloat myCenterXOffset;
 @property(nonatomic, assign) CGFloat myCenterYOffset;
 @property(nonatomic, assign) CGPoint myCenterOffset;

MyLayout/Lib/MyLayoutSizeClass.m

@@ -129,6 +129,19 @@ -(void)setMyBottomMargin:(CGFloat)bottomMargin
     self.bottomPos.equalTo(@(bottomMargin));
 }
 
+-(CGFloat)myMargin
+{
+    return self.leftPos.margin;
+}
+
+-(void)setMyMargin:(CGFloat)myMargin
+{
+    self.topPos.equalTo(@(myMargin));
+    self.leftPos.equalTo(@(myMargin));
+    self.rightPos.equalTo(@(myMargin));
+    self.bottomPos.equalTo(@(myMargin));
+}
+
 
 -(CGFloat)myCenterXOffset
 {

README.md

@@ -1,4 +1,4 @@
-# MyLayout1.1.3
+# MyLayout1.1.4
 
 ##  新版本注意
    为了防止命名冲突，以及命名的规范，1.1.1版本对一些方法进行了重命名，以及枚举值重新命名，请浏览最下面的如何解决命名冲突和报警的问题。
@@ -63,6 +63,12 @@ Then, run the following command:
 $ pod install
 ```
 
+## V1.1.4版本新功能
+1.	 修正了尺寸评估函数`estimateLayoutRect`的一个多层嵌套是无法正确评估尺寸的BUG。
+2.	 添加了属性`myMargin`用来简单快速的设置myLeftMarign,myTopMargin,myRightMargin,myBottomMargin都是相等的值。
+3.	 增加了`MyDimeScale`这个工具类，用来实现不同屏幕的尺寸和位置的缩放的功能，加入我们的UI给我们的是iPhone6的设计图，并指定了某个视图的高度为100但又同时希望在iPhone5上高度缩小，而在iPhone6Plus上高度增加，则可以通过`[MyDimeScale scale:100]`得到各种屏幕的缩放后的值了。
+
+
 ## V1.1.3版本新功能
 1.  对SizeClass支持和竖屏MySizeClass_Portrait和横屏MySizeClass_Landscape。以便支持单独的横屏和竖屏的界面适配，尤其是对iPad设备的横竖屏进行区分适配。