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

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

@@ -287,22 +287,37 @@ class DetailPicGet(DetailBase):
         pp_jpg_1 = pp_jpg_1.resize(value=int(round(bg_img.width * 660 / 1080)))
         pp_png_1 = pp_png_1.resize(value=int(round(bg_img.width * 660 / 1080)))
 
+
+        pw=pp_png_1.width
+        ph=pp_png_1.height
+
         aaa_img = aaa_img.paste_img(top_img=pp_png_1,base="cc", value=(0, 0))
 
-        pp_png_1 = aaa_img.rotate(15)
 
+        pp_png_1 = aaa_img.rotate(15)
+        print("811111111111111111")
+        print(ph/pw)
+        if (ph/pw)>1:
+            posy=(-1)*int(round(bg_img.height * 0.27))
+        elif (ph/pw)>0.8:
+            posy=(-1)*int(round(bg_img.height * 0.225))
+        else:
+            posy=(-1)*int(round(bg_img.height * 0.20))
+        posx=-10
 
+        # posy=int(round(bg_img.height * 0.01))
+        # print(posy)
 
         bg_img = bg_img.to_overlay_pic_advance(
             mode="pixel",
             top_img=pp_png_1,
             base="cc",
-            value=(-50, (-1)*int(round(bg_img.height * 0.24))),
+            value=(posx, posy),
             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(
@@ -312,7 +327,7 @@ class DetailPicGet(DetailBase):
         #     value=(0, -1),
         #     top_png_img=hover_img,
         # )
-        return bg_img1
+        return bg_img
 
     def deal_pic_9(self):
         goods_art_no_list = list(self.data.keys())

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

@@ -738,7 +738,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)
             pp_jpg_1 = pp_jpg_1.resize(value=awidth)
@@ -756,7 +756,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)
             pp_jpg_1 = pp_jpg_1.resize(value=awidth)
@@ -774,7 +774,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)
         pp_jpg_1 = pp_jpg_1.resize(value=awidth)
@@ -815,24 +815,7 @@ class DetailPicGet(DetailBase):
             goods_art_no=goods_art_no_list[0],
             name="后跟",
         )
-        aheight =350
-        # 等比计算目标宽度
-        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)
-        item_img = item_img.to_overlay_pic_advance(
-            mode="pixel",
-            top_img=pp_jpg_1,
-            base="cs",
-            value=(60, 260),
-            top_png_img=pp_png_1,
-        )
-        pp_jpg_1, pp_png_1 = self.image_one_pic(
-            return_orign=True,
-            goods_art_no=goods_art_no_list[0],
-            name="后跟",
-        )
-        aheight =450
+        aheight =400
         # 等比计算目标宽度
         awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
         pp_jpg_1 = pp_jpg_1.resize(value=awidth)
@@ -841,9 +824,26 @@ class DetailPicGet(DetailBase):
             mode="pixel",
             top_img=pp_jpg_1,
             base="cs",
-            value=(-60, 220),
+            value=(0, 240),
             top_png_img=pp_png_1,
         )
+        # pp_jpg_1, pp_png_1 = self.image_one_pic(
+        #     return_orign=True,
+        #     goods_art_no=goods_art_no_list[0],
+        #     name="后跟",
+        # )
+        # aheight =450
+        # # 等比计算目标宽度
+        # 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)
+        # item_img = item_img.to_overlay_pic_advance(
+        #     mode="pixel",
+        #     top_img=pp_jpg_1,
+        #     base="cs",
+        #     value=(-60, 220),
+        #     top_png_img=pp_png_1,
+        # )
 
         item_img.get_text_image_advanced(
             value=(520, 600),