From da7605a2e3c281f0f3e3cd42103c6b265b0af2f1 Mon Sep 17 00:00:00 2001
From: 123 <2070873540@qq.com>
Date: Sun, 2 Jun 2024 23:14:31 +0800
Subject: [PATCH] 7 commit

---
 .../__pycache__/主页面.cpython-311.pyc     | Bin 2995 -> 2872 bytes
 .../__pycache__/家居信息.cpython-311.pyc  | Bin 20641 -> 20085 bytes
 智能家居系统/主页面.py               |  11 ++--
 智能家居系统/家居信息.py            |  18 ++-----
 智能家居系统/环境监测.py            |  50 ++++--------------
 5 files changed, 16 insertions(+), 63 deletions(-)

diff --git a/智能家居系统/__pycache__/主页面.cpython-311.pyc b/智能家居系统/__pycache__/主页面.cpython-311.pyc
index 3f7525816aa2c14d7dce75805984014132d3689b..c8c6207f91f0fe1bae303784c00aaa4c14048f78 100644
GIT binary patch
delta 404
zcmdlizC(;}IWI340}#wKi%z@1GLcV$@z_N56h?!IJ#tb^45_TCoXZ#)7*+!@1VnMA
zaxUPW+{mHAmBJXz0K%G_n`Ia$G4t{ORXo|T`{lx|FXt|ryo2Q}FW&{<xC`>}7v<xx
z$j49K#9GOiFj<E!cJhA?HepRhKTVb*UZ9>^>?x_mB}Ms_lQ*!5OuoRTZz>EFE!F`N
z4Ga%BczQUmb4Xs|ki5tteT75%0*CZd4$%oIQ!+1dC|u!CxBx?wjoF(e_*hsKKQLet
zo6oWLGcrm}j^oT0)dU(`qy-|hL4+uX(3yOXQ=Cy^@;6R<CQY8n5nLv6AZ53hLb8iM
z;d6^Qv7q1<M{Z(fUQT{~0Z{!$E(tDEpbRKvijPjd%w?q^#0az-llTY{`+|^An{3Lh
b&L}WBmRoXiC$}6AI|GZ<1!l=2F`!8R*UxE$

delta 568
zcmdlXwppBSIWI340}%W)icV8toyaG__+g@Y3Zv`99yyj&&IMeP9XUjFQaG0}GBB(L
zVhCVlU}8vRO+^!p;s$Eq0cud;N?{CU0AWq8jh`klb8!N-J?)zRqIvJ+i7an<xi5G{
zUyzTvC?9i0K4x+^Yb9gWWLCCV_Zo(H7MK+&3_#tCewwUByg;E_+y#lr+3{)lMd_&}
zw|KoW6TM13^V0GI64O(QK<>ZAm6e&8RT^Ia6qwx4rf(tw6fD*T5)BLwICy$EuXD&=
z;*h<_A%BHK{sM>mQz`WoENeI~N*P^|GU{OI;qL&#$)DMpB?MSljXyA85}W(j`xzOf
zCd+YVi)sPQEdm){qyr*EL4@w)d7R>ml9RV_+AEjJ07ah7+y(UT({<aPZft$NdH3_(
z^L3x>*!^<h)|Yb^Y4T3~&S~NfGUpakNH)X^tR<NxIjOgp6AKD%apWdu=H=w)7ZmA&
z3>O0tATRymu*uC&Da}c>D>4UiK`~N%V{$f^m4+}Q(Ak*8N08VTgoMWAvs~&rLJTZC
z9aWc@B`+{b-ryGKFzPYwH19EQaJj+4(eBmcb%9^^B8%P?7QG8BdXss%<#{+6Sfqez
H!43fc1)88C

diff --git a/智能家居系统/__pycache__/家居信息.cpython-311.pyc b/智能家居系统/__pycache__/家居信息.cpython-311.pyc
index 72f7cdbd103d895d46ebf2e5b788b98e565d8768..48198c2e5ba04b662dce1251ddf62b96cc807de1 100644
GIT binary patch
delta 1923
zcmaKsU2GIp6oBXM?9X)D-EM2y?Y7iiwPl^s(n?jZ#X^JSr^Et*wosJrc4sKt-R*48
z?D8jAqkvW;ZMjBbVuBdJ5EV4zgEl6<nE0TH#nh;i_@F_c515+x6MgcW844JUH<@qG
zJ?GrH=Wq7R8TQ-j%>S0p=M`{${P3<lzspnpO7`PatggW!tQQpVsGvB{I|SiveC*Zl
zQr(IxZS7%`Lr~eUhj*+DR`pA`ajDXIhVJ;>bT3jR9%u==6}MV6Ts$=sW)hFL1W&SX
zm1mB8x@Ctc=JRROn^ko^F{BP^2l#3hWbM3{t#)n`WUq0WDa?KC;+boc$9a*cF|Tn@
zZ1nPG-yR+>uI0`CR#wB){vp1lw3uHAl=&hzuNMvr!x8>NX%E`Bmfo`SpZ$ZVSrNFc
znJpzvP1%A*$DLTduq)$lly&g2K!itqUOr#$X0`kQ-wwX{uFtCO#k=4>LM@?=u!Iof
z%@y@c%TSzC5VB}G^^~Fl1qV^mFw>LNvf0FlB0Hdk)Db>jQR{0Y@j>!HHJ`57#vbDS
zMIqM0mn_=quQMH3F4sCpWL5C;V~hUalfelV=F!k5cQqZYG)6;Th;`d%q@K%C&#ct*
zjnw~@)c<vSa5g?PGm@K;`Y%hPv(o5{G-?c1%MMKTNJrQ>SF?;YF2y%oV5WOtB2!Rx
zxd=9(!gMQYM$M~c$&i{KNbXH#6i`PXbTSgDUrlzgv->ewgfPiY(Dv)5NEC4&jYh!=
zYbW0rxx{LWKO<G1;t*OOLkRM_W3_B2UmH6grt`YrK7{9@&)5s94afaA*w`cF-#}<1
ztRg&0Xh#&>h^rHmSEkRx3KV4ttk9(GS}vpRQ!_w=4&{V?LI+_Np$CEPbUVCAI7&E1
zI8Jz;@PdF@z&MJ!gosDiSj*0>*BGz&VI7TA4Os_EaaU7}6?kJ)h~;@_Qv=(;p(!?Y
zN7D4h1B9mthY_X(S|&4?NT%T+>2@Myw_Q@dj^$70Rb?QRSF<`ylD~)Kfs_KzlKXQA
zok~D;TPS%S?hi$}Qi-m@mc)=z+5D-8z0AK~v7Duhz{+U{M)!H^Js9bY)=*#{I?JVS
z1b^UZ1oyU8MgCO;G*S(K6T<xQwiv563T-aO?e5Ic_iwdmj{YdDKF!f6Sk0Pql0+SY
zRz#r$VYltdCl{~2@{!%VQfuzu1i4uUCP<>Zt**jLB>khIV|R9Rgv=Vj>TQYL+mocQ
zYFBL4&Yp2NMe6@g^i_1xDbhF<*Y5lpyY)Lzd#J7}WgKXCiZ}sBI(EA{=_`W0gaV>K
zBYpMsx$BqS{ORob*FQMd8kH;I2{P|Tm@YjJsT@2>irs_(LYzm}S8u#MGg(s7*9gOe
zG{MS~#@tTU8YZh;G*J*FOd(_}06)4uxzrk!9H~bM*3eK|l-0tr(@GfS8%~H#GV7LI
zKtY(UWJc3f`=wUp5203OR%vx=IezE-%T1%68kD=`VqVf+w{|hgP)VS9hF(G+fyxF6
z!aIly0?;Y@YMNpo(4)V`4|el_Ai5UM6Kp>>U%ELu<}*F{bZR88f;|-0j9KYdEW85V
zMagt*Pg}!ciiup#lyacuwWOA@t~RA?A~llHv>d!gr*6gZm$WLYDTR#M4j-a{GSsIL
n^CDyHTcKixf45m)KJOkB8HV=X{KeA$dZ)FEuiMh+q+9+5#=62!

delta 2349
zcmaKtYitx%6oBXMbGqBzz8~Atc7ZKrc(f`YP0`XS56hzwODq<l-R_LA?LNw#-BxRB
zTg2F6mEy$*5n@XKB}6MO7{o;WnDB>~q9l?@Fp!jns+1BSCMG1FbEjKqFy7ty=G=47
zeVudeo%@H#&=7Hc;c(alD5XoczSgsFzcZUm>@O-Tl?B-tFb6Gl79tpgwSsKgBgp3C
z20=Ipk6!AmiYQx}d7Z8|2nuORV3lc^IdwLuSQXoG0_N~cncEc`tF&a9t%|+L!5Wri
zn-trilM&CHL?XzfhCh<XoWwO(BAU3->kqx?-J$s6Bj7te+}%~IoUF9%5$f!+twxaS
zu^u85%jo%`v7TY}ry)%2v8~3%Hj>9q*%db7*v`6>?X1?hjTEq+<XrY$QX^^%vWMMC
z*~*oj++=QY++=qOH(?1Wam~)uN_I7QHn+PS*E&4$1$GEc9_Dq{utB@cYL@3iy%46~
z!k$dKz#gQz$b6QXzM!N8?8jw*WYkQmUsk9aDs(n#h-USLgF$admJD<$s@<$P-Qy@m
zaT!{GnjK27Ay2c(^enQJi5Z)m^E5-GSu?Mp-k?J5Y)8i5X{l6+L}{o#60VOsl5NWz
zAUSLzbG>C24(E!k%(`e~k(|QV6S<Os<g-I2S4_<-CW{wA`w601TD^g&qDl$03KW_}
zRsu>y(Gqtkk$T@we?X>6h-R~&^9vSKpn-99^(x6ob5J(XaGR<bkw&Py-EPWftz%gQ
z!z4d;p&-X<&xRHnLS(VO=6OgRODQ_;!v3mL?*#qa-Fl(3Vk1Sjh*F03ixJNto<)=+
zRsy0Hz}UWl(Q`*>DTtCtE8wMxo5L*urBw+~J5*^J;#I_Rh;4|M0bq`^(|-1#EPKvg
z6yF1=BA~%t!Hd3+TF|t+*!3b;EV|$}fgLG}f(Fveel0F?wLxPPcW|S3aQxuW8%Iyw
zJbkRpO<P%7$s$t4DoTpF9@#q>(so2A;w^wC(r_Tq==C+zH&IsykSw}qohpRE7g6MT
ze?$qY^h30_qFnEn=^iwH2cV)S(0y^wZ-IJy!8*TpT@=n$Y^>xbE7`|RE`N$N$9`Xa
z&Oln(!Lr%j>9vo2c6#jNZ>HD&I&_zkXcxR_H=+lz8}T+`dSd!6R(lbBh-oj<kFc7<
za#s|QS+VC=m<?Uiu^h*f%>z1)HwusHI3^Ac?YIdgj4xdQh$aH`AdjB^dhEdWdZ?3l
zn$iI@;~n;+gzn)vK;K7cM)<oPjeiR^??UiQNYpdo04lhP?cBxsk)Q`r{r?;N6iifH
zX#>VU&z%ZAd0qi+d*M2NY)!ezICb#k%GKu8c<^Ww;$av*KX!BYNIVQuHr<ZRZvZs2
z8lnCcT91kbgcs4sCf4LuJxs4KD)9i*03wLsd#yl;Z<yyDcNr!h%|bAM1WsTtt@SPB
z!KJ8H5j?+eYq+y`(YNM{U0eHsvE&4)mdq3vp_zSwu&U^Ta_@J5RwCTJDux|y26lM;
zt~vQ2`%n=t7=L{3UIct1bO?-;dQ1d`TOKzXSdv1l?0P~vt4ecvI!OdapDG<>=I5u=
z&_M<*__bk!%Pn2>E3lKSbQoTGO5mb+nrMd2&D0DvO$@>(C=d>}Ox<bRP&0a4T4r2n
zTH3?A7JJmUz*nn1FMiOJ;>VkP${#R+x(U!NToV)bCGAbRB)Tq(t`X5SX%P|}{RzK`
zu3tpgB{BE1m^&io-nR(Jsr}Kuw*IzW(^Y5YK%_6!AL=z;f!>b2j=rS+q+b4`=*DU(
zk!5Tsd?62H>O$ZRLTeFQ5SW3~hu|(a4blmLch$pa#U=#aBI=i{a|0`|+05CK!sF1p
zS($sIyDLevMw<Phh(h%<$B!`2tPB|FUIJkB><{BZXT}d7;a=vG&@-T?rw}|tVjyW^
z3k^rYzHmTa;<wm(7J(b&tNcfNCK#5Z0i~S&2s%g|qo7`7v5m`CT@ms}X8tElAtQnH
U|2OY&{k=z98(B_utqCXl7Y2|xMF0Q*

diff --git a/智能家居系统/主页面.py b/智能家居系统/主页面.py
index 4cfe3fe..2db2d56 100644
--- a/智能家居系统/主页面.py
+++ b/智能家居系统/主页面.py
@@ -11,17 +11,16 @@ class MainPage:
         self.create_page()
     def create_page(self):
         # 创建一个标签用于展示简单的家居信息标题
-        self.home_info_title = tk.Label(self.page, text="功能区", font=("Helvetica", 16))
+        self.home_info_title = tk.Label(self.page, text="主页面区", font=("Helvetica", 16))
         self.home_info_title.pack(pady=20)
         # 添加一个按钮用于跳转到家居信息页面
         self.goto_jiaju_button = tk.Button(self.page, text="家居信息", command=self.show_jiaju_info)
         self.goto_jiaju_button.pack(pady=10)
-
     def show_jiaju_info(self):
-        # 隐藏当前主页面框架
-        self.page.pack_forget()
+        # 销毁当前页面
+        self.page.destroy()
         # 显示家居信息页面
-        self.jiaju_page = JiaJuInfoPage(self.root)
+        JiaJuInfoPage(self.root)
 class JiaJuInfoPage:
     def __init__(self, master):
         self.root = master
@@ -30,9 +29,7 @@ class JiaJuInfoPage:
         self.root.geometry('600x400')
         JiaJuPage(self.root)
 
-
 if __name__ == '__main__':
     root = tk.Tk()
-    root.title("智能家居系统-主页面")
     app = MainPage(root)
     root.mainloop()
\ No newline at end of file
diff --git a/智能家居系统/家居信息.py b/智能家居系统/家居信息.py
index 8bb3a3b..a4c829c 100644
--- a/智能家居系统/家居信息.py
+++ b/智能家居系统/家居信息.py
@@ -1,12 +1,12 @@
 import tkinter as tk
 from tkinter import ttk, messagebox
 import pymysql
-from 主页面 import MainPage
+#from 主页面 import MainPage
 
 class JiaJuPage:
     def __init__(self, master):
         self.root = master
-        self.root.title("智能家居系统 - 家居信息")
+        self.root.title("智能家居系统 - 家居管理")
         self.root.geometry('1000x700')
 
         self.conn = pymysql.connect(host='localhost', user='root', password='LH20021212', db='智能家居系统',
@@ -54,7 +54,7 @@ class JiaJuPage:
         tk.Button(button_frame, text="删除选中", command=self.delete_selected_jiaju).pack(side=tk.LEFT, padx=10)
         tk.Button(button_frame, text="修改选中", command=self.update_selected_jiaju_popup).pack(side=tk.LEFT, padx=10)
         tk.Button(button_frame, text="查询所有", command=self.query_all_jiaju).pack(side=tk.LEFT, padx=10)
-        tk.Button(button_frame, text="返回主页面", command=self.return_to_MainPage).pack(side=tk.LEFT, padx=10)
+        tk.Button(button_frame, text="返回主页面", command=self.query_all_jiaju).pack(side=tk.LEFT, padx=10)
 
         query_frame = tk.Frame(self.root)
         query_frame.pack(pady=(10, 0))  # 添加一些垂直间隔
@@ -231,18 +231,6 @@ class JiaJuPage:
         self.conn.close()
         self.root.destroy()
 
-    def return_to_main_page(self):
-        # 关闭当前家居信息页面的数据库连接（如果之前没有在其他地方关闭）
-        self.close_conn()
-
-        # 销毁当前家居信息窗口
-        self.root.destroy()
-
-        # 实例化并运行主页面（这将覆盖当前窗口）
-        root = tk.Tk()
-        app = MainPage(root)
-        root.mainloop()
-
 
 if __name__ == '__main__':
     root = tk.Tk()
diff --git a/智能家居系统/环境监测.py b/智能家居系统/环境监测.py
index 1cf9727..386b941 100644
--- a/智能家居系统/环境监测.py
+++ b/智能家居系统/环境监测.py
@@ -8,18 +8,15 @@ import matplotlib.pyplot as plt
 from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg
 
 class EnvironmentMonitorApp:
-    def __init__(self):
-        super().__init__()
-        self.title("空调自动调节系统")
-        self.geometry("800x600")
-
-        # 环境监测实例
-        self.env_monitor = EnvironmentMonitor()
-
-        # 获取初始环境条件
-        initial_temp, initial_humid = self.env_monitor.get_current_conditions()
-        # 空调调节实例
-        self.aircon = AirConditioner(initial_temp, initial_humid)
+    def __init__(self, root):
+        self.root = root
+        self.root.title("环境监测数据展示")
+        self.setup_ui()
+        self.data_records = []  # 保存所有监测记录
+        self.plot_window = None  # 初始化图表窗口变量
+        self.figure = None  # 初始化图表figure变量
+        self.canvas = None  # 初始化图表canvas变量
+        self.axs = None  # 初始化子图变量
         self.root.after(5000, self.update_data_and_display)  # 每5秒更新一次数据
 
         # 设置matplotlib的字体以支持中文显示
@@ -103,35 +100,6 @@ class EnvironmentMonitorApp:
             ax.grid(True)
         self.canvas.draw_idle()  # 更新图表而不重新绘制整个画布
 
-# 环境监测模拟
-class EnvironmentMonitor:
-    def __init__(self):
-        self.temperature = random.uniform(18, 25)  # 初始温度范围调整为更合理的室温范围
-        self.humidity = random.uniform(30, 60)  # 初始湿度范围调整为常见室内湿度范围
-
-    def get_current_conditions(self):
-        return self.temperature, self.humidity
-
-# 空调调节模拟
-class AirConditioner:
-    def __init__(self, initial_temperature, initial_humidity):
-        self.current_temperature = initial_temperature
-        self.current_humidity = initial_humidity
-        self.min_temperature = 16
-        self.max_temperature = 30
-        self.min_humidity = 0
-        self.max_humidity = 100
-        self.comfortable_temperature_range = (20, 24)
-        self.comfortable_humidity_range = (40, 60)
-
-    def adjust(self):
-        if not self.comfortable_temperature_range[0] <= self.current_temperature <= self.comfortable_temperature_range[1]:
-            self.current_temperature += 1 if self.current_temperature < self.comfortable_temperature_range[0] else -1
-        if not self.comfortable_humidity_range[0] <= self.current_humidity <= self.comfortable_humidity_range[1]:
-            self.current_humidity += 5 if self.current_humidity < self.comfortable_humidity_range[0] else -5
-
-    def display_status(self):
-        print(f"当前温度: {self.current_temperature:.1f}°C, 当前湿度: {self.current_humidity:.1f}%")
 
 def main():
     root = tk.Tk()