smartpi 0.1.22__py3-none-any.whl → 0.1.23__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.22"
+__version__ = "0.1.23"
 

smartpi/base_driver.py

@@ -641,7 +641,6 @@ def smartpi_init():
     motor.reset_motor_encoder(5)
     motor.reset_motor_encoder(6)
     time.sleep(0.1)
-    gui.init()
     serial_lock.release()     
     time.sleep(0.1)   
             

smartpi/gui.py

@@ -1,61 +1,87 @@
 import socket
 import json
-import sys
+import time
 
-# 连接对象（模块级单例）
-_connection = None
+class _gui_client:
+    def __init__(self, host="127.0.0.1", port=65167):
+        self.sock = socket.create_connection((host, port))
+        self.clear()
 
-def init(host="127.0.0.1", port=65167):
-    """初始化GUI连接"""
-    global _connection
-    if _connection is None:
-        _connection = socket.create_connection((host, port))
-        _send({"type": "clear"})
+    def _send(self, cmd):
+        self.sock.sendall((json.dumps(cmd) + "\n").encode())
+        time.sleep(0.1)
 
-def _send(cmd):
-    """发送命令到服务器"""
-    if _connection is None and "pytest" not in sys.modules:  # 允许测试环境不初始化
-        raise ConnectionError("GUI not initialized. Call gui.init() first.")
-    if _connection:
-        _connection.sendall((json.dumps(cmd) + "\n").encode())
+    def show_text(self, x, y, text, color="black", size=16):
+        self._send({"type": "text", "x": x, "y": y, "text": text, "color": color, "size": size})
 
+    def print(self, text):
+        self._send({"type": "print", "text": text})
+
+    def println(self, text):
+        self._send({"type": "println", "text": text})
+
+    def show_image(self, x, y, path, width, height):
+        self._send({"type": "image", "x": x, "y": y, "path": path, "width": width, "height": height})
+
+    def draw_line(self, x1, y1, x2, y2, color="black", width=1):
+        self._send({"type": "line", "x1": x1, "y1": y1, "x2": x2, "y2": y2, "color": color, "width": width})
+
+    def fill_rect(self, x, y, w, h, color="black"):
+        self._send({"type": "fill_rect", "x": x, "y": y, "w": w, "h": h, "color": color})
+        
+    def draw_rect(self, x, y, w, h, width, color="black"):
+        self._send({"type": "draw_rect", "x": x, "y": y, "w": w, "h": h, "width": width, "color": color})
+
+    def fill_circle(self, cx, cy, r, color="black"):
+        self._send({"type": "fill_circle", "cx": cx, "cy": cy, "r": r, "color": color})
+
+    def draw_circle(self, cx, cy, r, width, color="black"):
+        self._send({"type": "draw_circle", "cx": cx, "cy": cy, "r": r, "width": width, "color": color})
+    
+    def clear(self):
+        self._send({"type": "clear"})
+
+    def finish(self):
+        self.sock.close()
+
+# 创建全局实例
+_client_instance = _gui_client()
+
+# 将类方法提升为模块级别的函数
 def show_text(x, y, text, color="black", size=16):
-    _send({"type": "text", "x": x, "y": y, "text": text, "color": color, "size": size})
+    _client_instance.show_text(x, y, text, color, size)
 
-def print(text):  # 使用print作为函数名，因为调用时使用gui.print()
-    _send({"type": "print", "text": text})
+def print(text):
+    _client_instance.print(text)
 
 def println(text):
-    _send({"type": "println", "text": text})
+    _client_instance.println(text)
 
 def show_image(x, y, path, width, height):
-    _send({"type": "image", "x": x, "y": y, "path": path, "width": width, "height": height})
+    _client_instance.show_image(x, y, path, width, height)
 
 def draw_line(x1, y1, x2, y2, color="black", width=1):
-    _send({"type": "line", "x1": x1, "y1": y1, "x2": x2, "y2": y2, "color": color, "width": width})
+    _client_instance.draw_line(x1, y1, x2, y2, color, width)
 
 def fill_rect(x, y, w, h, color="black"):
-    _send({"type": "fill_rect", "x": x, "y": y, "w": w, "h": h, "color": color})
+    _client_instance.fill_rect(x, y, w, h, color)
     
 def draw_rect(x, y, w, h, width, color="black"):
