diff --git a/SQFitnessProgram/contents/01.gif b/SQFitnessProgram/contents/01.gif index a3e53494..d8c948a5 100644 Binary files a/SQFitnessProgram/contents/01.gif and b/SQFitnessProgram/contents/01.gif differ diff --git a/SQFitnessProgram/contents/02.gif b/SQFitnessProgram/contents/02.gif index 89e7ebfb..2b8a7d1c 100644 Binary files a/SQFitnessProgram/contents/02.gif and b/SQFitnessProgram/contents/02.gif differ diff --git a/SQLifestyle/contents/img1.gif b/SQLifestyle/contents/img1.gif index dc7a1ee4..d1814032 100644 Binary files a/SQLifestyle/contents/img1.gif and b/SQLifestyle/contents/img1.gif differ diff --git a/SQLifestyle/contents/img2.gif b/SQLifestyle/contents/img2.gif index eb980b88..a78d0f4e 100644 Binary files a/SQLifestyle/contents/img2.gif and b/SQLifestyle/contents/img2.gif differ diff --git a/SQMagnet/SQMagnet-01.JPG b/SQMagnet/SQMagnet-01.JPG index 5c58622c..a0f21089 100644 Binary files a/SQMagnet/SQMagnet-01.JPG and b/SQMagnet/SQMagnet-01.JPG differ diff --git a/SQMagnet/SQMagnet-02.JPG b/SQMagnet/SQMagnet-02.JPG index fb84efa3..692b1458 100644 Binary files a/SQMagnet/SQMagnet-02.JPG and b/SQMagnet/SQMagnet-02.JPG differ diff --git a/SQMagnet/SQMagnet-03.JPG b/SQMagnet/SQMagnet-03.JPG index 6f7ad369..bc44f638 100644 Binary files a/SQMagnet/SQMagnet-03.JPG and b/SQMagnet/SQMagnet-03.JPG differ diff --git a/SQMagnet/SQMagnet-04.JPG b/SQMagnet/SQMagnet-04.JPG index 10657c7e..7f03789f 100644 Binary files a/SQMagnet/SQMagnet-04.JPG and b/SQMagnet/SQMagnet-04.JPG differ diff --git a/SQMagnet/contents/01.gif b/SQMagnet/contents/01.gif index 94e8e9e9..eb31ae38 100644 Binary files a/SQMagnet/contents/01.gif and b/SQMagnet/contents/01.gif differ diff --git a/SQMagnet/contents/02.gif b/SQMagnet/contents/02.gif index 4522f1ef..c0d7cd54 100644 Binary files a/SQMagnet/contents/02.gif and b/SQMagnet/contents/02.gif differ diff --git a/SQMagnet/contents/alipay.JPG b/SQMagnet/contents/alipay.JPG index 8be8185e..510feba1 100644 Binary files a/SQMagnet/contents/alipay.JPG and b/SQMagnet/contents/alipay.JPG differ diff --git a/SQMagnet/contents/wechat.JPG b/SQMagnet/contents/wechat.JPG index acb83c0d..ada65418 100644 Binary files a/SQMagnet/contents/wechat.JPG and b/SQMagnet/contents/wechat.JPG differ diff --git a/SQManagement/SQManagement.xcodeproj/project.pbxproj b/SQManagement/SQManagement.xcodeproj/project.pbxproj index bd18cfcd..b932dbb3 100644 --- a/SQManagement/SQManagement.xcodeproj/project.pbxproj +++ b/SQManagement/SQManagement.xcodeproj/project.pbxproj @@ -9,6 +9,9 @@ /* Begin PBXBuildFile section */ 14040349233F887300D0BC12 /* SQTabBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 14040347233F887200D0BC12 /* SQTabBarController.m */; }; 1404034A233F887300D0BC12 /* SQTabbarControllerAnimatedTransitioning.m in Sources */ = {isa = PBXBuildFile; fileRef = 14040348233F887200D0BC12 /* SQTabbarControllerAnimatedTransitioning.m */; }; + 140BBD162340550F0077E130 /* SQProjectTimeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 140BBD152340550F0077E130 /* SQProjectTimeViewController.m */; }; + 140BBD19234059E30077E130 /* SQProjectTimeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 140BBD18234059E30077E130 /* SQProjectTimeView.m */; }; + 140BBD1B23405A390077E130 /* SQProjectTimeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 140BBD1A23405A390077E130 /* SQProjectTimeView.xib */; }; 14233205233F923700D4FA3B /* SQConnectionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 14233204233F923700D4FA3B /* SQConnectionModel.m */; }; 142787F3233CB4AB0000FEBB /* SQTimeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 142787F2233CB4AB0000FEBB /* SQTimeViewController.m */; }; 142787F6233CBC1F0000FEBB /* SQEnergyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 142787F5233CBC1F0000FEBB /* SQEnergyViewController.m */; }; @@ -45,6 +48,11 @@ 14040346233F887200D0BC12 /* SQTabbarControllerAnimatedTransitioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQTabbarControllerAnimatedTransitioning.h; sourceTree = ""; }; 14040347233F887200D0BC12 /* SQTabBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQTabBarController.m; sourceTree = ""; }; 14040348233F887200D0BC12 /* SQTabbarControllerAnimatedTransitioning.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQTabbarControllerAnimatedTransitioning.m; sourceTree = ""; }; + 140BBD142340550F0077E130 /* SQProjectTimeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQProjectTimeViewController.h; sourceTree = ""; }; + 140BBD152340550F0077E130 /* SQProjectTimeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SQProjectTimeViewController.m; sourceTree = ""; }; + 140BBD17234059E30077E130 /* SQProjectTimeView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQProjectTimeView.h; sourceTree = ""; }; + 140BBD18234059E30077E130 /* SQProjectTimeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SQProjectTimeView.m; sourceTree = ""; }; + 140BBD1A23405A390077E130 /* SQProjectTimeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SQProjectTimeView.xib; sourceTree = ""; }; 14233203233F923700D4FA3B /* SQConnectionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQConnectionModel.h; sourceTree = ""; }; 14233204233F923700D4FA3B /* SQConnectionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SQConnectionModel.m; sourceTree = ""; }; 142787F1233CB4AB0000FEBB /* SQTimeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SQTimeViewController.h; sourceTree = ""; }; @@ -144,6 +152,9 @@ 149AC88B2339C146009C88AB /* SQConnectionPropertyCell.h */, 149AC88C2339C146009C88AB /* SQConnectionPropertyCell.m */, 149AC88D2339C146009C88AB /* SQConnectionPropertyCell.xib */, + 140BBD17234059E30077E130 /* SQProjectTimeView.h */, + 140BBD18234059E30077E130 /* SQProjectTimeView.m */, + 140BBD1A23405A390077E130 /* SQProjectTimeView.xib */, ); path = Coms; sourceTree = ""; @@ -189,6 +200,8 @@ children = ( 142787F1233CB4AB0000FEBB /* SQTimeViewController.h */, 142787F2233CB4AB0000FEBB /* SQTimeViewController.m */, + 140BBD142340550F0077E130 /* SQProjectTimeViewController.h */, + 140BBD152340550F0077E130 /* SQProjectTimeViewController.m */, 142787F4233CBC1F0000FEBB /* SQEnergyViewController.h */, 142787F5233CBC1F0000FEBB /* SQEnergyViewController.m */, 14DC37CD23374DC600867A92 /* SQConnectionsViewController.h */, @@ -314,6 +327,7 @@ 149AC8992339F7D4009C88AB /* SQSearchInputView.xib in Resources */, 14DC37CB23374CFB00867A92 /* SQH1TitleView.xib in Resources */, 14E97DD82335014C004FC20D /* LaunchScreen.storyboard in Resources */, + 140BBD1B23405A390077E130 /* SQProjectTimeView.xib in Resources */, 14E97DD52335014C004FC20D /* Assets.xcassets in Resources */, 14E97DD02335014B004FC20D /* Main.storyboard in Resources */, 149AC88A2339BEF1009C88AB /* SQProfileHeaderView.xib in Resources */, @@ -354,6 +368,7 @@ buildActionMask = 2147483647; files = ( 14DC37E123374FA500867A92 /* UIView+SQExtension.m in Sources */, + 140BBD162340550F0077E130 /* SQProjectTimeViewController.m in Sources */, 14E97DDB2335014C004FC20D /* main.m in Sources */, 14DC37E323374FA500867A92 /* UIColor+SQExtension.m in Sources */, 14DC37E72337509E00867A92 /* SQNavigationController.m in Sources */, @@ -369,6 +384,7 @@ 142787F6233CBC1F0000FEBB /* SQEnergyViewController.m in Sources */, 142787F3233CB4AB0000FEBB /* SQTimeViewController.m in Sources */, 149AC8882339BEE6009C88AB /* SQProfileHeaderView.m in Sources */, + 140BBD19234059E30077E130 /* SQProjectTimeView.m in Sources */, 14DC37E023374FA500867A92 /* NSObject+SQExtension.m in Sources */, 1404034A233F887300D0BC12 /* SQTabbarControllerAnimatedTransitioning.m in Sources */, 14DC37CF23374DC600867A92 /* SQConnectionsViewController.m in Sources */, diff --git a/SQManagement/SQManagement/Base.lproj/Main.storyboard b/SQManagement/SQManagement/Base.lproj/Main.storyboard index d490e597..3dc95c67 100644 --- a/SQManagement/SQManagement/Base.lproj/Main.storyboard +++ b/SQManagement/SQManagement/Base.lproj/Main.storyboard @@ -3,6 +3,7 @@ + @@ -31,11 +32,11 @@ - + - + @@ -112,7 +113,9 @@ - + + + @@ -137,11 +140,11 @@ - + - + @@ -163,23 +166,28 @@ - - + + + + + + + - + - + @@ -194,5 +202,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SQManagement/SQManagement/Coms/SQProjectTimeView.h b/SQManagement/SQManagement/Coms/SQProjectTimeView.h new file mode 100644 index 00000000..688b1ff7 --- /dev/null +++ b/SQManagement/SQManagement/Coms/SQProjectTimeView.h @@ -0,0 +1,17 @@ +// +// SQProjectTimeView.h +// SQManagement +// +// Created by 朱双泉 on 2019/9/29. +// Copyright © 2019 Castie!. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface SQProjectTimeView : UIView + +@end + +NS_ASSUME_NONNULL_END diff --git a/SQManagement/SQManagement/Coms/SQProjectTimeView.m b/SQManagement/SQManagement/Coms/SQProjectTimeView.m new file mode 100644 index 00000000..6da7dd44 --- /dev/null +++ b/SQManagement/SQManagement/Coms/SQProjectTimeView.m @@ -0,0 +1,21 @@ +// +// SQProjectTimeView.m +// SQManagement +// +// Created by 朱双泉 on 2019/9/29. +// Copyright © 2019 Castie!. All rights reserved. +// + +#import "SQProjectTimeView.h" + +@implementation SQProjectTimeView + +/* +// Only override drawRect: if you perform custom drawing. +// An empty implementation adversely affects performance during animation. +- (void)drawRect:(CGRect)rect { + // Drawing code +} +*/ + +@end diff --git a/SQManagement/SQManagement/Coms/SQProjectTimeView.xib b/SQManagement/SQManagement/Coms/SQProjectTimeView.xib new file mode 100644 index 00000000..f5f7391d --- /dev/null +++ b/SQManagement/SQManagement/Coms/SQProjectTimeView.xib @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/SQManagement/SQManagement/Coms/SQSearchInputView.xib b/SQManagement/SQManagement/Coms/SQSearchInputView.xib index e83db9ef..c31cd57f 100644 --- a/SQManagement/SQManagement/Coms/SQSearchInputView.xib +++ b/SQManagement/SQManagement/Coms/SQSearchInputView.xib @@ -2,7 +2,6 @@ - @@ -14,7 +13,7 @@ - + diff --git a/SQManagement/SQManagement/UI/SQEnergyViewController.m b/SQManagement/SQManagement/UI/SQEnergyViewController.m index 1717bc0b..ef6cd895 100644 --- a/SQManagement/SQManagement/UI/SQEnergyViewController.m +++ b/SQManagement/SQManagement/UI/SQEnergyViewController.m @@ -7,6 +7,8 @@ // #import "SQEnergyViewController.h" +#import "SQH1TitleView.h" +#import "SQSearchInputView.h" @interface SQEnergyViewController () @@ -19,4 +21,36 @@ - (void)viewDidLoad { self.title = @"精力"; } +- (BOOL)isShowNavigationShadowImage { + return NO; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 2; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + if (section == 0) return 0; + else return 20; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell= [tableView dequeueReusableCellWithIdentifier:@"cell"]; + if (!cell) { + cell = [[UITableViewCell alloc] initWithStyle:(UITableViewCellStyleDefault) reuseIdentifier:@"cell"]; + } + cell.textLabel.text = [NSString stringWithFormat:@"%li", indexPath.row]; + return cell; +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + if (section == 0) return [SQH1TitleView viewWithTitle:self.title]; + else return [SQSearchInputView inputView]; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + if (section == 0) return 64; + return 44; +} + @end diff --git a/SQManagement/SQManagement/UI/SQProjectTimeViewController.h b/SQManagement/SQManagement/UI/SQProjectTimeViewController.h new file mode 100644 index 00000000..17e98cd3 --- /dev/null +++ b/SQManagement/SQManagement/UI/SQProjectTimeViewController.h @@ -0,0 +1,17 @@ +// +// SQProjectTimeViewController.h +// SQManagement +// +// Created by 朱双泉 on 2019/9/29. +// Copyright © 2019 Castie!. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface SQProjectTimeViewController : UIViewController + +@end + +NS_ASSUME_NONNULL_END diff --git a/SQManagement/SQManagement/UI/SQProjectTimeViewController.m b/SQManagement/SQManagement/UI/SQProjectTimeViewController.m new file mode 100644 index 00000000..9acb8940 --- /dev/null +++ b/SQManagement/SQManagement/UI/SQProjectTimeViewController.m @@ -0,0 +1,32 @@ +// +// SQProjectTimeViewController.m +// SQManagement +// +// Created by 朱双泉 on 2019/9/29. +// Copyright © 2019 Castie!. All rights reserved. +// + +#import "SQProjectTimeViewController.h" + +@interface SQProjectTimeViewController () + +@end + +@implementation SQProjectTimeViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + self.title = @"新增项目"; +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/SQManagement/SQManagement/UI/SQTimeViewController.m b/SQManagement/SQManagement/UI/SQTimeViewController.m index 87667c33..4eac1999 100644 --- a/SQManagement/SQManagement/UI/SQTimeViewController.m +++ b/SQManagement/SQManagement/UI/SQTimeViewController.m @@ -7,6 +7,9 @@ // #import "SQTimeViewController.h" +#import "SQH1TitleView.h" +#import "SQSearchInputView.h" +#import "SQProjectTimeViewController.h" @interface SQTimeViewController () @end @@ -18,4 +21,41 @@ - (void)viewDidLoad { self.title = @"时间"; } +- (BOOL)isShowNavigationShadowImage { + return NO; +} + +- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { + return 2; +} + +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + if (section == 0) return 0; + else return 20; +} + +- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + UITableViewCell *cell= [tableView dequeueReusableCellWithIdentifier:@"cell"]; + if (!cell) { + cell = [[UITableViewCell alloc] initWithStyle:(UITableViewCellStyleDefault) reuseIdentifier:@"cell"]; + } + cell.textLabel.text = [NSString stringWithFormat:@"%li", indexPath.row]; + return cell; +} + +- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section { + if (section == 0) return [SQH1TitleView viewWithTitle:self.title]; + else return [SQSearchInputView inputView]; +} + +- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section { + if (section == 0) return 64; + return 44; +} + +- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { + [tableView deselectRowAtIndexPath:indexPath animated:YES]; + [self.navigationController pushViewController:[SQProjectTimeViewController new] animated:YES]; +} + @end diff --git a/SQPerformance/contents/Castie!.jpg b/SQPerformance/contents/Castie!.jpg index b1151d44..e6c4ca9d 100644 Binary files a/SQPerformance/contents/Castie!.jpg and b/SQPerformance/contents/Castie!.jpg differ diff --git a/SQPerformance/contents/step1.gif b/SQPerformance/contents/step1.gif index a9791388..40f25665 100644 Binary files a/SQPerformance/contents/step1.gif and b/SQPerformance/contents/step1.gif differ diff --git a/SQPerformance/contents/step2.gif b/SQPerformance/contents/step2.gif index d2fd0873..1ad4ce4c 100644 Binary files a/SQPerformance/contents/step2.gif and b/SQPerformance/contents/step2.gif differ