Skip to content

Commit c4c6761

Browse files
author
Joey Lorich
committed
Enable audio output on webview
1 parent 8d48a96 commit c4c6761

4 files changed

Lines changed: 23 additions & 21 deletions

File tree

EasyReader.xcodeproj/project.pbxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
9D0602141911970D009A94C0 /* UIView+PlaceholderAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0602121911970D009A94C0 /* UIView+PlaceholderAdditions.m */; };
9494
9D0602151911970D009A94C0 /* UIView+PlaceholderAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0602121911970D009A94C0 /* UIView+PlaceholderAdditions.m */; };
9595
9D0602161911970D009A94C0 /* UIView+PlaceholderAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D0602121911970D009A94C0 /* UIView+PlaceholderAdditions.m */; };
96+
9D06021819142212009A94C0 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D06021719142212009A94C0 /* AVFoundation.framework */; };
9697
9D06C6481901AE190029A233 /* EZRHomeSocialToolbarDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D06C6471901AE190029A233 /* EZRHomeSocialToolbarDataSource.m */; };
9798
9D06C6491901AE190029A233 /* EZRHomeSocialToolbarDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D06C6471901AE190029A233 /* EZRHomeSocialToolbarDataSource.m */; };
9899
9D06C64A1901AE190029A233 /* EZRHomeSocialToolbarDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D06C6471901AE190029A233 /* EZRHomeSocialToolbarDataSource.m */; };
@@ -393,6 +394,7 @@
393394
9D010F1518F83940001999EE /* EZRMenuFeedCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZRMenuFeedCell.m; sourceTree = "<group>"; };
394395
9D0602111911970D009A94C0 /* UIView+PlaceholderAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+PlaceholderAdditions.h"; sourceTree = "<group>"; };
395396
9D0602121911970D009A94C0 /* UIView+PlaceholderAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+PlaceholderAdditions.m"; sourceTree = "<group>"; };
397+
9D06021719142212009A94C0 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
396398
9D06C6461901AE190029A233 /* EZRHomeSocialToolbarDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EZRHomeSocialToolbarDataSource.h; path = Home/EZRHomeSocialToolbarDataSource.h; sourceTree = "<group>"; };
397399
9D06C6471901AE190029A233 /* EZRHomeSocialToolbarDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EZRHomeSocialToolbarDataSource.m; path = Home/EZRHomeSocialToolbarDataSource.m; sourceTree = "<group>"; };
398400
9D16D32618DB57D0001E9C38 /* EZRRegisterRoutesService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRRegisterRoutesService.h; sourceTree = "<group>"; };
@@ -499,6 +501,7 @@
499501
isa = PBXFrameworksBuildPhase;
500502
buildActionMask = 2147483647;
501503
files = (
504+
9D06021819142212009A94C0 /* AVFoundation.framework in Frameworks */,
502505
9D79271E18DA1D0300E1D3E1 /* MessageUI.framework in Frameworks */,
503506
9D79271F18DA1D0300E1D3E1 /* Social.framework in Frameworks */,
504507
9D79272018DA1D0300E1D3E1 /* iAd.framework in Frameworks */,
@@ -907,6 +910,7 @@
907910
9DAC16C61709D48E00383722 /* Frameworks */ = {
908911
isa = PBXGroup;
909912
children = (
913+
9D06021719142212009A94C0 /* AVFoundation.framework */,
910914
8ECC8F8D18E4803E006EADD1 /* libPods-OCMock.a */,
911915
8ECC8F8A18E47BC1006EADD1 /* libPods-OCMock.a */,
912916
9D4355751795C9B3002C6657 /* MessageUI.framework */,
@@ -1703,6 +1707,7 @@
17031707
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
17041708
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
17051709
CODE_SIGN_IDENTITY = "iPhone Developer";
1710+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17061711
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
17071712
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17081713
GCC_PREFIX_HEADER = "EasyReader/Other Sources/EasyReader-Prefix.pch";
@@ -1744,7 +1749,7 @@
17441749
UIKit,
17451750
);
17461751
PRODUCT_NAME = Staging;
1747-
PROVISIONING_PROFILE = "FBE43E56-523F-4B31-9050-95F2750E83C8";
1752+
PROVISIONING_PROFILE = "";
17481753
TARGETED_DEVICE_FAMILY = 1;
17491754
VALID_ARCHS = "armv7 arm64 armv7s";
17501755
WRAPPER_EXTENSION = app;
@@ -1757,7 +1762,8 @@
17571762
buildSettings = {
17581763
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
17591764
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1760-
CODE_SIGN_IDENTITY = "iPhone Distribution: Unity Marketing, Inc. (34V4E5MT6Z)";
1765+
CODE_SIGN_IDENTITY = "iPhone Developer";
1766+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
17611767
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
17621768
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17631769
GCC_PREFIX_HEADER = "EasyReader/Other Sources/EasyReader-Prefix.pch";

EasyReader/Application/Controllers/Home/EZRHomeViewController.m

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
#import "CCARadialGradientLayer.h"
4444
#import "UIView+PlaceholderAdditions.h"
4545

46+
#import <AVFoundation/AVFoundation.h>
47+
48+
4649
@interface EZRHomeViewController()
4750

4851
@property User *currentUser;
@@ -160,6 +163,17 @@ - (void)viewDidLoad
160163
selector:@selector(selectedFeedDidChange:)
161164
name:@"kEZRFeedSelected"
162165
object:nil];
166+
167+
AVAudioSession *audioSession = [AVAudioSession sharedInstance];
168+
BOOL ok;
169+
NSError *setCategoryError = nil;
170+
ok = [audioSession setCategory:AVAudioSessionCategoryPlayback
171+
error:&setCategoryError];
172+
if (!ok) {
173+
NSLog(@"%s setCategoryError=%@", __PRETTY_FUNCTION__, setCategoryError);
174+
}
175+
176+
//[[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:nil];
163177
}
164178

