Skip to content

Commit

Permalink
Merge branch 'release/3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@defagos
defagos committed Aug 28, 2017
2 parents 8740d26 + 205123c commit 5594355
Show file tree
Hide file tree
Showing 65 changed files with 6,383 additions and 1,720 deletions.
5 changes: 3 additions & 2 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "SRGSSR/SRGMediaPlayer-iOS" "2.0.3"
github "SRGSSR/srgdataprovider-ios" "5.4"
github "SRGSSR/SRGMediaPlayer-iOS" "2.0.4"
github "SRGSSR/srgdataprovider-ios" "5.4.1"
github "SRGSSR/tagcommander-ios" "4.1.3_4.1.1"
github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
5 changes: 3 additions & 2 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
github "Mantle/Mantle" "2.1.0"
github "SRGSSR/MAKVONotificationCenter" "4a127e52997889729286510103f7e27100223730"
github "SRGSSR/SRGMediaPlayer-iOS" "2.0.3"
github "SRGSSR/SRGMediaPlayer-iOS" "2.0.4"
github "SRGSSR/libextobjc" "cf5eb0c8a2f6f85636f1fb6a1f2083cbc74899f9"
github "SRGSSR/srgdataprovider-ios" "5.4"
github "SRGSSR/srgdataprovider-ios" "5.4.1"
github "SRGSSR/srglogger-ios" "1.0"
github "SRGSSR/tagcommander-ios" "4.1.3_4.1.1"
github "comScore/ComScore-iOS-SDK" "92f34897cd7659d56bb5a3e9e85b808cf3758bda"
github "kif-framework/KIF" "v3.5.2"
28 changes: 28 additions & 0 deletions Demo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,33 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>srgtraffic</string>
<string>srf</string>
<string>srfsport</string>
<string>srfplayer</string>
<string>srfmeteo</string>
<string>srfradio3</string>
<string>srfvirus</string>
<string>srfjass</string>
<string>rtsinfo</string>
<string>rtssport</string>
<string>playrts</string>
<string>couleur3</string>
<string>dtqc3</string>
<string>rtsradio</string>
<string>rsinews</string>
<string>rsisport</string>
<string>playrsi</string>
<string>rsich</string>
<string>rsiibazaar</string>
<string>rsizerovero</string>
<string>rsipeo</string>
<string>playrtr</string>
<string>ch.swissinfo.news</string>
<string>playswi</string>
<string>tvsvizzera</string>
</array>
</dict>
</plist>
16 changes: 10 additions & 6 deletions Demo/Resources/LaunchScreen.xib
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
Expand All @@ -15,17 +19,17 @@
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright (c) SRG SSR. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SRGAnalytics Demo" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
<constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
Expand Down
13 changes: 10 additions & 3 deletions Demo/Sources/Application/AppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#import <SRGAnalytics/SRGAnalytics.h>
#import <SRGAnalytics_MediaPlayer/SRGAnalytics_MediaPlayer.h>
#import <SRGLogger/SRGLogger.h>
#import <TCCore/TCCore.h>

@implementation AppDelegate

Expand All @@ -25,9 +26,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

[SRGLogger setLogHandler:SRGNSLogHandler()];

[[SRGAnalyticsTracker sharedTracker] startWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierTEST
comScoreVirtualSite:@"rts-app-test-v"
netMetrixIdentifier:@"test"];
[TCDebug setDebugLevel:TCLogLevel_Verbose];
[TCDebug setNotificationLog:YES];

SRGAnalyticsConfiguration *configuration = [[SRGAnalyticsConfiguration alloc] initWithBusinessUnitIdentifier:SRGAnalyticsBusinessUnitIdentifierRTS
container:10
comScoreVirtualSite:@"rts-app-test-v"
netMetrixIdentifier:@"test"];
configuration.unitTesting = (NSClassFromString(@"XCTestCase") != Nil);
[[SRGAnalyticsTracker sharedTracker] startWithConfiguration:configuration];

DemosViewController *demosViewController = [[DemosViewController alloc] init];
self.window.rootViewController = [[UINavigationController alloc] initWithRootViewController:demosViewController];
Expand Down
21 changes: 10 additions & 11 deletions Demo/Sources/Demos/DemosViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 0: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking"
levels:nil
customLabels:nil
customInfo:nil
openedFromPushNotification:NO
trackedAutomatically:YES];
break;
Expand All @@ -52,7 +52,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 1: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels"
levels:@[@"Level1", @"Level2", @"Level3"]
customLabels:nil
customInfo:nil
openedFromPushNotification:NO
trackedAutomatically:YES];
break;
Expand All @@ -61,16 +61,16 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 2: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with many levels"
levels:@[@"Level1", @"Level2", @"Level3", @"Level4", @"Level5", @"Level6", @"Level7", @"Level8", @"Level9", @"Level10", @"Level11", @"Level12"]
customLabels:nil
customInfo:nil
openedFromPushNotification:NO
trackedAutomatically:YES];
break;
}

case 3: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels and custom labels"
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Automatic tracking with levels and labels"
levels:@[@"Level1", @"Level2"]
customLabels:@{ @"custom_label": @"custom_value" }
customInfo:@{ @"custom_label": @"custom_value" }
openedFromPushNotification:NO
trackedAutomatically:YES];
break;
Expand All @@ -79,7 +79,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 4: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@"Manual tracking"
levels:nil
customLabels:nil
customInfo:nil
openedFromPushNotification:NO
trackedAutomatically:NO];
break;
Expand All @@ -88,7 +88,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 5: {
simpleViewController = [[SimpleViewController alloc] initWithTitle:@""
levels:nil
customLabels:nil
customInfo:nil
openedFromPushNotification:NO
trackedAutomatically:YES];
break;
Expand All @@ -108,7 +108,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath

switch (indexPath.row) {
case 0: {
URL = [NSURL URLWithString:@"http://fr-par-iphone-2.cdn.hexaglobe.net/streaming/euronews_ewns/9-live.m3u8"];
URL = [NSURL URLWithString:@"http://ndr_fs-lh.akamaihd.net/i/ndrfs_nds@119224/master.m3u8?dw=0"];
break;
}

Expand All @@ -118,10 +118,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
}

case 2: {
URL = [NSURL URLWithString:@"https://wowza.jwplayer.com/live/jelly.stream/playlist.m3u8?DVR"];
URL = [NSURL URLWithString:@"http://tagesschau-lh.akamaihd.net/i/tagesschau_1@119231/master.m3u8"];
break;
}


default: {
return;
Expand All @@ -138,7 +137,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
case 2: {
UIViewController *simpleViewController = [[SimpleViewController alloc] initWithTitle:@"From push notification"
levels:nil
customLabels:nil
customInfo:nil
openedFromPushNotification:YES
trackedAutomatically:YES];
[self.navigationController pushViewController:simpleViewController animated:YES];
Expand Down
Loading

0 comments on commit 5594355

Please sign in to comment.