Skip to content

Commit

Permalink
iOS tv-casting-app: Implementing AppDelegate
Browse files Browse the repository at this point in the history
  • Loading branch information
sharadb-amazon committed Jul 19, 2023
1 parent 422829b commit c5f92ac
Show file tree
Hide file tree
Showing 6 changed files with 192 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
3CCB8743286A593700771BAD /* CastingServerBridge.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CCB873D286A593700771BAD /* CastingServerBridge.mm */; };
3CCB8744286A593700771BAD /* ConversionUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CCB873E286A593700771BAD /* ConversionUtils.mm */; };
3CD6D01A298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */; };
3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */ = {isa = PBXBuildFile; fileRef = 3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */; };
3CE5ECD02A673E2C007CF331 /* CommissioningCallbackHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */; };
3CE868F42946D76200FCB92B /* CommissionableDataProviderImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CE868F32946D76200FCB92B /* CommissionableDataProviderImpl.mm */; };
3CF8532728E37F1000F07B9F /* MatterError.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3CF8532628E37F1000F07B9F /* MatterError.mm */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -62,6 +64,8 @@
3CCB873D286A593700771BAD /* CastingServerBridge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CastingServerBridge.mm; sourceTree = "<group>"; };
3CCB873E286A593700771BAD /* ConversionUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ConversionUtils.mm; sourceTree = "<group>"; };
3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommissionerDiscoveryDelegateImpl.h; sourceTree = "<group>"; };
3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommissioningCallbackHandlers.h; sourceTree = "<group>"; };
3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommissioningCallbackHandlers.m; sourceTree = "<group>"; };
3CE868F32946D76200FCB92B /* CommissionableDataProviderImpl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = CommissionableDataProviderImpl.mm; sourceTree = "<group>"; };
3CF8532528E37ED800F07B9F /* MatterError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MatterError.h; sourceTree = "<group>"; };
3CF8532628E37F1000F07B9F /* MatterError.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MatterError.mm; sourceTree = "<group>"; };
Expand Down Expand Up @@ -131,6 +135,8 @@
3C0D9CDF2920A30C00D3332B /* CommissionableDataProviderImpl.hpp */,
3CE868F32946D76200FCB92B /* CommissionableDataProviderImpl.mm */,
3CD6D019298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h */,
3CE5ECCD2A673B30007CF331 /* CommissioningCallbackHandlers.h */,
3CE5ECCF2A673E2C007CF331 /* CommissioningCallbackHandlers.m */,
);
path = MatterTvCastingBridge;
sourceTree = "<group>";
Expand All @@ -145,6 +151,7 @@
3CD6D01A298CDA2100D7569A /* CommissionerDiscoveryDelegateImpl.h in Headers */,
3C26AC8C2926FE0C00BA6881 /* DeviceAttestationCredentialsProviderImpl.hpp in Headers */,
3CCB8740286A593700771BAD /* CastingServerBridge.h in Headers */,
3CE5ECCE2A673B30007CF331 /* CommissioningCallbackHandlers.h in Headers */,
3CCB8742286A593700771BAD /* ConversionUtils.hpp in Headers */,
3CCB8741286A593700771BAD /* DiscoveredNodeData.h in Headers */,
3CCB87212869085400771BAD /* MatterTvCastingBridge.h in Headers */,
Expand Down Expand Up @@ -249,6 +256,7 @@
files = (
3CCB8743286A593700771BAD /* CastingServerBridge.mm in Sources */,
3C4E53B228E5184C00F293E8 /* TargetNavigatorTypes.mm in Sources */,
3CE5ECD02A673E2C007CF331 /* CommissioningCallbackHandlers.m in Sources */,
3CF8532728E37F1000F07B9F /* MatterError.mm in Sources */,
3C4E53B628E5595A00F293E8 /* ContentLauncherTypes.mm in Sources */,
3C81C75028F7A7D3001CB9D1 /* VideoPlayer.m in Sources */,
Expand Down Expand Up @@ -419,9 +427,6 @@
"$(CHIP_ROOT)/third_party/nlassert/repo/include",
"$(CHIP_ROOT)/third_party/nlio/repo/include",
"$(TEMP_DIR)/out/gen/include",
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/app-common",
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
Expand Down Expand Up @@ -502,9 +507,6 @@
"$(CHIP_ROOT)/third_party/nlassert/repo/include",
"$(CHIP_ROOT)/third_party/nlio/repo/include",
"$(TEMP_DIR)/out/gen/include",
/* Compile time codegen would need this:
"$(TEMP_DIR)/out/gen/src/controller/data_model/zapgen/",
*/
"$(CHIP_ROOT)/zzz_generated/app-common",
);
INFOPLIST_KEY_NSHumanReadableCopyright = "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/