-    _send({"type": "draw_rect", "x": x, "y": y, "w": w, "h": h, "width": width, "color": color})
+    _client_instance.draw_rect(x, y, w, h, width, color)
 
 def fill_circle(cx, cy, r, color="black"):
-    _send({"type": "fill_circle", "cx": cx, "cy": cy, "r": r, "color": color})
+    _client_instance.fill_circle(cx, cy, r, color)
 
 def draw_circle(cx, cy, r, width, color="black"):
-    _send({"type": "draw_circle", "cx": cx, "cy": cy, "r": r, "width": width, "color": color})
+    _client_instance.draw_circle(cx, cy, r, width, color)
 
 def clear():
-    _send({"type": "clear"})
-
-def close():
-    """关闭GUI连接"""
-    global _connection
-    if _connection:
-        _connection.close()
-        _connection = None
-
-# 注册程序退出时自动关闭连接
-import atexit
-atexit.register(close)
+    _client_instance.clear()
+
+def finish():
+    _client_instance.finish()
+
+# 可选：如果希望仍然可以使用类创建新实例
+def create_client(host="127.0.0.1", port=65167):
+    return _gui_client(host, port)
+    

{smartpi-0.1.22.dist-info → smartpi-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpi
-Version: 0.1.22
+Version: 0.1.23
 Summary: A library use for H2-RCU
 Author: ZMROBO
 Classifier: Programming Language :: Python :: 3

{smartpi-0.1.22.dist-info → smartpi-0.1.23.dist-info}/RECORD

@@ -1,9 +1,9 @@
-smartpi/__init__.py,sha256=dbeSgtxUXUnzBRBUqAF0gP2AbNr9dwL8WvaeDNMTegY,55
-smartpi/base_driver.py,sha256=dhdmWK0_ff2GduYtGXiZ3W4ICRMf-gIROYgRhXYjZok,24204
+smartpi/__init__.py,sha256=vHEaSuG4o0m17zvDoMBhn-lttaKYGct1k73F5y1orhk,55
+smartpi/base_driver.py,sha256=jP8cuQ0LRfjMuVQ2I6tY7fxp3JsjcUH8fdWKooIogME,24188
 smartpi/color_sensor.py,sha256=YXJjknYjp7teTZsHYZRAWgi73CH0MhBp1go9y0Inxyo,498
 smartpi/cw2015.py,sha256=1lAF-pi_ye_ya1AZQS1sjbgsDf7MThO5IAskKsNGBzA,5695
 smartpi/flash.py,sha256=-pUqg6FSVoBiLFKqrG9B4dFqn8lICnQsSPJr_MtZLIU,4132
-smartpi/gui.py,sha256=E98_soyWbEf_dwYhXZgMSXrgY5QuYoDTuFCPK63flIQ,2102
+smartpi/gui.py,sha256=HaupXWg5cWw_n86ge8IxARrvL3gpcDCNRwATK9irwH8,2960
 smartpi/humidity.py,sha256=nZwiBtMWKNipVM83ymajZACPHxkC2vUJjDMmCOPN9lw,499
 smartpi/led.py,sha256=flvN7EJfP6VDTSiC93w1uR8pRxcZD9w2vLXA1GbJTo8,538
 smartpi/light_sensor.py,sha256=MayyVikWcXQfjeZrtYRnwYgHBDzu2g-mfJLpdd29EG8,1852
@@ -14,7 +14,7 @@ smartpi/temperature.py,sha256=VT79CYA41q1d_4AM-Y0eIMeIw7AtCkSXjWVws6Yx5yE,462
 smartpi/touch_sensor.py,sha256=P57RRQlqY0KexpMi-ydqwF5albOKCBOGb0Rb6zeVTqk,440
 smartpi/trace.py,sha256=tut7BMbq87ShaR5eNuv7PZtAEz9DS5_BDf0_muIZ-tQ,4577
 smartpi/ultrasonic.py,sha256=kmVpUfvE1oHoqgv92ZU6Fi-sO6DSwm10ssKsImNeOkY,624
-smartpi-0.1.22.dist-info/METADATA,sha256=znbfoZEXR-TzNdaUl9258HXSkWdCQAlj_aOfY2EZ4C0,311
-smartpi-0.1.22.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.22.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.22.dist-info/RECORD,,
+smartpi-0.1.23.dist-info/METADATA,sha256=VFDRXlgYEsVNBbHmPcqcwQnuu5VUeoFE0G1VtTfe3Vw,311
+smartpi-0.1.23.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.23.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.23.dist-info/RECORD,,