Browse Source

修改适配

swortect 3 months ago
parent
commit
84c8727cb8

+ 21 - 8
python/custom_plugins/plugins/detail_template/hongqingting/detail_hongqingting3.py

@@ -121,11 +121,16 @@ class DetailPicGet(DetailBase):
 
         # aaa_img = PictureProcessing("RGBA", (pp_jpg_1.width*1.2, pp_jpg_1.height*1.2), (255,255,255,0))
         #
-
-        aheight =600
-        # 等比计算目标宽度
-        awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
-
+        ph=pp_png_1.height
+        pw=pp_png_1.width
+        if (ph/pw)>0.8:
+            aheight =600
+            # 等比计算目标宽度
+            awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
+        else:
+            aheight =450
+            # 等比计算目标宽度
+            awidth = int(pp_jpg_1.width * aheight / pp_jpg_1.height)
         pp_png_1 = pp_png_1.resize(value=awidth)
         pp_jpg_1 = pp_jpg_1.resize(value=awidth)
         #
@@ -160,7 +165,7 @@ class DetailPicGet(DetailBase):
             mode="pixel",
             top_img=pp_jpg_2,
             base="cs",
-            value=(200, 850),
+            value=(200, 900),
             top_png_img=pp_png_2,
         )
         return bg_img
@@ -337,11 +342,19 @@ class DetailPicGet(DetailBase):
                                                 )
         pp_jpg_1 = pp_jpg_1.resize(value=round(bg_img.width*(850/bg_img.width)))
         pp_png_1 = pp_png_1.resize(value=round(bg_img.width*(850/bg_img.width)))
+        pw=pp_png_1.width
+        ph=pp_png_1.height
         pp_jpg_1=pp_jpg_1.rotate_advance(doge=22,is_crop=False)
         pp_png_1=pp_png_1.rotate_advance(doge=22,is_crop=False)
 
-
-        bg_img = bg_img.to_overlay_pic_advance(top_img=pp_jpg_1, top_png_img=pp_png_1, base="cs",value=(-50, (-1)*round(bg_img.height*0.15)))
+        if (ph/pw)>0.8:
+            print(555555555551)
+            print(ph/pw)
+            posy=(-1)*round(bg_img.height*0.12)
+        else:
+            print(555555555552)
+            posy=(-1)*round(bg_img.height*0.16)
+        bg_img = bg_img.to_overlay_pic_advance(top_img=pp_jpg_1, top_png_img=pp_png_1, base="cs",value=(-50,posy ))
 
 
         detailed_images.append(bg_img)