安装包脚本

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/FLY.FeedbackRenZiJia.UI.Client.csproj

@@ -317,6 +317,9 @@
       <Version>2.6.1</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\apache_server.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml

@@ -103,6 +103,12 @@
                         <TextBlock Text="降温" />
                     </StackPanel>
                 </Button>
+                <Button Click="button_smooth_click" >
+                    <StackPanel>
+                        <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/apache_server.png" />
+                        <TextBlock Text="平滑" />
+                    </StackPanel>
+                </Button>
                 <Button Click="button_cal_click" >
                     <StackPanel>
                         <Image Source="/FLY.FeedbackRenZiJia.UI.Client;component/Images/aim.png" />

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UIModule/Page_Graph.xaml.cs

@@ -704,6 +704,11 @@ namespace FLY.FeedbackRenZiJia.UI.Client.UIModule
             if (!lpress.IsOK)
                 mHeatCell.ClearOffsets();
         }
+
+        private void button_smooth_click(object sender, RoutedEventArgs e)
+        {
+            mHeatCell.Smooth();
+        }
     }
     public class LongPress : INotifyPropertyChanged
     {

脚本/.gitignore

 # 生成的安装包
 和美安装包/
 和美安装包*.zip
+和美安装包*/

脚本/0.clear_module.ps1

-#-----------------------------------------------------------------
-#清空全部模块
-
-$root_path = $PSScriptRoot
-
-$modules_AirRing = "FLY.FeedbackRenZiJia.dll","FLY.FeedbackRenZiJia.UI.Client.dll","main_module\AirRing"
-$modules_Weight = "FLY.Weight.dll","FLY.Weight.UI.Client.dll","main_module\Weight"
-$modules_IBC = "FLY.IBC.dll","FLY.IBC.UI.Client.dll","main_module\IBC"
-$modules_Winder = "FLY.Winder.dll","FLY.Winder.UI.Client.dll","main_module\Winder"
-$modules= $modules_AirRing + $modules_Weight + $modules_IBC + $modules_Winder
-
-$src_path = $root_path + "\..\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
-
-foreach ($n in $modules)
-{
-    $path = $src_path +"\" +$n
-    #echo $path
-    if(Test-Path($path))
-    {
-        echo $path + "存在,把它删除" 
-	    rm -R $path
-    }
-}
-
-$src_path = $root_path + "\..\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug"
-
-foreach ($n in $modules)
-{
-    $path = $src_path +"\" +$n
-    #echo $path
-    if(Test-Path($path))
-    {
-        echo $path + "存在,把它删除" 
-	    rm -R $path
-    }
-}
-#-----------------------------------------------------------------
-echo 复制成功 
-pause
\ No newline at end of file

脚本/0.update_main_module.ps1

-#-----------------------------------------------------------------
-
-
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
-
-echo  main_module\*
-cp -r -force ($PSScriptRoot + "\main_module\*") ($dest_path+"\main_module")
-
-#-----------------------------------------------------------------
-echo Ƴɹ 
-pause
\ No newline at end of file

脚本/1.update_dll.ps1

-#-----------------------------------------------------------------
-#AirRing
-
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug"
-
-$src_path = $root_path + "\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
-echo 复制 FLY.FeedbackRenZiJia.dll
-cp ($src_path + "\FLY.FeedbackRenZiJia.dll") $dest_path
-
-echo 复制 FLY.FeedbackRenZiJia.UI.Client.dll
-cp ($src_path + "\FLY.FeedbackRenZiJia.UI.Client.dll") $dest_path
-
-
-
-
-
-#-----------------------------------------------------------------
-#IBC
-
-$src_path = $root_path + "\Project.FLY.IBC\FLY.IBC.UI.Client\bin\Debug"
-
-echo 复制 FLY.IBC.dll
-cp ($src_path + "\FLY.IBC.dll") $dest_path
-
-echo 复制 FLY.IBC.UI.Client.dll
-cp ($src_path + "\FLY.IBC.UI.Client.dll") $dest_path
-
-
-#-----------------------------------------------------------------
-#Winder
-
-$src_path = $root_path + "\Project.FLY.Winder_20190413\FLY.Winder.UI.Client\bin\Debug"
-
-echo 复制 FLY.Winder.dll
-cp ($src_path + "\FLY.Winder.dll") $dest_path
-
-echo 复制 FLY.Winder.UI.Client.dll
-cp ($src_path + "\FLY.Winder.UI.Client.dll") $dest_path
-
-#-----------------------------------------------------------------
-#Weight
-
-$src_path = $root_path + "\Project.FLY.Weight\FLY.Weight.UI.Client\bin\Debug"
-
-echo 复制 FLY.Weight.dll
-cp ($src_path + "\FLY.Weight.dll") $dest_path
-
-echo 复制 FLY.Weight.UI.Client.dll
-cp ($src_path + "\FLY.Weight.UI.Client.dll") $dest_path
-
-
-
-#扫描测厚仪-----------------------------------------------------------
-echo ------------------------------------扫描测厚仪-------------------------------------------
-$dest_path = $root_path + "\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug"
-
-$src_path = $root_path + "\Project.FLY.FeedbackRenZiJia\FLY.FeedbackRenZiJia.UI.Client\bin\Debug"
-echo 复制 FLY.FeedbackRenZiJia.dll
-cp ($src_path + "\FLY.FeedbackRenZiJia.dll") $dest_path
-
-echo 复制 FLY.FeedbackRenZiJia.UI.Client.dll
-cp ($src_path + "\FLY.FeedbackRenZiJia.UI.Client.dll") $dest_path
-
-
-#-----------------------------------------------------------------
-#IBC
-
-$src_path = $root_path + "\Project.FLY.IBC\FLY.IBC.UI.Client\bin\Debug"
-
-echo 复制 FLY.IBC.dll
-cp ($src_path + "\FLY.IBC.dll") $dest_path
-
-echo 复制 FLY.IBC.UI.Client.dll
-cp ($src_path + "\FLY.IBC.UI.Client.dll") $dest_path
-
-
-#-----------------------------------------------------------------
-#Winder
-
-$src_path = $root_path + "\Project.FLY.Winder_20190413\FLY.Winder.UI.Client\bin\Debug"
-
-echo 复制 FLY.Winder.dll
-cp ($src_path + "\FLY.Winder.dll") $dest_path
-
-echo 复制 FLY.Winder.UI.Client.dll
-cp ($src_path + "\FLY.Winder.UI.Client.dll") $dest_path
-
-#-----------------------------------------------------------------
-#Weight
-
-$src_path = $root_path + "\Project.FLY.Weight\FLY.Weight.UI.Client\bin\Debug"
-
-echo 复制 FLY.Weight.dll
-cp ($src_path + "\FLY.Weight.dll") $dest_path
-
-echo 复制 FLY.Weight.UI.Client.dll
-cp ($src_path + "\FLY.Weight.UI.Client.dll") $dest_path
-
-
-#-----------------------------------------------------------------
-echo 复制成功 
-pause
\ No newline at end of file

脚本/1.update_dll.sh

+#!/bin/bash
+
+dest_dir="../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/bin/Debug"
+src_dir="src_dir"
+src=("src0" "src1")
+
+copy_to()
+{
+    for f in ${src[*]}
+    do
+        path=$src_dir/$f
+        cp $path $dest_dir
+        if [ $? != 0 ]; then 
+            echo "ERROR!"
+            exit 1
+        fi
+    done
+}
+
+echo "-------------------Copy To FLY.Thick.Blowing.UI.Fix.Client----------------------------"
+#-----------------------------------------------------------------
+#AirRing
+src_dir="../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/bin/Debug"
+
+src=("FLY.FeedbackRenZiJia.dll" \
+"FLY.FeedbackRenZiJia.UI.Client.dll")
+
+copy_to
+echo "Copy AirRing dll SUCCESS"
+
+#-----------------------------------------------------------------
+#IBC
+
+src_dir="../Project.FLY.IBC/FLY.IBC.UI.Client/bin/Debug"
+
+src=("FLY.IBC.dll" \
+"FLY.IBC.UI.Client.dll")
+
+copy_to
+echo "Copy IBC dll SUCCESS"
+
+
+#-----------------------------------------------------------------
+#Winder
+src_dir="../Project.FLY.Winder_20190413/FLY.Winder.UI.Client/bin/Debug"
+
+src=("FLY.Winder.dll" \
+"FLY.Winder.UI.Client.dll")
+
+copy_to
+echo "Copy Winder dll SUCCESS"
+
+#-----------------------------------------------------------------
+#Weight
+
+src_dir="../Project.FLY.Weight/FLY.Weight.UI.Client/bin/Debug"
+
+src=("FLY.Weight.dll" \
+"FLY.Weight.UI.Client.dll")
+
+copy_to
+echo "Copy Weight dll SUCCESS"
+
+
+dest_dir="../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/bin/Debug"
+
+echo "-------------------Copy To FLY.Thick.BlowingScan.UI.Client----------------------------"
+#-----------------------------------------------------------------
+#AirRing
+src_dir="../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/bin/Debug"
+
+src=("FLY.FeedbackRenZiJia.dll" \
+"FLY.FeedbackRenZiJia.UI.Client.dll")
+
+copy_to
+echo "Copy AirRing dll SUCCESS"
+
+#-----------------------------------------------------------------
+#IBC
+
+src_dir="../Project.FLY.IBC/FLY.IBC.UI.Client/bin/Debug"
+
+src=("FLY.IBC.dll" \
+"FLY.IBC.UI.Client.dll")
+
+copy_to
+echo "Copy IBC dll SUCCESS"
+
+
+#-----------------------------------------------------------------
+#Winder
+src_dir="../Project.FLY.Winder_20190413/FLY.Winder.UI.Client/bin/Debug"
+
+src=("FLY.Winder.dll" \
+"FLY.Winder.UI.Client.dll")
+
+copy_to
+echo "Copy Winder dll SUCCESS"
+
+#-----------------------------------------------------------------
+#Weight
+
+src_dir="../Project.FLY.Weight/FLY.Weight.UI.Client/bin/Debug"
+
+src=("FLY.Weight.dll" \
+"FLY.Weight.UI.Client.dll")
+
+copy_to
+echo "Copy Weight dll SUCCESS"
+

脚本/2.get_exe.sh

+#!/bin/bash
+#获取git 最后一个 tag 的描述！！！！
+LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
+
+install_dir="和美安装包_"$LatestTag
+if [ -e $install_dir ]; then
+	rm -rf $install_dir
+fi
+#复制 install 到 测厚仪安装包
+cp -rf install $install_dir
+
+install_dir=$install_dir"/佛山市枫莱尔自动化技术有限公司/windows"
+
+copy_to()
+{
+    src_dir=$1
+    dest_dir=$2
+    files=$3
+
+	#检测文件夹是否存在
+	#存在，删除全部数据，再新创建；
+	#不存在，创建。
+	if [ -e $dest_dir ]; then
+        rm -rf $dest_dir
+    fi
+
+	mkdir -p $dest_dir
+	
+	echo 复制 $dest_dir
+
+	for f in ${files[*]}; do
+		file_path=$src_dir"/"$f
+		cp -rf $file_path $dest_dir
+		if [ $? != 0 ]; then
+			echo 复制失败
+			exit 1
+		fi
+	done
+}
+
+copy_to2()
+{
+    src_dir=$1
+	dest_dir=$2
+    files=$3
+
+    src_dir=$src_dir"/bin/Debug" 
+	dest_dir=$install_dir"/"$dest_dir
+    copy_to $src_dir $dest_dir $files
+}
+
+# Project.FLY.Thick.Blowing
+
+src_dir="../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client"
+dest_dir="FLY.Thick.Blowing.UI.Fix.Client"
+files=(\
+	"FLY.Thick.Blowing.UI.Fix.Client.exe" \
+	"FLY.FeedbackRenZiJia.dll" "FLY.FeedbackRenZiJia.UI.Client.dll" \
+	"FLY.IBC.dll" "FLY.IBC.UI.Client.dll" \
+	"FLY.Weight.dll" "FLY.Weight.UI.Client.dll" \
+	"FLY.Winder.dll" "FLY.Winder.UI.Client.dll" \
+	"main_module" "csysparam.xml" "layout" "music" "版本说明.txt" "测厚仪说明书.pdf" \
+	"nlog.config" \
+	)
+copy_to2 $src_dir $dest_dir $files
+
+
+src_dir="../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server" 
+dest_dir="FLY.Thick.Blowing.UI.Fix.Server" 
+files=(\
+	"FLY.Thick.Blowing.UI.Fix.Server.exe" \
+	"Gage1" "x64" "x86" \
+	"nlog.config" \
+	)
+copy_to2 $src_dir $dest_dir $files
+
+#Project.FLY.FeedbackRenZiJia
+src_dir="../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server"
+dest_dir="FLY.FeedbackRenZiJia.UI.Server"
+files=(\
+	"FLY.FeedbackRenZiJia.UI.Server.exe" \
+	"Gage1" "x64" "x86" \
+	"nlog.config" \
+	)
+copy_to2 $src_dir $dest_dir $files
+
+#Project.FLY.Weight
+src_dir="../Project.FLY.Weight/FLY.Weight.UI.Server"
+dest_dir="FLY.Weight.UI.Server"
+files=(\
+	"FLY.Weight.UI.Server.exe" \
+	"Gage1" 
+	)
+copy_to2 $src_dir $dest_dir $files
+
+#Project.FLY.Winder
+src_dir="../Project.FLY.Winder_20190413/FLY.Winder.UI.Server"
+dest_dir="FLY.Winder.UI.Server"
+files=(\
+	"FLY.Winder.UI.Server.exe" \
+	"Gage1" 
+	)
+copy_to2 $src_dir $dest_dir $files
+
+#Project.FLY.IBC
+src_dir="../Project.FLY.IBC/FLY.IBC.UI.Server"
+dest_dir="FLY.IBC.UI.Server"
+files=(\
+	"FLY.IBC.UI.Server.exe" \
+	"Gage1" 
+	)
+copy_to2 $src_dir $dest_dir $files
+
+
+# Project.FLY.Thick.BlowingScan
+
+src_dir="../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client"
+dest_dir="FLY.Thick.BlowingScan.UI.Client"
+files=(\
+	"FLY.Thick.BlowingScan.UI.Client.exe" \
+	"FLY.FeedbackRenZiJia.dll" "FLY.FeedbackRenZiJia.UI.Client.dll" \
+	"FLY.IBC.dll" "FLY.IBC.UI.Client.dll" \
+	"FLY.Weight.dll" "FLY.Weight.UI.Client.dll" \
+	"FLY.Winder.dll" "FLY.Winder.UI.Client.dll" \
+	"main_module" "csysparam.xml" "layout" "music" "版本说明.txt" "测厚仪说明书.pdf" \
+	"nlog.config" \
+	)
+copy_to2 $src_dir $dest_dir $files
+
+
+src_dir="../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server" 
+dest_dir="FLY.Thick.BlowingScan.UI.Server" 
+files=(\
+	"FLY.Thick.BlowingScan.UI.Server.exe" \
+	"Gage1" "x64" "x86" \
+	"nlog.config" \
+	)
+copy_to2 $src_dir $dest_dir $files
+echo 完成
\ No newline at end of file

脚本/2.update_graphcustom_AirRing.ps1

-$src_path = $PSScriptRoot+ "\graphcustom\graphcustom_justAirRing.xml"
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-
-$dest_path = $root_path + "\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
-cp $src_path  $dest_path
-
-#-----------------------------------------------------------------
-echo Ƴɹ 
-pause
\ No newline at end of file

脚本/2.update_graphcustom_AirRingWeight3.ps1

-$src_path = $PSScriptRoot+ "\graphcustom\graphcustom_AirRingWeight3.xml"
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-$dest_path = $root_path + "\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-#-----------------------------------------------------------------
-echo Ƴɹ 
-pause
\ No newline at end of file

脚本/2.update_graphcustom_AirRingWeight5.ps1

-$src_path = $PSScriptRoot+ "\graphcustom\graphcustom_AirRingWeight5.xml"
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-$dest_path = $root_path + "\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-#-----------------------------------------------------------------
-echo Ƴɹ 
-pause
\ No newline at end of file

脚本/2.update_graphcustom_AllWeight3.ps1

-$src_path = $PSScriptRoot+ "\graphcustom\graphcustom_all_weight3.xml"
-$root_path = $PSScriptRoot + "\.."
-$dest_path = $root_path + "\Project.FLY.Thick.Blowing\FLY.Thick.Blowing.UI.Fix.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-$dest_path = $root_path + "\Project.FLY.Thick.BlowingScan\FLY.Thick.BlowingScan.UI.Client\bin\Debug\layout\graphcustom.xml"
-
-cp $src_path  $dest_path
-
-#-----------------------------------------------------------------
-echo Ƴɹ 
-pause
\ No newline at end of file

脚本/get_exe_all.ps1

-	
-$install_dir = $PSScriptRoot + "\和美安装包"
-
-if(Test-Path $install_dir )
-{
-	rm -Recurse -Force $install_dir
-}
-
-mkdir $install_dir
-
-
-#复制 install\* 到 和美安装包
-$files = ("佛山市枫莱尔自动化技术有限公司", "脚本","FLY.Install.exe", "install.xml")
-foreach($f in $files)
-{
-    cp -Recurse ($PSScriptRoot + "\install\"+$f) $install_dir
-}
-
-$install_dir = $install_dir+"\佛山市枫莱尔自动化技术有限公司\windows"
-
-function copy_to($src_dir , $project_name, $other )
-{
-
-	$src_dir = $PSScriptRoot + "\..\" + $src_dir
-	$dest_dir = $install_dir + "\" + $project_name
-
-	#检测文件夹是否存在
-	#存在，删除全部数据，再新创建；
-	#不存在，创建。
-	
-	if(Test-Path $dest_dir )
-	{
-		rm -Recurse -Force $dest_dir
-	}
-	mkdir -p $dest_dir
-	
-	echo 复制 $project_name
-
-	#复制全部 xxx.dll 与 $project_name+".exe"
-	cp ($src_dir + "\*.dll") $dest_dir
-	cp ($src_dir + "\*.exe") $dest_dir
-
-	#删除 *.vshost.exe
-	rm ($dest_dir + "\*.vshost.exe"	)
-
-    #复制其它
-	foreach($f in $other)
-	{
-		cp -Recurse ($src_dir + "\"+$f) $dest_dir
-	}
-}
-
-function copy_to2($src_dir , $project_name, $other )
-{
-    $src_dir = $src_dir + "\" + $project_name + "\bin\Debug" 
-    copy_to $src_dir $project_name $other
-}
-
-copy_to2 `
-"Project.FLY.Thick.Blowing" `
-"FLY.Thick.Blowing.UI.Fix.Client" `
-("nlog.config","csysparam.xml","layout", "main_module", "music", "版本说明.txt", "测厚仪说明书.pdf")
-
-copy_to2 `
-"Project.FLY.Thick.Blowing" `
-"FLY.Thick.Blowing.UI.Fix.Server" `
-("nlog.config","Gage1")
-
-copy_to2 `
-"Project.FLY.FeedbackRenZiJia" `
-"FLY.FeedbackRenZiJia.UI.Server" `
-("Gage1")
-
-copy_to2 `
-"Project.FLY.IBC" `
-"FLY.IBC.UI.Server" `
-("Gage1")
-
-copy_to2 `
-"Project.FLY.Weight" `
-"FLY.Weight.UI.Server" `
-("Gage1")
-
-copy_to2 `
-"Project.FLY.Winder_20190413" `
-"FLY.Winder.UI.Server" `
-("Gage1")
-
-copy_to2 `
-"Project.FLY.Thick.BlowingScan" `
-"FLY.Thick.BlowingScan.UI.Client" `
-("csysparam.xml","layout", "main_module", "music", "版本说明.txt", "测厚仪说明书.pdf")
-
-copy_to2 `
-"Project.FLY.Thick.BlowingScan" `
-"FLY.Thick.BlowingScan.UI.Server" `
-("Gage1")
-
-
-#删除 历史数据文件
-$remove_files = ("bulk.csv")
-foreach($f in $remove_files)
-{
-	rm -Recurse -Force ($install_dir + "\FLY.Thick.Blowing.UI.Fix.Server\Gage1\"+$f)
-}
-
-$remove_files = ("backup","profile","warning_history","history","bulk.csv")
-foreach($f in $remove_files)
-{
-	rm -Recurse -Force ($install_dir + "\FLY.Thick.BlowingScan.UI.Server\Gage1\"+$f)
-}
-
-$remove_files = ("flowlist.csv","warning_newest.csv")
-foreach($f in $remove_files)
-{
-	rm -Recurse -Force ($install_dir + "\FLY.Weight.UI.Server\Gage1\"+$f)
-}
-
-echo 复制成功 
-pause
\ No newline at end of file