diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs index 7102e69e..0cc877bb 100644 --- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ [assembly: AssemblyCompany("PepperDash Technology Corp")] [assembly: AssemblyProduct("PepperDashEssentials")] [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")] -[assembly: AssemblyVersion("1.0.46.*")] +[assembly: AssemblyVersion("1.0.47.*")] diff --git a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs index 460cd09d..275190b8 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/CotijaSystemController.cs @@ -74,12 +74,12 @@ namespace PepperDash.Essentials Config = config; Debug.Console(0, this, "Mobile UI controller initializing for server:{0}", config.ServerUrl); - CrestronConsole.AddNewConsoleCommand(DisconnectStreamClient, - "CloseHttpClient", "Closes the active HTTP client", ConsoleAccessLevelEnum.AccessOperator); + //CrestronConsole.AddNewConsoleCommand(DisconnectStreamClient, + // "CloseHttpClient", "Closes the active HTTP client", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(AuthorizeSystem, - "cotijaauth", "Authorizes system to talk to cotija server", ConsoleAccessLevelEnum.AccessOperator); - - //AddPostActivationAction(() => RegisterSystemToServer()); + "mobileauth", "Authorizes system to talk to cotija server", ConsoleAccessLevelEnum.AccessOperator); + CrestronConsole.AddNewConsoleCommand(s => ShowInfo(), + "mobileinfo", "Shows information for current mobile control session", ConsoleAccessLevelEnum.AccessOperator); } /// @@ -192,6 +192,20 @@ namespace PepperDash.Essentials } } + /// + /// Dumps info in response to console command. + /// + void ShowInfo() + { + CrestronConsole.ConsoleCommandResponse(@"Mobile Control Information: + Server address: {0} + System Name: {1} + System UUID: {2} + System User code: {3} + Connected?: {4}", Config.ServerUrl, RoomBridges[0].RoomName, SystemUuid, + RoomBridges[0].UserCode, WSClient.Connected ? "Yes" : "No"); + } + /// /// Registers the room with the server /// @@ -224,7 +238,7 @@ namespace PepperDash.Essentials else { var regClient = new HttpClient(); - regClient.Verbose = true; + regClient.Verbose = false; regClient.KeepAlive = true; string url = string.Format("http://{0}/api/system/join/{1}", Config.ServerUrl, SystemUuid); diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs index 0061cd13..a578a0ae 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaBridgeBase.cs @@ -18,6 +18,8 @@ namespace PepperDash.Essentials public string UserCode { get; private set; } + public abstract string RoomName { get; } + public CotijaBridgeBase(string key, string name) : base(key, name) { diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs index 9f62be62..324643fa 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaDdvc01RoomBridge.cs @@ -134,6 +134,14 @@ namespace PepperDash.Essentials.Room.Cotija /// public bool ConfigIsLoaded { get; private set; } + public override string RoomName + { + get { + var name = EISC.StringOutput[StringJoin.ConfigRoomName].StringValue; + return string.IsNullOrEmpty(name) ? "Not Loaded" : name; + } + } + CotijaDdvc01DeviceBridge SourceBridge; diff --git a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs index 37068183..ccd44070 100644 --- a/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs +++ b/Essentials/PepperDashEssentials/Room/Cotija/RoomBridges/CotijaEssentialsHuddleSpaceRoomBridge.cs @@ -15,6 +15,17 @@ namespace PepperDash.Essentials public EssentialsHuddleSpaceRoom Room { get; private set; } + /// + /// + /// + public override string RoomName + { + get + { + return Room.Name; + } + } + /// /// /// diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index ac78187c..cda0111d 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 5f2d91a6..357d0ee6 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