Skip to content

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

kundig 安装包

parent 304c5dc6
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 18 deletions
Project.Kundig.Thick.K300/Kundig.Thick.K300.UI.Server/Kundig.Thick.K300.UI.Server.csproj
View file @ 598dd790
......@@ -89,6 +89,9 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="NLog.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
......
Project.Kundig.Thick.K300/Kundig.Thick.K300.UI.Server/NLog.config 0 → 100644
View file @ 598dd790
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
<!-- optional, add some variables
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>
<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>
<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->
<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
<target xsi:type="File" name="f_debug" fileName="${basedir}/logs/debug/${shortdate}.log"
layout="${longdate} ${logger} ${uppercase:${level}} ${message}"
archiveAboveSize="1048576" encoding="utf-8"/>
<target xsi:type="File" name="f_error" fileName="${basedir}/logs/error/${shortdate}.log"
layout="${longdate} ${logger} ${uppercase:${level}} ${message} ${onexception:inner=${newline} *****Error***** ${newline} ${exception:format=ToString}}"
archiveAboveSize="1048576" encoding="utf-8"/>
<target xsi:type="File" name="plcWrite" fileName="${basedir}/logs/plcWrite/${shortdate}.log"
layout="${longdate} ${message}"
archiveAboveSize="1048576" encoding="utf-8"/>
</targets>
<rules>
<!-- add your logging rules here -->
<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
<!--<logger name="FObjSysOfClient" minlevel="Debug" writeTo="f_debug" />-->
<!--name 可以用匹配-->
<logger name="FLY.OBJComponents.Server.PLCProxySystem" minlevel="Info" writeTo="plcWrite" />
<logger name="*" minlevel="Error" writeTo="f_error" />
</rules>
</nlog>
Project.Kundig.Thick.K300/Kundig.Thick.K300.UI/UiModule/ScanGraph/ScanGraphVm.cs
View file @ 598dd790
......@@ -288,23 +288,23 @@ namespace Kundig.Thick.K300.UI.Client.UiModule
void UpdateY()
{
if (this.profile != null)
{
if (this.bulkDb.LastProfileId != this.profile.ID)
{
//使用 profile 数据显示
UpdateY_profile();
}
else
{
//使用 profileParam 的参数显示
UpdateY_profileParam();
}
}
else {
//if (this.profile != null)
//{
// if (this.bulkDb.LastProfileId != this.profile.ID)
// {
// //使用 profile 数据显示
// UpdateY_profile();
// }
// else
// {
// //使用 profileParam 的参数显示
// UpdateY_profileParam();
// }
//}
//else {
//使用 profileParam 的参数显示
UpdateY_profileParam();
}
//}
......
脚本/.gitignore
View file @ 598dd790
# 生成的安装包
和美安装包/
和美安装包*.zip
和美安装包*/
*安装包/
*安装包*/
*.zip
脚本/2.get_release_kundig.sh 0 → 100644
View file @ 598dd790
#!/bin/bash
#获取git 最后一个 tag 的描述！！！！
#LatestTag=$(git describe --tags `git rev-list --tags --max-count=1`)
#install_dir="和美安装包_"$LatestTag
install_dir="Kundig安装包_xxxx"
if [ -e $install_dir ]; then
rm -rf $install_dir
fi
#复制 install 到 测厚仪安装包
cp -rf install $install_dir
cp install_kundig.json $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
#第2步，复制 release_conf 对应的出厂默认配置文件
src_dir="release_conf/"$2
if [ -e $src_dir ]; then
src_dir=$src_dir"/*"
cp -Rf $src_dir $dest_dir
fi
}
# Kundig.Thick.K300.UI.Server
src_dir="../Project.Kundig.Thick.K300\Kundig.Thick.K300.UI.Server"
dest_dir="Kundig.Thick.K300.UI.Server"
files=(\
"Gage1" \
"x64" "x86" \
"Kundig.Thick.K300.UI.Server.exe" \
"NLog.config" \
)
copy_to2 $src_dir $dest_dir $files
# Kundig.Thick.K300.UI.Client
src_dir="../Project.Kundig.Thick.K300\Kundig.Thick.K300.UI.Client"
dest_dir="Kundig.Thick.K300.UI.Client"
files=(\
"default" "layout" "music" "unity"\
"x64" "x86" \
"Kundig.Thick.K300.UI.Client.exe" \
"NLog.config" \
)
copy_to2 $src_dir $dest_dir $files
#Kundig.AirRing.UI.Server
src_dir="../Project.Kundig.Thick.K300\Kundig.AirRing.UI.Server"
dest_dir="Kundig.AirRing.UI.Server"
files=(\
"Gage1"\
"x64" "x86" \
"Kundig.AirRing.UI.Server.exe" \
"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=(\
"x64" "x86" \
"FLY.Weight.UI.Server.exe" \
)
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=(\
"x64" "x86" \
"FLY.Winder.UI.Server.exe" \
)
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=(\
"x64" "x86" \
"FLY.IBC.UI.Server.exe" \
)
copy_to2 $src_dir $dest_dir $files
echo 完成
\ No newline at end of file
脚本/install_kundig.json 0 → 100644
View file @ 598dd790
{
"DefaultInstallPath":"D:\\佛山市枫莱尔自动化技术有限公司\\windows",
"Items":[
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\Kundig.Thick.K300.UI.Server",
"Exe":"Kundig.Thick.K300.UI.Server.exe",
"Name":"Kundig测厚仪服务器",
"IsAutoRun":true,
"Others":["NLog.config"]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\Kundig.Thick.K300.UI.Client",
"Exe":"Kundig.Thick.K300.UI.Client.exe",
"Name":"Kundig测厚仪客户端",
"IsAutoRun":true,
"Others":[
"default",
"unity",
"music",
"版本说明.txt",
"测厚仪说明书.pdf",
"NLog.config"
]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\Kundig.AirRing.UI.Server",
"Exe":"Kundig.AirRing.UI.Server.exe",
"Name":"Kundig自动风环",
"IsAutoRun":true,
"Others":["NLog.config"]
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight.UI.Server",
"Exe":"FLY.Weight.UI.Server.exe",
"Name":"称重",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Weight2.UI.Server",
"Exe":"FLY.Weight2.UI.Server.exe",
"Name":"称重单组",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Winder.UI.Server",
"Exe":"FLY.Winder.UI.Server.exe",
"Name":"收卷",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.IBC.UI.Server",
"Exe":"FLY.IBC.UI.Server.exe",
"Name":"IBC",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\FLY.Integrated.UI.Server",
"Exe":"FLY.Integrated.UI.Server.exe",
"Name":"IBC综合",
"IsAutoRun":true,
"Others":null
},
{
"PackPath":"佛山市枫莱尔自动化技术有限公司\\windows\\LP3",
"Exe":"FLY.LinkProxy.UI.exe",
"Name":"LP3",
"IsAutoRun":true,
"Others":null
}
]
}
\ 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