支持多尺寸生成主图

python/docs/socket命令.md

@@ -89,6 +89,7 @@ _(该命令用于单独自定义配置中某一项的单独调整测试，不进
 * data参数释义：
     * image_counts : 执行拍照任务的数量，可理解为照片张数
     * goods_art_no : 货号
+    * action_names : 执行的动作名称
     * current_time : 当前时间
 * msg 消息提示
 #### 响应示例
@@ -98,6 +99,13 @@ _(该命令用于单独自定义配置中某一项的单独调整测试，不进
     "data": {
         "image_counts": 4,
         "goods_art_no": "1234556",
+        "action_names": [
+            "俯视",
+            "侧视",
+            "后跟",
+            "鞋底",
+            "内里"
+        ],
         "current_time": "年月日时分秒"
     },
     "msg_type":"image_process"

python/service/grenerate_main_image_test.py

@@ -258,7 +258,7 @@ class GeneratePic(object):
 
     @time_it
     def run(self, image_path, cut_image_path, out_path, image_deal_mode=0, image_index=99,
-            out_pic_size=1024, is_logo=True, out_process_path_1=None, out_process_path_2=None,
+            out_pic_size=[1600], is_logo=True, out_process_path_1=None, out_process_path_2=None,
             resize_mode=None, max_box=None, logo_path="", **kwargs):  # im 为cv对象
         print("****************************处理图像核心********************************\n")
         """
@@ -432,15 +432,22 @@ class GeneratePic(object):
         if settings.OUT_PIC_FACTOR > 1.0:
             print("图片锐化处理")
             image_bg = sharpen_image(image_bg, factor=settings.OUT_PIC_FACTOR)
-
-        if out_pic_size < 1600:
-            image_bg = image_bg.resize((out_pic_size, out_pic_size), resample=settings.RESIZE_IMAGE_MODE)
-
-        if settings.OUT_PIC_MODE == ".jpg":
-            image_bg.save(out_path, quality=100, dpi=(300, 300), format="JPEG")
-        else:
-            # quality=quality
-            image_bg.save(out_path, quality=100)
+        for imageSize in out_pic_size:
+            if imageSize < 1600:
+                image_bg = image_bg.resize(
+                    (imageSize, imageSize), resample=settings.RESIZE_IMAGE_MODE
+                )
+
+            if settings.OUT_PIC_MODE == ".jpg":
+                image_bg.save(
+                    f"{out_path}_{imageSize}",
+                    quality=100,
+                    dpi=(300, 300),
+                    format="JPEG",
+                )
+            else:
+                # quality=quality
+                image_bg.save(f"{out_path}_{imageSize}", quality=100)
 
         if output_queue is not None:
             output_queue.put(True)

python/settings.py

@@ -180,10 +180,10 @@ is_test_plugins = true_divide
 
 OUT_PIC_MODE = "."+getSysConfigs("basic_configs", "image_out_format", "png")  # ".png"
 
-OUT_PIC_SIZE = int(
+OUT_PIC_SIZE = json.loads(
     800
-    if getSysConfigs("basic_configs", "main_image_size", "800") == ""
-    else getSysConfigs("basic_configs", "main_image_size", "800")
+    if getSysConfigs("basic_configs", "main_image_size", "[1600]") == ""
+    else getSysConfigs("basic_configs", "main_image_size", "[1600]")
 )  # 主图大小
 
 

python/sys_configs.json

@@ -1,7 +1,7 @@
 [
     {
         "key": "basic_configs",
-        "value": "{\"main_image_size\":1600,\"image_out_format\":\"png\",\"image_sharpening\":1.0}"
+        "value": "{\"main_image_size\":[1600],\"image_out_format\":\"png\",\"image_sharpening\":1.0}"
     },
     {
         "key": "take_photo_configs",