diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index 5879262..0da490b 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -619,7 +619,7 @@ Public Class TableInteraction 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") OrElse index.DEV_TYPE_DATA.Equals("46")) Then - SpecifySetting(from1.Resultmodel.Name, "") + SpecifySetting(from1.Resultmodel.Name,index.DEV_TYPE_DATA) End If Next @@ -2274,7 +2274,31 @@ Public Class TableInteraction Case "插卡" _grd.Cell(rowindex, TableColNumber.ServerAttribute).Text = "1,1,0,1," _grd.Range(rowindex, TableColNumber.KeyName, rowindex, TableColNumber.KeyName).SelectCells() - AddSceneLine("插卡") + + If cand.Equals("46") Then + AddSceneLine("插卡") + AddSceneLine("插卡") + AddSceneLine("插卡") + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "按键取电" + _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 = "卡在人离" + _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 = "拔卡" + _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 + AddSceneLine("插卡") + _grd.Cell(rowindex + 1, TableColNumber.KeyName).Text = "拔卡" _grd.Cell(rowindex + 1, TableColNumber.ServerAttribute).Text = "1,2,1,2," 'Console.WriteLine(_grd.Cell(i + 1, TableColNumber.SceneAttribute).Text) @@ -2284,6 +2308,9 @@ Public Class TableInteraction _grd.Cell(rowindex + 1, TableColNumber.SceneAttribute).Text = "2,1,1152921504606846976" End If nuindex = nuindex + 1 + End If + + Case "门铃"