From 5bf9f5cc0ad2689de4e34d628d8ac3168df5142a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 23 八月 2024 17:41:41 +0800
Subject: [PATCH] 修复编译bug
---
service/nvcs.go | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/service/nvcs.go b/service/nvcs.go
index 51bbba9..d5b1f41 100644
--- a/service/nvcs.go
+++ b/service/nvcs.go
@@ -67,8 +67,6 @@
logger.Info("UDP server listening on port %s...", port)
- var runState string
- var iRunSate int
// 鏃犻檺寰幆绛夊緟鎺ユ敹鏁版嵁
for {
// 鍒涘缓涓�涓紦鍐插尯鏉ュ瓨鍌ㄦ帴鏀剁殑鏁版嵁
@@ -98,7 +96,10 @@
continue
}
- // 璁板綍鐢垫杩愯鐘舵��, 鍙褰曚笂琛屽拰涓嬭
+ var runState string
+ var iRunSate int
+
+ // 璁板綍鐢垫杩愯鐘舵��
iRunSate = data.Elevator[0].Status.RunDir
if config.NVCSConf.RunState {
if data.Elevator[0].Status.RunDir == RunUp {
@@ -106,14 +107,10 @@
} else if data.Elevator[0].Status.RunDir == RunDown {
runState = "涓�"
}
+ }
- // 宸插埌鏈�涓嬪眰
- if data.Elevator[0].Status.Floor == 0 {
- runState = "涓�"
- }
- if data.Elevator[0].Status.Floor == data.Elevator[0].Status.TotalFloors {
- runState = "涓�"
- }
+ if !config.NVCSConf.RunState {
+ runState = ""
}
// 璁剧疆osd 鏍煎紡 "1F涓� 鍥� 鏋�"
@@ -233,7 +230,7 @@
logger.Debug("Received A2 report data %+v", req)
- // 璁板綍鐢垫杩愯鐘舵��, 鍙褰曚笂琛屽拰涓嬭
+ // 璁板綍鐢垫杩愯鐘舵��
if strings.Contains(req.State.Status, "涓�") {
runState = "涓�"
iRunState = RunUp
@@ -252,6 +249,10 @@
// iRunState = RunDown
//}
+ if !config.NVCSConf.RunState {
+ runState = ""
+ }
+
if config.NVCSConf.OSD != "" {
floorText := fmt.Sprintf("%s%s %s", req.State.Floor, runState, config.NVCSConf.OSD)
--
Gitblit v1.8.0