diff --git a/AppBox/Info.plist b/AppBox/Info.plist index 401a0d11..f95e1eed 100644 --- a/AppBox/Info.plist +++ b/AppBox/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.5 + 0.9.6 CFBundleSignature ???? CFBundleURLTypes @@ -30,6 +30,7 @@ CFBundleURLSchemes db-86tfx5bu3356fqo + db-mzwu8mq9xdtilpr diff --git a/AppBox/ViewController/HomeViewController/HomeViewController.m b/AppBox/ViewController/HomeViewController/HomeViewController.m index 076bd2c2..67eb1a07 100644 --- a/AppBox/ViewController/HomeViewController/HomeViewController.m +++ b/AppBox/ViewController/HomeViewController/HomeViewController.m @@ -38,14 +38,6 @@ - (void)viewDidLoad { //setup initial value [pathBuild setURL:[NSURL URLWithString:[@"~/Desktop" stringByExpandingTildeInPath]]]; [project setBuildDirectory: pathBuild.URL]; - - //setup team id - [comboTeamId removeAllItems]; - [allTeamIds enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { - [comboTeamId addItemWithObjectValue:[obj valueForKey:abFullName]]; - }]; - - [self updateViewState]; } - (void)viewWillAppear{ @@ -105,7 +97,7 @@ - (IBAction)comboBuildTypeValueChanged:(NSComboBox *)sender { //IPA File Path Handler - (IBAction)ipaFilePathHandle:(NSPathControl *)sender { if (![project.fullPath isEqual:sender.URL]){ - project.ipaFullPath = sender.URL; + project.ipaFullPath = sender.URL.filePathURL; [self updateViewState]; } } @@ -388,6 +380,7 @@ - (void)getIPAInfoFromLocalURL:(NSURL *)ipaFileURL{ }]; }else{ [[AppDelegate appDelegate] addSessionLog:[NSString stringWithFormat:@"\n\n======\nFile Not Exist - %@\n======\n\n",fromPath]]; + [self viewStateForProgressFinish:YES]; } } @@ -662,7 +655,14 @@ -(void)viewStateForProgressFinish:(BOOL)finish{ //team id combo [comboTeamId setEnabled:finish]; - if (finish && comboTeamId.indexOfSelectedItem >= 0) [comboTeamId deselectItemAtIndex:comboTeamId.indexOfSelectedItem]; + if (finish){ + //setup team id + [comboTeamId removeAllItems]; + [comboTeamId setStringValue:abEmptyString]; + [allTeamIds enumerateObjectsUsingBlock:^(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { + [comboTeamId addItemWithObjectValue:[obj valueForKey:abFullName]]; + }]; + } //build type combo [comboBuildType setEnabled:finish]; @@ -672,6 +672,7 @@ -(void)viewStateForProgressFinish:(BOOL)finish{ [comboBuildScheme setEnabled:finish]; if (finish){ if (comboBuildScheme.indexOfSelectedItem >= 0){ + [comboBuildScheme setStringValue:abEmptyString]; [comboBuildScheme deselectItemAtIndex:comboBuildType.indexOfSelectedItem]; } [comboBuildScheme removeAllItems]; @@ -685,7 +686,7 @@ -(void)viewStateForProgressFinish:(BOOL)finish{ [textFieldMessage setEnabled:(finish && buttonSendMail.state == NSOnState)]; //action button - [buttonAction setEnabled:finish]; + [self updateViewState]; } -(void)resetBuildOptions{