165179
/**

EasyReader/Application/Controls/EZRNestableWebView.m

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,19 @@ - (void) layoutSubviews {
2929
[self fixOffsetIfZeroForScrollView:self.scrollView];
3030
}
3131

32-
33-
3432
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
35-
//
3633
[super scrollViewDidScroll:scrollView];
3734

3835
BOOL scrollingUp = (scrollViewHasScrolled && scrollView.contentOffset.y < lastContentOffset.y) || scrollView.contentOffset.y <= 0;
39-
// BOOL crossedOrAtZeroGoingUp = scrollingUp && (scrollView.contentOffset.y == 0 || (lastContentOffset.y > 0 && scrollView.contentOffset.y < 0));
40-
//
41-
// if (scrollingUp)
42-
// {
43-
// NSLog(@"SCROLLING UP - %f", scrollView.contentOffset.y);
44-
// if (scrollView.contentOffset.y == 0) {
45-
// NSLog(@"at zero");
46-
// }
47-
// }
48-
//
49-
// if (crossedOrAtZeroGoingUp) {
50-
// NSLog(@"crossed or at zero going up");
51-
// }
5236

5337
if (!scrollingUp) {
5438
[self fixOffsetIfZeroForScrollView:scrollView];
55-
// scrollViewHasScrolled = NO;
5639
}
5740

5841
scrollViewHasScrolled = YES;
5942
lastContentOffset = scrollView.contentOffset;
6043
}
6144

62-
6345
- (void)fixOffsetIfZeroForScrollView:(UIScrollView *)scrollView {
6446
if (scrollView.contentOffset.y == 0) {
6547
scrollView.contentOffset = CGPointMake(0, 1);

EasyReader/Supporting Files/Staging-Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>2.0.41</string>
39+
<string>2.0.42</string>
4040
<key>LSApplicationCategoryType</key>
4141
<string></string>
4242
<key>LSRequiresIPhoneOS</key>

0 commit comments

Comments
 (0)