内容修改

python/config.ini

@@ -4,7 +4,7 @@ app_name=智慧拍-后端应用
 # 应用版本号
 version=1.0.0
 # 应用host地址
-host=10.56.42.45
+host=127.0.0.1
 # 应用服务启动名称
 app_run=api:app
 # 端口号
@@ -43,6 +43,6 @@ right_foot_action_1 = 99
 right_foot_action_2 = 99
 stop = 9
 
-[camera_config]
-low_iso = 100
-high_iso = 6400
+; [camera_config]
+; low_iso = 100
+; high_iso = 6400

python/service/base_deal.py

@@ -614,7 +614,7 @@ class BaseDealImage(object):
                             else:
                                 callback_func("货号图{} 抠图完成~".format(file_name))
             progress = {
-                "status":"处理成功",
+                "status":"正在处理",
                 "current":finish_progress,
                 "total":total_progress,
                 "error":error_progress,
@@ -623,9 +623,9 @@ class BaseDealImage(object):
             if goods_art_floder_name not in error_goods_art_no_folder:
                 finish_progress+=1
                 sendAsyncMessage(
-                    msg="处理成功",
+                    msg="正在处理",
                     goods_arts=[goods_art_floder_name],
-                    status="处理成功",
+                    status="正在处理",
                     progress=progress
                 )
             else:
@@ -663,12 +663,13 @@ class BaseDealImage(object):
                 # progress=progress
             )
         else:
-            sendAsyncMessage(
-                        msg="抠图完成",
-                        goods_arts=[],
-                        status="抠图完成",
-                        progress=progress
-                    )
+            pass
+        sendAsyncMessage(
+                    msg="抠图完成",
+                    goods_arts=[],
+                    status="抠图完成",
+                    progress=progress
+                )
 
     def checkCutoutImage(self, image_dir: str, todo_goods_art_no_folder_name_list=None):
         """

python/service/run_main.py

@@ -186,22 +186,10 @@ class RunMain:
 
     # 抠图校验后的回调函数处理
     def check_for_cutout_image_first_call_back(self, return_data):
-        # return_data = {
-        #     "code": 99,
-        #     "message": "",
-        #     "data": {
-        #         "all_goods_art_no_folder_data": [],
-        #     },
-        # }
         code = return_data["code"]
         config_data = return_data["data"]["config_data"]
         config_data["sign_text"] = ""
         if code != 0:
-            # self.windows.show_message(return_data["message"])
-            # self.show_progress_detail(return_data["message"])
-            # _dialog_dict = {"text": return_data["message"],
-            #                 "windows": self,
-            #                 }
             raise UnicornException(return_data["message"])
 
         do_next = False
@@ -233,27 +221,6 @@ class RunMain:
         elif button_1 == "继续" and button_2 is None and button_3 is None:
             do_next = True
         else:
-            # print("runmain  179----------------")
-            # # print(self)
-            # # print(self.windows)
-            # _dialog_dict = {"text": text,
-            #                 "button_1": button_1,
-            #                 "button_2": button_2,
-            #                 "button_3": button_3,
-            #                 "windows": self,
-            #                 }
-            # self.show_dialog_sign.emit(_dialog_dict)
-            # # self.exec_()
-            # # 等待事件被设置
-            # self.event.wait()
-            # print("self.dialog_result", self.dialog_result)
-            # #
-            # # my_dialog = DialogShow(self.windows, text=text, button_1=button_1, button_2=button_2,
-            # #                        button_3=button_3)
-            # # ret = my_dialog.exec()
-            # print("460  ===============my_dialog.flag_name===============")
-            # print(my_dialog.flag_name)
-
             if "移除" in self.dialog_result:
                 for error_folder_data in [
                     x for x in all_goods_art_no_folder_data if x["label"] == "错误"
@@ -270,28 +237,6 @@ class RunMain:
             goods_art_no_folder_data["folder_name"]
             for goods_art_no_folder_data in all_goods_art_no_folder_data
         ]
-        # try:
-        #     loop = asyncio.get_event_loop()
-        #     loop.create_task(sendSocketMessage(
-        #         code=0,
-        #         msg="开始处理抠图",
-        #         data={
-        #             "status": "进行中",
-        #             "goods_art_nos": goods_arts,
-        #         },
-        #         msg_type="segment_progress",
-        #     ))
-        # except:
-        #     print('An exception occurred')
-        #     asyncio.run(sendSocketMessage(
-        #         code=0,
-        #         msg="开始处理抠图",
-        #         data={
-        #             "status": "进行中",
-        #             "goods_art_nos": goods_arts,
-        #         },
-        #         msg_type="segment_progress",
-        #     ))
         if do_next:
             all_goods_art_no_folder_data = [
                 x for x in all_goods_art_no_folder_data if x["label"] == "待处理"
@@ -312,32 +257,6 @@ class RunMain:
             return new_func
         else:
             print("已结束抠图处理")
-            # try:
-            #     loop = asyncio.get_event_loop()
-            #     loop.create_task(
-            #         sendSocketMessage(
-            #             code=0,
-            #             msg="抠图结束",
-            #             data={
-            #                 "status": "已完成",
-            #                 "goods_art_nos": goods_arts,
-            #             },
-            #             msg_type="segment_progress",
-            #         )
-            #     )
-            # except:
-            #     print('An exception occurred')
-            #     asyncio.run(
-            #         sendSocketMessage(
-            #             code=0,
-            #             msg="抠图结束",
-            #             data={
-            #                 "status": "已完成",
-            #                 "goods_art_nos": goods_arts,
-            #             },
-            #             msg_type="segment_progress",
-            #         )
-            #     )
             return True
 
     def do_run_cutout_image(
@@ -1017,7 +936,7 @@ class RunMain:
                     config_data["success_handler"].append(
                         {"goods_art_no": goods_no, "success": True, "info": "处理成功"}
                     )
-                    detail_progress = {"status":"处理成功","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
+                    detail_progress = {"status":"正在处理","goods_art_no":goods_no, "current":detail_finish_progress, "total":detail_total_progress, "error":detail_error_progress}
                     self.sendAsyncMessage(
                         msg="开始处理详情页",
                         goods_arts=[],

python/settings.py

@@ -194,11 +194,11 @@ MOVE_DOWN = _mcu_config_dict["move_down"]
 STOP = _mcu_config_dict["stop"]
 
 
-camera_config_dict = config.items("camera_config")
-_camera_config_dict = {}
-for i, k in mcu_config_dict:
-    _camera_config_dict[i] = int(k)
-_camera_config_dict = get_config_by_items(camera_config_dict)
+# camera_config_dict = config.items("camera_config")
+# _camera_config_dict = {}
+# for i, k in mcu_config_dict:
+#     _camera_config_dict[i] = int(k)
+# _camera_config_dict = get_config_by_items(camera_config_dict)
 
 # LOW_ISO = _camera_config_dict["low_iso"]
 # HIGH_ISO = _camera_config_dict["high_iso"]