|
@@ -86,7 +86,7 @@ class ScanGarbageEvent(StationEventBase):
|
|
|
return self.thread is not None and not self.thread.is_alive()
|
|
|
|
|
|
def done_after_event(self):
|
|
|
- res = self.thread.wait_event()
|
|
|
+ res: GarbageBag = self.thread.wait_event()
|
|
|
if res is not None:
|
|
|
if self._user is None:
|
|
|
self.station.show_warning("操作失败", "用户未登录")
|
|
@@ -95,6 +95,9 @@ class ScanGarbageEvent(StationEventBase):
|
|
|
self.station.show_garbage_info() # 显示信息
|
|
|
self.station.update_control()
|
|
|
else:
|
|
|
+ if res.is_use() or res.is_check()[0]:
|
|
|
+ self.station.show_warning("扫描垃圾袋", "垃圾袋已经被使用")
|
|
|
+ return
|
|
|
self.station.to_get_garbage_type(res)
|
|
|
self.station.show_msg("扫码垃圾袋", "垃圾袋扫描成功", show_time=3)
|
|
|
self.station.update_control()
|