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

smartpi/__init__.py

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

smartpi/gui.py

@@ -1,87 +1,238 @@
-import socket
-import json
+#!/usr/bin/env python3
+"""
+可靠触摸屏GUI - 恢复可工作版本
+"""
+
+import tkinter as tk
+from tkinter import font as tkfont
+import os
+import select
+import struct
+import threading
 import time
 
-class _gui_client:
-    def __init__(self, host="127.0.0.1", port=65167):
-        self.sock = socket.create_connection((host, port))
-        self.clear()
-
-    def _send(self, cmd):
-        self.sock.sendall((json.dumps(cmd) + "\n").encode())
-        time.sleep(0.1)
-
-    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})
+# 全局变量
+_root = None
+_canvas = None
+_fonts = {}
+_touch_x = 0
+_touch_y = 0
+_touch_pressed = False
+_x_cache = 0
+_y_cache = 0
+_exit_triggered = False
+
+def _create_fonts():
+    """创建字体"""
+    global _fonts
+    _fonts[16] = tkfont.Font(family="Arial", size=16)
+    _fonts[24] = tkfont.Font(family="Arial", size=24)
+    _fonts[32] = tkfont.Font(family="Arial", size=32)
+    _fonts[40] = tkfont.Font(family="Arial", size=40)
+    _fonts[48] = tkfont.Font(family="Arial", size=48)
+
+def _read_touch_events():
+    """可靠的触摸事件读取 - 使用之前验证过的方法"""
+    global _touch_x, _touch_y, _touch_pressed, _x_cache, _y_cache
+    
+    try:
+        # 打开输入设备
+        fd = os.open('/dev/input/event2', os.O_RDONLY | os.O_NONBLOCK)
+    except Exception as e:
+        print(f"无法打开设备: {e}")
+        return
+
+    # input_event结构体格式
+    EVENT_FORMAT = 'llHHI'
+    EVENT_SIZE = struct.calcsize(EVENT_FORMAT)
+    
+    # 事件类型定义
+    EV_SYN = 0x00
+    EV_ABS = 0x03
+    
+    # 绝对轴定义
+    ABS_MT_POSITION_X = 0x35
+    ABS_MT_POSITION_Y = 0x36
+    ABS_MT_TRACKING_ID = 0x39
+    
+    # 持续读取触摸事件
+    while not _exit_triggered:
+        try:
+            # 使用select等待数据可读
+            r, w, e = select.select([fd], [], [], 0.1)
+            
+            if fd in r:
+                data = os.read(fd, EVENT_SIZE * 10)
+                data_len = len(data)
+                pos = 0
+                
+                while pos + EVENT_SIZE <= data_len:
+                    # 解析事件
+                    tv_sec, tv_usec, etype, code, value = struct.unpack(EVENT_FORMAT, data[pos:pos+EVENT_SIZE])
+                    pos += EVENT_SIZE
+                    
+                    if etype == EV_ABS:
+                        if code == ABS_MT_POSITION_X:
+                            _x_cache = value
+                            _touch_x = value
+                        elif code == ABS_MT_POSITION_Y:
+                            _y_cache = value
+                            _touch_y = value
+                        elif code == ABS_MT_TRACKING_ID:
+                            if value >= 0:
+                                _touch_pressed = True
+                                _touch_x = _x_cache
+                                _touch_y = _y_cache
+                            else:
+                                _touch_pressed = False
+                    
+                    # 同步事件
+                    elif etype == EV_SYN:
+                        if _touch_pressed:
+                            _touch_x = _x_cache
+                            _touch_y = _y_cache
+                            
+        except BlockingIOError:
+            pass
+        except OSError as e:
+            if e.errno != 11:  # 忽略EAGAIN错误
+                print(f"读取错误: {e}")
+                break
+        except Exception as e:
+            print(f"触摸读取异常: {e}")
+            break
     
-    def clear(self):
-        self._send({"type": "clear"})
+    # 关闭设备
+    os.close(fd)
 
-    def finish(self):
-        self.sock.close()
+def _run_gui():
+    """运行GUI主循环"""
+    global _root, _canvas
+    
+    # 创建GUI
+    _root = tk.Tk()
+    _root.title("Touch GUI")
+    _root.geometry("480x800")
+    _root.attributes('-fullscreen', True)
+    
+    _canvas = tk.Canvas(_root, width=480, height=800, bg="white")
+    _canvas.pack(fill=tk.BOTH, expand=True)
+    
+    _create_fonts()
+    
+    # 定期检查退出按钮点击
+    def check_exit_periodically():
+        if _exit_triggered:
+            _root.quit()
+            return
+        _root.after(100, check_exit_periodically)
+    
+    check_exit_periodically()
+    
+    # 启动主循环
+    _root.mainloop()
+
+def init():
+    """初始化GUI"""
+    # 启动GUI线程
+    gui_thread = threading.Thread(target=_run_gui, daemon=True)
+    gui_thread.start()
+    
+    # 启动触摸事件读取线程
+    touch_thread = threading.Thread(target=_read_touch_events, daemon=True)
+    touch_thread.start()
+    
+    # 等待GUI初始化完成
+    time.sleep(0.2)
 
