From cba5dfa1fc4e8c73c684857757f5d6a509fc2c79 Mon Sep 17 00:00:00 2001 From: coderZsq Date: Sat, 12 Oct 2019 14:41:08 +0800 Subject: [PATCH] add --- .../tomato.imageset/Contents.json | 22 +++++ .../tomato.imageset/tomato-1.png | Bin 0 -> 3510 bytes .../tomato.imageset/tomato.png | Bin 0 -> 3510 bytes .../Base.lproj/Main.storyboard | 87 ++++++++---------- .../SQIntervalTimer/ViewController.m | 15 --- 5 files changed, 60 insertions(+), 64 deletions(-) create mode 100644 SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json create mode 100644 SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png create mode 100644 SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json new file mode 100644 index 00000000..8f5c1540 --- /dev/null +++ b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "tomato.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "tomato-1.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f25cfc07068d2a93bc5f35c660d151618ed65bc7 GIT binary patch literal 3510 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 literal 0 HcmV?d00001 diff --git a/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png b/SQIntervalTimer/SQIntervalTimer/Assets.xcassets/tomato.imageset/tomato.png new file mode 100644 index 0000000000000000000000000000000000000000..f25cfc07068d2a93bc5f35c660d151618ed65bc7 GIT binary patch literal 3510 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 literal 0 HcmV?d00001 diff --git a/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard b/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard index 04c53e44..cd44fb99 100644 --- a/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard +++ b/SQIntervalTimer/SQIntervalTimer/Base.lproj/Main.storyboard @@ -16,10 +16,7 @@ - - - - + @@ -31,48 +28,50 @@ - - - + + + + - - + - - - + + + + - - + - - - - - - - - - - - - - + - - - - @@ -201,4 +187,7 @@ + + + diff --git a/SQIntervalTimer/SQIntervalTimer/ViewController.m b/SQIntervalTimer/SQIntervalTimer/ViewController.m index 8c0775c7..3fb0629a 100644 --- a/SQIntervalTimer/SQIntervalTimer/ViewController.m +++ b/SQIntervalTimer/SQIntervalTimer/ViewController.m @@ -11,9 +11,7 @@ @interface ViewController () @property (strong, nonatomic) IBOutletCollection(UIView) NSArray *circles; @property (strong, nonatomic) IBOutletCollection(UIView) NSArray *operators; -@property (strong, nonatomic) IBOutletCollection(UILabel) NSArray *labels; @property (weak, nonatomic) IBOutlet UIPickerView *pickView; -@property (weak, nonatomic) IBOutlet UISegmentedControl *segmentedControl; @property (weak, nonatomic) IBOutlet UILabel *countDownLabel; @property (strong, nonatomic) NSMutableArray *dataSource; @property (strong, nonatomic) NSMutableArray *numbers; @@ -24,7 +22,6 @@ @implementation ViewController - (void)viewDidLoad { [super viewDidLoad]; [self initialData]; - [self configureView]; } - (void)initialData { @@ -48,12 +45,6 @@ - (void)initialData { self.numbers = @[@0, @0, @0].mutableCopy; } -- (void)configureView { - [self.segmentedControl addTarget:self action:@selector(segmentedControlValueChanged:) forControlEvents:(UIControlEventValueChanged)]; - self.segmentedControl.selectedSegmentIndex = 1; - [self segmentedControlValueChanged:self.segmentedControl]; -} - - (UIStatusBarStyle)preferredStatusBarStyle { return UIStatusBarStyleLightContent; } @@ -75,12 +66,6 @@ - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComp self.numbers[component] = self.dataSource[component][row]; } -- (void)segmentedControlValueChanged:(UISegmentedControl *)sender { - for (UILabel *label in self.labels) { - label.text = @[@"时", @"分", @"秒"][sender.selectedSegmentIndex]; - } -} - - (IBAction)operatorEventTouchUpInside:(UIButton *)sender { [self operatorsStyleToggle];