Skip to content

Commit 522e23c

Browse files
committed
PRE RELEASE
refactor: 修改存储函数为异步并调整日志格式和逻辑
1 parent 39ec5db commit 522e23c

File tree

3 files changed

+159
-74
lines changed

3 files changed

+159
-74
lines changed

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ company = "Tim & Pigeon Games"
2525
# copyright text to display in about app dialogs
2626
copyright = "Copyright (C) 2025 by Tim, Assets from Pigeon Games."
2727

28+
build_number = 2085 # --build-number
2829

2930
[tool.flet.app]
3031
path = "src"

src/PhiControls.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ async def storage(
154154
page.session.remove(key)
155155
else:
156156
raise LookupError("Key not found in session storage")
157-
print(f"[log-", datetime.datetime.now(), "]{key}值为: {page.session.get(key)}")
157+
print(f"[log-{datetime.datetime.now()}]{key}值为: {page.session.get(key)}")
158158
elif type == "c":
159159
if mode == "r":
160160
if await page.client_storage.contains_key_async(key):
@@ -169,15 +169,16 @@ async def storage(
169169
page.client_storage.remove(key)
170170
else:
171171
raise LookupError("Key not found in client storage")
172+
print(f"[log-{datetime.datetime.now()}]{key}值为: {page.session.get(key)}")
172173
elif type == "DEL":
173174
await page.client_storage.clear_async()
174175
page.session.clear()
175176

176177

177-
def play_key_sound(page: ft.Page):
178+
async def play_key_sound(page: ft.Page):
178179
"""播放按键声音"""
179180
# 背景音乐
180-
if storage(page=page, key="is_load_finish",type="s"):
181+
if await storage(page=page, key="is_load_finish",type="s"):
181182
try:
182183
import flet_audio as ft_a
183184

@@ -196,7 +197,7 @@ class PhiBack(ft.Stack):
196197
ft (_type_): _description_
197198
"""
198199

199-
def __init__(self, on_click=None, n=1):
200+
def __init__(self, on_click=None,on_long_press=None, n=1):
200201
super().__init__()
201202
self.controls = [
202203
ft.Container(
@@ -232,6 +233,7 @@ def __init__(self, on_click=None, n=1):
232233
),
233234
padding=0,
234235
on_click=on_click,
236+
on_long_press=on_long_press,
235237
),
236238
ft.Container(
237239
ft.Image(src="back.svg"),
@@ -514,13 +516,13 @@ async def on_click(
514516
detailText.value += textTemp
515517
page.update()
516518
await asyncio.sleep(0.05)
517-
if multi:
518-
await asyncio.sleep(0.25)
519+
# if multi:
520+
# await asyncio.sleep(0.25)
519521
elif await storage(page=page, key="data") < datadelta:
520522
self.nodata = True
521523
self.controls[0].visible = not self.controls[0].visible # ?图
522524
print("[log-", datetime.datetime.now(), "]余额不足")
523-
# TODO: 前端日志输出失效,待修复
525+
# 余额不足提示
524526
page.snack_bar = ft.SnackBar(ft.Text("余额不足"))
525527
page.snack_bar.open = True
526528
page.update()
@@ -684,14 +686,14 @@ class PhiStoreNav(ft.Stack):
684686
"""_summary_: `PhiStore` 导航栏
685687
686688
Args:
687-
ft (_type_): _description_
689+
on_click (list, optional): 导航栏点击事件列表,用字符串包裹事件回调,禁止使用双引号. Defaults to [].
688690
"""
689691

690692
def __init__(
691693
self,
692694
page: ft.Page,
693695
n=1,
694-
on_click=[print("click"), print("click2"), print("click3"), print("click4")],
696+
on_click=["print('click')", "print('click2')", "print('click3')", "print('click4')"],
695697
lock=False,
696698
):
697699
super().__init__()
@@ -816,8 +818,8 @@ def __init__(
816818
),
817819
]
818820

819-
def on_click(self, e):
820-
if storage(page=self.page, key="is_load_finish"):
821+
async def on_click(self, e):
822+
if await storage(page=self.page, key="is_load_finish",type="s"):
821823
play_key_sound(self.page)
822824
self.controls[1].controls[0].content.controls[0].offset = (
823825
ft.transform.Offset(
@@ -826,7 +828,7 @@ def on_click(self, e):
826828
)
827829
self.page.update()
828830
if self.on_click_list != [] and self.on_click_list is not None:
829-
for i, action in enumerate(self.on_click_list):
831+
for i in range(0, len(self.on_click_list) - 1):
830832
if e.control.data[-1] == str(i + 1):
831833
print(
832834
"[log-",
@@ -835,4 +837,5 @@ def on_click(self, e):
835837
i + 1,
836838
"个导航栏动作",
837839
)
838-
# action
840+
print("[log-", datetime.datetime.now(), "]", self.on_click_list)
841+
exec(self.on_click_list[i])

0 commit comments

Comments
 (0)