Skip to content

Commit 250700d

Browse files
gsdiosgsdios
committed
调整
1 parent b4c0b03 commit 250700d

File tree

6 files changed

+20
-23
lines changed

6 files changed

+20
-23
lines changed

‎SDAutoLayoutDemo.xcodeproj/project.pbxproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
48EB73451C749212003A818E /* Home.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 48EB73441C749212003A818E /* Home.xcassets */; };
126126
48EEAD6C1C9C25F4001138FE /* DemoVC12.m in Sources */ = {isa = PBXBuildFile; fileRef = 48EEAD6B1C9C25F4001138FE /* DemoVC12.m */; };
127127
48EEAD701C9C3006001138FE /* DemoVC13.m in Sources */ = {isa = PBXBuildFile; fileRef = 48EEAD6F1C9C3006001138FE /* DemoVC13.m */; };
128+
48F4867E1D1010BA003B7418 /* LEETheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 48F4867D1D1010BA003B7418 /* LEETheme.m */; };
128129
48FC0E161C4FB3A8004098B8 /* Ads.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FC0E041C4FB3A8004098B8 /* Ads.m */; };
129130
48FC0E171C4FB3A8004098B8 /* Editor.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FC0E061C4FB3A8004098B8 /* Editor.m */; };
130131
48FC0E181C4FB3A8004098B8 /* Imgextra.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FC0E081C4FB3A8004098B8 /* Imgextra.m */; };
@@ -214,7 +215,6 @@
214215
99D694F01C8C567A00DA97E1 /* SDBaseTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 99D694ED1C8C567A00DA97E1 /* SDBaseTableViewController.m */; };
215216
99D694F21C8C585300DA97E1 /* Discover.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 99D694F11C8C585200DA97E1 /* Discover.xcassets */; };
216217
99D694F81C8C7F7600DA97E1 /* SDTimeLineRefreshFooter.m in Sources */ = {isa = PBXBuildFile; fileRef = 99D694F71C8C7F7600DA97E1 /* SDTimeLineRefreshFooter.m */; };
217-
9B3AEBEB1D0EA69500B90F77 /* LEETheme.m in Sources */ = {isa = PBXBuildFile; fileRef = 9B3AEBEA1D0EA69500B90F77 /* LEETheme.m */; };
218218
9BF7727A1D080DF700460B6E /* theme_day_json.json in Resources */ = {isa = PBXBuildFile; fileRef = 9BF772781D080DF700460B6E /* theme_day_json.json */; };
219219
9BF7727B1D080DF700460B6E /* theme_night_json.json in Resources */ = {isa = PBXBuildFile; fileRef = 9BF772791D080DF700460B6E /* theme_night_json.json */; };
220220
/* End PBXBuildFile section */
@@ -417,6 +417,8 @@
417417
48EEAD6B1C9C25F4001138FE /* DemoVC12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoVC12.m; sourceTree = "<group>"; };
418418
48EEAD6E1C9C3006001138FE /* DemoVC13.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoVC13.h; sourceTree = "<group>"; };
419419
48EEAD6F1C9C3006001138FE /* DemoVC13.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoVC13.m; sourceTree = "<group>"; };
420+
48F4867C1D1010BA003B7418 /* LEETheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEETheme.h; sourceTree = "<group>"; };
421+
48F4867D1D1010BA003B7418 /* LEETheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LEETheme.m; sourceTree = "<group>"; };
420422
48FC0E031C4FB3A8004098B8 /* Ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Ads.h; sourceTree = "<group>"; };
421423
48FC0E041C4FB3A8004098B8 /* Ads.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Ads.m; sourceTree = "<group>"; };
422424
48FC0E051C4FB3A8004098B8 /* Editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
@@ -594,8 +596,6 @@
594596
99D694F11C8C585200DA97E1 /* Discover.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Discover.xcassets; sourceTree = "<group>"; };
595597
99D694F61C8C7F7600DA97E1 /* SDTimeLineRefreshFooter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDTimeLineRefreshFooter.h; sourceTree = "<group>"; };
596598
99D694F71C8C7F7600DA97E1 /* SDTimeLineRefreshFooter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDTimeLineRefreshFooter.m; sourceTree = "<group>"; };
597-
9B3AEBE91D0EA69500B90F77 /* LEETheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LEETheme.h; sourceTree = "<group>"; };
598-
9B3AEBEA1D0EA69500B90F77 /* LEETheme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LEETheme.m; sourceTree = "<group>"; };
599599
9BF772781D080DF700460B6E /* theme_day_json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = theme_day_json.json; sourceTree = "<group>"; };
600600
9BF772791D080DF700460B6E /* theme_night_json.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = theme_night_json.json; sourceTree = "<group>"; };
601601
/* End PBXFileReference section */
@@ -635,6 +635,7 @@
635635
485302961C3F648F004361A7 /* Vender */ = {
636636
isa = PBXGroup;
637637
children = (
638+
48F4867B1D1010BA003B7418 /* LEETheme */,
638639
48EB72F31C748DF5003A818E /* MLEmojiLabel */,
639640
485302E41C3F65EE004361A7 /* SDCycleScrollView */,
640641
485302971C3F648F004361A7 /* SDPhotoBrowser */,
@@ -905,7 +906,6 @@
905906
487D3EB31BCB9EC700A66173 /* SDAutoLayoutDemo */ = {
906907
isa = PBXGroup;
907908
children = (
908-
9BF772621D07D45000460B6E /* LEETheme */,
909909
99A6976F1C423B0D004EA699 /* SDAutoLayout */,
910910
485303491C3F97AA004361A7 /* Others */,
911911
485303021C3F977A004361A7 /* DemoVC */,
@@ -1114,6 +1114,15 @@
11141114
path = DemoVC13;
11151115
sourceTree = "<group>";
11161116
};
1117+
48F4867B1D1010BA003B7418 /* LEETheme */ = {
1118+
isa = PBXGroup;
1119+
children = (
1120+
48F4867C1D1010BA003B7418 /* LEETheme.h */,
1121+
48F4867D1D1010BA003B7418 /* LEETheme.m */,
1122+
);
1123+
path = LEETheme;
1124+
sourceTree = "<group>";
1125+
};
11171126
48FC0E011C4FB399004098B8 /* DemoVC10 */ = {
11181127
isa = PBXGroup;
11191128
children = (
@@ -1582,15 +1591,6 @@
15821591
path = BaseRefreshView;
15831592
sourceTree = "<group>";
15841593
};
1585-
9BF772621D07D45000460B6E /* LEETheme */ = {
1586-
isa = PBXGroup;
1587-
children = (
1588-
9B3AEBE91D0EA69500B90F77 /* LEETheme.h */,
1589-
9B3AEBEA1D0EA69500B90F77 /* LEETheme.m */,
1590-
);
1591-
path = LEETheme;
1592-
sourceTree = "<group>";
1593-
};
15941594
9BF772771D080DF700460B6E /* Theme */ = {
15951595
isa = PBXGroup;
15961596
children = (
@@ -1649,7 +1649,7 @@
16491649
TargetAttributes = {
16501650
487D3EB01BCB9EC700A66173 = {
16511651
CreatedOnToolsVersion = 6.4;
1652-
DevelopmentTeam = QCC328325S;
1652+
DevelopmentTeam = V4Q779DR3D;
16531653
};
16541654
487D3EC91BCB9EC700A66173 = {
16551655
CreatedOnToolsVersion = 6.4;
@@ -1801,7 +1801,6 @@
18011801
48FC0EBD1C4FB60A004098B8 /* MJRefreshBackNormalFooter.m in Sources */,
18021802
48FC0EAD1C4FB60A004098B8 /* MJPropertyType.m in Sources */,
18031803
485302E11C3F6490004361A7 /* UIImageView+HighlightedWebCache.m in Sources */,
1804-
9B3AEBEB1D0EA69500B90F77 /* LEETheme.m in Sources */,
18051804
485303401C3F977A004361A7 /* DemoVC7Cell.m in Sources */,
18061805
99D694B51C8C54D000DA97E1 /* SDTimeLineCellModel.m in Sources */,
18071806
48EEAD701C9C3006001138FE /* DemoVC13.m in Sources */,
@@ -1861,6 +1860,7 @@
18611860
4808F3941CE4ABFB00242779 /* DemoVC14.m in Sources */,
18621861
48FC0EA51C4FB60A004098B8 /* UIProgressView+AFNetworking.m in Sources */,
18631862
99D694D91C8C553500DA97E1 /* NSMutableAttributedString+MLLabel.m in Sources */,
1863+
48F4867E1D1010BA003B7418 /* LEETheme.m in Sources */,
18641864
48FC0EC51C4FB60A004098B8 /* UIScrollView+MJRefresh.m in Sources */,
18651865
485303511C3F97AA004361A7 /* DemoTableViewControler.m in Sources */,
18661866
48FC0ECB1C4FB7CA004098B8 /* XYString.m in Sources */,

‎SDAutoLayoutDemo.xcodeproj/project.xcworkspace/xcuserdata/gsd.xcuserdatad/UserInterfaceState.xcuserstate‎

609 Bytes
Binary file not shown.

‎SDAutoLayoutDemo/DemoVC/DemoVC9/DemoVC9.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ - (void)viewDidLoad
113113
headerView.frame = CGRectMake(0, 0, 0, 260);
114114
self.tableView.tableHeaderView = headerView;
115115

116-
// self.tableView.separatorColor = [[UIColor grayColor] colorWithAlphaComponent:0.2f];
117-
118116
//添加分隔线颜色设置
119117

120118
self.tableView.lee_theme
@@ -214,11 +212,8 @@ - (void)rightBarButtonItemAction:(UIBarButtonItem *)sender{
214212
[LEETheme startTheme:NIGHT];
215213

216214
} else {
217-
218215
[LEETheme startTheme:DAY];
219-
220216
}
221-
222217
}
223218

224219
- (NSArray *)creatModelsWithCount:(NSInteger)count
@@ -377,7 +372,6 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
377372

378373

379374

380-
381375
- (CGFloat)cellContentViewWith
382376
{
383377
CGFloat width = [UIScreen mainScreen].bounds.size.width;

‎SDAutoLayoutDemo/SDAutoLayout/UIView+SDAutoLayout.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,9 @@ - (void)layoutBottomWithView:(UIView *)view model:(SDAutoLayoutModel *)model
14241424
view.bottom_sd = model.equalBottom.refView.bottom_sd + model.equalBottom.offset;
14251425
}
14261426
}
1427+
if (model.widthEqualHeight && !view.fixedHeight) {
1428+
[self layoutRightWithView:view model:model];
1429+
}
14271430
}
14281431

14291432

@@ -1560,10 +1563,10 @@ - (void)setWidth_sd:(CGFloat)width_sd {
15601563
if (self.ownLayoutModel.widthEqualHeight) {
15611564
if (width_sd != self.height_sd) return;
15621565
}
1566+
[self setWidth:width_sd];
15631567
if (self.ownLayoutModel.heightEqualWidth) {
15641568
self.height_sd = width_sd;
15651569
}
1566-
[self setWidth:width_sd];
15671570
}
15681571

15691572
- (CGFloat)height_sd {
@@ -1574,10 +1577,10 @@ - (void)setHeight_sd:(CGFloat)height_sd {
15741577
if (self.ownLayoutModel.heightEqualWidth) {
15751578
if (height_sd != self.width_sd) return;
15761579
}
1580+
[self setHeight:height_sd];
15771581
if (self.ownLayoutModel.widthEqualHeight) {
15781582
self.width_sd = height_sd;
15791583
}
1580-
[self setHeight:height_sd];
15811584
}
15821585

15831586
- (CGPoint)origin_sd {

‎SDAutoLayoutDemo/LEETheme/LEETheme.h‎ renamed to ‎SDAutoLayoutDemo/Vender/LEETheme/LEETheme.h‎

File renamed without changes.

‎SDAutoLayoutDemo/LEETheme/LEETheme.m‎ renamed to ‎SDAutoLayoutDemo/Vender/LEETheme/LEETheme.m‎

File renamed without changes.

0 commit comments

Comments
 (0)