Working like a turtle. Restructuring sources SRL

This commit is contained in:
Heath Volmer
2017-02-16 16:25:51 -07:00
parent c83f09fe12
commit a54498091b
23 changed files with 128 additions and 99 deletions

View File

@@ -0,0 +1,27 @@
2/16/2017 1:36:02 PM, Info: Initializing SIMPLSharp Services...
2/16/2017 1:36:02 PM, Info: ProjectInfo successfully initialized.
2/16/2017 3:09:53 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:09:55 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:09:55 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:09:56 PM, Info: Saving project information...
2/16/2017 3:16:32 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:16:33 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:16:33 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:16:34 PM, Info: Saving project information...
2/16/2017 3:20:07 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:20:08 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:20:08 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:20:10 PM, Info: Saving project information...
2/16/2017 3:32:15 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:32:16 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:32:16 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:32:17 PM, Info: Saving project information...
2/16/2017 3:41:21 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:41:22 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:41:22 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:41:23 PM, Info: Saving project information...
2/16/2017 3:45:03 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
2/16/2017 3:45:04 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
2/16/2017 3:45:04 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
2/16/2017 3:45:05 PM, Info: Saving project information...
2/16/2017 4:24:42 PM, Info: Terminating SIMPLSharp Services

View File

@@ -104,12 +104,18 @@ namespace PepperDash.Essentials
continue;
}
var localSrcConfig = srcConfig; // lambda scope below
var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig,
b => { if (!b) UiSelectSource(localSrcConfig); });
SourcesSrl.AddItem(item); // add to the SRL
item.RegisterForSourceChange(Parent.CurrentRoom);
SourcesSrl.GetBoolFeedbackSig(i, 1).UserObject = new Action<bool>(b =>
{ if (!b) UiSelectSource(localSrcConfig); });
SourcesSrl.StringInputSig(i, 1).StringValue = srcConfig.PreferredName;
i++;
//var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig,
// b => { if (!b) UiSelectSource(localSrcConfig); });
//SourcesSrl.AddItem(item); // add to the SRL
//item.RegisterForSourceChange(Parent.CurrentRoom);
}
SourcesSrl.Count = (ushort)(i - 1);
Parent.CurrentRoom.CurrentSourceInfoChange += CurrentRoom_CurrentSourceInfoChange;
}
}
@@ -118,17 +124,6 @@ namespace PepperDash.Essentials
}
/// <summary>
///
/// </summary>
void ToggleSharingModePressed()
{
Hide();
IsSharingModeAdvanced = !IsSharingModeAdvanced;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced;
Show();
}
/// <summary>
/// Called from button presses on source, where We can assume we want
/// to change to the proper screen.
@@ -144,6 +139,23 @@ namespace PepperDash.Essentials
Parent.CurrentRoom.DoSourceToAllDestinationsRoute(sourceItem);
}
void CurrentRoom_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
{
}
/// <summary>
///
/// </summary>
void ToggleSharingModePressed()
{
Hide();
IsSharingModeAdvanced = !IsSharingModeAdvanced;
TriList.BooleanInput[UIBoolJoin.ToggleSharingModePress].BoolValue = IsSharingModeAdvanced;
Show();
}
public void SourceListButtonPress(SourceListItem item)
{
// start the timer

View File

@@ -1,65 +1,65 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Crestron.SimplSharp;
using Crestron.SimplSharpPro;
using Crestron.SimplSharpPro.UI;
//using System;
//using System.Collections.Generic;
//using System.Linq;
//using System.Text;
//using Crestron.SimplSharp;
//using Crestron.SimplSharpPro;
//using Crestron.SimplSharpPro.UI;
using PepperDash.Essentials.Core;
//using PepperDash.Essentials.Core;
namespace PepperDash.Essentials
{
public class SubpageReferenceListSourceItem : SubpageReferenceListItem
{
public SourceListItem SourceItem { get; private set; }
//namespace PepperDash.Essentials
//{
// public class SubpageReferenceListSourceItem : SubpageReferenceListItem
// {
// public SourceListItem SourceItem { get; private set; }
public SubpageReferenceListSourceItem(uint index, SubpageReferenceList owner,
SourceListItem sourceItem, Action<bool> routeAction)
: base(index, owner)
{
SourceItem = sourceItem;
owner.GetBoolFeedbackSig(index, 1).UserObject = new Action<bool>(routeAction);
owner.StringInputSig(index, 1).StringValue = SourceItem.PreferredName;
}
// public SubpageReferenceListSourceItem(uint index, SubpageReferenceList owner,
// SourceListItem sourceItem, Action<bool> routeAction)
// : base(index, owner)
// {
// SourceItem = sourceItem;
// owner.GetBoolFeedbackSig(index, 1).UserObject = new Action<bool>(routeAction);
// owner.StringInputSig(index, 1).StringValue = SourceItem.PreferredName;
// }
public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
{
room.CurrentSourceInfoChange -= room_CurrentSourceInfoChange;
room.CurrentSourceInfoChange += room_CurrentSourceInfoChange;
}
// public void RegisterForSourceChange(IHasCurrentSourceInfoChange room)
// {
// room.CurrentSourceInfoChange -= room_CurrentSourceInfoChange;
// room.CurrentSourceInfoChange += room_CurrentSourceInfoChange;
// }
void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
{
if (type == ChangeType.WillChange && info == SourceItem)
ClearFeedback();
else if (type == ChangeType.DidChange && info == SourceItem)
SetFeedback();
}
// void room_CurrentSourceInfoChange(EssentialsRoomBase room, SourceListItem info, ChangeType type)
// {
// if (type == ChangeType.WillChange && info == SourceItem)
// ClearFeedback();
// else if (type == ChangeType.DidChange && info == SourceItem)
// SetFeedback();
// }
/// <summary>
/// Called by SRL to release all referenced objects
/// </summary>
public override void Clear()
{
Owner.BoolInputSig(Index, 1).UserObject = null;
Owner.StringInputSig(Index, 1).StringValue = "";
}
// /// <summary>
// /// Called by SRL to release all referenced objects
// /// </summary>
// public override void Clear()
// {
// Owner.BoolInputSig(Index, 1).UserObject = null;
// Owner.StringInputSig(Index, 1).StringValue = "";
// }
/// <summary>
/// Sets the selected feedback on the button
/// </summary>
public void SetFeedback()
{
Owner.BoolInputSig(Index, 1).BoolValue = true;
}
// /// <summary>
// /// Sets the selected feedback on the button
// /// </summary>
// public void SetFeedback()
// {
// Owner.BoolInputSig(Index, 1).BoolValue = true;
// }
/// <summary>
/// Clears the selected feedback on the button
/// </summary>
public void ClearFeedback()
{
Owner.BoolInputSig(Index, 1).BoolValue = false;
}
}
}
// /// <summary>
// /// Clears the selected feedback on the button
// /// </summary>
// public void ClearFeedback()
// {
// Owner.BoolInputSig(Index, 1).BoolValue = false;
// }
// }
//}

View File

@@ -10,8 +10,8 @@
<ArchiveName />
</RequiredInfo>
<OptionalInfo>
<CompiledOn>2/15/2017 10:47:23 AM</CompiledOn>
<CompilerRev>1.0.0.19420</CompilerRev>
<CompiledOn>2/16/2017 3:45:04 PM</CompiledOn>
<CompilerRev>1.0.0.28239</CompilerRev>
</OptionalInfo>
<Plugin>
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>

View File

@@ -1,6 +1,6 @@
MainAssembly=PepperDashEssentials.dll:60c91f66dea9040efb0f42a2e016ea2d
MainAssembly=PepperDashEssentials.dll:5deb13632556e8d5c82a54c2bb816ea0
MainAssemblyMinFirmwareVersion=1.009.0029
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
MainAssemblyResource=SimplSharpData.dat:820b61c48c8a2cace82957eed4cc377c
ü
DependencySource=Crestron.SimplSharpPro.DeviceSupport.dll:caae4b4259aaf619059f0ae34473bfd2
DependencyPath=PepperDashEssentials.cpz:Crestron.SimplSharpPro.DeviceSupport.dll
@@ -30,37 +30,33 @@ DependencySource=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
DependencyPath=PepperDashEssentials.cpz:Crestron.SimplSharpPro.UI.dll
DependencyMainAssembly=Crestron.SimplSharpPro.UI.dll:089312a0cb0b4537072d4eb234e71e0e
ü
DependencySource=Essentials Devices Common.dll:34096f733e1dccaaa0a25a0078bee6c1
DependencySource=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca
DependencyPath=PepperDashEssentials.cpz:Essentials Devices Common.dll
DependencyMainAssembly=Essentials Devices Common.dll:34096f733e1dccaaa0a25a0078bee6c1
DependencyMainAssembly=Essentials Devices Common.dll:8aa9519dd8b47681a03ce49bbd85d7ca
ü
DependencySource=EssentialsHttpServer.dll:0666085bdb0856c1d117699c7859bb8c
DependencyPath=PepperDashEssentials.cpz:EssentialsHttpServer.dll
DependencyMainAssembly=EssentialsHttpServer.dll:0666085bdb0856c1d117699c7859bb8c
ü
DependencySource=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896
DependencyPath=PepperDashEssentials.cpz:Newtonsoft.Json.Compact.dll
DependencyMainAssembly=Newtonsoft.Json.Compact.dll:ea996aa2ec65aa1878e7c9d09e37a896
ü
DependencySource=PepperDashCorePortalSync.dll:80cb079012e59e1a1805c7e5bbe07e76
DependencySource=PepperDashCorePortalSync.dll:815e608cb8a8808dab167837cf89b15a
DependencyPath=PepperDashEssentials.cpz:PepperDashCorePortalSync.dll
DependencyMainAssembly=PepperDashCorePortalSync.dll:80cb079012e59e1a1805c7e5bbe07e76
DependencyMainAssembly=PepperDashCorePortalSync.dll:815e608cb8a8808dab167837cf89b15a
ü
DependencySource=PepperDash_Core.dll:376f0c0b11f57cee97fbee77c6d5579f
DependencySource=PepperDash_Core.dll:99fe5dcaaf81523443764e14332eb8ec
DependencyPath=PepperDashEssentials.cpz:PepperDash_Core.dll
DependencyMainAssembly=PepperDash_Core.dll:376f0c0b11f57cee97fbee77c6d5579f
DependencyMainAssembly=PepperDash_Core.dll:99fe5dcaaf81523443764e14332eb8ec
ü
DependencySource=PepperDash_Essentials_Core.dll:f7a721fec365c6060bc860c9e095cee7
DependencySource=PepperDash_Essentials_Core.dll:6af3638bcef46f41ff56cdd5fe464b75
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Core.dll
DependencyMainAssembly=PepperDash_Essentials_Core.dll:f7a721fec365c6060bc860c9e095cee7
DependencyMainAssembly=PepperDash_Essentials_Core.dll:6af3638bcef46f41ff56cdd5fe464b75
ü
DependencySource=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_Displays.dll
DependencyMainAssembly=PepperDash_Essentials_Displays.dll:3135ef6b8f66b5b1bc5223aad3ef66e0
ü
DependencySource=PepperDash_Essentials_DM.dll:79c934f3762e7e3ad6044a4afb070e29
DependencySource=PepperDash_Essentials_DM.dll:33b846111ff1f05f67a42bb2e9b0fbff
DependencyPath=PepperDashEssentials.cpz:PepperDash_Essentials_DM.dll
DependencyMainAssembly=PepperDash_Essentials_DM.dll:79c934f3762e7e3ad6044a4afb070e29
DependencyMainAssembly=PepperDash_Essentials_DM.dll:33b846111ff1f05f67a42bb2e9b0fbff
ü
DependencySource=SimplSharpCryptographyInterface.dll:dd4791a86d6f67ddc309c4ab1e24c663
DependencyPath=PepperDashEssentials.cpz:SimplSharpCryptographyInterface.dll
@@ -70,10 +66,6 @@ DependencySource=SimplSharpCustomAttributesInterface.dll:9c4b4d4c519b655af90016e
DependencyPath=PepperDashEssentials.cpz:SimplSharpCustomAttributesInterface.dll
DependencyMainAssembly=SimplSharpCustomAttributesInterface.dll:9c4b4d4c519b655af90016edca2d66b9
ü
DependencySource=SimplSharpCWSHelperInterface.dll:8b215ccdae52c92aff1591473e025580
DependencyPath=PepperDashEssentials.cpz:SimplSharpCWSHelperInterface.dll
DependencyMainAssembly=SimplSharpCWSHelperInterface.dll:8b215ccdae52c92aff1591473e025580
ü
DependencySource=SimplSharpHelperInterface.dll:aed72eb0e19559a3f56708be76445dcd
DependencyPath=PepperDashEssentials.cpz:SimplSharpHelperInterface.dll
DependencyMainAssembly=SimplSharpHelperInterface.dll:aed72eb0e19559a3f56708be76445dcd

View File

@@ -82,8 +82,6 @@ C:\Users\hvolmer\Desktop\working\essentials-ssp\PepperDashEssentials\PepperDashE
C:\Users\hvolmer\Desktop\working\essentials-ssp\PepperDashEssentials\PepperDashEssentials\bin\PepperDashCorePortalSync.dll
C:\Users\hvolmer\Desktop\working\essentials-ssp\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpCWSHelperInterface.dll
C:\Users\hvolmer\Desktop\working\essentials-ssp\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpCryptographyInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\obj\Debug\ResolveAssemblyReference.cache
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\obj\Debug\PepperDashEssentials.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll.config
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.pdb
@@ -96,17 +94,17 @@ C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssen
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\Essentials Devices Common.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\EssentialsHttpServer.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDash_Core.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDash_Essentials_Core.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDash_Essentials_DM.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashCorePortalSync.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpCustomAttributesInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpHelperInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpNewtonsoft.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpPro.exe
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpCWSHelperInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpSQLHelperInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpCryptographyInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\Crestron.SimplSharpPro.Gateways.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\SimplSharpReflectionInterface.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\Newtonsoft.Json.Compact.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\obj\Debug\ResolveAssemblyReference.cache
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\obj\Debug\PepperDashEssentials.dll
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\obj\Debug\PepperDashEssentials.pdb
C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDash_Essentials_Core.dll