feat: 更新节能属性和服务行添加功能

- 在 EnergySavingAttribute.vb 中添加了全局亮度节能的字典初始化。
- 在 FrmMain.vb 中修改了 AddServiceRow 方法，增加了可选参数以支持显示标志。
- 在 PowerSupply.vb 中实现了删除和设置服务的功能，增强了对场景号的处理。
- 在 ServiceAttribute.vb 中增加了对服务类型的删除确认，避免误删系统服务。
- 更新了版本号至 4.4.5.42，并修改了相关的发布文件。

BLV_Studio/BLV_Studio.vbproj

@@ -35,7 +35,7 @@
     <MinimumRequiredVersion>4.0.0.5</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
-    <ApplicationRevision>85</ApplicationRevision>
+    <ApplicationRevision>89</ApplicationRevision>
     <ApplicationVersion>4.4.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

BLV_Studio/Control/FrmCSeriesConfig.vb

@@ -3589,6 +3589,7 @@ Public Class FrmCSeriesConfig
     ''' <param name="ep"></param>
     Private Sub DealCmdCheckUpdate(dataBuff() As Byte, ep As IPEndPoint)
         'Dim upgradeIndex As Integer = _upgrade.Item(ep)
+        Try
             Dim upkey As String = ep.Address.ToString & ":" & ep.Port
             If Not _newupgrade.ContainsKey(upkey) Then
                 MsgBox($"未找到对应节点{upkey}")
@@ -3608,6 +3609,10 @@ Public Class FrmCSeriesConfig
                     _isCheckReply = False
                     UpgradeResultColor(upgradeIndex, $"未知错误", Color.Red)
             End Select
+        Catch ex As Exception
+            Console.WriteLine(ex.Message)
+        End Try
+
     End Sub
 
 
@@ -5539,7 +5544,7 @@ Public Class FrmCSeriesConfig
                 Dim data(0) As Byte
                 data(0) = &H1
                 Dim sendData As Byte() = FillSendData(cmd, data)
-                SendUDPData(sendData)
+                'SendUDPData(sendData)'CZH 20260130  曹聪要求不要发送D1命令
                 'Console.WriteLine($"查询设备状态：{ByteToString(sendData)}")
 
                 'GetMatchingHostsInfo()
@@ -9239,15 +9244,15 @@ Public Class FrmCSeriesConfig
     End Function
     Private Function UpdateMatching(rowid As Integer) As Boolean
 
-        'For index = 1 To _matchingType.Length - 1   '备注不参与匹配
+        ''For index = 1 To _matchingType.Length - 1   '备注不参与匹配
-        '    If GrdMatching.Cell(index, EnMatchingInfo.CKS).Text = 1 Then    '选择匹配类型参与匹配
+        ''    If GrdMatching.Cell(index, EnMatchingInfo.CKS).Text = 1 Then    '选择匹配类型参与匹配
-        If GetMatchingCheck(GrdRCUHost.Cell(rowid, EnRCUHosts.MCUName).Text, _Mcus) = True Then
+        'If GetMatchingCheck(GrdRCUHost.Cell(rowid, EnRCUHosts.MCUName).Text, _Mcus) = True Then
-            Button28.ForeColor = Color.Red
+        '    Button28.ForeColor = Color.Red
-            Button28.Text = $"{LanguageData.StringList(MultiLanguageDAL.StringEnum.Mismatching)}"
+        '    Button28.Text = $"{LanguageData.StringList(MultiLanguageDAL.StringEnum.Mismatching)}"
-            Return False
+        '    Return False
-        End If
+        'End If
-        '    End If
+        ''    End If
-        'Next
+        ''Next
         Return True
     End Function
 
@@ -10027,6 +10032,16 @@ Public Class FrmCSeriesConfig
         Return data.ToArray
     End Function
 
+    Delegate Sub SetGrdRCUHostDelegate(bnx As Integer, bny As Integer, txt As String)
+
+    Public Sub SetGrdRCUHost(bnx As Integer, bny As Integer, txt As String)
+        If Me.InvokeRequired Then
+            Dim d As New SetGrdRCUHostDelegate(AddressOf SetGrdRCUHost)
+            Me.Invoke(d, New Object() {bnx, bny, txt})
+        Else
+            GrdRCUHost.Cell(bnx, bny).Text = txt
+        End If
+    End Sub
 
     ''' <summary>
     ''' 重发次数标志位
@@ -10062,7 +10077,8 @@ Public Class FrmCSeriesConfig
             'SendUpdateData(burnPackage, ud.ReomteEP)
             SendSocketData(csb, burnPackage, ud.ReomteEP)
 
-            GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"{packageNumber}/{blockCount}"
+            'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"{packageNumber}/{blockCount}"
+            SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"{packageNumber}/{blockCount}")
             Console.WriteLine($"{Now.ToString("yyyy-MM-dd HH:mm:ss.fff")}:开始发送第{packageNumber}包({burnPackage.Length }):{ByteToString(burnPackage)}")
 
             If _upgradeSum = 1 Then
@@ -10075,27 +10091,33 @@ Public Class FrmCSeriesConfig
             If _isTftpSendReply = True Then     '重发机制
                 If packageNumber = blockCount Then
                     Console.WriteLine($"升级数据发送完成！")
-                    GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"升级中"
+                    'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"升级中"
+                    SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"升级中")
 
                     If _updateWay = True Then
-                        GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待校验"
+                        'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待校验"
+                        SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"等待校验")
                         'StateReplyLabel($"等待校验", Color.Blue)
                         CheckCmd(ud.ReomteEP.Address, _endPort)
                         WaitReplyCheckPacket(30000)
                         If _isCheckReply = True Then
                             ResetCmd(ud.ReomteEP.Address, _endPort)
                             'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待复位" 
+                            SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"等待复位")
                             'StateReplyLabel($"等待复位", Color.Blue)
                             WaitReplyResetPacket(2000)
                             If _isResetReply = True Then
-                                GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待重启"
+                                'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待重启"
+                                SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"等待重启")
                                 'StateReplyLabel($"升级完成", Color.Blue)
                             Else
                                 If ResendReset(ud.ReomteEP) = True Then
-                                    GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待重启"
+                                    'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"等待重启"
+                                    SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"等待重启")
                                     'StateReplyLabel($"升级完成", Color.Blue)
                                 Else
-                                    GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"升级失败"
+                                    'GrdRCUHost.Cell(ud.Index, EnRCUHosts.Update).Text = $"升级失败"
+                                    SetGrdRCUHost(ud.Index, EnRCUHosts.Update, $"升级失败")
                                     'StateReplyLabel($"升级失败", Color.Blue)
                                 End If
                                 BtnEnabledChange(Button25, True)

BLV_Studio/EnergySavingAttribute.vb

@@ -41,6 +41,12 @@ Public Class EnergySavingAttribute
             End If
         Next
         G_DateStr = New Dictionary(Of String, List(Of (String， String)))
+        Dim tnli1 As New List(Of (String， String))
+        'tnli1.Add(("60", "全局亮度节能"))
+        Dim tnli2 As New List(Of (String， String))
+        'tnli2.Add(("1", "1"))
+        G_DateStr.Add(2, tnli1)
+        G_DateStr.Add(3, tnli2)
         If Not String.IsNullOrEmpty(datestr) Then
 
             Dim tnli As List(Of (String， String))
@@ -59,13 +65,8 @@ Public Class EnergySavingAttribute
                 End If
             Next
             Console.WriteLine(G_DateStr.Count)
-        Else
+
-            Dim tnli1 As New List(Of (String， String))
+
-            'tnli1.Add(("60", "全局亮度节能"))
-            Dim tnli2 As New List(Of (String， String))
-            'tnli2.Add(("1", "1"))
-            G_DateStr.Add(2, tnli1)
-            G_DateStr.Add(3, tnli2)
         End If
 
 

BLV_Studio/FrmMain.vb

@@ -5044,7 +5044,7 @@ Public Class FrmMain
     'End Sub
     Private Sub ToolStripButton15_Click(sender As Object, e As EventArgs) Handles ToolStripButton15.Click
         If Not IsNothing(_TableInteraction) AndAlso Not IsNothing(_TableInteraction._grd) AndAlso Not IsNothing(_TableInteraction.Dic_Devicemodel) Then
-            _TableInteraction.AddServiceRow()
+            _TableInteraction.AddServiceRow(True)
         Else
             MsgBox("请先配置逻辑表")
         End If

BLV_Studio/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 '通过使用 "*"，如下所示:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("4.4.5.40")>
+<Assembly: AssemblyVersion("4.4.5.42")>
-<Assembly: AssemblyFileVersion("4.4.5.40")>
+<Assembly: AssemblyFileVersion("4.4.5.42")>

BLV_Studio/Test/GridTest/PowerSupply.vb

@@ -45,12 +45,137 @@ Public Class PowerSupply
             '改用设置标志位到无卡取电中
 
         End If
-
+        Dim portname, chname As String
+        For i = 1 To PortTable.Rows - 1
+            portname = PortTable.Cell(i, 2).Text
+            chname = PortTable.Cell(i, 0).Text
+            If String.IsNullOrEmpty(portname) Then Continue For
+            SetG_TableGridService(portname, chname)
+        Next
 
         Me.DialogResult = System.Windows.Forms.DialogResult.OK
         Me.Close()
         Return
     End Sub
+
+    Public Sub deleteG_TableGridService(intenndoe As DeviceChildNode)
+        Dim portname, chname As String
+        Dim cbuf As String() = intenndoe.Description.Split(",")
+        If cbuf.Length > 1 Then
+            portname = cbuf(1)
+        Else
+            Return
+        End If
+
+
+        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 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
+
+        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,"
+                ElseIf chname.Contains("CH2") Then
+                    addserviceData = "32,1,0,1,"
+                ElseIf chname.Contains("CH3") Then
+                    addserviceData = "33,1,0,1,"
+                ElseIf chname.Contains("CH4") Then
+                    addserviceData = "34,1,0,1,"
+                ElseIf chname.Contains("CH5") Then
+                    addserviceData = "35,1,0,1,"
+                ElseIf chname.Contains("CH6") Then
+                    addserviceData = "36,1,0,1,"
+                ElseIf chname.Contains("CH7") Then
+                    addserviceData = "37,1,0,1,"
+                ElseIf chname.Contains("CH8") Then
+                    addserviceData = "38,1,0,1,"
+                ElseIf chname.Contains("CH9") Then
+                    addserviceData = "39,1,0,1,"
+                ElseIf chname.Contains("CH10") Then
+                    addserviceData = "40,1,0,1,"
+                Else
+                    Return
+                End If
+                '判断serviceData是否包含addserviceData
+                If serviceData.Contains(addserviceData) Then
+                    '清除serviceData中addserviceData
+                    serviceData = serviceData.Replace(addserviceData, "")
+                    '更新g_TableGrid表中的ServerAttribute列
+                    g_TableGrid.Cell(tabrow, TableColNumber.ServerAttribute).Text = serviceData.Trim
+                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
+        ''遍历PortTable表
+        'For i = 1 To PortTable.Rows - 1
+        '    '获取绑定端口名称
+        '    portname = PortTable.Cell(i, 2).Text
+        '    chname = PortTable.Cell(i, 0).Text
+        '判断该名称是否为空
+        If String.IsNullOrEmpty(portname) Then Return
+        '从名称中提取场景号绑定端口名称格式为 portname = $"{ TableGrid.Cell(i, TableColNumber.KeyName).Text}({TableGrid.Cell(i, TableColNumber.SceneID).Text})"
+        Dim sceneid As String = portname.Substring(portname.LastIndexOf("(") + 1, portname.LastIndexOf(")") - portname.LastIndexOf("(") - 1)
+        '遍历g_TableGrid表找到该场景号对应行
+        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
+                '21,1,0,1,
+                '21,2,10,2,
+                If chname.Contains("CH1") Then
+                    addserviceData = "13,1,0,1,"
+                ElseIf chname.Contains("CH2") Then
+                    addserviceData = "32,1,0,1,"
+                ElseIf chname.Contains("CH3") Then
+                    addserviceData = "33,1,0,1,"
+                ElseIf chname.Contains("CH4") Then
+                    addserviceData = "34,1,0,1,"
+                ElseIf chname.Contains("CH5") Then
+                    addserviceData = "35,1,0,1,"
+                ElseIf chname.Contains("CH6") Then
+                    addserviceData = "36,1,0,1,"
+                ElseIf chname.Contains("CH7") Then
+                    addserviceData = "37,1,0,1,"
+                ElseIf chname.Contains("CH8") Then
+                    addserviceData = "38,1,0,1,"
+                ElseIf chname.Contains("CH9") Then
+                    addserviceData = "39,1,0,1,"
+                ElseIf chname.Contains("CH10") Then
+                    addserviceData = "40,1,0,1,"
+                Else
+                    Return
+                End If
+                '判断serviceData是否包含addserviceData
+                If serviceData.Contains(addserviceData) Then
+                    Return
+                End If
+                '判断serviceData是否为空
+                If String.IsNullOrEmpty(serviceData) Then
+                    serviceData = addserviceData
+                Else
+                    serviceData = $"{addserviceData}{vbLf}{serviceData}"
+                End If
+                g_TableGrid.Cell(j, TableColNumber.ServerAttribute).Text = serviceData
+                Exit For
+            End If
+        Next
+
+
+        'Next
+    End Sub
+
+
     Public Sub SetDevDescription()
         If IsNothing(UniqueDevice) Then Return
 
@@ -119,6 +244,7 @@ Public Class PowerSupply
                     ' Continue For
                 End If
                 'rstr = rstr.Remove(0, 1)
+                deleteG_TableGridService(NoCardNode.Nodes(i - 1))
                 NoCardNode.Nodes(i - 1).Description = rstr
             Next
         Else
@@ -137,6 +263,7 @@ Public Class PowerSupply
                     ' Continue For
                 End If
                 'rstr = rstr.Remove(0, 1)
+                deleteG_TableGridService(NoCardNode.Nodes(i - 1))
                 NoCardNode.Nodes(i - 1).Description = rstr
             Next
         End If

BLV_Studio/Test/GridTest/ServiceAttribute.vb

@@ -9,7 +9,7 @@ Public Class ServiceAttribute
     Public G_input As String
 
     Private g_dicComboBox1 As Dictionary(Of String, String)
-
+    Public g_diaplay As Boolean
     Public G_result As String
     Enum STcolname
         <Description("输入序号")>
@@ -69,6 +69,7 @@ Public Class ServiceAttribute
         Dim buff() As String = datastr.Split(vbLf)
         Dim isok As Boolean
         For Each index In buff
+            If String.IsNullOrEmpty(index) Then Continue For
             isok = False
 
             Dim buf() As String = index.Split(",")
@@ -115,6 +116,7 @@ Public Class ServiceAttribute
         Dim C1, C2, C3, C4 As String
 
         For Each index In buff
+            If String.IsNullOrEmpty(index) Then Continue For
             C1 = String.Empty
             C2 = String.Empty
             C3 = String.Empty
@@ -389,6 +391,19 @@ 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)
+            If LoopAddri >= 25 AndAlso LoopAddri <= 57 Then
+                '弹框二次删除确认
+                If MessageBox.Show("该服务为系统服务，删除后可能导致系统异常，是否继续删除？", "警告", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) = DialogResult.Yes Then
+                    Table_Grid1.Row(Table_Grid1.ActiveCell.Row).Delete()
+                Else
+                    Return
+                End If
+            End If
+
             Table_Grid1.Row(Table_Grid1.ActiveCell.Row).Delete()
         End If
     End Sub
@@ -416,7 +431,27 @@ Public Class ServiceAttribute
 
 
                 Case STcolname.服务类型
-                    Table_Grid1.ComboBox(e.Col).Items.AddRange(Dic_1.ToArray)
+
+                    For Each item In Dic_1
+                        '切割字符串(item) 提取LoopAddr
+                        Dim arr As String() = item.Split(":")
+                        '判斷 g_display
+                        If g_diaplay Then
+
+                        Else
+                            '将arr(0)转为int
+                            Dim LoopAddri As Integer = Integer.Parse(arr(0).Trim)
+                            '過濾掉arr >= 25 AndAlso Node.LoopAddr <= 57
+                            If LoopAddri >= 25 AndAlso LoopAddri <= 57 Then
+                                Continue For
+                            End If
+                        End If
+
+
+
+                        Table_Grid1.ComboBox(e.Col).Items.Add(item)
+                    Next
+                    'Table_Grid1.ComboBox(e.Col).Items.AddRange(Dic_1.ToArray)
 
                 Case Else
 

BLV_Studio/Test/GridTest/TableInteraction.vb

@@ -1431,10 +1431,11 @@ Public Class TableInteraction
 
     End Sub
 
-     Public Function AddServiceRow() As Boolean
+     Public Function AddServiceRow(Optional display As Boolean = False) As Boolean
                             Dim fromshow As New ServiceAttribute
                     fromshow.G_input ="" '_grd.Cell(_grd.ActiveCell.Row, TableColNumber.ServerAttribute).Text
                     fromshow.G_hostNode = Nothing
+       fromshow. g_diaplay=display
                     For Each Anode In Dic_Devicemodel.Item(hostname).Nodes
                         If Anode.Name.Equals（"HOSTSERVICE"） Then
                             fromshow.G_hostNode = Anode

BLV_Studio/bin/Debug/BLV_Studio.application

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="chenzhihao" asmv2:product="宝易逻辑配置软件" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" minimumRequiredVersion="4.0.0.5" co.v1:createDesktopShortcut="true">
     <subscription>
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="BLV_Studio.exe.manifest" size="37872">
-      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>OYC1suCZ7Etako2+s/qGekuT+x0spnOHfhMkyeNgm/c=</dsig:DigestValue>
+        <dsig:DigestValue>8laOil/SKar1D84cDEBITKinDS7kei9VlhvMr8bRFzk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/bin/Debug/BLV_Studio.exe.manifest

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="BLV_Studio.exe" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="BLV_Studio.exe" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="favicon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="BLV_Studio" version="4.4.5.29" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="BLV_Studio" version="4.4.5.42" language="neutral" processorArchitecture="msil" />
     <commandLine file="BLV_Studio.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -102,14 +102,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2587648">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2596352">
-      <assemblyIdentity name="BLV_Studio" version="4.4.5.29" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="BLV_Studio" version="4.4.5.42" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bZrPTZN1qeqsU5SeEhqhsBxl3BFsvhKxFNsWvjHSIsM=</dsig:DigestValue>
+        <dsig:DigestValue>aZoGyAg2IBRYxzKYiEc6VowX0zD/Yfp8r4pQz+S2Xto=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/obj/Debug/BLV_Studio.application

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="chenzhihao" asmv2:product="宝易逻辑配置软件" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" minimumRequiredVersion="4.0.0.5" co.v1:createDesktopShortcut="true">
     <subscription>
@@ -15,13 +15,13 @@
   </compatibleFrameworks>
   <dependency>
     <dependentAssembly dependencyType="install" codebase="BLV_Studio.exe.manifest" size="37872">
-      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>OYC1suCZ7Etako2+s/qGekuT+x0spnOHfhMkyeNgm/c=</dsig:DigestValue>
+        <dsig:DigestValue>8laOil/SKar1D84cDEBITKinDS7kei9VlhvMr8bRFzk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/obj/Debug/BLV_Studio.exe.manifest

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <asmv1:assemblyIdentity name="BLV_Studio.exe" version="4.4.3.73" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+  <asmv1:assemblyIdentity name="BLV_Studio.exe" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
   <description asmv2:iconFile="favicon.ico" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <application />
   <entryPoint>
-    <assemblyIdentity name="BLV_Studio" version="4.4.5.29" language="neutral" processorArchitecture="msil" />
+    <assemblyIdentity name="BLV_Studio" version="4.4.5.42" language="neutral" processorArchitecture="msil" />
     <commandLine file="BLV_Studio.exe" parameters="" />
   </entryPoint>
   <trustInfo>
@@ -102,14 +102,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2587648">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="BLV_Studio.exe" size="2596352">
-      <assemblyIdentity name="BLV_Studio" version="4.4.5.29" language="neutral" processorArchitecture="msil" />
+      <assemblyIdentity name="BLV_Studio" version="4.4.5.42" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>bZrPTZN1qeqsU5SeEhqhsBxl3BFsvhKxFNsWvjHSIsM=</dsig:DigestValue>
+        <dsig:DigestValue>aZoGyAg2IBRYxzKYiEc6VowX0zD/Yfp8r4pQz+S2Xto=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/publish/BLV_Studio.application

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.72" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
+  <assemblyIdentity name="BLV_Studio.application" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <description asmv2:publisher="chenzhihao" asmv2:product="宝易逻辑配置软件" xmlns="urn:schemas-microsoft-com:asm.v1" />
   <deployment install="true" mapFileExtensions="true" minimumRequiredVersion="4.0.0.5" co.v1:createDesktopShortcut="true">
     <subscription>
@@ -14,14 +14,14 @@
     <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
   </compatibleFrameworks>
   <dependency>
-    <dependentAssembly dependencyType="install" codebase="Application Files\BLV_Studio_4_4_3_72\BLV_Studio.exe.manifest" size="37872">
+    <dependentAssembly dependencyType="install" codebase="Application Files\BLV_Studio_4_4_3_89\BLV_Studio.exe.manifest" size="37872">
-      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.72" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
+      <assemblyIdentity name="BLV_Studio.exe" version="4.4.3.89" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>zbPNYKPGfxmfv38h8sVhbBTqeYsOYJPAghcjQVEPpuY=</dsig:DigestValue>
+        <dsig:DigestValue>+pu11XfQGAdHudnsJ0fsdh1CVhEB2bN2b/yAx7xiplM=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

BLV_Studio/publish/index.html

@@ -126,7 +126,7 @@ function CompareVersions(v1, v2)
 <TR><TD ALIGN="LEFT"><TABLE CELLPADDING="2" CELLSPACING="0" BORDER="0" WIDTH="540"><TR><TD WIDTH="496">
 
 <!-- Begin AppInfo -->
-<TABLE><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>名称: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>宝易逻辑配置软件</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>版本: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>4.4.3.72</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>发行者: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>chenzhihao</TD></TR><tr><td colspan="3">&nbsp;</td></tr></TABLE>
+<TABLE><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>名称: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>宝易逻辑配置软件</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>版本: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>4.4.3.89</TD></TR><TR><TD COLSPAN="3">&nbsp;</TD></TR><TR><TD><B>发行者: </B></TD><TD WIDTH="5"><SPACER TYPE="block" WIDTH="10" /></TD><TD>chenzhihao</TD></TR><tr><td colspan="3">&nbsp;</td></tr></TABLE>
 <!-- End AppInfo -->
 
 

BLV_Studio/publish/宝易逻辑配置软件.application

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
-  <assemblyIdentity name="宝易逻辑配置软件.application" version="4.3.6.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <description asmv2:publisher="chenzhihao" asmv2:product="BLV_Studio" xmlns="urn:schemas-microsoft-com:asm.v1" />
-  <deployment install="true" mapFileExtensions="true" minimumRequiredVersion="4.0.0.5">
-    <subscription>
-      <update>
-        <beforeApplicationStartup />
-      </update>
-    </subscription>
-    <deploymentProvider codebase="http://auth.blv-oa.com/Apps/BLV_Studio/%E5%AE%9D%E6%98%93%E9%80%BB%E8%BE%91%E9%85%8D%E7%BD%AE%E8%BD%AF%E4%BB%B6.application" />
-  </deployment>
-  <compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
-    <framework targetVersion="4.8" profile="Full" supportedRuntime="4.0.30319" />
-  </compatibleFrameworks>
-  <dependency>
-    <dependentAssembly dependencyType="install" codebase="Application Files\宝易逻辑配置软件_4_3_6_1\宝易逻辑配置软件.exe.manifest" size="31189">
-      <assemblyIdentity name="宝易逻辑配置软件.exe" version="4.3.6.1" publicKeyToken="0000000000000000" language="neutral" processorArchitecture="msil" type="win32" />
-      <hash>
-        <dsig:Transforms>
-          <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
-        </dsig:Transforms>
-        <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>Mw976olwnTBiZvBexpppUg8ZYl7cX2reQ98qb+kDlAw=</dsig:DigestValue>
-      </hash>
-    </dependentAssembly>
-  </dependency>
-</asmv1:assembly>