修复比较版本错误问题
This commit is contained in:
@@ -35,7 +35,7 @@
|
|||||||
<MinimumRequiredVersion>4.0.0.5</MinimumRequiredVersion>
|
<MinimumRequiredVersion>4.0.0.5</MinimumRequiredVersion>
|
||||||
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
|
||||||
<WebPage>index.html</WebPage>
|
<WebPage>index.html</WebPage>
|
||||||
<ApplicationRevision>95</ApplicationRevision>
|
<ApplicationRevision>97</ApplicationRevision>
|
||||||
<ApplicationVersion>4.4.3.%2a</ApplicationVersion>
|
<ApplicationVersion>4.4.3.%2a</ApplicationVersion>
|
||||||
<UseApplicationTrust>false</UseApplicationTrust>
|
<UseApplicationTrust>false</UseApplicationTrust>
|
||||||
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
<CreateDesktopShortcut>true</CreateDesktopShortcut>
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
'通过使用 "*",如下所示:
|
'通过使用 "*",如下所示:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("4.4.6.8")>
|
<Assembly: AssemblyVersion("4.4.6.9")>
|
||||||
<Assembly: AssemblyFileVersion("4.4.6.8")>
|
<Assembly: AssemblyFileVersion("4.4.6.9")>
|
||||||
|
|||||||
@@ -4265,7 +4265,7 @@ Public Class TableInteraction
|
|||||||
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
|
Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
|
||||||
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
|
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
|
||||||
End If
|
End If
|
||||||
If FVer =67 Then
|
If FVer =68 Then
|
||||||
|
|
||||||
Dim btxtr As string
|
Dim btxtr As string
|
||||||
Dim bctr As Integer=48
|
Dim bctr As Integer=48
|
||||||
@@ -4287,7 +4287,7 @@ Public Class TableInteraction
|
|||||||
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
|
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
|
||||||
btxli(5) = bctr
|
btxli(5) = bctr
|
||||||
ncbuf.Add(btxli)
|
ncbuf.Add(btxli)
|
||||||
Else If FVer > 67 Then
|
Else If FVer > 68 Then
|
||||||
Else
|
Else
|
||||||
If checkbuf(1).Equals("1") Then
|
If checkbuf(1).Equals("1") Then
|
||||||
'Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
|
'Dbuf = dic.Item([Enum].GetName(GetType(AddPeripherals.Temproweven), AddPeripherals.Temproweven.互锁)).Trim.Split("*")
|
||||||
@@ -4356,7 +4356,7 @@ Public Class TableInteraction
|
|||||||
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
|
ncbuf.Add(GetActionData(DeviceModuleDic, Dbuf(0), "Temp", Dbuf(1), "0,1,1,1,1,1,16"))
|
||||||
|
|
||||||
End If
|
End If
|
||||||
If FVer =67 Then
|
If FVer =68 Then
|
||||||
|
|
||||||
Dim btxtr As string
|
Dim btxtr As string
|
||||||
Dim bctr As Integer=32
|
Dim bctr As Integer=32
|
||||||
@@ -4380,7 +4380,7 @@ Public Class TableInteraction
|
|||||||
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
|
dim btxli As Byte()= GetActionData(DeviceModuleDic, DevName, "Temp", 1, btxtr)
|
||||||
btxli(5) = bctr
|
btxli(5) = bctr
|
||||||
ncbuf.Add(btxli)
|
ncbuf.Add(btxli)
|
||||||
Else If FVer > 67 Then
|
Else If FVer > 68 Then
|
||||||
|
|
||||||
Else
|
Else
|
||||||
If checkbuf(1).Equals("1") Then
|
If checkbuf(1).Equals("1") Then
|
||||||
|
|||||||
Reference in New Issue
Block a user