Skip to content

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

修复 thick_public 的bug

parent a2f5a492
Expand all Show whitespace changes
Inline Side-by-side
Showing with 816 additions and 62 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Server/TDGage.cs
View file @ 8bde3da5
......@@ -211,11 +211,8 @@ namespace FLY.Thick.Blowing.Server
//---------------------------------------------------------------------------------------------------------------
//FlyAD7_Create
mFlyAD = new FlyAD7();
Misc.BindingOperations.SetBinding(mSysParam, "FLYAD7_HasCRC",mFlyAD, "HasCRC", BindingOperations.BindingMode.TwoWay);
mFlyAD.Connect(mSysParam.FLYAD7EP);
Misc.BindingOperations.SetBinding(mFlyAD, "LocalEP", mSysParam, "FLYAD7EP");
mFlyAD.Load();
mFlyAD.Connect();
Misc.BindingOperations.SetBinding(mFlyAD, "IStatus", mDynArea, "IStatus");
Misc.BindingOperations.SetBinding(mFlyAD, "OStatus", mDynArea, "OStatus");
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ 8bde3da5
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("FLY.Thick.BlowingScan.UI.Server")]
[assembly: AssemblyCopyright("Copyright © 2018 FlyAutomation")]
[assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation")]
[assembly: AssemblyTrademark("FlyAutomation")]
[assembly: AssemblyCulture("")]
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0.0")]
[assembly: AssemblyFileVersion("5.1.0.0")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/FLY.Thick.BlowingScan.UI.csproj
View file @ 8bde3da5
......@@ -59,6 +59,9 @@
<ItemGroup>
<Compile Include="PgBlowing\PgBlowingVm.cs" />
<Compile Include="PgBlowing\PgBlowingVmUt.cs" />
<Compile Include="PgInitparam.xaml.cs">
<DependentUpon>PgInitparam.xaml</DependentUpon>
</Compile>
<Compile Include="PgMenu.xaml.cs">
<DependentUpon>PgMenu.xaml</DependentUpon>
</Compile>
......@@ -99,6 +102,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgInitparam.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="PgMenu.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/PgMenu.xaml.cs
View file @ 8bde3da5
......@@ -5,7 +5,7 @@ using System.Windows.Controls;
using System.Windows.Navigation;
using Unity;
using PgFlyAd = FLY.Thick.Base.UI.PgFlyAd;
using PgInitparam = FLY.Thick.Base.UI.PgInitparam;
namespace FLY.Thick.BlowingScan.UI.Client
{
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/GM_BlowingScan.cs
View file @ 8bde3da5
......@@ -918,9 +918,6 @@ namespace FLY.Thick.BlowingScan.Server
mScanPosDetect.Init(mFlyAD);
ScanCnt = -1;
}
......
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs
View file @ 8bde3da5
......@@ -306,9 +306,8 @@ namespace FLY.Thick.BlowingScan.Server
//---------------------------------------------------------------------------------------------------------------
//FlyAD7_Create
mFlyAD = new FlyAD7();
//TODO
mFlyAD.Connect(mSysParam.FLYAD7EP);
Misc.BindingOperations.SetBinding(mFlyAD, "LocalEP", mSysParam, "FLYAD7EP");
mFlyAD.Load();
mFlyAD.Connect();
Misc.BindingOperations.SetBinding(mInitParam, "PosLength", mFlyAD, "PosLen");
......
thick_public @ 715ebee6
Subproject commit 5e49ed992e2210e9ec5c5a1397777f248d7182eb
Subproject commit 715ebee61130332971fcac03421f62bc114bb015
脚本/2.get_exe.sh
View file @ 8bde3da5
#!/bin/bash
#获取git 最后一个 tag 的描述！！！！
LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
#LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
install_dir="和美安装包_"$LatestTag
#install_dir="和美安装包_"$LatestTag
install_dir="和美安装包_xxxx"
if [ -e $install_dir ]; then
rm -rf $install_dir
fi
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustom.json
View file @ 8bde3da5
......@@ -6,8 +6,7 @@
"MenuItems": [
19818984,
63206470,
44866487,
58324414
44866487
],
"DynAreaItems": [
50585687,
......@@ -15,27 +14,9 @@
63402646,
21215025,
64060950,
6082351,
41268531
],
"Items": [
{
"Graphs": [
{
"ID": 9296665,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "称重"
},
{
"Graphs": [
{
......@@ -87,10 +68,6 @@
{
"ID": 48220637,
"Rect": "0, 0, 1, 1"
},
{
"ID": 8698273,
"Rect": "0, 1, 1, 1"
}
],
"ColumnCount": 1,
......@@ -156,11 +133,6 @@
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 58324414,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 50585687,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaThick",
......@@ -186,21 +158,11 @@
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 6082351,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_DynAreaWeight",
"ServiceContainerName": "gage0.service"
},
{
"ID": 41268531,
"Module": "FLY.HeatingHelper.UI.UiModule.UiModule2_HeatThickDetector",
"ServiceContainerName": "gage0.service"
},
{
"ID": 9296665,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_MainGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36919767,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
......@@ -226,11 +188,6 @@
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 8698273,
"Module": "FLY.Weight2.UI.Client.UiModule.UiModule2_FlowGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 13476385,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraphCircular",
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/layout/graphcustoms/风环.json 0 → 100644
View file @ 8bde3da5
{
"GageTabItems": [
{
"Title": "吹膜",
"ServiceContainerName": "gage0.service",
"MenuItems": [
19818984,
63206470,
44866487
],
"DynAreaItems": [
50585687,
10658788,
63402646,
21215025,
64060950,
41268531
],
"Items": [
{
"Graphs": [
{
"ID": 36919767,
"Rect": "0, 0, 1, 1"
},
{
"ID": 15676068,
"Rect": "0, 1, 1, 1"
},
{
"ID": 48662582,
"Rect": "0, 2, 1, 2"
}
],
"ColumnCount": 1,
"RowCount": 4,
"RowDefinitions": [
false,
false,
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "风环"
},
{
"Graphs": [
{
"ID": 14719473,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "扫描"
},
{
"Graphs": [
{
"ID": 48220637,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "趋势"
},
{
"Graphs": [
{
"ID": 13476385,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 1,
"RowDefinitions": [
false
],
"ColumnDefinitions": [
false
],
"Header": "环型"
},
{
"Graphs": [
{
"ID": 28792051,
"Rect": "0, 0, 1, 1"
}
],
"ColumnCount": 1,
"RowCount": 2,
"RowDefinitions": [
false,
false
],
"ColumnDefinitions": [
false
],
"Header": "定点"
}
],
"Components": [
{
"ID": 19818984,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 63206470,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_MenuProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 44866487,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_MenuSetting",
"ServiceContainerName": "gage0.service"
},
{
"ID": 50585687,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaThick",
"ServiceContainerName": "gage0.service"
},
{
"ID": 10658788,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaProfile",
"ServiceContainerName": "gage0.service"
},
{
"ID": 63402646,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_DynAreaBlowing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 21215025,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_DynAreaIO",
"ServiceContainerName": "gage0.service"
},
{
"ID": 64060950,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_DynAreaAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 41268531,
"Module": "FLY.HeatingHelper.UI.UiModule.UiModule2_HeatThickDetector",
"ServiceContainerName": "gage0.service"
},
{
"ID": 36919767,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 15676068,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph2",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48662582,
"Module": "FLY.FeedbackRenZiJia.UI.Client.UiModule.UiModule2_GraphAirRing",
"ServiceContainerName": "gage0.service"
},
{
"ID": 14719473,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 48220637,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_TrendGraph",
"ServiceContainerName": "gage0.service"
},
{
"ID": 13476385,
"Module": "FLY.Thick.Blowing.UI.Fix.Client.UiModule.UiModule2_ScanGraphCircular",
"ServiceContainerName": "gage0.service"
},
{
"ID": 28792051,
"Module": "FLY.Thick.Base.UI.UiModule.UiModule2_FixGraph",
"ServiceContainerName": "gage0.service"
}
]
}
],
"DynAreaWidth": 250,
"IsDynAreaVisible": true,
"IsLogoHidden": true,
"Rect": "0, 0, 1382, 744",
"WindowState": 2
}
\ No newline at end of file
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