Explorar o código

整合excel与系统生成图像处理

rambo hai 3 meses
pai
achega
55a93fda91
Modificáronse 3 ficheiros con 518 adicións e 553 borrados
  1. 511 546
      python/api.py
  2. 3 3
      python/mcu/BlueToothMode.py
  3. 4 4
      python/service/run_main.py

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 511 - 546
python/api.py


+ 3 - 3
python/mcu/BlueToothMode.py

@@ -64,9 +64,9 @@ class BlueToothMode(BaseClass, metaclass=SingletonType):
             devices = await BleakScanner.discover()
         except BaseException as e:
             self.print_error("蓝牙疑似未打开,{}".format(e))
-            self.sendSocketMessage(
-                code=0, msg="蓝牙疑似未打开,{}".format(e), data=None, device_status=-1
-            )
+            # self.sendSocketMessage(
+            #     code=0, msg="蓝牙疑似未打开,{}".format(e), data=None, device_status=-1
+            # )
             return
         for d in devices:
             # print(f"Device: {d.name} - Address: {d.address}")

+ 4 - 4
python/service/run_main.py

@@ -882,9 +882,9 @@ class RunMain:
         detail_error_progress = 0
         detail_progress = {"status":"正在处理", "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
         self.sendAsyncMessage(
-            msg="正在处理",
+            msg="准备处理详情页",
             goods_arts=[],
-            status="正在处理",
+            status="准备处理详情页",
             progress=detail_progress
         )
         for goods_no, temp_name_list in finally_goods_no_need_temps.items():
@@ -893,9 +893,9 @@ class RunMain:
                     detail_finish_progress+=1
                     detail_progress = {"status":"正在处理","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
                     self.sendAsyncMessage(
-                        msg="正在处理",
+                        msg="正在处理详情页",
                         goods_arts=[],
-                        status="正在处理",
+                        status="正在处理详情页",
                         progress=detail_progress
                     )
                     # if _temp_name != "xiaosushuoxie-4":

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio