Skip to content

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

添加 12点自动重启客户端。临时解决内存占用2G

parent 8197933f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 17 deletions
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ dc6e5ef0
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("8.0.0.0")]
[assembly: AssemblyFileVersion("8.0.0.0")]
[assembly: AssemblyVersion("8.0.1.0")]
[assembly: AssemblyFileVersion("8.0.1.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/BlowingSimulator/BlowingSimulator.csproj
View file @ dc6e5ef0
......@@ -163,10 +163,10 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.8</Version>
<Version>5.1.0</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation.Blowing/FLY.Simulation.Blowing.csproj
View file @ dc6e5ef0
......@@ -78,7 +78,7 @@
<Version>11.0.6</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation.Flyad7/FLY.Simulation.Flyad7.csproj
View file @ dc6e5ef0
......@@ -84,7 +84,7 @@
<Version>10.1.1</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.Thick.BlowingScan/Project.BlowingSimulator/FLY.Simulation/FLY.Simulation.csproj
View file @ dc6e5ef0
......@@ -62,10 +62,10 @@
<Version>10.1.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
<Version>13.0.2</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
Project.FLY.Weight/FLY.Weight/Server/FeederSystem.cs
View file @ dc6e5ef0
......@@ -75,7 +75,7 @@ namespace FLY.Weight.Server
//--------------------------------------------------------------------------------
//step 2 报警配置
string resourceName = $"dict.Feeder.StringResource.ERRNO";
string resourceName = $"dict.Weight.StringResource.ERRNO";
var rd_errnos = (ResourceDictionary)Application.Current.FindResource(resourceName);
string strF_plcDisconnecteds = (string)rd_errnos["str.Feeder.ERRNO.ERRNO_PLC_DCs"];
string str_plcDisconnected = (string)rd_errnos["str.Feeder.ERRNO.ERRNO_PLC_DC"];
......
Project.FLY.Winder/FLY.Winder.BeiJiaDe.UI.Server/FLY.Winder.BeiJiaDe.UI.Server.csproj
View file @ dc6e5ef0
......@@ -137,13 +137,13 @@
<Version>11.1.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
<Version>13.0.2</Version>
</PackageReference>
<PackageReference Include="NLog">
<Version>4.6.8</Version>
<Version>5.1.0</Version>
</PackageReference>
<PackageReference Include="PropertyChanged.Fody">
<Version>3.3.1</Version>
<Version>4.1.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
Project.FLY.Winder/FLY.Winder.UI.Server/Themes/StringResources/StringResource.UcSpinnerRack.xaml
View file @ dc6e5ef0
......@@ -20,6 +20,7 @@
<system:String x:Key="str.UcSpinnerPack.MinuteOfR">1圈时间</system:String>
<system:String x:Key="str.UcSpinnerPack.IsReversed">反向</system:String>
<system:String x:Key="str.UcSpinnerPack.Ok">确定</system:String>
<system:String x:Key="str.UcSpinnerPack.Update">更新</system:String>
<system:String x:Key="str.UcSpinnerPack.Time">时间</system:String>
<system:String x:Key="str.UcSpinnerPack.No">信号</system:String>
<system:String x:Key="str.UcSpinnerPack.RPos">相对脉冲</system:String>
......
Project.FLY.Winder/FLY.Winder.UI.Server/Themes/StringResources/en/StringResource.UcSpinnerRack.xaml
View file @ dc6e5ef0
......@@ -20,6 +20,7 @@
<system:String x:Key="str.UcSpinnerPack.MinuteOfR">Time of Round</system:String>
<system:String x:Key="str.UcSpinnerPack.IsReversed">Is Reversed</system:String>
<system:String x:Key="str.UcSpinnerPack.Ok">OK</system:String>
<system:String x:Key="str.UcSpinnerPack.Update">Update</system:String>
<system:String x:Key="str.UcSpinnerPack.Time">Time</system:String>
<system:String x:Key="str.UcSpinnerPack.No">No</system:String>
<system:String x:Key="str.UcSpinnerPack.RPos">pulse</system:String>
......
Project.FLY.Winder/FLY.Winder.UI.Server/UcSpinnerRack.xaml
View file @ dc6e5ef0
......@@ -146,6 +146,7 @@
<CheckBox Content="{StaticResource str.UcSpinnerPack.IsReversed}" IsChecked="{Binding RotarySystem.IsReversed}"/>
</StackPanel>
<Button Content="{StaticResource str.UcSpinnerPack.Ok}" Padding="20,5" Margin="5" Command="{Binding OkCmd}"/>
<Button Content="{StaticResource str.UcSpinnerPack.Update}" Padding="20,5" Margin="5" Command="{Binding UpdateCmd}"/>
</StackPanel>
</StackPanel>
<DataGrid ItemsSource="{Binding Signs}" Grid.Row="1" Margin="5" AutoGenerateColumns="False" IsReadOnly="True" >
......
thick_public @ 43f5a9e5
Subproject commit a3159a6ada6445ff5734f15b933898e8c3af9f49
Subproject commit 43f5a9e5ffe31d8fc8fa3ee04bb0f6afac86c5a1
脚本/.gitignore
View file @ dc6e5ef0
......@@ -3,4 +3,6 @@
*安装包*.*
*安装包*/
temp_conf*/
current_is_*
\ No newline at end of file
current_is_*
!x64/
!x86/
\ No newline at end of file
脚本/hemeiInstallZipVersionInfo.json
View file @ dc6e5ef0
{
"InstallZipVersion":"8.0.0.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v8.0.0.0_20240519.7z"
"InstallZipVersion":"8.0.1.0",
"InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v8.0.1.0_20240526.7z"
}
\ No newline at end of file
脚本/install/x64/install.json 0 → 100644
View file @ dc6e5ef0
{
"InstallZipVersion":"7.0.0",
"NewestInstallZipVersionInfoPath":"http://server.flyautomation.net:8889/download/batteryInstallZipVersionInfo.json",
"DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
"Items":[
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Normal.UI.Server",
"Exe":"FLY.Thick.Normal.UI.Server.exe",
"Name":"测厚仪服务器",
"IsAutoRun":true,
"UpdateScript":"更新脚本\\BatteryUpdateScript.dll",
"ScriptTypeFullName":"BatteryUpdateScript.UpdateScript",
"IsDefaultSelected":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Normal.UI.Client",
"Exe":"FLY.Thick.Normal.UI.Client.exe",
"Name":"测厚仪客户端",
"IsAutoRun":true,
"UpdateScript":"更新脚本\\BatteryUpdateScript.dll",
"ScriptTypeFullName":"BatteryUpdateScript.UpdateScript",
"Others":[
"default",
"unity",
"测厚仪说明书.pdf"
],
"IsDefaultSelected":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Normal.UI.DBViewer",
"Exe":"FLYDBBrowser.exe",
"Name":"数据浏览器",
"Others":[
"电池报表模板.xlsx"
],
"IsDefaultSelected":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.ExtrusionCoating.UI.Server",
"Exe":"FLY.ExtrusionCoating.UI.Server.exe",
"Name":"挤压涂布纵向闭环",
"IsAutoRun":true,
"Others":[
"Gage\\coatingplcs.json"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.ExtrusionCoating.DieCtrl.UI.Server",
"Exe":"FLY.ExtrusionCoating.DieCtrl.UI.Server.exe",
"Name":"挤压涂布横向闭环",
"IsAutoRun":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.TransferCoating.UI.Server",
"Exe":"FLY.TransferCoating.UI.Server.exe",
"Name":"转移涂布纵向闭环",
"IsAutoRun":true
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
"Exe":"FLY.LinkProxy.UI.exe",
"Name":"LP3",
"IsAutoRun":true
}
]
}
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/customSection.config
View file @ dc6e5ef0
......@@ -15,6 +15,7 @@
<register type="UserControl" mapTo="UcSectionError" name="error" />
<register type="UserControl" mapTo="UcSectionLanguage" name="lang" />
<register type="UserControl" mapTo="UcSectionScanGraph" name="graph" />
<register type="UserControl" mapTo="UcSectionReboot" name="reboot" />
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/root.config
View file @ dc6e5ef0
......@@ -21,6 +21,9 @@
<register type="IOnInit" mapTo="OnInitOSK" name="osk">
<lifetime type="singleton" />
</register>
<register type="IOnInit" mapTo="OnInitReboot" name="reboot">
<lifetime type="singleton" />
</register>
<register type="IJsonDistService" mapTo="JsonDistServiceClient">
<lifetime type="singleton" />
<constructor>
......
脚本/和美扫描客户端容器描述.unity/unity/customSection.config
View file @ dc6e5ef0
......@@ -15,6 +15,7 @@
<register type="UserControl" mapTo="UcSectionError" name="error" />
<register type="UserControl" mapTo="UcSectionLanguage" name="lang" />
<register type="UserControl" mapTo="UcSectionScanGraph" name="graph" />
<register type="UserControl" mapTo="UcSectionReboot" name="reboot" />
</container>
</unity>
</configuration>
\ No newline at end of file
脚本/和美扫描客户端容器描述.unity/unity/root.config
View file @ dc6e5ef0
......@@ -21,6 +21,9 @@
<register type="IOnInit" mapTo="OnInitOSK" name="osk">
<lifetime type="singleton" />
</register>
<register type="IOnInit" mapTo="OnInitReboot" name="reboot">
<lifetime type="singleton" />
</register>
<register type="IJsonDistService" mapTo="JsonDistServiceClient">
<lifetime type="singleton" />
<constructor>
......
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