add simplified statsOverlay, stage manager version
This commit is contained in:
@@ -47,6 +47,7 @@
|
||||
UITapGestureRecognizer *_menuDoubleTapGestureRecognizer;
|
||||
UITapGestureRecognizer *_playPauseTapGestureRecognizer;
|
||||
UITextView *_overlayView;
|
||||
uint16_t overlayLevel;
|
||||
UILabel *_stageLabel;
|
||||
UILabel *_tipLabel;
|
||||
UIActivityIndicatorView *_spinner;
|
||||
@@ -160,6 +161,7 @@
|
||||
}
|
||||
|
||||
_settings = [[[DataManager alloc] init] getSettings]; //StreamFrameViewController retrieve the settings here.
|
||||
overlayLevel = _settings.statsOverlayLevel.intValue;
|
||||
[self configOscLayoutTool];
|
||||
[self configSwipeGestures];
|
||||
[self configZoomGestureAndAddStreamView];
|
||||
@@ -180,7 +182,7 @@
|
||||
target:self
|
||||
selector:@selector(updateStatsOverlay)
|
||||
userInfo:nil
|
||||
repeats:_settings.statsOverlay];
|
||||
repeats:_settings.statsOverlayEnabled];
|
||||
|
||||
NSLog(@"frameview gestures: %d", (uint32_t)[self.view.gestureRecognizers count]);
|
||||
NSLog(@"streamview gestures: %d", (uint32_t)[_streamView.gestureRecognizers count]);
|
||||
@@ -447,13 +449,13 @@
|
||||
#endif
|
||||
|
||||
- (void)updateStatsOverlay {
|
||||
if(!_settings.statsOverlay){
|
||||
if(!_settings.statsOverlayEnabled){
|
||||
[_overlayView removeFromSuperview];
|
||||
return; // add this for realtime streamview reconfig
|
||||
}
|
||||
else [self.view addSubview:_overlayView]; // don't know why but this is necessary for reactivating overlay.
|
||||
|
||||
NSString* overlayText = [self->_streamMan getStatsOverlayText];
|
||||
NSString* overlayText = [self->_streamMan getStatsOverlayText:overlayLevel];
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self updateOverlayText:overlayText];
|
||||
});
|
||||
@@ -479,7 +481,13 @@
|
||||
#if TARGET_OS_TV
|
||||
[_overlayView setFont:[UIFont systemFontOfSize:24]];
|
||||
#else
|
||||
[_overlayView setFont:[UIFont systemFontOfSize:12]];
|
||||
if (@available(iOS 13.0, *)) {
|
||||
[_overlayView setFont:[UIFont monospacedSystemFontOfSize:12 weight:UIFontWeightRegular]];
|
||||
} else {
|
||||
[_overlayView setFont:[UIFont systemFontOfSize:12]];// Fallback on earlier versions
|
||||
}
|
||||
//[_overlayView setFont:[UIFont fontWithName:@"Menlo" size:12]];
|
||||
|
||||
#endif
|
||||
[_overlayView setAlpha:0.5];
|
||||
[self.view addSubview:_overlayView];
|
||||
@@ -675,7 +683,7 @@
|
||||
|
||||
[self->_controllerSupport connectionEstablished];
|
||||
|
||||
if (self->_settings.statsOverlay) {
|
||||
if (self->_settings.statsOverlayEnabled) {
|
||||
self->_statsUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:1.0f
|
||||
target:self
|
||||
selector:@selector(updateStatsOverlay)
|
||||
@@ -976,7 +984,7 @@
|
||||
DataManager* dataMan = [[DataManager alloc] init];
|
||||
Settings *currentSettings = [dataMan retrieveSettings];
|
||||
|
||||
currentSettings.statsOverlay = !currentSettings.statsOverlay;
|
||||
currentSettings.statsOverlayEnabled = !currentSettings.statsOverlayEnabled;
|
||||
|
||||
[dataMan saveData];
|
||||
[self reConfigStreamViewRealtime];
|
||||
|
||||
Reference in New Issue
Block a user