From ea6ffac1a801c1505f0d0fc7638e9327df10ca2e Mon Sep 17 00:00:00 2001
From: CaoYuHui <1152604503@qq.com>
Date: Mon, 17 Jun 2024 13:50:00 +0800
Subject: [PATCH] =?UTF-8?q?20240617=20=E4=BC=98=E5=8C=9613=E6=89=80?=
 =?UTF-8?q?=E5=90=8A=E8=88=B1=E6=8E=A7=E5=88=B6=E5=8D=8F=E8=AE=AE=E5=B8=A7?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=A4=A9=E8=BF=9B=E5=90=8A=E8=88=B1?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8A=9F=E8=83=BD=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E6=8C=87=E4=BB=A4=E5=8F=91=E9=80=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=88=E8=A3=85=E8=AE=A2=E6=8C=87=E4=BB=A4=EF=BC=89?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9C=BA=E6=8C=87=E4=BB=A4=EF=BC=88=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E6=8C=87=E4=BB=A4=EF=BC=89=E5=8F=91=E9=80=81=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A013=E6=89=80=E5=90=8A=E8=88=B1=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E3=80=81=E5=A4=A9=E8=BF=9B=E5=90=8A=E8=88=B1=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E3=80=81H264=E8=A3=B8=E6=B5=81=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E8=A7=A3=E6=9E=90=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A9=E8=BF=9B=E5=90=8A=E8=88=B1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E2=80=9C=E5=8D=95=E7=82=B9=E8=B7=9F=E8=B8=AA=E2=80=9D?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=90=8E=EF=BC=8C=E5=8F=8C=E5=87=BB=E5=9B=BE?=
 =?UTF-8?q?=E5=83=8F=E5=8C=BA=E5=9F=9F=E5=8F=91=E9=80=81=E5=90=8A=E8=88=B1?=
 =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E5=9D=90=E6=A0=87=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore       | 177 ++++++++++++++++++++++++++++++++++++++---------
 版本说明.txt |   8 +--
 2 files changed, 149 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 742e971..766e31c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
+*.rsuser
 *.suo
 *.user
 *.userosscache
@@ -10,48 +13,68 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Mono auto generated files
+mono_crash.*
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-[Xx]64/
-[Xx]86/
-[Bb]uild/
+x64/
+x86/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
+
 
-# Visual Studio 2015 cache/options directory
+# Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-# NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
 project.lock.json
+project.fragment.lock.json
 artifacts/
 
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
 *_i.c
 *_p.c
-*_i.h
+*_h.h
 *.ilk
 *.meta
 *.obj
+*.iobj
 *.pch
 *.pdb
+*.ipdb
 *.pgc
 *.pgd
 *.rsp
@@ -61,6 +84,7 @@ artifacts/
 *.tlh
 *.tmp
 *.tmp_proj
+*_wpftmp.csproj
 *.log
 *.vspscc
 *.vssscc
@@ -81,6 +105,7 @@ ipch/
 *.sdf
 *.cachefile
 *.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
@@ -88,6 +113,9 @@ ipch/
 *.vspx
 *.sap
 
+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/
 
@@ -108,6 +136,14 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -139,22 +175,27 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-
-# TODO: Un-comment the next line if you do not want to checkin
-# your web deploy settings because they may include unencrypted
-# passwords
-#*.pubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
 *.publishproj
 
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
 # NuGet Packages
 *.nupkg
+# NuGet Symbol Packages
+*.snupkg
 # The packages folder can be ignored because of Package Restore
-**/packages/*
+**/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/packages/build/
+!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
 
@@ -166,28 +207,40 @@ csx/
 ecf/
 rcf/
 
-# Windows Store app package directory
+# Windows Store app package directories and files
 AppPackages/
 BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
 *.[Cc]ache
 # but keep track of directories ending in .cache
-!*.[Cc]ache/
+!?*.[Cc]ache/
 
 # Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -198,15 +251,22 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
 
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
 
 # Microsoft Fakes
 FakesAssemblies/
@@ -216,6 +276,7 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
 
 # Visual Studio 6 build log
 *.plg
@@ -223,6 +284,9 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -231,20 +295,71 @@ FakesAssemblies/
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
 
-# LightSwitch generated files
-GeneratedArtifacts/
-ModelManifest.xml
-
 # Paket dependency manager
 .paket/paket.exe
+paket-files/
 
 # FAKE - F# Make
 .fake/
 
-#klocwork
-.klocwork/
-#GIS
-GISControlDlg20140626/
-.cpptest/
-.parasoft
-.parasoft.dat/
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# The folders defined by Robin to be ignored 
+Bin/
+Lib/
+Src/Debug/
+Src/Release/
+Src/FH98ViewOnPlane_Setup/
+Src/ipch/
+Src/XtremeToolKitPro/
+Src/JoyStick/
+Src/QB_ImgProcessFun/
+Src/QB_ImgShowBase/
\ No newline at end of file
diff --git a/版本说明.txt b/版本说明.txt
index 61d1b8f..d460109 100644
--- a/版本说明.txt
+++ b/版本说明.txt
@@ -6,12 +6,10 @@
 增加13所吊舱控制功能
 隐藏IMP对话框及上下行通信连接
 
-20240613
+20240617
 优化13所吊舱控制协议帧
 增加天进吊舱控制功能
 优化控制指令发送逻辑（装订指令）
 增加视频管理计算机指令（开关指令）发送
-
-20240617
-增加13所吊舱协议、天进吊舱协议、H264裸流视频协议解析选择；
-增加天进吊舱点击“单点跟踪”按钮后，双击图像区域发送吊舱跟踪坐标点；
\ No newline at end of file
+增加13所吊舱协议、天进吊舱协议、H264裸流视频协议解析选择
+增加天进吊舱点击“单点跟踪”按钮后，双击图像区域发送吊舱跟踪坐标点
\ No newline at end of file