和美安装包_v6.33.0 -20210927

1. 添加 在客户端左下角 “枫莱尔” 进入的界面菜单， 添加 【升级检测】
2. 修复 测厚仪服务器，保存图片功能， livechart 的控件不会释放资源，导致14小时后，服务器占了 900Mb 内存

Project.FLY.Blowing.DbViewer/FLY.Blowing.DbViewer/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]
 [assembly: Guid("5FE5D848-CD2B-42CC-8EBD-2029371CDFE2")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.31.0.0")]
-[assembly: AssemblyFileVersion("6.31.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]
 [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/PicHistory/PicHistory.cs

@@ -113,6 +113,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
             this.scanGraphVm = new ScanGraphVm();
             scanGraphVm.Init(this, profileParam);
 
+            Init_FrameworkElement();
 
             this.PropertyChanged += PicHistory_PropertyChanged;
 
@@ -134,11 +135,7 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
         }
         private void PicHistory_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == nameof(IntervalMin))
-            {
-                timer.Interval = TimeSpan.FromMinutes(IntervalMin);
-            }
-            else if (e.PropertyName == nameof(Enable)) {
+            if (e.PropertyName == nameof(Enable)) {
                 timer.IsEnabled = Enable;
             }
         }
@@ -188,16 +185,18 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
             Directory.CreateDirectory(dirpath);
             return $@"{dirpath}\{dt:HH_mm_ss}.jpg";
         }
-        public async void SavePic(string path) 
+
+        Viewbox viewbox;
+        ScanGraph scanGraph;
+
+        void Init_FrameworkElement()
         {
-            
             //一定要把 scangraph 放入容器， 且scangraph  Left,Top 对齐，margin=0
             //不然有黑框
             //整个scangraph 的尺寸是 Margin+(Width,Height)
             //Margin 是透明，也就是黑色
-            var viewbox = new Viewbox();
-
-            ScanGraph scanGraph = new ScanGraph
+            viewbox = new Viewbox();
+            scanGraph = new ScanGraph
             {
                 Width = PicWidth,
                 Height = PicHeight,
@@ -215,8 +214,21 @@ namespace FLY.Thick.Blowing.UI.Fix.Server
             scanGraph.ChartUpdate();//强制使 livechart 刷新
             viewbox.UpdateLayout();
 
+        }
+
+        public void SavePic(string path)
+        {
+            scanGraph.Width = PicWidth;
+            scanGraph.Height = PicHeight;
+
+            viewbox.Measure(scanGraph.RenderSize);
+            viewbox.Arrange(new System.Windows.Rect(new System.Windows.Point(0, 0), scanGraph.RenderSize));
+
+            scanGraph.ChartUpdate();//强制使 livechart 刷新
+            viewbox.UpdateLayout();
 
             ChartToImage.SaveToJpeg(scanGraph, path);
+
         }
         public async Task Add(Pack_GetFrameReponse reponse)
         {

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.30.0")]
-[assembly: AssemblyFileVersion("6.30.0")]
+[assembly: AssemblyVersion("6.33.0")]
+[assembly: AssemblyFileVersion("6.33.0")]
 [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]

Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.20.0")]
-[assembly: AssemblyFileVersion("6.20.0")]
+[assembly: AssemblyVersion("6.33.0")]
+[assembly: AssemblyFileVersion("6.33.0")]
 [assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs

@@ -51,6 +51,6 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.31.0")]
-[assembly: AssemblyFileVersion("6.31.0")]
+[assembly: AssemblyVersion("6.33.0")]
+[assembly: AssemblyFileVersion("6.33.0")]
 [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs

@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.30.0.0")]
-[assembly: AssemblyFileVersion("6.30.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]
 [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
 

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@ using System.Windows;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FLY.Thick.BlowingScan.UI")]
-[assembly: AssemblyCopyright("Copyright ©  2020")]
+[assembly: AssemblyCopyright("Copyright ©  2021 flyautomation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.20.0.0")]
-[assembly: AssemblyFileVersion("6.20.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FLY.Thick.BlowingScan")]
-[assembly: AssemblyCopyright("Copyright ©  2020 FlyAutomation")]
+[assembly: AssemblyCopyright("Copyright ©  2021 FlyAutomation")]
 [assembly: AssemblyTrademark("FlyAutomation")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.20.0.0")]
-[assembly: AssemblyFileVersion("6.20.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]

Project.FLY.Weight/FLY.Weight.UI.Server/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Windows;
 // 有关程序集的常规信息通过以下
 // 特性集控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("FLY.Weight.UI.Server")]
+[assembly: AssemblyTitle("称重服务器")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
@@ -51,6 +51,6 @@ using System.Windows;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.31.0.0")]
-[assembly: AssemblyFileVersion("6.31.0.0")]
+[assembly: AssemblyVersion("6.33.0.0")]
+[assembly: AssemblyFileVersion("6.33.0.0")]
 [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]

thick_public @ 993e371a

-Subproject commit b30a5aa7c5f4c61eb2d391644adcdf637e6e1eb1
+Subproject commit 993e371ae147e2a3c7a3029755ff97930bbe4bf8

脚本/.gitignore

 # 生成的安装包
 *安装包/
-*安装包*.zip
+*安装包*.*
 *安装包*/
 *.zip
 temp_conf*/

脚本/2.get_release.sh

@@ -3,14 +3,32 @@
 #LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
 
 #install_dir="和美安装包_"$LatestTag
-install_dir="和美安装包_xxxx"
+
+version=$1
+if [ -z "$version" ]; then
+ echo "format error: version is empty"
+ echo "Usage: ./2.get_release.sh 7.3.0"
+ exit
+fi
+
+install_dir="和美安装包"
+
+# 对 $install_dir_root 重命名为 ${install_dir_root}_v${version}_yyyyMMdd
+# date参考 https://www.cnblogs.com/zuiyue_jing/p/12557430.html
+suffix=$(date +%Y%m%d)
+install_dir=${install_dir}_v${version}_${suffix}
+
+install_dir_root=$install_dir
+
+
 if [ -e $install_dir ]; then
 	rm -rf $install_dir
 fi
 #复制 install 到 测厚仪安装包
 cp -rf install $install_dir
-cp 版本描述.txt $install_dir
 
+#复制 版本描述
+cp 版本描述.txt $install_dir
 
 install_dir=$install_dir"/佛山市枫莱尔自动化技术有限公司/windows"
 
@@ -173,5 +191,25 @@ 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
+
+# 复制 $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
+cp ${install_dir_root}/install.json $install_dir/FLY.Thick.BlowingScan.UI.Client/update
+
+fileName7z=${install_dir_root}.7z
+if [ -e $fileName7z ]; then
+	rm $fileName7z
+fi
+
+# 进入安装包内 用7z压缩
+cd ${install_dir_root}
+"C:\Program Files (x86)\7-Zip\7z.exe" a ../${fileName7z} ./*
 
+#cd ..
 echo 完成
\ No newline at end of file

脚本/hemeiInstallZipVersionInfo.json

+{
+  "InstallZipVersion":"6.33.0",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/和美安装包_v6.33.0_20210927.7z"
+}
\ No newline at end of file

脚本/install.json

+{
+  "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",
+        "测厚仪说明书.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

 {
+  "InstallZipVersion":"6.33.0",
+  "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
+      "IsAutoRun":true,
+      "IsDefaultSelected":true
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.Blowing.UI.Fix.Client",
@@ -16,8 +20,10 @@
         "default",	
         "unity",
         "music",
+        "update",
         "测厚仪说明书.pdf"
-      ]
+      ],
+      "IsDefaultSelected":true
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.BlowingScan.UI.Server",
@@ -47,49 +53,58 @@
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight.UI.Server",
       "Exe":"FLY.Weight.UI.Server.exe",
       "Name":"称重",
-      "IsAutoRun":true
+      "IsAutoRun":true,
+      "Others":[
+        "Gage1\\plcgroups"
+      ]
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight2.UI.Server",
       "Exe":"FLY.Weight2.UI.Server.exe",
       "Name":"称重单组",
       "IsAutoRun":true,
-      "Others":null
+      "Others":[
+        "Gage1\\plcgroups"
+      ]
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Winder.UI.Server",
       "Exe":"FLY.Winder.UI.Server.exe",
       "Name":"收卷",
       "IsAutoRun":true,
-      "Others":null
+      "Others":[
+        "Gage1\\plcgroups"
+      ]
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.IBC.UI.Server",
       "Exe":"FLY.IBC.UI.Server.exe",
       "Name":"IBC",
       "IsAutoRun":true,
-      "Others":null
+      "Others":[
+        "Gage1\\plcgroups"
+      ]
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Integrated.UI.Server",
       "Exe":"FLY.Integrated.UI.Server.exe",
       "Name":"IBC综合",
       "IsAutoRun":true,
-      "Others":null
+      "Others":[
+        "Gage1\\plcgroups"
+      ]
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Blowing.DbViewer",
       "Exe":"FLY.Blowing.DbViewer.exe",
       "Name":"吹膜数据库浏览器",
-      "IsAutoRun":false,
-      "Others":null
+      "IsAutoRun":false
     },
     {
       "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
       "Exe":"FLY.LinkProxy.UI.exe",
       "Name":"LP3",
-      "IsAutoRun":true,
-      "Others":null
+      "IsAutoRun":true
     }
   ]
 }

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/customMenu.config

@@ -13,6 +13,7 @@
       <register type="IMenu" mapTo="CustomMenu" name="custom" />
       <register type="IMenu" mapTo="PwMenu" name="pw" />
       <register type="IMenu" mapTo="MainEditMenu" name="main" />
+      <register type="IMenu" mapTo="UpdateMenu" name="up" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/update/install.json

+{
+  "InstallZipVersion":"6.33.0",
+  "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",
+        "测厚仪说明书.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

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷中心-IBC-温区/fixgraph.json

+{"Items":[{"Len":500,"Interval":1000,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":28792051},{"Len":500,"Interval":50,"Mix":1,"IsAutoTarget":true,"IsADMode":false,"IsAutoY":false,"YTarget":0.0,"YRange":10.0,"ID":18036132}]}
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷中心-IBC-温区/scangraph.json

+{"Items":[{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":36919767},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":15676068},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-15,"IsPercent":true,"IsAutoTarget":true,"ID":14719473},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-10,"IsPercent":true,"IsAutoTarget":true,"ID":32688641},{"UiModule":"scangraph","YRangePercent":3.0,"Mix":1,"Number":-5,"IsPercent":true,"IsAutoTarget":true,"ID":30883273},{"UiModule":"scangraph2","YRangePercent":3.0,"Mix":1,"Number":0,"IsPercent":true,"IsAutoTarget":true,"ID":3118346}]}
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷中心-IBC-温区/scangraphcircular.json

+{"Items":[{"Title":"环形扫描图","Mix":1,"BM":-1,"BoltNoWithManual1st":1,"ManualCnt":8,"MPIsRight":true,"ID":13476385}]}
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷中心-IBC-温区/trendgraph.json

+{"Items":[{"Len":120,"BeginNo":0,"EndNo":20,"IsAll":true,"Type":0,"XType":0,"BM":0,"YRangePercent":3.0,"Title":"趋势图","Mix":1,"IsAutoTarget":true,"IsPercent":true,"ID":48220637}]}
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/default/layout.default/风环-称重-收卷中心-IBC-温区/trendgraph2.json

+{"Items":[{"Interval":2,"YRangePercent":3.0,"Mix":1,"ID":48220637}]}
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/customMenu.config

@@ -13,6 +13,7 @@
       <register type="IMenu" mapTo="CustomMenu" name="custom" />
       <register type="IMenu" mapTo="PwMenu" name="pw" />
       <register type="IMenu" mapTo="MainEditMenu" name="main" />
+      <register type="IMenu" mapTo="UpdateMenu" name="up" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/update/install.json

+{
+  "InstallZipVersion":"6.33.0",
+  "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",
+        "测厚仪说明书.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

脚本/和美扫描客户端容器描述.unity/unity/customMenu.config

@@ -13,6 +13,7 @@
       <register type="IMenu" mapTo="CustomMenu" name="custom" />
       <register type="IMenu" mapTo="PwMenu" name="pw" />
       <register type="IMenu" mapTo="MainEditMenu" name="main" />
+      <register type="IMenu" mapTo="UpdateMenu" name="up" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/和美追边客户端容器描述.unity/unity/customMenu.config

@@ -13,6 +13,7 @@
       <register type="IMenu" mapTo="CustomMenu" name="custom" />
       <register type="IMenu" mapTo="PwMenu" name="pw" />
       <register type="IMenu" mapTo="MainEditMenu" name="main" />
+      <register type="IMenu" mapTo="UpdateMenu" name="up" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/版本描述.txt

+和美安装包_v6.33.0 -20210927
+1. 添加 在客户端左下角 “枫莱尔” 进入的界面菜单， 添加 【升级检测】
+2. 修复 测厚仪服务器，保存图片功能， livechart 的控件不会释放资源，导致14小时后，服务器占了 900Mb 内存
+
+和美安装包_v6.32.5 -20210925
+1.修复 扫描测厚,  解方程数 无法保存大于20， 平滑 无法保存
+2.修复 扫描测厚，计算膜距离，最大值 可以到 70m
+
+
 和美安装包_v6.32.4 -20210905
 1. 添加 称重添加141_v3