#import "AppParameters.h"
#import "CommissioningCallbackHandlers.h"
#import "ContentApp.h"
#import "ContentLauncherTypes.h"
#import "DiscoveredNodeData.h"
Expand Down Expand Up @@ -109,24 +110,20 @@
@param clientQueue Queue to dispatch the call to the commissioningWindowRequestedHandler on
@param commissioningCompleteCallback Callback for when commissioning of this app has been completed via a call to the general
commissioning cluster (by usually an on-network TV/Media device acting as a Matter commissioner)
@param onConnectionSuccessCallback Handles a VideoPlayer * once connection is successfully established
@param onConnectionFailureCallback Handles MatterError if there is a failure in establishing connection
@param onNewOrUpdatedEndpointCallback Handles a ContentApp * for each new ContentApp is found. May be called multiple times based
on the number of ContentApp
@param commissioningWindowRequestedHandler Handler to call on requesting the opening of a commissioning window
@param commissioningCallbackHandlers Optional parameter to specific handlers for callbacks during commissioning
*/
- (void)openBasicCommissioningWindow:(dispatch_queue_t _Nonnull)clientQueue
commissioningWindowRequestedHandler:(void (^_Nonnull)(bool))commissioningWindowRequestedHandler
commissioningCompleteCallback:(void (^_Nonnull)(bool))commissioningCompleteCallback
onConnectionSuccessCallback:(void (^_Nonnull)(VideoPlayer * _Nonnull))onConnectionSuccessCallback
onConnectionFailureCallback:(void (^_Nonnull)(MatterError * _Nonnull))onConnectionFailureCallback
onNewOrUpdatedEndpointCallback:(void (^_Nonnull)(ContentApp * _Nonnull))onNewOrUpdatedEndpointCallback;
commissioningCallbackHandlers:(CommissioningCallbackHandlers * _Nullable)commissioningCallbackHandlers
onConnectionSuccessCallback:(void (^_Nonnull)(VideoPlayer * _Nonnull))onConnectionSuccessCallback
onConnectionFailureCallback:(void (^_Nonnull)(MatterError * _Nonnull))onConnectionFailureCallback
onNewOrUpdatedEndpointCallback:(void (^_Nonnull)(ContentApp * _Nonnull))onNewOrUpdatedEndpointCallback;

