SecsGemPro 1.2.0__tar.gz → 1.3.0__tar.gz

{secsgempro-1.2.0 → secsgempro-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SecsGemPro
-Version: 1.2.0
+Version: 1.3.0
 Summary: secs/gem
 Author: LiuWei
 Author-email: 183074632@qq.com

{secsgempro-1.2.0 → secsgempro-1.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SecsGemPro"
-version = "1.2.0"
+version = "1.3.0"
 description = "secs/gem"
 authors = ["LiuWei <183074632@qq.com>"]
 readme = "README.md"

{secsgempro-1.2.0 → secsgempro-1.3.0}/secsgem/secs/handler.py

@@ -118,23 +118,21 @@ class SecsHandler:  # pylint: disable=too-many-instance-attributes,too-many-publ
             return
 
         try:
-            if sf_pre_func := getattr(self, f"{sf_callback_index}_pre", None):
-                pre_result = sf_pre_func(message)
-                if pre_result and not pre_result[0]:
-                    self.send_response(
-                        self.stream_function(stream_num, function_num + 1)(pre_result[-1]), message.header.system
-                    )
+            # 接收到 host 或工厂下发的指令后进行预检查
+            if sf_pre_func := getattr(self, f"sf_pre", None):
+                if not sf_pre_func():  # sf_pre_func 返回 False 则不进行下面的逻辑
                     return
 
+            # 获取注册的函数 1. _on_sxxfxx  2. 通过 self.register_stream_function 注册的函数名
             callback = getattr(self._callback_handler, sf_callback_index)
-            result = callback(self, message)
+            result = callback(self, message)  # 执行注册的函数
 
-            if result is not None:
+            if result is not None:  # 执行注册函数后如果有结果返回
                 self.send_response(result, message.header.system)
 
             # 回复后是否要发送事件
-            if func := getattr(self, f"send_event_after_response_s{stream_num}f{function_num + 1}", None):
-                func()
+            if func := getattr(self, "send_event_after_response_sf", None):
+                func(stream_num, function_num + 1)
 
         except Exception:  # pylint: disable=broad-except
             self.logger.exception("Callback aborted because of exception, abort sent")