Update app.py

app.py

@@ -4,16 +4,16 @@ import pandas as pd
 import json
 import os
 
-# 數據存儲文件
+# 数据存储文件
 data_file = "dog_activity_data.json"
 
-# 初始化數據文件
+# 初始化数据文件
 def init_data_file():
     if not os.path.exists(data_file):
         with open(data_file, "w") as file:
             json.dump([], file)
 
-# 加載活動記錄
+# 加载活动记录
 def load_data():
     try:
         with open(data_file, "r") as file:
@@ -21,7 +21,7 @@ def load_data():
     except:
         return []
 
-# 保存活動記錄
+# 保存活动记录
 def save_activity(activity):
     timestamp = datetime.datetime.now()
     record = {"活動": activity, "時間": timestamp.strftime("%Y-%m-%d %H:%M:%S")}
@@ -31,30 +31,35 @@ def save_activity(activity):
         json.dump(data, file)
     return update_activity_display()
 
-# 更新顯示活動記錄 (僅顯示最近 5 條)
+# 删除记录功能
+def delete_activity(index):
+    data = load_data()
+    try:
+        index = int(index)
+        if 0 <= index < len(data):
+            del data[index]
+            with open(data_file, "w") as file:
+                json.dump(data, file)
+    except:
+        pass
+    return update_activity_display()
+
+# 更新显示活动记录 (仅显示最近 5 条)
 def update_activity_display(show_all=False):
     data = load_data()
     df = pd.DataFrame(data)
     if df.empty:
-        return pd.DataFrame(columns=["活動", "時間"])
+        return [], []
     if not show_all:
-        df = df.tail(5)
-    return df
-
-# 刪除記錄功能
-def delete_activity(row_index):
-    data = load_data()
-    try:
-        row_index = int(row_index)
-        if 0 <= row_index < len(data):
-            del data[row_index]
-            with open(data_file, "w") as file:
-                json.dump(data, file)
-            return "記錄刪除成功", update_activity_display()
-        else:
-            return "錯誤: 行號超出範圍", update_activity_display()
-    except ValueError:
-        return "錯誤: 請輸入有效的數字行號", update_activity_display()
+        df = df.tail(5).reset_index(drop=True)
+    
+    # 构建展示用的行数据和删除按钮
+    rows = []
+    delete_buttons = []
+    for i, row in df.iterrows():
+        rows.append(f"{row['活動']} - {row['時間']}")
+        delete_buttons.append(gr.Button(value="❌", elem_id=f"delete_{i}"))
+    return rows, delete_buttons
 
 # 主界面
 def main_interface():
@@ -77,58 +82,61 @@ def main_interface():
     .btn-half { background-color: #FFD700; } /* Gold */
     .btn-no-eat { background-color: #D3D3D3; } /* LightGray */
     """
+
     with gr.Blocks(css=custom_css) as app:
-        gr.Markdown("## 🐾 狗狗活動記錄器")
+        gr.Markdown("## 🐾 狗狗活动记录器")
 
-        # 記錄活動按鈕 (不同顏色 + icon)
+        # 记录活动按钮 (不同颜色 + icon)
         with gr.Row():
             poop_btn = gr.Button("💩 拉屎", elem_classes="custom-btn btn-poop")
             pee_btn = gr.Button("💦 尿尿", elem_classes="custom-btn btn-pee")
             eat_btn = gr.Button("🍽️ 全吃了", elem_classes="custom-btn btn-eat")
             half_eat_btn = gr.Button("🍛 吃了一半", elem_classes="custom-btn btn-half")
-            no_eat_btn = gr.Button("🥄 沒怎麼吃", elem_classes="custom-btn btn-no-eat")
-
-        # 活動記錄表格
-        gr.Markdown("### 📊 最近活動記錄 (僅顯示最近5條)")
-        data_table = gr.Dataframe(update_activity_display(), interactive=False)
-
-        # 顯示更多按鈕
-        show_more_btn = gr.Button("顯示更多記錄")
-        show_less_btn = gr.Button("顯示最近5條", visible=False)
-
-        # 刪除記錄功能
-        gr.Markdown("### 🗑️ 刪除記錄")
-        row_to_delete = gr.Textbox(label="輸入要刪除的行號 (從 0 開始)")
-        delete_btn = gr.Button("刪除記錄")
-        delete_msg = gr.Textbox(label="刪除狀態", interactive=False)
-
-        # 綁定活動按鈕邏輯
-        poop_btn.click(lambda: save_activity("拉屎"), outputs=[data_table])
-        pee_btn.click(lambda: save_activity("尿尿"), outputs=[data_table])
-        eat_btn.click(lambda: save_activity("全吃了"), outputs=[data_table])
-        half_eat_btn.click(lambda: save_activity("吃了一半"), outputs=[data_table])
-        no_eat_btn.click(lambda: save_activity("沒怎麼吃"), outputs=[data_table])
-
-        # 綁定顯示更多邏輯
-        show_more_btn.click(
-            lambda: (update_activity_display(show_all=True), gr.update(visible=False), gr.update(visible=True)),
-            inputs=[],
-            outputs=[data_table, show_more_btn, show_less_btn]
-        )
-        show_less_btn.click(
-            lambda: (update_activity_display(show_all=False), gr.update(visible=True), gr.update(visible=False)),
-            inputs=[],
-            outputs=[data_table, show_more_btn, show_less_btn]
-        )
-
-        # 刪除記錄邏輯
-        delete_btn.click(
-            delete_activity, 
-            inputs=[row_to_delete], 
-            outputs=[delete_msg, data_table]
-        )
+            no_eat_btn = gr.Button("🥄 没怎么吃", elem_classes="custom-btn btn-no-eat")
+
+        # 活动记录部分
+        gr.Markdown("### 📊 最近活动记录 (最多显示最近5条)")
+        record_list = gr.State([])  # 存储记录
+        delete_buttons = gr.State([])
+
+        with gr.Row():
+            record_display = gr.Column()
+            delete_button_display = gr.Column()
+
+        # 显示更多按钮
+        show_more_btn = gr.Button("显示更多记录")
+        show_less_btn = gr.Button("显示最近5条", visible=False)
+
+        # 更新显示逻辑
+        def refresh_display(show_all=False):
+            rows, buttons = update_activity_display(show_all)
+            return rows, buttons, gr.update(visible=not show_all), gr.update(visible=show_all)
+
+        def on_delete(index):
+            delete_activity(index)
+            return refresh_display()
+
+        # 添加活动逻辑
+        poop_btn.click(lambda: save_activity("拉屎"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+        pee_btn.click(lambda: save_activity("尿尿"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+        eat_btn.click(lambda: save_activity("全吃了"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+        half_eat_btn.click(lambda: save_activity("吃了一半"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+        no_eat_btn.click(lambda: save_activity("没怎么吃"), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+
+        # 显示更多/更少逻辑
+        show_more_btn.click(lambda: refresh_display(show_all=True), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+        show_less_btn.click(lambda: refresh_display(show_all=False), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+
+        # 动态绑定删除按钮事件
+        for i in range(5):  # 最多5条删除按钮
+            delete_button = gr.Button(visible=False, value="❌")
+            delete_button.click(lambda idx=i: on_delete(idx), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
+
+        # 初始显示
+        app.load(lambda: refresh_display(), outputs=[record_list, delete_buttons, show_more_btn, show_less_btn])
 
     return app
 
-# 啟動應用
+
+# 启动应用
 main_interface().launch(share=True, server_name="0.0.0.0", server_port=7860)