解决曲线标绘动画反向后流速复位的bug
This commit is contained in:
@ -1,220 +0,0 @@
|
|||||||
x64:
|
|
||||||
firstOrDefaultFilePatterns:
|
|
||||||
- '!**/node_modules'
|
|
||||||
- '!build{,/**/*}'
|
|
||||||
- '!build{,/**/*}'
|
|
||||||
- dist/electron/**/*
|
|
||||||
- node_modules/**/*
|
|
||||||
- package.json
|
|
||||||
- '!**/*.{iml,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,suo,xproj,cc,d.ts,pdb}'
|
|
||||||
- '!**/._*'
|
|
||||||
- '!**/electron-builder.{yaml,yml,json,json5,toml}'
|
|
||||||
- '!**/{.git,.hg,.svn,CVS,RCS,SCCS,__pycache__,.DS_Store,thumbs.db,.gitignore,.gitkeep,.gitattributes,.npmignore,.idea,.vs,.flowconfig,.jshintrc,.eslintrc,.circleci,.yarn-integrity,.yarn-metadata.json,yarn-error.log,yarn.lock,package-lock.json,npm-debug.log,appveyor.yml,.travis.yml,circle.yml,.nyc_output}'
|
|
||||||
- '!.yarn{,/**/*}'
|
|
||||||
- '!.editorconfig'
|
|
||||||
- '!.yarnrc.yml'
|
|
||||||
nodeModuleFilePatterns:
|
|
||||||
- '**/*'
|
|
||||||
- dist/electron/**/*
|
|
||||||
- node_modules/**/*
|
|
||||||
- package.json
|
|
||||||
nsis:
|
|
||||||
script: |-
|
|
||||||
!include "F:\workCode\fs-4.0\4.0\node_modules\app-builder-lib\templates\nsis\include\StdUtils.nsh"
|
|
||||||
!addincludedir "F:\workCode\fs-4.0\4.0\node_modules\app-builder-lib\templates\nsis\include"
|
|
||||||
!macro _isUpdated _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "updated"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isUpdated `"" isUpdated ""`
|
|
||||||
|
|
||||||
!macro _isForceRun _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "force-run"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isForceRun `"" isForceRun ""`
|
|
||||||
|
|
||||||
!macro _isKeepShortcuts _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "keep-shortcuts"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isKeepShortcuts `"" isKeepShortcuts ""`
|
|
||||||
|
|
||||||
!macro _isNoDesktopShortcut _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "no-desktop-shortcut"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isNoDesktopShortcut `"" isNoDesktopShortcut ""`
|
|
||||||
|
|
||||||
!macro _isDeleteAppData _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "delete-app-data"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isDeleteAppData `"" isDeleteAppData ""`
|
|
||||||
|
|
||||||
!macro _isForAllUsers _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "allusers"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isForAllUsers `"" isForAllUsers ""`
|
|
||||||
|
|
||||||
!macro _isForCurrentUser _a _b _t _f
|
|
||||||
${StdUtils.TestParameter} $R9 "currentuser"
|
|
||||||
StrCmp "$R9" "true" `${_t}` `${_f}`
|
|
||||||
!macroend
|
|
||||||
!define isForCurrentUser `"" isForCurrentUser ""`
|
|
||||||
|
|
||||||
!macro addLangs
|
|
||||||
!insertmacro MUI_LANGUAGE "English"
|
|
||||||
!insertmacro MUI_LANGUAGE "German"
|
|
||||||
!insertmacro MUI_LANGUAGE "French"
|
|
||||||
!insertmacro MUI_LANGUAGE "SpanishInternational"
|
|
||||||
!insertmacro MUI_LANGUAGE "SimpChinese"
|
|
||||||
!insertmacro MUI_LANGUAGE "TradChinese"
|
|
||||||
!insertmacro MUI_LANGUAGE "Japanese"
|
|
||||||
!insertmacro MUI_LANGUAGE "Korean"
|
|
||||||
!insertmacro MUI_LANGUAGE "Italian"
|
|
||||||
!insertmacro MUI_LANGUAGE "Dutch"
|
|
||||||
!insertmacro MUI_LANGUAGE "Danish"
|
|
||||||
!insertmacro MUI_LANGUAGE "Swedish"
|
|
||||||
!insertmacro MUI_LANGUAGE "Norwegian"
|
|
||||||
!insertmacro MUI_LANGUAGE "Finnish"
|
|
||||||
!insertmacro MUI_LANGUAGE "Russian"
|
|
||||||
!insertmacro MUI_LANGUAGE "Portuguese"
|
|
||||||
!insertmacro MUI_LANGUAGE "PortugueseBR"
|
|
||||||
!insertmacro MUI_LANGUAGE "Polish"
|
|
||||||
!insertmacro MUI_LANGUAGE "Ukrainian"
|
|
||||||
!insertmacro MUI_LANGUAGE "Czech"
|
|
||||||
!insertmacro MUI_LANGUAGE "Slovak"
|
|
||||||
!insertmacro MUI_LANGUAGE "Hungarian"
|
|
||||||
!insertmacro MUI_LANGUAGE "Arabic"
|
|
||||||
!insertmacro MUI_LANGUAGE "Turkish"
|
|
||||||
!insertmacro MUI_LANGUAGE "Thai"
|
|
||||||
!insertmacro MUI_LANGUAGE "Vietnamese"
|
|
||||||
!macroend
|
|
||||||
|
|
||||||
!addincludedir "F:\workCode\fs-4.0\4.0\build"
|
|
||||||
!include "F:\workCode\fs-4.0\4.0\installer.nsh"
|
|
||||||
!addplugindir /x86-unicode "C:\Users\Administrator\AppData\Local\electron-builder\Cache\nsis\nsis-resources-3.4.1\plugins\x86-unicode"
|
|
||||||
!include "C:\Users\ADMINI~1\AppData\Local\Temp\t-wLRMfI\0-messages.nsh"
|
|
||||||
!include "C:\Users\ADMINI~1\AppData\Local\Temp\t-wLRMfI\1-messages.nsh"
|
|
||||||
|
|
||||||
Var newStartMenuLink
|
|
||||||
Var oldStartMenuLink
|
|
||||||
Var newDesktopLink
|
|
||||||
Var oldDesktopLink
|
|
||||||
Var oldShortcutName
|
|
||||||
Var oldMenuDirectory
|
|
||||||
|
|
||||||
!include "common.nsh"
|
|
||||||
!include "MUI2.nsh"
|
|
||||||
!include "multiUser.nsh"
|
|
||||||
!include "allowOnlyOneInstallerInstance.nsh"
|
|
||||||
|
|
||||||
!ifdef INSTALL_MODE_PER_ALL_USERS
|
|
||||||
!ifdef BUILD_UNINSTALLER
|
|
||||||
RequestExecutionLevel user
|
|
||||||
!else
|
|
||||||
RequestExecutionLevel admin
|
|
||||||
!endif
|
|
||||||
!else
|
|
||||||
RequestExecutionLevel user
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifdef BUILD_UNINSTALLER
|
|
||||||
SilentInstall silent
|
|
||||||
!else
|
|
||||||
Var appExe
|
|
||||||
Var launchLink
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifdef ONE_CLICK
|
|
||||||
!include "oneClick.nsh"
|
|
||||||
!else
|
|
||||||
!include "assistedInstaller.nsh"
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!insertmacro addLangs
|
|
||||||
|
|
||||||
!ifmacrodef customHeader
|
|
||||||
!insertmacro customHeader
|
|
||||||
!endif
|
|
||||||
|
|
||||||
Function .onInit
|
|
||||||
SetOutPath $INSTDIR
|
|
||||||
${LogSet} on
|
|
||||||
|
|
||||||
!ifmacrodef preInit
|
|
||||||
!insertmacro preInit
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifdef DISPLAY_LANG_SELECTOR
|
|
||||||
!insertmacro MUI_LANGDLL_DISPLAY
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifdef BUILD_UNINSTALLER
|
|
||||||
WriteUninstaller "${UNINSTALLER_OUT_FILE}"
|
|
||||||
!insertmacro quitSuccess
|
|
||||||
!else
|
|
||||||
!insertmacro check64BitAndSetRegView
|
|
||||||
|
|
||||||
!ifdef ONE_CLICK
|
|
||||||
!insertmacro ALLOW_ONLY_ONE_INSTALLER_INSTANCE
|
|
||||||
!else
|
|
||||||
${IfNot} ${UAC_IsInnerInstance}
|
|
||||||
!insertmacro ALLOW_ONLY_ONE_INSTALLER_INSTANCE
|
|
||||||
${EndIf}
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!insertmacro initMultiUser
|
|
||||||
|
|
||||||
!ifmacrodef customInit
|
|
||||||
!insertmacro customInit
|
|
||||||
!endif
|
|
||||||
|
|
||||||
!ifmacrodef addLicenseFiles
|
|
||||||
InitPluginsDir
|
|
||||||
!insertmacro addLicenseFiles
|
|
||||||
!endif
|
|
||||||
!endif
|
|
||||||
FunctionEnd
|
|
||||||
|
|
||||||
!ifndef BUILD_UNINSTALLER
|
|
||||||
!include "installUtil.nsh"
|
|
||||||
!endif
|
|
||||||
|
|
||||||
Section "install"
|
|
||||||
!ifndef BUILD_UNINSTALLER
|
|
||||||
# If we're running a silent upgrade of a per-machine installation, elevate so extracting the new app will succeed.
|
|
||||||
# For a non-silent install, the elevation will be triggered when the install mode is selected in the UI,
|
|
||||||
# but that won't be executed when silent.
|
|
||||||
!ifndef INSTALL_MODE_PER_ALL_USERS
|
|
||||||
!ifndef ONE_CLICK
|
|
||||||
${if} $hasPerMachineInstallation == "1" # set in onInit by initMultiUser
|
|
||||||
${andIf} ${Silent}
|
|
||||||
${ifNot} ${UAC_IsAdmin}
|
|
||||||
ShowWindow $HWNDPARENT ${SW_HIDE}
|
|
||||||
!insertmacro UAC_RunElevated
|
|
||||||
${Switch} $0
|
|
||||||
${Case} 0
|
|
||||||
${Break}
|
|
||||||
${Case} 1223 ;user aborted
|
|
||||||
${Break}
|
|
||||||
${Default}
|
|
||||||
MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate, error $0"
|
|
||||||
${Break}
|
|
||||||
${EndSwitch}
|
|
||||||
Quit
|
|
||||||
${else}
|
|
||||||
!insertmacro setInstallModePerAllUsers
|
|
||||||
${endIf}
|
|
||||||
${endIf}
|
|
||||||
!endif
|
|
||||||
!endif
|
|
||||||
!include "installSection.nsh"
|
|
||||||
!endif
|
|
||||||
SectionEnd
|
|
||||||
|
|
||||||
!ifdef BUILD_UNINSTALLER
|
|
||||||
!include "uninstaller.nsh"
|
|
||||||
!endif
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
directories:
|
|
||||||
output: build
|
|
||||||
buildResources: build
|
|
||||||
extraFiles:
|
|
||||||
- from: ./collada2gltf/
|
|
||||||
to: ./collada2gltf
|
|
||||||
- from: ./convert/
|
|
||||||
to: ./convert
|
|
||||||
- from: ./yjearth4_0/
|
|
||||||
to: ./yjearth4_0
|
|
||||||
- from: ./ffplay/
|
|
||||||
to: ./ffplay
|
|
||||||
- from: ./build/icons/
|
|
||||||
to: ./icons
|
|
||||||
productName: 实景三维电子沙盘系统
|
|
||||||
appId: org.dzsp_yingjizhihuijunyong_offline_Y_save
|
|
||||||
files:
|
|
||||||
- filter:
|
|
||||||
- dist/electron/**/*
|
|
||||||
- node_modules/**/*
|
|
||||||
- package.json
|
|
||||||
dmg:
|
|
||||||
contents:
|
|
||||||
- x: 410
|
|
||||||
'y': 150
|
|
||||||
type: link
|
|
||||||
path: /Applications
|
|
||||||
- x: 130
|
|
||||||
'y': 150
|
|
||||||
type: file
|
|
||||||
mac:
|
|
||||||
icon: build/icons/icon.icns
|
|
||||||
win:
|
|
||||||
icon: build/icons/81.ico
|
|
||||||
linux:
|
|
||||||
target: rpm
|
|
||||||
icon: build/icons/81.png
|
|
||||||
desktop:
|
|
||||||
Icon: /opt/实景三维电子沙盘系统/icons/81.png
|
|
||||||
executableArgs:
|
|
||||||
- '--no-sandbox'
|
|
||||||
nsis:
|
|
||||||
include: installer.nsh
|
|
||||||
oneClick: false
|
|
||||||
perMachine: true
|
|
||||||
allowToChangeInstallationDirectory: true
|
|
||||||
language: '2052'
|
|
||||||
electronVersion: 13.6.9
|
|
||||||
Binary file not shown.
Binary file not shown.
5563
dist/electron/main.js
vendored
5563
dist/electron/main.js
vendored
File diff suppressed because one or more lines are too long
17052
package-lock.json
generated
Normal file
17052
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
8
static/sdk/YJEarth.min.js
vendored
8
static/sdk/YJEarth.min.js
vendored
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -1,14 +0,0 @@
|
|||||||
2025-11-24 11:14:23.019 [INFO] {a0dfecd4dfd27a1892c2bf154d84fb70} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:14:23.020 [INFO] {3c1c79dedfd27a1893c2bf15be2d5609} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 11:33:50.969 [INFO] {e8559dcdefd37a1898c2b171bab97c22} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:33:50.969 [INFO] {5c34a5cdefd37a1899c2b1710600b081} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 11:36:15.447 [INFO] {dc8b2b7111d47a18c8b4d87d184df633} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:36:15.447 [INFO] {a853337111d47a18c9b4d87d74f81cfd} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 11:38:33.938 [INFO] {846eecaf31d47a18abdd276946ad01fa} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:38:33.939 [INFO] {d439f4af31d47a18acdd2769c1bba3ed} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 11:40:44.140 [INFO] {8cea8a0050d47a18c5807414ad729c36} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:40:44.141 [INFO] {00c9920050d47a18c68074145e0d0019} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 11:41:03.177 [INFO] {841b356f54d47a182937361f6bc742c2} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 11:41:03.177 [INFO] {88e23c6f54d47a182a37361f07a60e19} gps.go:105: 没有查询到串口数据
|
|
||||||
2025-11-24 14:38:57.561 [INFO] {bc8aaec109de7a186748ad251159ef4b} gps.go:101: 查询串口数据
|
|
||||||
2025-11-24 14:38:57.575 [INFO] {545af0c209de7a186848ad25bd16b487} gps.go:105: 没有查询到串口数据
|
|
||||||
BIN
yjearth4_0/static/log/2025-11-25.20251126143100935260.log.gz
Normal file
BIN
yjearth4_0/static/log/2025-11-25.20251126143100935260.log.gz
Normal file
Binary file not shown.
20
yjearth4_0/static/log/2025-11-26.log
Normal file
20
yjearth4_0/static/log/2025-11-26.log
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
2025-11-26 09:49:24.333 [INFO] {e4a89cdf656b7b18394f3e363077428f} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 09:49:24.334 [INFO] {4820b7df656b7b183a4f3e3612f9ce11} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 09:51:34.541 [INFO] {c8ad9e30846b7b183ccc3a629f387f33} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 09:51:34.541 [INFO] {387ca630846b7b183dcc3a62e2d8ee8d} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 09:54:30.278 [INFO] {50335a1bad6b7b18c9ffb2055ea4151c} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 09:54:30.278 [INFO] {a07b621bad6b7b18caffb205a289f330} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 09:59:25.720 [INFO] {4c8d1de5f16b7b18a4758d649359f3ae} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 09:59:25.721 [INFO] {945125e5f16b7b18a5758d64f28b7c6c} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 10:12:47.933 [INFO] {1c4ba8acac6c7b180b37912dfe25d068} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 10:12:47.933 [INFO] {f4c1b8acac6c7b180c37912d16489041} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 14:31:00.938 [INFO] {608688ebc37a7b189ff63f7f867aa2e5} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 14:31:00.938 [INFO] {c8dfcbebc37a7b18a0f63f7f83499051} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 14:31:32.346 [INFO] {c474cf3bcb7a7b18c4994f29a18af25b} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 14:31:32.347 [INFO] {2072df3bcb7a7b18c5994f2945c2679d} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 14:34:49.293 [INFO] {f46dca16f97a7b18de4a753b5cf806f5} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 14:34:49.294 [INFO] {383bd216f97a7b18df4a753b6a0cec5b} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 16:12:21.839 [INFO] {50bcb7bd4b807b1810872d75c4db92e6} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 16:12:21.841 [INFO] {00b5d2bd4b807b1811872d752eb8b839} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-26 16:39:14.630 [INFO] {84d2863fc3817b1863a63e337ccd5a83} gps.go:101: 查询串口数据
|
||||||
|
2025-11-26 16:39:14.631 [INFO] {3080963fc3817b1864a63e33a52b1cea} gps.go:105: 没有查询到串口数据
|
||||||
8
yjearth4_0/static/log/2025-11-27.log
Normal file
8
yjearth4_0/static/log/2025-11-27.log
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
2025-11-27 09:03:55.060 [INFO] {90ac9dfb7eb77b184c9d3a7208b13860} gps.go:101: 查询串口数据
|
||||||
|
2025-11-27 09:03:55.061 [INFO] {c074a5fb7eb77b184d9d3a728eb6a9d5} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-27 09:53:34.855 [INFO] {f07236c534ba7b18ed50ae678f2f6419} gps.go:101: 查询串口数据
|
||||||
|
2025-11-27 09:53:34.855 [INFO] {c4a53ec534ba7b18ee50ae672f6a54af} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-27 09:56:15.418 [INFO] {a43b82275aba7b18cafc9b3120daffd5} gps.go:101: 查询串口数据
|
||||||
|
2025-11-27 09:56:15.419 [INFO] {bca799275aba7b18cbfc9b31d9be8f4d} gps.go:105: 没有查询到串口数据
|
||||||
|
2025-11-27 10:08:03.568 [INFO] {50638208ffba7b1893407f435516acf5} gps.go:101: 查询串口数据
|
||||||
|
2025-11-27 10:08:03.569 [INFO] {70219a08ffba7b1894407f437e771f11} gps.go:105: 没有查询到串口数据
|
||||||
BIN
yjearth4_0/static/richText/2025-11-26/test.mp4
Normal file
BIN
yjearth4_0/static/richText/2025-11-26/test.mp4
Normal file
Binary file not shown.
Reference in New Issue
Block a user