Merge branch 'smart-shooter-master-0827' into smart-shooter-socket-progress

python/custom_plugins/plugins/detail_template/hongqingting/detail_hongqingting2.py

@@ -316,8 +316,8 @@ class DetailPicGet(DetailBase):
             top_png_img=pp_png_1,
         )
 
-        # bg_img1 = PictureProcessing("RGB", (bg_img.width, 1080), (255,255,255))
-        # bg_img1 = bg_img1.paste_img(top_img=bg_img,base="nc", value=(0, 0))
+        bg_img1 = PictureProcessing("RGB", (bg_img.width, 1080), (255,255,255))
+        bg_img1 = bg_img1.paste_img(top_img=bg_img,base="nc", value=(0, 0))
 
         # hover_img = PictureProcessing(r"{}\8-1.png".format(self.root))
         # bg_img = bg_img.to_overlay_pic_advance(
@@ -327,7 +327,7 @@ class DetailPicGet(DetailBase):
         #     value=(0, -1),
         #     top_png_img=hover_img,
         # )
-        return bg_img
+        return bg_img1
 
     def deal_pic_9(self):
         goods_art_no_list = list(self.data.keys())
@@ -871,7 +871,7 @@ class DetailPicGet(DetailBase):
                 goods_art_no=goods_art_no_list[2],
                 name="俯视",
             )
-            aheight =350
+            aheight =400
             # 等比计算目标宽度
             awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
             if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)== True:
@@ -892,7 +892,7 @@ class DetailPicGet(DetailBase):
                 goods_art_no=goods_art_no_list[1],
                 name="俯视",
             )
-            aheight =350
+            aheight =400
             # 等比计算目标宽度
             awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
             if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)== True:
@@ -913,7 +913,7 @@ class DetailPicGet(DetailBase):
             goods_art_no=goods_art_no_list[0],
             name="俯视",
         )
-        aheight =350
+        aheight =400
         # 等比计算目标宽度
         awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
         if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)== True:
@@ -1001,7 +1001,7 @@ class DetailPicGet(DetailBase):
             pp_png_1 = pp_png_1.transpose()
             pp_jpg_1 = pp_jpg_1.transpose()
 
-        aheight =320
+        aheight =380
         # 等比计算目标宽度
         awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
         pp_jpg_1 = pp_jpg_1.resize(value=awidth)
@@ -1041,34 +1041,46 @@ class DetailPicGet(DetailBase):
             name="内里",
         )
 
-        if self.check_shoe_is_right_by_pixel(im=pp_png_1.im)== False:
-            pp_jpg_1 = pp_jpg_1.transpose()
-            pp_png_1 = pp_png_1.transpose()
+
 
         pp_jpg_1 = pp_jpg_1.resize(value=530)
         pp_png_1 = pp_png_1.resize(value=530)
+
+
+        ty=0
+        if self.check_shoe_is_right_by_pixel(im=pp_png_1.im) == False:
+            pp_jpg_1 = pp_jpg_1.transpose()
+            pp_png_1 = pp_png_1.transpose()
+            ty=1
+
+
         pp_jpg_1=pp_jpg_1.rotate_advance(doge=90,is_crop=False)
         pp_png_1=pp_png_1.rotate_advance(doge=90,is_crop=False)
 
-        item_img = item_img.to_overlay_pic_advance(
-            mode="pixel",
-            top_img=pp_png_1,
-            base="cs",
-            value=(-120, -50),
-            top_png_img=pp_png_1,
-        )
+        if ty==1:
+            pp_jpg_1 = pp_jpg_1.transpose()
+            pp_png_1 = pp_png_1.transpose()
 
 
-        pp_jpg_1 = pp_jpg_1.transpose()
-        pp_png_1 = pp_png_1.transpose()
         item_img = item_img.to_overlay_pic_advance(
             mode="pixel",
             top_img=pp_png_1,
             base="cs",
-            value=(120, -50),
+            value=(0, -50),
             top_png_img=pp_png_1,
         )
 
+
+        # pp_jpg_1 = pp_jpg_1.transpose()
+        # pp_png_1 = pp_png_1.transpose()
+        # item_img = item_img.to_overlay_pic_advance(
+        #     mode="pixel",
+        #     top_img=pp_png_1,
+        #     base="cs",
+        #     value=(120, -50),
+        #     top_png_img=pp_png_1,
+        # )
+
         font_hei = ImageFont.truetype(r"resources\ttf\simhei.ttf", 24)
         item_img.get_text_image_advanced(
             value=(500, 600),

python/custom_plugins/plugins/detail_template/hongqingting/detail_hongqingting3.py

@@ -399,8 +399,12 @@ class DetailPicGet(DetailBase):
             name="俯视",
         )
 
-        pp_jpg_1 = pp_jpg_1.resize(value=round(bg_img.width*(660/bg_img.width)))
-        pp_png_1 = pp_png_1.resize(value=round(bg_img.width*(660/bg_img.width)))
+        aheight =650
+        # 等比计算目标宽度
+        awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
+
+        pp_jpg_1 = pp_jpg_1.resize(value=awidth)
+        pp_png_1 = pp_png_1.resize(value=awidth)
         bg_img = bg_img.to_overlay_pic_advance(
             mode="pixel",
             top_img=pp_jpg_1,
@@ -709,7 +713,7 @@ class DetailPicGet(DetailBase):
             mode="pixel",
             top_img=all_color_pp,
             base="cs",
-            value=(0, 350),
+            value=(0, 250),
             top_png_img=all_color_pp,
         )
 
@@ -918,25 +922,37 @@ class DetailPicGet(DetailBase):
 
         pp_jpg_1 = pp_jpg_1.resize(value=aheight)
         pp_png_1 = pp_png_1.resize(value=aheight)
+
+        ty=0
+        if self.check_shoe_is_right_by_pixel(im=pp_png_1.im) == False:
+            pp_jpg_1 = pp_jpg_1.transpose()
+            pp_png_1 = pp_png_1.transpose()
+            ty=1
+
         pp_jpg_1=pp_jpg_1.rotate_advance(doge=90,is_crop=False)
         pp_png_1=pp_png_1.rotate_advance(doge=90,is_crop=False)
 
+
+        if ty==1:
+            pp_jpg_1 = pp_jpg_1.transpose()
+            pp_png_1 = pp_png_1.transpose()
+
         item_img = item_img.to_overlay_pic_advance(
             mode="pixel",
             top_img=pp_png_1,
             base="cs",
-            value=(-120, 0),
-            top_png_img=pp_png_1,
-        )
-        pp_jpg_1 = pp_jpg_1.transpose()
-        pp_png_1 = pp_png_1.transpose()
-        item_img = item_img.to_overlay_pic_advance(
-            mode="pixel",
-            top_img=pp_png_1,
-            base="cs",
-            value=(120, 0),
+            value=(0, -70),
             top_png_img=pp_png_1,
         )
+        # pp_jpg_1 = pp_jpg_1.transpose()
+        # pp_png_1 = pp_png_1.transpose()
+        # item_img = item_img.to_overlay_pic_advance(
+        #     mode="pixel",
+        #     top_img=pp_png_1,
+        #     base="cs",
+        #     value=(120, -50),
+        #     top_png_img=pp_png_1,
+        # )
 
         item_img.get_text_image_advanced(
             value=(600, 600),