-# 创建全局实例
-_client_instance = _gui_client()
 
-# 将类方法提升为模块级别的函数
+# 公共接口函数
 def show_text(x, y, text, color="black", size=16):
-    _client_instance.show_text(x, y, text, color, size)
-
-def print(text):
-    _client_instance.print(text)
-
-def println(text):
-    _client_instance.println(text)
-
-def show_image(x, y, path, width, height):
-    _client_instance.show_image(x, y, path, width, height)
+    if _canvas and _fonts:
+        font = _fonts.get(size, _fonts[16])
+        _root.after(0, lambda: _canvas.create_text(x, y, text=text, fill=color, font=font, anchor="nw"))
 
 def draw_line(x1, y1, x2, y2, color="black", width=1):
-    _client_instance.draw_line(x1, y1, x2, y2, color, width)
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_line(x1, y1, x2, y2, fill=color, width=width))
 
 def fill_rect(x, y, w, h, color="black"):
-    _client_instance.fill_rect(x, y, w, h, color)
-    
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_rectangle(x, y, x+w, y+h, fill=color, outline=""))
+        
 def draw_rect(x, y, w, h, width, color="black"):
-    _client_instance.draw_rect(x, y, w, h, width, color)
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_rectangle(x, y, x+w, y+h, width=width, outline=color))
 
 def fill_circle(cx, cy, r, color="black"):
-    _client_instance.fill_circle(cx, cy, r, color)
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_oval(cx-r, cy-r, cx+r, cy+r, fill=color, outline=""))
 
 def draw_circle(cx, cy, r, width, color="black"):
-    _client_instance.draw_circle(cx, cy, r, width, color)
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_oval(cx-r, cy-r, cx+r, cy+r, width=width, outline=color))
+
+def fill_polygon(points, color):
+    """填充多边形"""
+    if _canvas:
+        _root.after(0, lambda: _canvas.create_polygon(points, fill=color, outline=""))
 
 def clear():
-    _client_instance.clear()
+    if _canvas:
+        _root.after(0, lambda: _canvas.delete("all"))
+
+def get_touch_x():
+    return _touch_x
+
+def get_touch_y():
+    return _touch_y
 
-def finish():
-    _client_instance.finish()
+def get_touchscreen():
+    return _touch_pressed
 
-# 可选：如果希望仍然可以使用类创建新实例
-def create_client(host="127.0.0.1", port=65167):
-    return _gui_client(host, port)
-    
+def should_exit():
+    """检查是否应该退出程序"""
+    return _exit_triggered
+
+def draw_exit_button():
+    """绘制退出按钮"""
+    if not _canvas:
+        return
+        
+    # 退出按钮位置 - 底部中间
+    button_width = 100
+    button_height = 80
+    x1 = 480//2 - button_width//2
+    y1 = 800 - button_height - 20
+    x2 = 480//2 + button_width//2
+    y2 = 800 - 20
+    
+    # 绘制朝向左边的蓝色三角形
+    triangle_size = 50
+    center_x = (x1 + x2) // 2
+    center_y = (y1 + y2) // 2
+    
+    # 三角形顶点坐标 - 朝向左边的三角形
+    points = [
+        center_x - triangle_size//2, center_y,  # 左顶点
+        center_x + triangle_size//2, center_y - triangle_size//2,  # 右上顶点
+        center_x + triangle_size//2, center_y + triangle_size//2   # 右下顶点
+    ]
+    
+    _root.after(0, lambda: _canvas.create_polygon(points, fill="blue", outline=""))
+
+def check_exit_button(x, y):
+    """检查是否点击了退出按钮"""
+    # 退出按钮位置 - 底部中间
+    button_width = 100
+    button_height = 80
+    x1 = 480//2 - button_width//2
+    y1 = 800 - button_height - 20
+    x2 = 480//2 + button_width//2
+    y2 = 800 - 20
+    
+    if x1 <= x <= x2 and y1 <= y <= y2:
+        global _exit_triggered
+        _exit_triggered = True
+        return True
+    return False

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

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

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

@@ -1,9 +1,9 @@
-smartpi/__init__.py,sha256=vHEaSuG4o0m17zvDoMBhn-lttaKYGct1k73F5y1orhk,55
+smartpi/__init__.py,sha256=mtkDm-FlobRiZdbqGbS77ZzAwe5A9DRGKwIoWdhN2U4,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=HaupXWg5cWw_n86ge8IxARrvL3gpcDCNRwATK9irwH8,2960
+smartpi/gui.py,sha256=nUFfU-jbDMOHIqZOyiy-7bwO0gMTJllscjnTLyoPYsk,7228
 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.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,,
+smartpi-0.1.24.dist-info/METADATA,sha256=EQIoqPSL55ic97bXSlKHbMhQYTH37iI-k9tCJHCJPXc,311
+smartpi-0.1.24.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.24.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.24.dist-info/RECORD,,