/*!
@brief Gets the list of VideoPlayers currently connected
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,24 +565,75 @@ - (OnboardingPayload *)getOnboardingPayload
}

- (void)openBasicCommissioningWindow:(dispatch_queue_t _Nonnull)clientQueue
commissioningWindowRequestedHandler:(void (^_Nonnull)(bool))commissioningWindowRequestedHandler
commissioningCompleteCallback:(void (^_Nonnull)(bool))commissioningCompleteCallback
onConnectionSuccessCallback:(void (^_Nonnull)(VideoPlayer * _Nonnull))onConnectionSuccessCallback
onConnectionFailureCallback:(void (^_Nonnull)(MatterError * _Nonnull))onConnectionFailureCallback
onNewOrUpdatedEndpointCallback:(void (^_Nonnull)(ContentApp * _Nonnull))onNewOrUpdatedEndpointCallback
commissioningCallbackHandlers:(CommissioningCallbackHandlers * _Nullable)commissioningCallbackHandlers
onConnectionSuccessCallback:(void (^_Nonnull)(VideoPlayer * _Nonnull))onConnectionSuccessCallback
onConnectionFailureCallback:(void (^_Nonnull)(MatterError * _Nonnull))onConnectionFailureCallback
onNewOrUpdatedEndpointCallback:(void (^_Nonnull)(ContentApp * _Nonnull))onNewOrUpdatedEndpointCallback
{
[self
dispatchOnMatterSDKQueue:@"openBasicCommissioningWindow(...)"
block:^{
CommissioningCallbacks commissioningCallbacks;
if (commissioningCallbackHandlers != nil) {
if (commissioningCallbackHandlers.commissioningCompleteCallback != nil) {
commissioningCallbacks.commissioningComplete = [clientQueue, commissioningCallbackHandlers](
CHIP_ERROR err) {
[[CastingServerBridge getSharedInstance]
dispatchOnClientQueue:clientQueue
description:
@"openBasicCommissioningWindow(...) commissioningCompleteCallback"
block:^{
commissioningCallbackHandlers.commissioningCompleteCallback(
CHIP_NO_ERROR == err);
}];
};
}

if (commissioningCallbackHandlers.sessionEstablishmentStartedCallback != nil) {
commissioningCallbacks.sessionEstablishmentStarted
= [clientQueue, commissioningCallbackHandlers]() {
[[CastingServerBridge getSharedInstance]
dispatchOnClientQueue:clientQueue
description:@"openBasicCommissioningWindow(...) "
@"sessionEstablishmentStartedCallback"
block:^{
commissioningCallbackHandlers
.sessionEstablishmentStartedCallback();
}];
};
}

if (commissioningCallbackHandlers.sessionEstablishedCallback != nil) {
commissioningCallbacks.sessionEstablished = [clientQueue, commissioningCallbackHandlers]() {
[[CastingServerBridge getSharedInstance]
dispatchOnClientQueue:clientQueue
description:@"openBasicCommissioningWindow(...) sessionEstablishedCallback"
block:^{
commissioningCallbackHandlers.sessionEstablishedCallback();
}];
};
}

if (commissioningCallbackHandlers.sessionEstablishmentStoppedCallback != nil) {
commissioningCallbacks.sessionEstablishmentStopped = [clientQueue,
commissioningCallbackHandlers](
CHIP_ERROR err) {
[[CastingServerBridge getSharedInstance]
dispatchOnClientQueue:clientQueue
description:@"openBasicCommissioningWindow(...) "
@"sessionEstablishmentStoppedCallback"
block:^{
commissioningCallbackHandlers
.sessionEstablishmentStoppedCallback([[MatterError alloc]
initWithCode:err.AsInteger()
message:[NSString
stringWithUTF8String:err.AsString()]]);
}];
};
}
}
CHIP_ERROR err = CastingServer::GetInstance()->OpenBasicCommissioningWindow(
[clientQueue, commissioningCompleteCallback](CHIP_ERROR err) {
[[CastingServerBridge getSharedInstance]
dispatchOnClientQueue:clientQueue
description:@"openBasicCommissioningWindow(...) commissioningCompleteCallback"
block:^{
commissioningCompleteCallback(CHIP_NO_ERROR == err);
}];
},
commissioningCallbacks,
[clientQueue, onConnectionSuccessCallback](TargetVideoPlayerInfo * cppTargetVideoPlayerInfo) {
VideoPlayer * videoPlayer =
[ConversionUtils convertToObjCVideoPlayerFrom:cppTargetVideoPlayerInfo];
Expand Down Expand Up @@ -614,10 +665,13 @@ - (void)openBasicCommissioningWindow:(dispatch_queue_t _Nonnull)clientQueue
}];
});

dispatch_async(clientQueue, ^{
ChipLogProgress(AppServer, "[async] Dispatching commissioningWindowRequestedHandler");
commissioningWindowRequestedHandler(CHIP_NO_ERROR == err);
});
if (commissioningCallbackHandlers != nil
&& commissioningCallbackHandlers.commissioningWindowRequestedHandler != nil) {
dispatch_async(clientQueue, ^{
ChipLogProgress(AppServer, "[async] Dispatching commissioningWindowRequestedHandler");
commissioningCallbackHandlers.commissioningWindowRequestedHandler(CHIP_NO_ERROR == err);
});
}
}];
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/**
*
* Copyright (c) 2020-2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#import "MatterError.h"
#import <Foundation/Foundation.h>

#ifndef CommissioningCallbacksHandlers_h
#define CommissioningCallbacksHandlers_h

@interface CommissioningCallbackHandlers : NSObject

- (CommissioningCallbackHandlers * _Nonnull)
initWithCommissioningWindowRequestedHandler:(void (^_Nonnull)(bool))commissioningWindowRequestedHandler
commissioningCompleteCallback:(void (^_Nonnull)(bool))commissioningCompleteCallback
sessionEstablishmentStartedCallback:(void (^_Nullable)(void))sessionEstablishmentStartedCallback
sessionEstablishedCallback:(void (^_Nullable)(void))sessionEstablishedCallback
sessionEstablishmentStoppedCallback:(void (^_Nullable)(MatterError * _Nonnull))sessionEstablishmentStoppedCallback;

@property void (^_Nullable commissioningWindowRequestedHandler)(bool);

@property void (^_Nullable commissioningCompleteCallback)(bool);

@property void (^_Nullable sessionEstablishmentStartedCallback)(void);

@property void (^_Nullable sessionEstablishedCallback)(void);

@property void (^_Nullable sessionEstablishmentStoppedCallback)(MatterError * _Nonnull);

@end

#endif /* CommissioningCallbacksHandlers_h */
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/**
*
* Copyright (c) 2020-2023 Project CHIP Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#import "CommissioningCallbackHandlers.h"

@implementation CommissioningCallbackHandlers

- (CommissioningCallbackHandlers * _Nonnull)
initWithCommissioningWindowRequestedHandler:(void (^_Nonnull)(bool))commissioningWindowRequestedHandler
commissioningCompleteCallback:(void (^_Nonnull)(bool))commissioningCompleteCallback
sessionEstablishmentStartedCallback:(void (^_Nullable)(void))sessionEstablishmentStartedCallback
sessionEstablishedCallback:(void (^_Nullable)(void))sessionEstablishedCallback
sessionEstablishmentStoppedCallback:(void (^_Nullable)(MatterError * _Nonnull))sessionEstablishmentStoppedCallback
{
self = [super init];
if (self) {
_commissioningWindowRequestedHandler = commissioningWindowRequestedHandler;
_commissioningCompleteCallback = commissioningCompleteCallback;
_sessionEstablishmentStartedCallback = sessionEstablishmentStartedCallback;
_sessionEstablishedCallback = sessionEstablishedCallback;
_sessionEstablishmentStoppedCallback = sessionEstablishmentStoppedCallback;
}
return self;
}

@end
Loading

0 comments on commit c5f92ac

Please sign in to comment.