diff --git a/.gitignore b/.gitignore index d0749cc..4d63c69 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,18 @@ BLV_Studio/bin BLV_Studio/obj BLV_Studio/publish BLV_Studio/bin +BLV_Studio/bin +BLV_Studio/bin/Debug/app.publish/BLV_Studio.exe +BLV_Studio/bin/Debug +BLV_Studio/bin/Debug/BLV_Studio.application +BLV_Studio/bin/Debug/BLV_Studio.exe +BLV_Studio/bin/Debug/BLV_Studio.exe.manifest +BLV_Studio/bin/Debug/BLV_Studio.pdb +BLV_Studio/obj/Debug/BLV_Studio.application +BLV_Studio/obj/Debug/BLV_Studio.exe.manifest +BLV_Studio/obj/Debug/BLV_Studio.exe +BLV_Studio/obj/Debug/BLV_Studio.FrmMain.resources +BLV_Studio/obj/Debug/BLV_Studio.vbproj.AssemblyReference.cache +BLV_Studio/obj/Debug/BLV_Studio.pdb +BLV_Studio/obj/Debug/BLV_Studio.vbproj.GenerateResource.cache +BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferences.cache diff --git a/BLV_Studio/BLV_Studio.vbproj b/BLV_Studio/BLV_Studio.vbproj index b43678c..669fe2b 100644 --- a/BLV_Studio/BLV_Studio.vbproj +++ b/BLV_Studio/BLV_Studio.vbproj @@ -35,7 +35,7 @@ 4.0.0.5 true index.html - 89 + 91 4.4.3.%2a false true diff --git a/BLV_Studio/FrmMain.Designer.vb b/BLV_Studio/FrmMain.Designer.vb index 96bfa8f..cf8dff8 100644 --- a/BLV_Studio/FrmMain.Designer.vb +++ b/BLV_Studio/FrmMain.Designer.vb @@ -123,9 +123,9 @@ Partial Class FrmMain Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator() Me.Tablet_DeleteRow = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton21 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton5 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton18 = New System.Windows.Forms.ToolStripButton() - Me.ToolStripButton21 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton22 = New System.Windows.Forms.ToolStripButton() Me.tab_Actions = New System.Windows.Forms.TabPage() Me.GrdEvent = New FlexCell.Grid() @@ -1208,6 +1208,17 @@ Partial Class FrmMain Me.ToolStripButton3.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.ToolStripButton3.ToolTipText = "展开全部节点" ' + 'ToolStripButton21 + ' + Me.ToolStripButton21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer)) + Me.ToolStripButton21.Image = CType(resources.GetObject("ToolStripButton21.Image"), System.Drawing.Image) + Me.ToolStripButton21.ImageTransparentColor = System.Drawing.Color.Magenta + Me.ToolStripButton21.Name = "ToolStripButton21" + Me.ToolStripButton21.Size = New System.Drawing.Size(60, 37) + Me.ToolStripButton21.Text = "上传回路" + Me.ToolStripButton21.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText + Me.ToolStripButton21.ToolTipText = "将数据发布至项目视图中选定的房型" + ' 'ToolStripButton5 ' Me.ToolStripButton5.ForeColor = System.Drawing.Color.Blue @@ -1229,17 +1240,6 @@ Partial Class FrmMain Me.ToolStripButton18.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText Me.ToolStripButton18.ToolTipText = "隐藏属性节点" ' - 'ToolStripButton21 - ' - Me.ToolStripButton21.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer)) - Me.ToolStripButton21.Image = CType(resources.GetObject("ToolStripButton21.Image"), System.Drawing.Image) - Me.ToolStripButton21.ImageTransparentColor = System.Drawing.Color.Magenta - Me.ToolStripButton21.Name = "ToolStripButton21" - Me.ToolStripButton21.Size = New System.Drawing.Size(60, 37) - Me.ToolStripButton21.Text = "上传回路" - Me.ToolStripButton21.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText - Me.ToolStripButton21.ToolTipText = "将数据发布至项目视图中选定的房型" - ' 'ToolStripButton22 ' Me.ToolStripButton22.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer)) @@ -1297,7 +1297,6 @@ Partial Class FrmMain ' Me.ToolStripTextBox1.BackColor = System.Drawing.SystemColors.ButtonHighlight Me.ToolStripTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.ToolStripTextBox1.Font = New System.Drawing.Font("Microsoft YaHei UI", 9.0!) Me.ToolStripTextBox1.Name = "ToolStripTextBox1" Me.ToolStripTextBox1.ReadOnly = True Me.ToolStripTextBox1.Size = New System.Drawing.Size(100, 25) diff --git a/BLV_Studio/FrmMain.resx b/BLV_Studio/FrmMain.resx index 81c3438..3165e2c 100644 --- a/BLV_Studio/FrmMain.resx +++ b/BLV_Studio/FrmMain.resx @@ -179,7 +179,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - PgAAAk1TRnQBSQFMAgEBQgEAAXABIwFwASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + PgAAAk1TRnQBSQFMAgEBQgEAAXgBIwF4ASMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARABAQIAAQEBAAEIBgABRBgAAYACAAGAAwACgAEAAYADAAGAAQABgAEAAoACAAPAAQABwAHc AcABAAHwAcoBpgEAATMFAAEzAQABMwEAATMBAAIzAgADFgEAAxwBAAMiAQADKQEAA1UBAANNAQADQgEA AzkBAAGAAXwB/wEAAlAB/wEAAZMBAAHWAQAB/wHsAcwBAAHGAdYB7wEAAdYC5wEAAZABqQGtAgAB/wEz @@ -466,7 +466,7 @@ 17, 55 - 69 + 224 diff --git a/BLV_Studio/My Project/AssemblyInfo.vb b/BLV_Studio/My Project/AssemblyInfo.vb index 16c7d47..24b6bfa 100644 --- a/BLV_Studio/My Project/AssemblyInfo.vb +++ b/BLV_Studio/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices '通过使用 "*",如下所示: ' - - + + diff --git a/BLV_Studio/SetLoopInformation.vb b/BLV_Studio/SetLoopInformation.vb index 5fcf843..5b2d8cb 100644 --- a/BLV_Studio/SetLoopInformation.vb +++ b/BLV_Studio/SetLoopInformation.vb @@ -528,6 +528,15 @@ Public Class SetLoopInformation End Sub + Public Sub setCheckTheBox(loopaddr As String, loopname As String, serveraddr As String, servername As String) + For i = 1 To Grid1.Rows - 1 + + Next + + End Sub + + + Private Sub ToolStripButton2_Click(sender As Object, e As EventArgs) End Sub diff --git a/BLV_Studio/Test/GridTest/PowerSupply.vb b/BLV_Studio/Test/GridTest/PowerSupply.vb index 1ae45ea..021979a 100644 --- a/BLV_Studio/Test/GridTest/PowerSupply.vb +++ b/BLV_Studio/Test/GridTest/PowerSupply.vb @@ -58,11 +58,15 @@ Public Class PowerSupply Return End Sub - Public Sub deleteG_TableGridService(intenndoe As DeviceChildNode) + Public Sub deleteG_TableGridService(intenndoe As DeviceChildNode, CardNodestr As String) Dim portname, chname As String Dim cbuf As String() = intenndoe.Description.Split(",") If cbuf.Length > 1 Then portname = cbuf(1) + If CardNodestr.Contains(portname) Then + Return + End If + Else Return End If @@ -71,36 +75,47 @@ Public Class PowerSupply chname = intenndoe.Name If String.IsNullOrEmpty(portname) Then Return '从名称中提取场景号绑定端口名称格式为 portname = $"{ TableGrid.Cell(i, TableColNumber.KeyName).Text}({TableGrid.Cell(i, TableColNumber.SceneID).Text})" - Dim addserviceData As String + Dim addserviceData, addserviceData1 As String Dim sceneid As String = portname.Substring(portname.LastIndexOf("(") + 1, portname.LastIndexOf(")") - portname.LastIndexOf("(") - 1) Dim serviceData As String '遍历g_TableGrid表找到该场景号对应行 - Dim tabrows As Integer = g_TableGrid.Rows - 2 + Dim tabrows As Integer = g_TableGrid.Rows - 5 For tabrow = 1 To tabrows serviceData = g_TableGrid.Cell(tabrow, TableColNumber.SceneID).Text If g_TableGrid.Cell(tabrow, TableColNumber.SceneID).Text.Equals(sceneid) Then serviceData = g_TableGrid.Cell(tabrow, TableColNumber.ServerAttribute).Text If chname.Contains("CH1") Then - addserviceData = "13,1,0,1," + Return + 'addserviceData = "13,1,0,1," + 'addserviceData1 = "13,2,0,1," ElseIf chname.Contains("CH2") Then addserviceData = "32,1,0,1," + addserviceData1 = "32,2,0,1," ElseIf chname.Contains("CH3") Then addserviceData = "33,1,0,1," + addserviceData1 = "33,2,0,1," ElseIf chname.Contains("CH4") Then addserviceData = "34,1,0,1," + addserviceData1 = "34,2,0,1," ElseIf chname.Contains("CH5") Then addserviceData = "35,1,0,1," + addserviceData1 = "35,2,0,1," ElseIf chname.Contains("CH6") Then addserviceData = "36,1,0,1," + addserviceData1 = "36,2,0,1," ElseIf chname.Contains("CH7") Then addserviceData = "37,1,0,1," + addserviceData1 = "37,2,0,1," ElseIf chname.Contains("CH8") Then addserviceData = "38,1,0,1," + addserviceData1 = "38,2,0,1," ElseIf chname.Contains("CH9") Then addserviceData = "39,1,0,1," + addserviceData1 = "39,2,0,1," ElseIf chname.Contains("CH10") Then addserviceData = "40,1,0,1," + addserviceData1 = "40,2,0,1," Else Return End If @@ -110,14 +125,45 @@ Public Class PowerSupply serviceData = serviceData.Replace(addserviceData, "") '更新g_TableGrid表中的ServerAttribute列 g_TableGrid.Cell(tabrow, TableColNumber.ServerAttribute).Text = serviceData.Trim + + End If + Dim cloopkey = g_TableGrid.Cell(tabrow, TableColNumber.KeyVal).Text + + deleteG_TableGridService2(tabrow, cloopkey, addserviceData1) + + End If + Next + End Sub + + Public Sub deleteG_TableGridService2(row As Integer, loopkey As String, scene As String) + Dim cloopkey, cscene, serviceData As String + Dim cscenebuf As String() + Dim cr As CtabRange = New CtabRange(g_TableGrid, row, TableColNumber.DeviceName) + '遍历行 + For i = cr.fr To cr.lr + cloopkey = g_TableGrid.Cell(i, TableColNumber.KeyVal).Text + cscene = g_TableGrid.Cell(i, TableColNumber.SceneAttribute).Text + '判断loopkey是否相当于cloopkey + If cloopkey.Equals(loopkey) Then + cscenebuf = cscene.Split(",") + If cscenebuf(0).Equals("2") Then + serviceData = g_TableGrid.Cell(i, TableColNumber.ServerAttribute).Text + If serviceData.Contains(scene) Then + serviceData = serviceData.Replace(scene, "") + g_TableGrid.Cell(i, TableColNumber.ServerAttribute).Text = serviceData.Trim + + End If + End If End If Next End Sub + Public Sub SetG_TableGridService(portname As String, chname As String) - Dim serviceData As String - Dim addserviceData As String + Dim serviceData, cloopkey As String + Dim addserviceData, addserviceData1 As String + Dim crow As Integer ''遍历PortTable表 'For i = 1 To PortTable.Rows - 1 ' '获取绑定端口名称 @@ -131,34 +177,48 @@ Public Class PowerSupply For j = 1 To g_TableGrid.Rows - 1 If g_TableGrid.Cell(j, TableColNumber.SceneID).Text.Equals(sceneid) Then serviceData = g_TableGrid.Cell(j, TableColNumber.ServerAttribute).Text + cloopkey = g_TableGrid.Cell(j, TableColNumber.KeyVal).Text + crow = j '21,1,0,1, '21,2,10,2, If chname.Contains("CH1") Then addserviceData = "13,1,0,1," + addserviceData1 = "13,2,0,1," ElseIf chname.Contains("CH2") Then addserviceData = "32,1,0,1," + addserviceData1 = "32,2,0,1," ElseIf chname.Contains("CH3") Then addserviceData = "33,1,0,1," + addserviceData1 = "33,2,0,1," ElseIf chname.Contains("CH4") Then addserviceData = "34,1,0,1," + addserviceData1 = "34,2,0,1," ElseIf chname.Contains("CH5") Then addserviceData = "35,1,0,1," + addserviceData1 = "35,2,0,1," ElseIf chname.Contains("CH6") Then addserviceData = "36,1,0,1," + addserviceData1 = "36,2,0,1," ElseIf chname.Contains("CH7") Then addserviceData = "37,1,0,1," + addserviceData1 = "37,2,0,1," ElseIf chname.Contains("CH8") Then addserviceData = "38,1,0,1," + addserviceData1 = "38,2,0,1," ElseIf chname.Contains("CH9") Then addserviceData = "39,1,0,1," + addserviceData1 = "39,2,0,1," ElseIf chname.Contains("CH10") Then addserviceData = "40,1,0,1," + addserviceData1 = "40,2,0,1," Else - Return + Exit For End If + + '判断serviceData是否包含addserviceData If serviceData.Contains(addserviceData) Then - Return + Exit For End If '判断serviceData是否为空 If String.IsNullOrEmpty(serviceData) Then @@ -171,11 +231,62 @@ Public Class PowerSupply End If Next + If Not String.IsNullOrEmpty(addserviceData1) AndAlso Not String.IsNullOrEmpty(cloopkey) Then + SetG_TableGridService2(crow, cloopkey, addserviceData1) + End If 'Next End Sub + Public Sub SetG_TableGridService2(row As Integer, loopkey As String, scene As String) + Dim cloopkey, cscene, serviceData As String + Dim cscenebuf As String() + Dim cr As CtabRange = New CtabRange(g_TableGrid, row, TableColNumber.DeviceName) + '遍历行 + For i = cr.fr To cr.lr + cloopkey = g_TableGrid.Cell(i, TableColNumber.KeyVal).Text + cscene = g_TableGrid.Cell(i, TableColNumber.SceneAttribute).Text + '判断loopkey是否相当于cloopkey + If cloopkey.Equals(loopkey) Then + cscenebuf = cscene.Split(",") + If cscenebuf(0).Equals("2") Then + serviceData = g_TableGrid.Cell(i, TableColNumber.ServerAttribute).Text + If serviceData.Contains(scene) Then + Return + End If + '判断serviceData是否为空 + If String.IsNullOrEmpty(serviceData) Then + serviceData = scene + Else + serviceData = $"{scene}{vbLf}{serviceData}" + End If + g_TableGrid.Cell(i, TableColNumber.ServerAttribute).Text = serviceData + Return + End If + End If + Next + G_TableInteraction.grdSetFocus(row, 2) + Console.WriteLine(g_TableGrid.ActiveCell.Row) + ToolStripMenuItem16Click() + ToolStripMenuItem17Click() + g_TableGrid.Cell(row + 1, TableColNumber.ServerAttribute).Text = scene + scene = g_TableGrid.Cell(row + 1, TableColNumber.SceneAttribute).Text + '将scene第一个字符换成2 + scene = "2" & scene.Substring(1) + g_TableGrid.Cell(row + 1, TableColNumber.SceneAttribute).Text = scene + + End Sub + Private Sub ToolStripMenuItem16Click() + If IsNothing(G_TableInteraction) Then Return + G_TableInteraction.CopySceneActionData() + End Sub + + Private Sub ToolStripMenuItem17Click() + If IsNothing(G_TableInteraction) Then Return + G_TableInteraction.GlueSceneActionData() + End Sub + Public Sub SetDevDescription() If IsNothing(UniqueDevice) Then Return @@ -244,7 +355,9 @@ Public Class PowerSupply ' Continue For End If 'rstr = rstr.Remove(0, 1) - deleteG_TableGridService(NoCardNode.Nodes(i - 1)) + + + deleteG_TableGridService(NoCardNode.Nodes(i - 1), rstr) NoCardNode.Nodes(i - 1).Description = rstr Next Else @@ -263,7 +376,8 @@ Public Class PowerSupply ' Continue For End If 'rstr = rstr.Remove(0, 1) - deleteG_TableGridService(NoCardNode.Nodes(i - 1)) + + deleteG_TableGridService(NoCardNode.Nodes(i - 1), rstr) NoCardNode.Nodes(i - 1).Description = rstr Next End If @@ -424,6 +538,7 @@ Public Class PowerSupply 'End Sub Public g_TableGrid As FlexCell.Grid Public G_ActionConfiguration As List(Of TableRowTag) + Public G_TableInteraction As TableInteraction Public IsCheckBox5 As Boolean Public Sub ParseDeviceList(Devicemodel As Dictionary(Of String, DeviceModel), TableGrid As FlexCell.Grid) Dic_Devicemodel = Devicemodel diff --git a/BLV_Studio/Test/GridTest/ServiceAttribute.vb b/BLV_Studio/Test/GridTest/ServiceAttribute.vb index 053e096..56da562 100644 --- a/BLV_Studio/Test/GridTest/ServiceAttribute.vb +++ b/BLV_Studio/Test/GridTest/ServiceAttribute.vb @@ -392,6 +392,7 @@ Public Class ServiceAttribute Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click If Table_Grid1.ActiveCell.Row > 0 Then '判断选中服务是否在25 到57区间 + Dim tstr As String = Table_Grid1.Cell(Table_Grid1.ActiveCell.Row, STcolname.服务类型).Text.Trim Dim arr As String() = tstr.Split(":") Dim LoopAddri As Integer = Integer.Parse(arr(0).Trim) diff --git a/BLV_Studio/Test/GridTest/TableInteraction.vb b/BLV_Studio/Test/GridTest/TableInteraction.vb index b16d3e8..5879262 100644 --- a/BLV_Studio/Test/GridTest/TableInteraction.vb +++ b/BLV_Studio/Test/GridTest/TableInteraction.vb @@ -1383,6 +1383,7 @@ Public Class TableInteraction Console.WriteLine($"Grid_DoubleClick{_grd.Cell(_grd.ActiveCell.Row, _grd.ActiveCell.Col).Text }") If _grd.ActiveCell.Row = TableRowNumber.DeviceName AndAlso _grd.ActiveCell.Col = TableColNumber.DeviceName Then Dim fromshow As New PowerSupply + fromshow.G_TableInteraction=Me fromshow.G_ActionConfiguration = Dic_ActionConfiguration fromshow.ParseDeviceList(Dic_Devicemodel, _grd) @@ -2485,6 +2486,10 @@ Public Class TableInteraction MsgBox("非场景动作数据不可复制!") End If End Sub + Public sub grdSetFocus( r As Integer ,c As Integer) + _grd.Cell(r,c).SetFocus + + End sub Public Sub GlueSceneActionData() If CopyActionData.Count = 0 Then Return If _grd.ActiveCell.Row > TableRowNumber.Max - 1 Then diff --git a/BLV_Studio/bin/Debug/BLV_Studio.application b/BLV_Studio/bin/Debug/BLV_Studio.application deleted file mode 100644 index c7e96f4..0000000 --- a/BLV_Studio/bin/Debug/BLV_Studio.application +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 8laOil/SKar1D84cDEBITKinDS7kei9VlhvMr8bRFzk= - - - - \ No newline at end of file diff --git a/BLV_Studio/bin/Debug/BLV_Studio.exe b/BLV_Studio/bin/Debug/BLV_Studio.exe deleted file mode 100644 index ac4d02b..0000000 Binary files a/BLV_Studio/bin/Debug/BLV_Studio.exe and /dev/null differ diff --git a/BLV_Studio/bin/Debug/BLV_Studio.exe.manifest b/BLV_Studio/bin/Debug/BLV_Studio.exe.manifest deleted file mode 100644 index c10ef35..0000000 --- a/BLV_Studio/bin/Debug/BLV_Studio.exe.manifest +++ /dev/null @@ -1,715 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1vFRiIo6lfXxHAESlmqIBQyxzYRTAcEO9FAKDkIzIGM= - - - - - - - - - - - - B2aS4naqyeOeNn4LrqR+7MkuBfm6MEhc9u6uJHuLqro= - - - - - - - - - - - - yHfX9VQbnDHzXMx2EkMrP/v2Q5z4mMRgQ/6ydRMvZE0= - - - - - - - - - - - - GydLsDGDSlCXQQLzu+VpJTPlpX8wwWnYM+gjKfV0sX0= - - - - - - - - - - - - sHpSlL/kFos15hQzdlxnzAGUwNUudzQTvvkTGFi76pE= - - - - - - - - - - - - aZoGyAg2IBRYxzKYiEc6VowX0zD/Yfp8r4pQz+S2Xto= - - - - - - - - - - - - w65qp1qKjHyS64RoNynOUdOkNQwmjgKbKfLhJhU3G3M= - - - - - - - - - - - - 3cPG3pI9/N8OdCmT2axxnZUakNsEeYPEp7K4anGoK6M= - - - - - - - - - - - - FnYM3iZjb2r0kK9GdEdG5XJdqaosm3Y5GKZqmxWgw4I= - - - - - - - - - - - - XFbI7exym+C8hW8I+54PtwZIp0M2rgRYDbKYUOibEz0= - - - - - - - - - - - - /0K8pwRgXhh6u0VSOGixUSjWrxworUCkV51QfTSpU7I= - - - - - - - - - - - - qWDdTS8PN7PAn/uVZ8MkJrh5ExDX65NcBMgZw9Rr1J4= - - - - - - - - - - - - AoV3YTkf3kbvrFkm1A1nhn9JrFpjCi6XbqydLHpZoxg= - - - - - - - - - - - - rjgJb/IX0GetL+OMedFvFESHxeLiualxv+MztdOlurA= - - - - - - - - - - - - 28d0pL6ZczrSHwUZ0CvOoTbAMTd1JgQWtf+IVJOCVJE= - - - - - - - - - - - - LAYio0GLM6iB7Yzp/UB7P8TyssxLkj7eqnZ4W1zSjw8= - - - - - - - - - - - - 7HurV05mun2+z1+wExxfgokBxNE/LBF44nXWEaP6sS4= - - - - - - - - - - - - TDtzhPHVMrpOEQAbdbZ/WuAaKo5CnL94FhwPUENVvmw= - - - - - - - - - - - - EQ80i1BW05RFWHofw8nY4upHJV2z3owIUJDXc8sbY4o= - - - - - - - - - - - - z31p2BzUOuLHq2u4qDuVvooXliJwKf8DPA18R54Yjss= - - - - - - - - - - - - 6anSgcGnCKquNm+C/WoXQvZdopGMxPpeqqraC+JCd9k= - - - - - - - - - - - - i8hqhaR3H1h1WeXCOsEc1C54ODQCPJ+58hy+EjlhG6c= - - - - - - - - - - - - tiSUnfiw46YVP9+3MKfG9JkLZZLuDZIuF4hDPSdmEPM= - - - - - - - - - - - - rMzPvkXZ8I/+7ZkW43sz6YxlvgEs//bn+ntnIQzh/vs= - - - - - - - - - - - - X6xanpuLva1s9mHb8xh+OVkUzXE540tyWQbvu2ASLA0= - - - - - - - - - - - - hXoof385CXwvcP8M5oHTUZba7mC0PyVbxyuEKjUSCMQ= - - - - - - - - - - - - T6PMifXDz6D3lMH4SbDqjQgeXA5p1/stg0yu0I0RQMA= - - - - - - - - - - - - jnYxjosGaSq/fasRadJ9FVV/fwo002r2Rj7/D+ISE8c= - - - - - - - - - - - - HT74aYKB589zcdFVSv71hys5+Wwm2nciEKM9oEG6EYM= - - - - - - - - - - - - PK3La4pzNRQcfDV6HXevH/SbWbhy30lPUCVYAZHRwNU= - - - - - - - - - - - - H9pJHuvbGeoKg89sFqtd0AShv9/IRe3gF+vglFvrkn8= - - - - - - - - - - - - tNjhWtwjXQ6Fjjm1Ez5dAKS6qMlPTznjteeRsPnAyAY= - - - - - - - - - - - - cNW/U5Y3OMMIW/kl8FmTkBNWbF6HL41QIYaIvFQ/z6k= - - - - - - - - - - - - ttecckwE31dY0GSn9GG+E9x76JZhKT5N6IzYQjWxXSo= - - - - - - - - - - - - 5rrHKgOqMPqN1beBJzpCDZqXH9jaD2Uf7MolVellyt4= - - - - - - - - - - KSRvgxRYkhbso/VSG0EYg7Skg+QGx8HsDLCz1iYV5B4= - - - - - - - - - +7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8= - - - - - - - - - VT5YQgA5CY9Sq+vPjRUHcEk7FZvl5nTFwUNmqQacgy8= - - - - - - - - - BTtP9nG4dYoZawFS39IMSHzZlhQbGVF/L1iaBUrB8+E= - - - - - - - - - gVYLvEFDLTSvNd4nbZ+j8A+h6D+eR3aRRTSKY/A7/yA= - - - - - - - - - LwOiyhsJbh5lZFFaTpU7CgV389DsrKK7v7SXkJ4QrI4= - - - - - - - - - jw+cRVxoGyvNjIpK6JSxGzDbonLNyBR41QPaI4JwR8w= - - - - - - - - - SzWVEfCERs5SckvYyIGP4yzixZQBJsOE/MwJQClUJH4= - - - - - - - - - A1LCjsJguvcKLDSZ71axXfTG6hVOZ7Rom3pa3HAo/t8= - - - - - - - - - OPja3r1fXvNsOnuKMip4smGhKNy4Zv6AGI6OkYzZAhk= - - - - - - - - - BqacosOunHExQk4ouzvUocSYesBERf98wi388MiL+cA= - - - - - - - - - 3nIl/zfdzFbvMIewGz3v9/ewwMO6456xAz6epIrAi+w= - - - - - - - - - qEVc093RcCBn6eRPF2MZ1q/wKYI6VM+jIKBe2wuPMYs= - - - - - - - - - 1PjryCkmxVd9XH+qKgekjloS23oIzwtx4MQdghTT/u4= - - - - - - - - - FiYNssfxUh45BPsgbNCEvNcbDiwDUO6/GO/zj6cDQ7o= - - - - - - - - - PxiURAJUyqeBc6mL9FhuwdhrN6s0n3s7PMg/pN9lTtI= - - - - - - - - - bzsx6XdY/qHVeZF50v2yyxlBtRWknCzJFV2RdMpFnio= - - - - - - - - - Bqe2PZ9FH3vvC/Lr155jZdlyOXNhODl1obmKNNEfdoU= - - - - - - - - - Ho262/yAEbbonE4jk0wrAW1NPIXN4OEuKwIaGLkDAWA= - - - - - - - - - MahCUh5+O8hiiE5rCKBkCld80B3TRpnfjfYKWYbahg0= - - - - - - - - - yYQ+J7kGvCdqG60FtWgxkGt+tC5kTkc+2Z5QseIwZPw= - - - - - - - - - Qh3DpjRmzvn0w7Jb+LLqnYbusBeiN5KnZuqD+ROc2D4= - - - - - - - - - OIQMLkccBJ2upLgnUtjOmeVa7I9J8Eh22/W3ZBYrulY= - - - - - - - - - pQWNFlScWo2PxMj/9/6h8MJeCjpUtDa0islXYxkQAEw= - - - - - - - - - Yy1FAI5LiI9l95Et3ouEPka5K5WomLBs1RCnIgysfAo= - - - - - - - - - +7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8= - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BLV_Studio/bin/Debug/BLV_Studio.pdb b/BLV_Studio/bin/Debug/BLV_Studio.pdb deleted file mode 100644 index 9519add..0000000 Binary files a/BLV_Studio/bin/Debug/BLV_Studio.pdb and /dev/null differ diff --git a/BLV_Studio/bin/Debug/app.publish/BLV_Studio.exe b/BLV_Studio/bin/Debug/app.publish/BLV_Studio.exe deleted file mode 100644 index ac4d02b..0000000 Binary files a/BLV_Studio/bin/Debug/app.publish/BLV_Studio.exe and /dev/null differ diff --git a/BLV_Studio/obj/Debug/BLV_Studio.FrmMain.resources b/BLV_Studio/obj/Debug/BLV_Studio.FrmMain.resources deleted file mode 100644 index b8a47f5..0000000 Binary files a/BLV_Studio/obj/Debug/BLV_Studio.FrmMain.resources and /dev/null differ diff --git a/BLV_Studio/obj/Debug/BLV_Studio.application b/BLV_Studio/obj/Debug/BLV_Studio.application deleted file mode 100644 index c7e96f4..0000000 --- a/BLV_Studio/obj/Debug/BLV_Studio.application +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 8laOil/SKar1D84cDEBITKinDS7kei9VlhvMr8bRFzk= - - - - \ No newline at end of file diff --git a/BLV_Studio/obj/Debug/BLV_Studio.exe b/BLV_Studio/obj/Debug/BLV_Studio.exe deleted file mode 100644 index ac4d02b..0000000 Binary files a/BLV_Studio/obj/Debug/BLV_Studio.exe and /dev/null differ diff --git a/BLV_Studio/obj/Debug/BLV_Studio.exe.manifest b/BLV_Studio/obj/Debug/BLV_Studio.exe.manifest deleted file mode 100644 index c10ef35..0000000 --- a/BLV_Studio/obj/Debug/BLV_Studio.exe.manifest +++ /dev/null @@ -1,715 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1vFRiIo6lfXxHAESlmqIBQyxzYRTAcEO9FAKDkIzIGM= - - - - - - - - - - - - B2aS4naqyeOeNn4LrqR+7MkuBfm6MEhc9u6uJHuLqro= - - - - - - - - - - - - yHfX9VQbnDHzXMx2EkMrP/v2Q5z4mMRgQ/6ydRMvZE0= - - - - - - - - - - - - GydLsDGDSlCXQQLzu+VpJTPlpX8wwWnYM+gjKfV0sX0= - - - - - - - - - - - - sHpSlL/kFos15hQzdlxnzAGUwNUudzQTvvkTGFi76pE= - - - - - - - - - - - - aZoGyAg2IBRYxzKYiEc6VowX0zD/Yfp8r4pQz+S2Xto= - - - - - - - - - - - - w65qp1qKjHyS64RoNynOUdOkNQwmjgKbKfLhJhU3G3M= - - - - - - - - - - - - 3cPG3pI9/N8OdCmT2axxnZUakNsEeYPEp7K4anGoK6M= - - - - - - - - - - - - FnYM3iZjb2r0kK9GdEdG5XJdqaosm3Y5GKZqmxWgw4I= - - - - - - - - - - - - XFbI7exym+C8hW8I+54PtwZIp0M2rgRYDbKYUOibEz0= - - - - - - - - - - - - /0K8pwRgXhh6u0VSOGixUSjWrxworUCkV51QfTSpU7I= - - - - - - - - - - - - qWDdTS8PN7PAn/uVZ8MkJrh5ExDX65NcBMgZw9Rr1J4= - - - - - - - - - - - - AoV3YTkf3kbvrFkm1A1nhn9JrFpjCi6XbqydLHpZoxg= - - - - - - - - - - - - rjgJb/IX0GetL+OMedFvFESHxeLiualxv+MztdOlurA= - - - - - - - - - - - - 28d0pL6ZczrSHwUZ0CvOoTbAMTd1JgQWtf+IVJOCVJE= - - - - - - - - - - - - LAYio0GLM6iB7Yzp/UB7P8TyssxLkj7eqnZ4W1zSjw8= - - - - - - - - - - - - 7HurV05mun2+z1+wExxfgokBxNE/LBF44nXWEaP6sS4= - - - - - - - - - - - - TDtzhPHVMrpOEQAbdbZ/WuAaKo5CnL94FhwPUENVvmw= - - - - - - - - - - - - EQ80i1BW05RFWHofw8nY4upHJV2z3owIUJDXc8sbY4o= - - - - - - - - - - - - z31p2BzUOuLHq2u4qDuVvooXliJwKf8DPA18R54Yjss= - - - - - - - - - - - - 6anSgcGnCKquNm+C/WoXQvZdopGMxPpeqqraC+JCd9k= - - - - - - - - - - - - i8hqhaR3H1h1WeXCOsEc1C54ODQCPJ+58hy+EjlhG6c= - - - - - - - - - - - - tiSUnfiw46YVP9+3MKfG9JkLZZLuDZIuF4hDPSdmEPM= - - - - - - - - - - - - rMzPvkXZ8I/+7ZkW43sz6YxlvgEs//bn+ntnIQzh/vs= - - - - - - - - - - - - X6xanpuLva1s9mHb8xh+OVkUzXE540tyWQbvu2ASLA0= - - - - - - - - - - - - hXoof385CXwvcP8M5oHTUZba7mC0PyVbxyuEKjUSCMQ= - - - - - - - - - - - - T6PMifXDz6D3lMH4SbDqjQgeXA5p1/stg0yu0I0RQMA= - - - - - - - - - - - - jnYxjosGaSq/fasRadJ9FVV/fwo002r2Rj7/D+ISE8c= - - - - - - - - - - - - HT74aYKB589zcdFVSv71hys5+Wwm2nciEKM9oEG6EYM= - - - - - - - - - - - - PK3La4pzNRQcfDV6HXevH/SbWbhy30lPUCVYAZHRwNU= - - - - - - - - - - - - H9pJHuvbGeoKg89sFqtd0AShv9/IRe3gF+vglFvrkn8= - - - - - - - - - - - - tNjhWtwjXQ6Fjjm1Ez5dAKS6qMlPTznjteeRsPnAyAY= - - - - - - - - - - - - cNW/U5Y3OMMIW/kl8FmTkBNWbF6HL41QIYaIvFQ/z6k= - - - - - - - - - - - - ttecckwE31dY0GSn9GG+E9x76JZhKT5N6IzYQjWxXSo= - - - - - - - - - - - - 5rrHKgOqMPqN1beBJzpCDZqXH9jaD2Uf7MolVellyt4= - - - - - - - - - - KSRvgxRYkhbso/VSG0EYg7Skg+QGx8HsDLCz1iYV5B4= - - - - - - - - - +7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8= - - - - - - - - - VT5YQgA5CY9Sq+vPjRUHcEk7FZvl5nTFwUNmqQacgy8= - - - - - - - - - BTtP9nG4dYoZawFS39IMSHzZlhQbGVF/L1iaBUrB8+E= - - - - - - - - - gVYLvEFDLTSvNd4nbZ+j8A+h6D+eR3aRRTSKY/A7/yA= - - - - - - - - - LwOiyhsJbh5lZFFaTpU7CgV389DsrKK7v7SXkJ4QrI4= - - - - - - - - - jw+cRVxoGyvNjIpK6JSxGzDbonLNyBR41QPaI4JwR8w= - - - - - - - - - SzWVEfCERs5SckvYyIGP4yzixZQBJsOE/MwJQClUJH4= - - - - - - - - - A1LCjsJguvcKLDSZ71axXfTG6hVOZ7Rom3pa3HAo/t8= - - - - - - - - - OPja3r1fXvNsOnuKMip4smGhKNy4Zv6AGI6OkYzZAhk= - - - - - - - - - BqacosOunHExQk4ouzvUocSYesBERf98wi388MiL+cA= - - - - - - - - - 3nIl/zfdzFbvMIewGz3v9/ewwMO6456xAz6epIrAi+w= - - - - - - - - - qEVc093RcCBn6eRPF2MZ1q/wKYI6VM+jIKBe2wuPMYs= - - - - - - - - - 1PjryCkmxVd9XH+qKgekjloS23oIzwtx4MQdghTT/u4= - - - - - - - - - FiYNssfxUh45BPsgbNCEvNcbDiwDUO6/GO/zj6cDQ7o= - - - - - - - - - PxiURAJUyqeBc6mL9FhuwdhrN6s0n3s7PMg/pN9lTtI= - - - - - - - - - bzsx6XdY/qHVeZF50v2yyxlBtRWknCzJFV2RdMpFnio= - - - - - - - - - Bqe2PZ9FH3vvC/Lr155jZdlyOXNhODl1obmKNNEfdoU= - - - - - - - - - Ho262/yAEbbonE4jk0wrAW1NPIXN4OEuKwIaGLkDAWA= - - - - - - - - - MahCUh5+O8hiiE5rCKBkCld80B3TRpnfjfYKWYbahg0= - - - - - - - - - yYQ+J7kGvCdqG60FtWgxkGt+tC5kTkc+2Z5QseIwZPw= - - - - - - - - - Qh3DpjRmzvn0w7Jb+LLqnYbusBeiN5KnZuqD+ROc2D4= - - - - - - - - - OIQMLkccBJ2upLgnUtjOmeVa7I9J8Eh22/W3ZBYrulY= - - - - - - - - - pQWNFlScWo2PxMj/9/6h8MJeCjpUtDa0islXYxkQAEw= - - - - - - - - - Yy1FAI5LiI9l95Et3ouEPka5K5WomLBs1RCnIgysfAo= - - - - - - - - - +7X+tBYM4Whn1mJvI9Gmy6s+HcFVDtx9i+uAFSaoeH8= - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BLV_Studio/obj/Debug/BLV_Studio.pdb b/BLV_Studio/obj/Debug/BLV_Studio.pdb deleted file mode 100644 index 9519add..0000000 Binary files a/BLV_Studio/obj/Debug/BLV_Studio.pdb and /dev/null differ diff --git a/BLV_Studio/obj/Debug/BLV_Studio.vbproj.AssemblyReference.cache b/BLV_Studio/obj/Debug/BLV_Studio.vbproj.AssemblyReference.cache deleted file mode 100644 index f5e894a..0000000 Binary files a/BLV_Studio/obj/Debug/BLV_Studio.vbproj.AssemblyReference.cache and /dev/null differ diff --git a/BLV_Studio/obj/Debug/BLV_Studio.vbproj.GenerateResource.cache b/BLV_Studio/obj/Debug/BLV_Studio.vbproj.GenerateResource.cache deleted file mode 100644 index f48b82a..0000000 Binary files a/BLV_Studio/obj/Debug/BLV_Studio.vbproj.GenerateResource.cache and /dev/null differ diff --git a/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferences.cache deleted file mode 100644 index aff6dc6..0000000 Binary files a/BLV_Studio/obj/Debug/DesignTimeResolveAssemblyReferences.cache and /dev/null differ diff --git a/BLV_Studio/publish/BLV_Studio.application b/BLV_Studio/publish/BLV_Studio.application index 36758b9..0b4f97d 100644 --- a/BLV_Studio/publish/BLV_Studio.application +++ b/BLV_Studio/publish/BLV_Studio.application @@ -1,6 +1,6 @@ - + @@ -14,14 +14,14 @@ - - + + - +pu11XfQGAdHudnsJ0fsdh1CVhEB2bN2b/yAx7xiplM= + HOeGFkhw5Tl0DB6eJ8xSqJpiEqVXFXqlbkM3+T76Obo= diff --git a/BLV_Studio/publish/index.html b/BLV_Studio/publish/index.html index ae2f8b9..d20c040 100644 --- a/BLV_Studio/publish/index.html +++ b/BLV_Studio/publish/index.html @@ -126,7 +126,7 @@ function CompareVersions(v1, v2) - 名称: 宝易逻辑配置软件 版本: 4.4.3.89 发行者: chenzhihao + 名称: 宝易逻辑配置软件 版本: 4.4.3.90 发行者: chenzhihao