diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index 897c108..64f17bc 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -609,8 +609,8 @@ Public Class TableInteraction ShowRelay(from1.Resultmodel, from1.ResulDic) Grid_Click(Nothing, Nothing) For Each index In from1.Resultmodel.Nodes - If index.Interface.Equals("DI") AndAlso (index.DEV_TYPE_DATA.Equals("10") OrElse index.DEV_TYPE_DATA.Equals("24")) Then - SpecifySetting(from1.Resultmodel.Name, "") + If index.Interface.Equals("DI") AndAlso (index.DEV_TYPE_DATA.Equals("10") OrElse index.DEV_TYPE_DATA.Equals("24") OrElse index.DEV_TYPE_DATA.Equals("46")) Then + SpecifySetting(from1.Resultmodel.Name,index.DEV_TYPE_DATA) End If Next @@ -2210,45 +2210,100 @@ Public Class TableInteraction Public Sub SpecifySetting(devname As String, cand As String) Dim srowid As CtabRange = GetRowDevNametabRange(devname, TableColNumber.DeviceName) If IsNothing(srowid) Then Return - For i = srowid.fr To srowid.lr - 'If i = srowid.fr Then + Dim nuindex = 0 + Dim tagdic As Dictionary(Of String, String) = New Dictionary(Of String, String)() + tagdic.Add("50 Adjustable Lower limit Settings (0-100)", 10) + tagdic.Add("49 Adjustable Upper limit Settings (0-100)", 90) + tagdic.Add("48 Host dimming percentage (0-100)", 90) + tagdic.Add("32 1-10V Dimming gradient time", 21) + tagdic.Add("33 A9 Constant voltage dimming gradient time", 21) + tagdic.Add("34 A9PB Dimming gradient time", 21) + tagdic.Add("35 C12 Dimming gradient time", 21) + tagdic.Add("36 Dimming gradient time of light strip", 21) + tagdic.Add("C8PLC comes with constant pressure dimming gradient time", 21) + tagdic.Add("C8PLC peripheral constant voltage dimming gradient time", 21) + tagdic.Add("7 Set music volume", 6) + tagdic.Add("8 Set prompt sound volume", 6) + tagdic.Add("9 Set doorbell and welcome message volume", 6) + tagdic.Add("12 Set sleep aid volume", 6) + tagdic.Add("10 Set global volume limit", 6) - 'End If - Select Case _grd.Cell(i, TableColNumber.KeyName).Text + For i = srowid.fr To srowid.lr + + Dim rowindex = i + nuindex + Dim datastr As String = _grd.Cell(rowindex, TableColNumber.KeyName).Text.Trim + If rowindex = 7 Then + _grd.Cell(rowindex, TableColNumber.SceneAttribute).Tag = JsonConvert.SerializeObject(tagdic) + End If + Select Case datastr Case "Insert card" - _grd.Range(i, TableColNumber.KeyName, i, TableColNumber.KeyName).SelectCells() - AddSceneLine("Insert card") - _grd.Cell(i + 1, TableColNumber.KeyName).Text = "pull out" - 'Console.WriteLine(_grd.Cell(i + 1, TableColNumber.SceneAttribute).Text) - If _grd.Cell(i + 1, TableColNumber.SceneAttribute).Text.Contains("1365,1") Then - _grd.Cell(i + 1, TableColNumber.SceneAttribute).Text = "2730,1,1152921504606846976" + _grd.Cell(rowindex, TableColNumber.ServerAttribute).Text = "1,1,0,1," + _grd.Range(rowindex, TableColNumber.KeyName, rowindex, TableColNumber.KeyName).SelectCells() + + If cand.Equals("46") Then + AddSceneLine("Insert card") + AddSceneLine("Insert card") + AddSceneLine("Insert card") + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "KeyLeft" + _grd.Cell(rowindex + 1, TableColNumber.ServerAttribute).Text = "1,1,0,1," + _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "6,1,1152921504606846976" + nuindex = nuindex + 1 + + _grd.Cell(rowindex + 2, TableColNumber.KeyName).Text = "NoKeyLeft" + _grd.Cell(rowindex + 2, TableColNumber.ServerAttribute).Text = "1,2,1,2," + _grd.Cell(rowindex + 2, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" + nuindex = nuindex + 1 + + + + _grd.Cell(rowindex + 3, TableColNumber.KeyName).Text = "pull out" + _grd.Cell(rowindex +3, TableColNumber.ServerAttribute).Text = "1,2,1,2," + _grd.Cell(rowindex + 3, TableColNumber.SceneAttribute).Text = "3,1,1152921504606846976" + nuindex = nuindex + 1 + Else - _grd.Cell(i + 1, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" + AddSceneLine("Insert card") + + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "pull out" + _grd.Cell(rowindex + 1, TableColNumber.ServerAttribute).Text = "1,2,1,2," + 'Console.WriteLine(_grd.Cell(i + 1, TableColNumber.SceneAttribute).Text) + If _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text.Contains("1365,1") Then + _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "2730,1,1152921504606846976" + Else + _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" End If - i = i + 1 + nuindex = nuindex + 1 + End If + Case "door bell" - _grd.Cell(i, TableColNumber.SceneAttribute).Text = "1,1,1152921504606847520" + _grd.Cell(rowindex, TableColNumber.SceneAttribute).Text = "1,1,1152921504606847520" Case "SOS pressed" - _grd.Range(i, TableColNumber.KeyName, i, TableColNumber.KeyName).SelectCells() + _grd.Range(rowindex, TableColNumber.KeyName, rowindex, TableColNumber.KeyName).SelectCells() + _grd.Cell(rowindex, TableColNumber.ServerAttribute).Text = "8,1,0,1," AddSceneLine("SOS pressed") - _grd.Cell(i + 1, TableColNumber.KeyName).Text = "SOS release" - _grd.Cell(i + 1, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" - i = i + 1 + _grd.Cell(rowindex + 1, TableColNumber.ServerAttribute).Text = "8,2,0,1," + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "SOS release" + _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" + nuindex = nuindex + 1 Case "Open door contact" - _grd.Range(i, TableColNumber.KeyName, i, TableColNumber.KeyName).SelectCells() + _grd.Range(rowindex, TableColNumber.KeyName, rowindex, TableColNumber.KeyName).SelectCells() + _grd.Cell(rowindex, TableColNumber.ServerAttribute).Text = "13,1,0,1," AddSceneLine("Open door contact") - _grd.Cell(i + 1, TableColNumber.KeyName).Text = "Close door contact" - _grd.Cell(i, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" - i = i + 1 + _grd.Cell(rowindex + 1, TableColNumber.ServerAttribute).Text = "13,2,0,1," + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "Close door contact" + _grd.Cell(rowindex, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" + nuindex = nuindex + 1 + Case Else - If _grd.Cell(i, TableColNumber.KeyName).Text.Contains("Sliding bar") Then - _grd.Range(i, TableColNumber.KeyName, i, TableColNumber.KeyName).SelectCells() + If _grd.Cell(rowindex, TableColNumber.KeyName).Text.Contains("Sliding bar") Then + _grd.Range(rowindex, TableColNumber.KeyName, rowindex, TableColNumber.KeyName).SelectCells() AddSceneLine("Right sliding") - _grd.Cell(i + 1, TableColNumber.KeyName).Text = "Left sliding" - _grd.Cell(i + 1, TableColNumber.SceneAttribute).Text = "1,1,1152921504606847008" - i = i + 1 + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "Left sliding" + _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "1,1,1152921504606847008" + nuindex = nuindex + 1 + End If End Select