microsoft
/
project-rome
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 12736: Update iOS samples for renames of selectors in Activities 

Update iOS samples for renames of selectors in Activities
This commit is contained in:
Brian Bowman 2018-11-09 22:23:11 +00:00
Родитель d8ef217a79
Коммит 7474050ccf
5 изменённых файлов: 12 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
iOS/samples/GraphNotifications/GraphNotificationsSample.xcodeproj/project.pbxproj
Просмотреть файл

@ -24,7 +24,6 @@
00823375212F114B0055F6E4 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 00823374212F114B0055F6E4 /* main.m */; };
00D6D060213720E5008E5E33 /* NotificationsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D6D05F213720E5008E5E33 /* NotificationsViewController.m */; };
00D6D06321384D00008E5E33 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 00D6D06221384D00008E5E33 /* HistoryViewController.m */; };
5D93128427C67BC7232939D5 /* libPods-GraphNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B6312F300B55978A0074729 /* libPods-GraphNotifications.a */; };
86E3681E27114147F58BE403 /* libPods-GraphNotificationsSample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 06928972061C754C239718DC /* libPods-GraphNotificationsSample.a */; };
/* End PBXBuildFile section */
@ -45,7 +44,7 @@
0017A49C2135D10E00EB86D8 /* NotificationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NotificationProvider.m; sourceTree = "<group>"; };
003421A72130A887007FC970 /* NotificationsManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotificationsManager.h; sourceTree = "<group>"; };
003421A821347622007FC970 /* NotificationsManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotificationsManager.m; sourceTree = "<group>"; };
0082335C212F114B0055F6E4 /* GraphNotifications.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = GraphNotifications.app; path = GraphNotificationsSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
0082335C212F114B0055F6E4 /* GraphNotificationsSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GraphNotificationsSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
0082335F212F114B0055F6E4 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
00823360212F114B0055F6E4 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
00823362212F114B0055F6E4 /* RootViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
@ -78,7 +77,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5D93128427C67BC7232939D5 /* libPods-GraphNotifications.a in Frameworks */,
86E3681E27114147F58BE403 /* libPods-GraphNotificationsSample.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -119,7 +117,7 @@
0082335D212F114B0055F6E4 /* Products */ = {
isa = PBXGroup;
children = (
0082335C212F114B0055F6E4 /* GraphNotifications.app */,
0082335C212F114B0055F6E4 /* GraphNotificationsSample.app */,
);
name = Products;
sourceTree = "<group>";
@ -193,7 +191,7 @@
);
name = GraphNotificationsSample;
productName = GraphNotificationsSample;
productReference = 0082335C212F114B0055F6E4 /* GraphNotifications.app */;
productReference = 0082335C212F114B0055F6E4 /* GraphNotificationsSample.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
@ -448,10 +446,7 @@
ENABLE_BITCODE = NO;
INFOPLIST_FILE = GraphNotificationsSample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GraphNotificationsSample/ConnectedDevices",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.connecteddevices.graphnotifications;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ba3afbc5-30e6-4150-9eb9-d8967de4ce9b";
@ -472,10 +467,7 @@
ENABLE_BITCODE = NO;
INFOPLIST_FILE = GraphNotificationsSample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GraphNotificationsSample/ConnectedDevices",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.connecteddevices.graphnotifications;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "ba3afbc5-30e6-4150-9eb9-d8967de4ce9b";

4
iOS/samples/GraphNotifications/GraphNotificationsSample/NotificationsManager.m
Просмотреть файл

@ -41,8 +41,8 @@ static NotificationsManager* s_manager;
- (void)setupWithAccount:(MCDUserAccount*)account {
@synchronized (self) {
MCDUserDataFeed* dataFeed = [MCDUserDataFeed userDataFeedForAccount:account platform:_platform activitySourceHost:APP_HOST_NAME];
self.channel = [MCDUserNotificationChannel userNotificationChannelWithUserDataFeed:dataFeed];
MCDUserDataFeed* dataFeed = [MCDUserDataFeed getForAccount:account platform:_platform activitySourceHost:APP_HOST_NAME];
self.channel = [MCDUserNotificationChannel channelWithUserDataFeed:dataFeed];
self.reader = [self.channel createReader];
__weak typeof(self) weakSelf;

2
iOS/samples/GraphNotifications/Podfile
Просмотреть файл

@ -8,7 +8,7 @@ target 'GraphNotificationsSample' do
pod 'ProjectRomeSdk'
pod 'AdaptiveCards'
pod 'ADAL', '2.7.3'
pod 'ADAL', '2.6.6'
# Pods for GraphNotificationsSample

2
iOS/samples/SDKSample/iOSSample/RemoteSystemViewController.m
Просмотреть файл

@ -121,7 +121,7 @@
- (void)startDiscovery
{
NSMutableArray<NSObject<MCDRemoteSystemFilter>*>* filters = [NSMutableArray new];
[filters addObject:[MCDRemoteSystemLocalVisibilityKindFilter filterWithLocalVisibilityKind:MCDRemoteSystemLocalVisibilityKindShowAll]];
[filters addObject:[MCDRemoteSystemLocalVisibilityKindFilter filterWithKind:MCDRemoteSystemLocalVisibilityKindShowAll]];
[self startWatcherWithFilter:filters];
}

6
iOS/samples/SDKSample/iOSSample/UserActivityViewController.m
Просмотреть файл

@ -29,12 +29,12 @@
// Step #1: Get a UserActivity channel, getting the default channel
NSLog(@"Creating UserActivityChannel");
NSArray<MCDUserAccount*>* accounts = [[AppDataSource sharedInstance].accountProvider getUserAccounts];
MCDUserDataFeed* userDataFeed = [MCDUserDataFeed userDataFeedForAccount:accounts[0]
MCDUserDataFeed* userDataFeed = [MCDUserDataFeed getForAccount:accounts[0]
platform:[AppDataSource sharedInstance].platform
activitySourceHost:CROSS_PLATFORM_APP_ID];
NSArray<MCDUserDataFeedSyncScope*>* syncScopes = @[ [MCDUserActivityChannel syncScope] ];
NSArray<id<MCDUserDataFeedSyncScope>>* syncScopes = @[ [MCDUserActivityChannel syncScope] ];
[userDataFeed addSyncScopes:syncScopes];
self.channel = [MCDUserActivityChannel userActivityChannelWithUserDataFeed:userDataFeed];
self.channel = [MCDUserActivityChannel channelWithUserDataFeed:userDataFeed];
}
else
{