Skip to content

H
hemei
Commit e6f286eb authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

和美安装包_v6.34.1 -20211031 

1. 修复 收卷主界面 4个控制使能， 修改为 状态改变 。（之前错误为 按1松0）
parent 55fa02c2
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 137 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ e6f286eb
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.34.0.0")]
[assembly: AssemblyFileVersion("6.34.0.0")]
[assembly: AssemblyVersion("6.34.1.0")]
[assembly: AssemblyFileVersion("6.34.1.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ e6f286eb
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.34.0")]
[assembly: AssemblyFileVersion("6.34.0")]
[assembly: AssemblyVersion("6.34.1")]
[assembly: AssemblyFileVersion("6.34.1")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/MainPanel.xaml
View file @ e6f286eb
......@@ -377,7 +377,7 @@
DataContext="{Binding Accessory}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsTraction1OnSet}"/>
<flyctrl:ToggleBehavior Binding="{Binding IsTraction1OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<!--二牵引-->
......@@ -406,7 +406,7 @@
OnBrush="Green"
DataContext="{Binding Accessory}">
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsTraction2OnSet}"/>
<flyctrl:ToggleBehavior Binding="{Binding IsTraction2OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
......@@ -437,7 +437,7 @@
DataContext="{Binding Items[0]}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
<flyctrl:ToggleBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
......@@ -467,7 +467,7 @@
DataContext="{Binding Items[1]}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
<flyctrl:ToggleBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</Grid>
......
Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/MainPanel/MainPanel2.xaml
View file @ e6f286eb
......@@ -377,7 +377,8 @@
DataContext="{Binding Accessory}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsTraction1OnSet}"/>
<!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsTraction1OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
<!--二牵引-->
......@@ -407,7 +408,8 @@
DataContext="{Binding Accessory}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsTraction2OnSet}"/>
<!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsTraction2OnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
......@@ -438,7 +440,8 @@
DataContext="{Binding Items[0]}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
<!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
......@@ -468,7 +471,8 @@
DataContext="{Binding Items[1]}"
>
<i:Interaction.Behaviors>
<flyctrl:ResetBehavior Binding="{Binding IsOnSet}"/>
<!--状态切换-->
<flyctrl:ToggleBehavior Binding="{Binding IsOnSet}"/>
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</Grid>
......
Resource/称重/设备连接变量表_111111111_v5/Generated/plcgroup.json
View file @ e6f286eb
......@@ -489,7 +489,7 @@
"PropertyName": "FlowSetting"
},
{
"DeviceIndex": 0,
"DeviceIndex": 2,
"Mode": "4",
"Addr": 4144,
"Type": "UInt16",
......
thick_public @ 3cb0dbf0
Subproject commit 993e371ae147e2a3c7a3029755ff97930bbe4bf8
Subproject commit 3cb0dbf0bff8c35837a204febd3500964368591a
脚本/2.get_release.sh
View file @ e6f286eb
......@@ -191,12 +191,10 @@ files=(\
)
copy_to2 $src_dir $dest_dir $files
# 复制 install.json 到 $install_dir_root 下
cp install.json $install_dir_root
# 修改 $install_dir_root/install.json 中的版本号
# 参考 https://www.cnblogs.com/thePeaceOftheLord/p/11107737.html
sed -i 's/"InstallZipVersion":""/"InstallZipVersion":"'${version}'"/g' ${install_dir_root}/install.json
# 正则表达式 https://www.cnblogs.com/zd520pyx1314/p/6061339.html
sed -i 's/"InstallZipVersion":".*"/"InstallZipVersion":"'${version}'"/g' ${install_dir_root}/install.json
# 复制 $install_dir_root/install.json 到 $install_dir/FLY.Thick.Blowing.UI.Fix.Client/update
cp ${install_dir_root}/install.json $install_dir/FLY.Thick.Blowing.UI.Fix.Client/update
......@@ -211,5 +209,10 @@ fi
cd ${install_dir_root}
"C:\Program Files (x86)\7-Zip\7z.exe" a ../${fileName7z} ./*
#cd ..
cd ..
# 修改 hemeiInstallZipVersionInfo.json
sed -i 's/"InstallZipVersion":".*"/"InstallZipVersion":"'${version}'"/g' hemeiInstallZipVersionInfo.json
sed -i 's/"InstallZipUrl":".*"/"InstallZipUrl":"http:\/\/server.flyautomation.net:8889\/download\/'${fileName7z}'"/g' hemeiInstallZipVersionInfo.json
echo 完成
\ No newline at end of file
脚本/hemeiInstallZipVersionInfo.json
View file @ e6f286eb
{
"InstallZipVersion":"6.34.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v6.34.0_20210929.7z"
"InstallZipVersion":"6.34.1",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v6.34.1_20211031.7z"
}
\ No newline at end of file
脚本/install.json deleted 100644 → 0
View file @ 55fa02c2
{
"InstallZipVersion":"",
"NewestInstallZipVersionInfoPath":"http://server.flyautomation.net:8889/download/hemeiInstallZipVersionInfo.json",
"DefaultNewestInstallZipPath":"D:\\测厚仪软件",
"DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
"Items":[
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Blowing.UI.Fix.Server",
"Exe":"FLY.Thick.Blowing.UI.Fix.Server.exe",
"Name":"测厚仪服务器",
"IsAutoRun":true,
"IsDefaultSelected":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Blowing.UI.Fix.Client",
"Exe":"FLY.Thick.Blowing.UI.Fix.Client.exe",
"Name":"测厚仪客户端",
"IsAutoRun":true,
"Others":[
"default",
"unity",
"music",
"update",
"测厚仪说明书.pdf"
],
"IsDefaultSelected":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.BlowingScan.UI.Server",
"Exe":"FLY.Thick.BlowingScan.UI.Server.exe",
"Name":"扫描测厚仪服务器",
"IsAutoRun":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.BlowingScan.UI.Client",
"Exe":"FLY.Thick.BlowingScan.UI.Client.exe",
"Name":"扫描测厚仪客户端",
"IsAutoRun":true,
"Others":[
"default",
"unity",
"music",
"update",
"测厚仪说明书.pdf"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.FeedbackRenZiJia.UI.Server",
"Exe":"FLY.FeedbackRenZiJia.UI.Server.exe",
"Name":"自动风环",
"IsAutoRun":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight.UI.Server",
"Exe":"FLY.Weight.UI.Server.exe",
"Name":"称重",
"IsAutoRun":true,
"Others":[
"Gage1\\plcgroups"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight2.UI.Server",
"Exe":"FLY.Weight2.UI.Server.exe",
"Name":"称重单组",
"IsAutoRun":true,
"Others":[
"Gage1\\plcgroups"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Winder.UI.Server",
"Exe":"FLY.Winder.UI.Server.exe",
"Name":"收卷",
"IsAutoRun":true,
"Others":[
"Gage1\\plcgroups"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.IBC.UI.Server",
"Exe":"FLY.IBC.UI.Server.exe",
"Name":"IBC",
"IsAutoRun":true,
"Others":[
"Gage1\\plcgroups"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Integrated.UI.Server",
"Exe":"FLY.Integrated.UI.Server.exe",
"Name":"IBC综合",
"IsAutoRun":true,
"Others":[
"Gage1\\plcgroups"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Blowing.DbViewer",
"Exe":"FLY.Blowing.DbViewer.exe",
"Name":"吹膜数据库浏览器",
"IsAutoRun":false
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
"Exe":"FLY.LinkProxy.UI.exe",
"Name":"LP3",
"IsAutoRun":true
}
]
}
\ No newline at end of file
脚本/install/install.json
View file @ e6f286eb
{
"InstallZipVersion":"6.33.0",
"InstallZipVersion":"6.34.0",
"NewestInstallZipVersionInfoPath":"http://server.flyautomation.net:8889/download/hemeiInstallZipVersionInfo.json",
"DefaultNewestInstallZipPath":"D:\\测厚仪软件",
"DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
......@@ -40,6 +40,7 @@
"default",
"unity",
"music",
"update",
"测厚仪说明书.pdf"
]
},
......
脚本/release_conf/FLY.Weight.UI.Server/Gage1/plcgroups/设备连接变量表_111111111_v5/Generated/plcgroup.json
View file @ e6f286eb
......@@ -489,7 +489,7 @@
"PropertyName": "FlowSetting"
},
{
"DeviceIndex": 0,
"DeviceIndex": 2,
"Mode": "4",
"Addr": 4144,
"Type": "UInt16",
......
脚本/版本描述.txt
View file @ e6f286eb
和美安装包_v6.34.1 -20211031
1. 修复 收卷主界面 4个控制使能， 修改为 状态改变 。（之前错误为 按1松0）
和美安装包_v6.34.0 -20210929
1. 添加 称重添加 1x9_v5, 可以有9层
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment