Kaydet (Commit) 3cb55e0f authored tarafından Siqi LIU's avatar Siqi LIU

retain timer running state when auto-start then didAppear

Change-Id: I4b4b327643919a9a6266f51e3e0bc8791ad27fbe
üst f499acb2
...@@ -55,7 +55,6 @@ int vibrationCount; ...@@ -55,7 +55,6 @@ int vibrationCount;
self.timeLabel = timeLabel; self.timeLabel = timeLabel;
[self setupActions]; [self setupActions];
[self clear];
return self; return self;
} }
...@@ -67,7 +66,7 @@ int vibrationCount; ...@@ -67,7 +66,7 @@ int vibrationCount;
self.timeLabel = (UILabel *)[[cell viewWithTag:9] viewWithTag:1]; self.timeLabel = (UILabel *)[[cell viewWithTag:9] viewWithTag:1];
[self setupActions]; [self setupActions];
[self clear]; // [self clear];
} }
- (void) setupActions - (void) setupActions
......
...@@ -79,8 +79,6 @@ dispatch_queue_t backgroundQueue; ...@@ -79,8 +79,6 @@ dispatch_queue_t backgroundQueue;
[self.stopWatch updateStartButtonIcon]; [self.stopWatch updateStartButtonIcon];
[self.timer updateStartButtonIcon]; [self.timer updateStartButtonIcon];
if ([self.comManager.interpreter.slideShow size] > 0) { if ([self.comManager.interpreter.slideShow size] > 0) {
[self.stopWatch updateStartButtonIcon];
[self.timer updateStartButtonIcon];
NSIndexPath *indexPath = [NSIndexPath indexPathForRow:self.slideshow.currentSlide NSIndexPath *indexPath = [NSIndexPath indexPathForRow:self.slideshow.currentSlide
inSection:1]; inSection:1];
[self.tableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone]; [self.tableView selectRowAtIndexPath:indexPath animated:NO scrollPosition:UITableViewScrollPositionNone];
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
@property (nonatomic, strong) id slideShowFinishedObserver; @property (nonatomic, strong) id slideShowFinishedObserver;
@property (nonatomic, strong) SlideShow* slideshow; @property (nonatomic, strong) SlideShow* slideshow;
@property BOOL pointerCalibrationOn;
@property CGPoint refLeftUpperGravity; @property CGPoint refLeftUpperGravity;
@property CGPoint refRightUpperGravity; @property CGPoint refRightUpperGravity;
@property CGPoint refRightLowerGravity; @property CGPoint refRightLowerGravity;
...@@ -53,20 +52,6 @@ ...@@ -53,20 +52,6 @@
#pragma mark - Pointer #pragma mark - Pointer
- (CMMotionManager *)motionManager
{
CMMotionManager *motionManager = nil;
id appDelegate = [UIApplication sharedApplication].delegate;
if ([appDelegate respondsToSelector:@selector(motionManager)]) {
motionManager = [appDelegate motionManager];
}
return motionManager;
}
// Not localized for now since this is subject to fundemental changes
- (IBAction)pointerAction:(id)sender { - (IBAction)pointerAction:(id)sender {
if ([self.touchPointerImage isHidden]){ if ([self.touchPointerImage isHidden]){
[self.slideshow getContentAtIndex:self.slideshow.currentSlide forView:self.touchPointerImage]; [self.slideshow getContentAtIndex:self.slideshow.currentSlide forView:self.touchPointerImage];
...@@ -198,7 +183,6 @@ ...@@ -198,7 +183,6 @@
action:@selector( revealToggle: )]; action:@selector( revealToggle: )];
self.revealViewController.navigationItem.leftBarButtonItem = self.revealButtonItem; self.revealViewController.navigationItem.leftBarButtonItem = self.revealButtonItem;
self.pointerCalibrationOn = NO;
self.movingPointer.layer.cornerRadius = 3; self.movingPointer.layer.cornerRadius = 3;
[self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer]; [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
...@@ -255,9 +239,6 @@ ...@@ -255,9 +239,6 @@
[self.slideView setShadow]; [self.slideView setShadow];
[self.secondarySlideView setShadow]; [self.secondarySlideView setShadow];
// We calibrate once when presentation starts. needs a users alert to inform users to point at the center of the screen at the beginning
self.pointerCalibrationOn = YES;
[super viewDidAppear:animated]; [super viewDidAppear:animated];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment