优化 3.get_exe.sh 需要有 版本号参数， 直接生成有版本号的安装包，及对应的压缩包

thick_public @ 7d29227d

-Subproject commit 0c6e00f3e20dba20bb8b45d530a109bb108843d4
+Subproject commit 7d29227dee96f5d25468263e740e9eb3f56a07f2

脚本/3.get_exe.sh

@@ -3,14 +3,33 @@
 #LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
 
 #install_dir="流延测厚仪安装包_"$LatestTag
+
+version=$1
+if [ -z "$version" ]; then
+ echo "format error: version is empty"
+ echo "Usage: ./3.get_exe.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
+
 install_dir=$install_dir"/佛山市枫莱尔自动化技术有限公司/windows"
 
 copy_to()
@@ -55,7 +74,7 @@ src_dir="../Project.FLY.Thick.FilmCasting/FLY.Thick.FilmCasting.UI.Client"
 dest_dir="FLY.Thick.FilmCasting.UI.Client"
 files=(\
 	"FLY.Thick.FilmCasting.UI.Client.exe" \
-	"default" "unity" "layout" "music" \
+	"default" "unity" "layout" "music" "update"\
 	"nlog.config" \
 	)
 copy_to2 $src_dir $dest_dir $files
@@ -79,4 +98,26 @@ 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.FilmCasting.UI.Client/update
+cp ${install_dir_root}/install.json $install_dir/FLY.Thick.FilmCasting.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

脚本/4.upload.sh

+#!/bin/bash
+scp 流延测厚仪安装包_v7.3.0_20210920.7z root@server.flyautomation.net://www/wwwroot/server.flyautomation.net/LpClient2/download/
\ No newline at end of file

脚本/filmCastingInstallZipVersionInfo.json

 {
-  "InstallZipVersion":"7.2.1",
-  "InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.2.1_20210918.7z"
+  "InstallZipVersion":"7.3.0",
+  "InstallZipUrl":"http://server.flyautomation.net:8889/download/流延测厚仪安装包_v7.3.0_20210920.7z"
 }
\ No newline at end of file

脚本/install.json

+{
+  "InstallZipVersion":"",
+  "NewestInstallZipVersionInfoPath":"http://server.flyautomation.net:8889/download/filmCastingInstallZipVersionInfo.json",
+  "DefaultNewestInstallZipPath":"D:\\测厚仪软件",
+  "DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
+  "Items":[
+    {
+      "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.FilmCasting.UI.Server",
+      "Exe":"FLY.Thick.FilmCasting.UI.Server.exe",
+      "Name":"流延测厚仪服务器",
+      "IsAutoRun":true,
+      "IsDefaultSelected":true
+    },
+    {
+      "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.FilmCasting.UI.Client",
+      "Exe":"FLY.Thick.FilmCasting.UI.Client.exe",
+      "Name":"流延测厚仪客户端",
+      "IsAutoRun":true,
+      "Others":[
+        "default",	
+        "unity",
+        "music",
+        "update"
+      ],
+      "IsDefaultSelected":true
+    },
+    {
+      "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Thick.FilmCasting.UI.DbViewer",
+      "Exe":"FLY.Thick.FilmCasting.UI.DbViewer.exe",
+      "Name":"数据浏览器",
+      "IsAutoRun":false,
+      "IsDefaultSelected":true
+    },
+    {
+      "PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
+      "Exe":"FLY.LinkProxy.UI.exe",
+      "Name":"LP3",
+      "IsAutoRun":true
+    }
+  ]
+}
\ No newline at end of file

脚本/install/install.json

 {
   "InstallZipVersion":"7.2.0",
   "NewestInstallZipVersionInfoPath":"http://server.flyautomation.net:8889/download/filmCastingInstallZipVersionInfo.json",
+  "DefaultNewestInstallZipPath":"D:\\测厚仪软件",
   "DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
   "Items":[
     {
@@ -18,7 +19,8 @@
       "Others":[
         "default",	
         "unity",
-        "music"
+        "music",
+        "update"
       ],
       "IsDefaultSelected":true
     },

脚本/流延客户端容器描述.unity/unity/customMenu.config

@@ -14,6 +14,7 @@
       <register type="IMenu" mapTo="WarningMenu" name="warning" />
       <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

+流延测厚仪安装包_v7.3.0_20210920
+1. 添加 在客户端左下角 “枫莱尔” 进入的界面菜单， 添加 【升级检测】
+2. 修复 样品界面 样品直径无法保存
+
 流延测厚仪安装包_v7.2.1_20210918
 1. 添加 大混合扫描图
 2. 添加 在产品中， 公差可以 输入绝对值