From 366517fd571034e9a7d07a9d9b2e6644015d718b Mon Sep 17 00:00:00 2001 From: Prerak Mann Date: Sun, 28 Feb 2021 21:32:51 +0530 Subject: [PATCH] temp --- ios/Classes/Device.swift | 2 ++ ios/Classes/MPCManager.swift | 16 ++++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ios/Classes/Device.swift b/ios/Classes/Device.swift index 076b436..bd58051 100644 --- a/ios/Classes/Device.swift +++ b/ios/Classes/Device.swift @@ -3,6 +3,7 @@ import MultipeerConnectivity import SwiftyJSON class Device: NSObject { + var endpointId: Int let peerID: MCPeerID var session: MCSession? var state = MCSessionState.notConnected @@ -12,6 +13,7 @@ class Device: NSObject { init(peerID: MCPeerID) { self.peerID = peerID + self.UUID = UUID().uuidString super.init() } diff --git a/ios/Classes/MPCManager.swift b/ios/Classes/MPCManager.swift index a952653..aa271da 100644 --- a/ios/Classes/MPCManager.swift +++ b/ios/Classes/MPCManager.swift @@ -32,11 +32,7 @@ class MPCManager: NSObject { var localPeerID: MCPeerID! var enterbackgroundNotification: NSObjectProtocol! private var backgroundTaskID: UIBackgroundTaskIdentifier = .invalid - var devices: [Device] = [] { - didSet { - deviceDidChange?() - } - } + var devices: [Device] = [] var deviceDidChange: (() -> Void)? @@ -76,7 +72,6 @@ class MPCManager: NSObject { func startAdvertisingPeer() { self.advertiser.startAdvertisingPeer() - } func startBrowsingForPeers() { @@ -91,9 +86,9 @@ class MPCManager: NSObject { self.browser.stopBrowsingForPeers() } - func invitePeer(deviceID: String) { + func invitePeer(endpointId: String) { do { - let device = MPCManager.instance.findDevice(for: deviceID) + let device = MPCManager.instance.findDevice(for: endpointId) if(device?.state == MCSessionState.notConnected){ device?.invite(with: self.browser) } @@ -118,9 +113,9 @@ class MPCManager: NSObject { return device } - func findDevice(for deviceId: String) -> Device? { + func findDevice(for endpointId: String) -> Device? { for device in self.devices { - if device.peerID.displayName == deviceId { return device } + if device.endpointId == endpointId { return device } } return nil } @@ -168,6 +163,7 @@ extension MPCManager: MCNearbyServiceBrowserDelegate { func browser(_ browser: MCNearbyServiceBrowser, foundPeer peerID: MCPeerID, withDiscoveryInfo info: [String : String]?) { // found peer, create a device with this peerID addNewDevice(for: peerID) + } func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {