@@ -10,6 +10,7 @@ #import "Constants.h" #import "DbHelper.h" #import "BlogProxy.h" +#import "Util.h" @implementation AudioReportView @@ -41,6 +42,11 @@ [self.view addSubview:audioCell]; } +- (void)viewWillAppear:(BOOL)animated{ + [super viewWillAppear:animated]; + [audioCell resetFile]; //Make sure the file is empty +} + /* // Override to allow orientations other than the default portrait orientation. @@ -72,6 +78,11 @@ NSString *tmpSoundPath = [audioCell.soundFileURL path]; NSData *fileData = [NSData dataWithContentsOfFile:tmpSoundPath]; + if (!fileData) { + [Util handleMsg:@"Please record your audio report." withTitle:@"Error"]; + [self performSelectorInBackground:@selector(stopSpin) withObject:nil]; + return; + } if (self.myPost==nil && fileData) { Classes/AudioReportView.m @@ -70,6 +70,7 @@ extern NSString *kCellAudio_ID; - (IBAction) playOrStop: (id) sender; - (void) pausePlayback; - (void) resumePlayback; +- (void) resetFile; @end Classes/AudioView.h @@ -73,36 +73,7 @@ NSString *kCellAudio_ID = @"CellAudio_ID"; - (id)initWithFrame:(CGRect)frame { if (self = [super initWithFrame:frame ]) { - // this app uses a fixed file name at a fixed location, so it makes sense to set the name and - // URL here. - NSArray *filePaths = NSSearchPathForDirectoriesInDomains ( - - NSDocumentDirectory, - NSUserDomainMask, - YES - ); - - self.recordingDirectory = [filePaths objectAtIndex: 0]; - - CFStringRef fileString = (CFStringRef) [NSString stringWithFormat: @"%@/Recording.caf", self.recordingDirectory]; - - //Delete previous audio report - [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat: @"%@/Recording.caf", self.recordingDirectory] error:NULL]; - - // create the file URL that identifies the file that the recording audio queue object records into - CFURLRef fileURL = CFURLCreateWithFileSystemPath ( - NULL, - fileString, - kCFURLPOSIXPathStyle, - false - ); - NSLog (@"Recorded file path: %@", fileURL); // shows the location of the recorded file - - // save the sound file URL as an object attribute (as an NSURL object) - if (fileURL) { - self.soundFileURL = (NSURL *) fileURL; - CFRelease (fileURL); - } + [self resetFile]; // allocate memory to hold audio level values audioLevels = calloc (2, sizeof (AudioQueueLevelMeterState)); @@ -138,6 +109,41 @@ NSString *kCellAudio_ID = @"CellAudio_ID"; return self; } +- (void) resetFile { + // this app uses a fixed file name at a fixed location, so it makes sense to set the name and + // URL here. + NSArray *filePaths = NSSearchPathForDirectoriesInDomains ( + + NSDocumentDirectory, + NSUserDomainMask, + YES + ); + + self.recordingDirectory = [filePaths objectAtIndex: 0]; + + CFStringRef fileString = (CFStringRef) [NSString stringWithFormat: @"%@/Recording.caf", self.recordingDirectory]; + + //Delete previous audio report + [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat: @"%@/Recording.caf", self.recordingDirectory] error:NULL]; + + // create the file URL that identifies the file that the recording audio queue object records into + CFURLRef fileURL = CFURLCreateWithFileSystemPath ( + NULL, + fileString, + kCFURLPOSIXPathStyle, + false + ); + NSLog (@"Recorded file path: %@", fileURL); // shows the location of the recorded file + + // save the sound file URL as an object attribute (as an NSURL object) + if (fileURL) { + self.soundFileURL = (NSURL *) fileURL; + CFRelease (fileURL); + } + [self.playButton setEnabled: NO]; + +} + - (void) addBargraphToView: (UIView *) parentView { // static image for showing average level Classes/AudioView.m @@ -10,6 +10,7 @@ #import "Constants.h" #import "DbHelper.h" #import "BlogProxy.h" +#import "Util.h" @implementation TextReportView @@ -66,6 +67,11 @@ if (self.myPost==nil) isNew = YES; else isNew = NO; + if ([captionTextField.text length]==0 && [storyTextView.text length]==0){ + [Util handleMsg:@"Please enter either title or report body." withTitle:@"Error"]; + return; + } + if (self.myPost==nil && ([captionTextField.text length] > 0 || [storyTextView.text length] > 0) ) Classes/TextReportView.m @@ -562,13 +562,13 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Sze Wong"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Zerion Software, Inc."; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 2.1; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "5C47A760-DF91-4D03-B0C7-81AAFE639463"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "753BAAB7-DA00-4A0F-BE74-1C9F677DCCE1"; SDKROOT = iphoneos2.2; }; name = Distribution; Inauguration Report.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ <key>CFBundleIconFile</key> <string>Icon.png</string> <key>CFBundleIdentifier</key> - <string>com.popvox.${PRODUCT_NAME}</string> + <string>com.zerion.apps.InaugReport</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> @@ -19,7 +19,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> - <string>????</string> + <string>ZERN</string> <key>CFBundleVersion</key> <string>1.0.0.0</string> <key>LSRequiresIPhoneOS</key> Info.plist b37468148477d4f9f0d4d057ec5983628c9070c9 Sze Wong szewong@sze-wongs-macbook-pro.local http://github.com/davetroy/inaugreport-iphone/commit/550ad2e2ae0155a89ed1edf1630844490ad68a24 550ad2e2ae0155a89ed1edf1630844490ad68a24 2009-01-11T16:11:21-08:00 2009-01-11T16:11:21-08:00 Updated Audio and Text view to ensure content before submitting. bb53b1c8cf0f87fe40504687734c3ca705e73ac7 Sze Wong szewong@sze-wongs-macbook-pro.local