|
|
@@ -219,7 +219,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
pass
|
|
|
except BaseException as e:
|
|
|
print("121231298908", e)
|
|
|
- logger.info("121231298908", e)
|
|
|
+ logger.info(f"121231298908{e}")
|
|
|
break
|
|
|
|
|
|
self.is_running = False
|
|
|
@@ -459,14 +459,14 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
data = receive_data[1:].decode()
|
|
|
if "设备初始化完成" in data:
|
|
|
self.init_state = True
|
|
|
- logger.info("设备初始化完成:%s", data)
|
|
|
+ logger.info(f"设备初始化完成:%{data}")
|
|
|
self.sendSocketMessage(msg=data, device_status=2)
|
|
|
else:
|
|
|
print("设备异常数据打印:", data)
|
|
|
- logger.info("115 设备异常数据打印:%s", data)
|
|
|
+ logger.info(f"115 设备异常数据打印:%{data}")
|
|
|
except BaseException as e:
|
|
|
print("117 error {}".format(e))
|
|
|
- logger.info("117 error %s", e)
|
|
|
+ logger.info(f"117 error %{e}")
|
|
|
return
|
|
|
def print_mcu_noraml_data(self, receive_data):
|
|
|
# 扫码数据
|
|
|
@@ -501,12 +501,12 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
device_name_info = self.device_name_dict_mapping[device_id]
|
|
|
message_info = {"设备名称":device_name_info,"运动值":device_value}
|
|
|
print("【设备运动】消息回执:", message_info)
|
|
|
- logger.info("设备运动消息回执:%s", message_info)
|
|
|
+ logger.info(f"设备运动消息回执:{message_info}")
|
|
|
print("接收设备消息回执:", command_text)
|
|
|
- logger.info("接收设备消息回执:%s", receive_data_temp_text)
|
|
|
+ logger.info(f"接收设备消息回执:{receive_data_temp_text}")
|
|
|
except BaseException as e:
|
|
|
- print("255 error {}".format(e))
|
|
|
- logger.info("255 error %s", e)
|
|
|
+ print(f"255 error {e}")
|
|
|
+ logger.info(f"255 error {e}")
|
|
|
return
|
|
|
def get_from_mcu_move_respond_data(self, receive_data):
|
|
|
self.last_from_mcu_move_respond_data = receive_data
|
|
|
@@ -1772,8 +1772,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
await program_item.run(3)
|
|
|
self.msg_type = "mcu"
|
|
|
logger.info(
|
|
|
- "发送 run_mcu_signle消息",
|
|
|
- "{} 执行完成~".format(program_item.action_name),
|
|
|
+ "发送 run_mcu_signle消息{} 执行完成~".format(program_item.action_name)
|
|
|
)
|
|
|
self.sendSocketMessage(
|
|
|
code=0,
|
|
|
@@ -1800,7 +1799,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
await asyncio.sleep(0.1)
|
|
|
print("only_take_photo=====>", goods_art_no, image_index, record_id)
|
|
|
logger.info(
|
|
|
- "only_take_photo=====> %s %s %s", goods_art_no, image_index, record_id
|
|
|
+ f"only_take_photo=====> {goods_art_no} {image_index} {record_id}"
|
|
|
)
|
|
|
if goods_art_no == "":
|
|
|
print("only_take_photo 数据查询异常")
|