From eef888a37c402a1e6e7482a9a2b5fd0a52d66350 Mon Sep 17 00:00:00 2001
From: 小驴在此and <2154553021@qq.com>
Date: 星期一, 04 十一月 2024 15:03:54 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/朱航/log/朱航1103.doc | 0
common.h | 10 +++++++++-
Client/郑凯文/log/郑凯文1104.doc | 0
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git "a/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521103.doc" "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521103.doc"
new file mode 100644
index 0000000..6c74468
--- /dev/null
+++ "b/Client/\346\234\261\350\210\252/log/\346\234\261\350\210\2521103.doc"
Binary files differ
diff --git "a/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071104.doc" "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071104.doc"
new file mode 100644
index 0000000..5c4a25e
--- /dev/null
+++ "b/Client/\351\203\221\345\207\257\346\226\207/log/\351\203\221\345\207\257\346\226\2071104.doc"
Binary files differ
diff --git a/common.h b/common.h
index e52d8d8..fb8ffa3 100644
--- a/common.h
+++ b/common.h
@@ -436,6 +436,8 @@
//鐜鏁版嵁鍝嶅簲
struct Environment
{
+ double longitude;//缁忓害
+ double latitude;//绾害
float temp;//娓╁害
float humidity;//婀垮害
float oxygen;//姘ф皵娴撳害
@@ -463,6 +465,8 @@
//璁惧鐘舵�佸搷搴�
struct DeviceStatus
{
+ double longitude;//缁忓害
+ double latitude;//绾害
int deviceID;//璁惧缂栧彿
char deviceName[32];//璁惧鍚嶇О
char deviceStatus[32];//璁惧鐘舵��
@@ -489,6 +493,8 @@
//鎿嶄綔鏃ュ織鍝嶅簲
struct MovementRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char userName;//鎿嶄綔鐢ㄦ埛鍚�
char operateTime[32];//鎿嶄綔鏃堕棿
char deviceName[32];//鎿嶄綔璁惧
@@ -516,8 +522,10 @@
//璀︽姤璁板綍鍝嶅簲
struct AlarmRecord
{
+ double longitude;//缁忓害
+ double latitude;//绾害
char alarmTime[32];//璀︽姤鏃堕棿
- char alarmtype[32];//閫氱煡鏃堕棿
+ char alarmtype[32];//澶勭悊鏃堕棿
char alarmContent[256];//璀︽姤鍐呭
};
struct AlarmRecordRes
--
Gitblit v1.8.0