Fix issue #3

sunnyyoung · Oct 5, 2016 · eebc369 · eebc369
1 parent 7347879
commit eebc369
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/AppleReserver/Info.plist b/AppleReserver/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/AppleReserver/Main.storyboard b/AppleReserver/Main.storyboard
@@ -203,7 +203,6 @@
                                                                     </tableColumn>
                                                                 </tableColumns>
                                                                 <connections>
-                                                                    <action selector="storeTableViewAction:" target="XfG-lQ-9wD" id="N6u-gw-rMW"/>
                                                                     <outlet property="dataSource" destination="XfG-lQ-9wD" id="tFY-lR-h9g"/>
                                                                     <outlet property="delegate" destination="XfG-lQ-9wD" id="gvt-0i-gUe"/>
                                                                 </connections>

diff --git a/AppleReserver/Module/HomeViewController.m b/AppleReserver/Module/HomeViewController.m
@@ -16,6 +16,7 @@ @interface HomeViewController () <NSTableViewDataSource, NSTableViewDelegate>
 // TableViews
 @property (weak) IBOutlet NSTableView *storeTableView;
 @property (weak) IBOutlet NSTableView *availabilityTableView;
+
 // Buttons
 @property (weak) IBOutlet NSButton *onlyAvailabilityButton;
 @property (weak) IBOutlet NSButton *notificationButton;
@@ -30,6 +31,7 @@ @interface HomeViewController () <NSTableViewDataSource, NSTableViewDelegate>
 
 @property (nonatomic, strong) Store *selectedStore;
 @property (nonatomic, strong) NSTimer *pollingTimer;
+@property (nonatomic, copy) NSURL *reserveURL;
 
 @end
 
@@ -117,19 +119,33 @@ - (void)checkAndMakeNotification {
     }
 }
 
-#pragma mark - Event Response
+#pragma mark - Notification Handler
 
-- (IBAction)storeTableViewAction:(NSTableView *)sender {
-    self.selectedStore = self.storeArray[sender.selectedRow];
-    [self.selectedModelArray removeAllObjects];
-    [self reloadAvailability];
+- (void)tableViewSelectionDidChange:(NSNotification *)notification {
+    if ([notification.object isKindOfClass:[NSTableView class]]) {
+        NSTableView *tableVeiw = notification.object;
+        if (tableVeiw.selectedRow < 0) {
+            return;
+        }
+        if (notification.object == self.storeTableView) {
+            self.selectedStore = self.storeArray[tableVeiw.selectedRow];
+            [self.selectedModelArray removeAllObjects];
+            [self.availabilityTableView deselectAll:nil];
+            [self reloadAvailability];
+        } else if (notification.object == self.availabilityTableView) {
+            NSString *store = self.selectedStore.storeNumber;
+            NSString *model = self.availabilityDictionary.allKeys[tableVeiw.selectedRow];
+            self.reserveURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://reserve.cdn-apple.com/CN/zh_CN/reserve/iPhone/availability?channel=1&returnURL=&store=%@&partNumber=%@", store, model]];
+        }
+    }
 }
 
+#pragma mark - Event Response
+
 - (IBAction)reverseAction:(NSTableView *)sender {
-    NSString *store = self.selectedStore.storeNumber;
-    NSString *model = self.availabilityDictionary.allKeys[sender.selectedRow];
-    NSURL *reverseURL = [NSURL URLWithString:[NSString stringWithFormat:@"https://reserve.cdn-apple.com/CN/zh_CN/reserve/iPhone/availability?channel=1&returnURL=&store=%@&partNumber=%@", store, model]];
-    [[NSWorkspace sharedWorkspace] openURL:reverseURL];
+    if (sender.clickedRow > 0) {
+        [[NSWorkspace sharedWorkspace] openURL:self.reserveURL];
+    }
 }
 
 - (IBAction)onlyAvailabilityButtonAction:(NSButton *)sender {