片尾按比例宽高比进行缩放

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -1730,20 +1730,16 @@ extension PQStuckPointPublicController {
                    avatarSticker.locationPath = avatarFilePath.replacingOccurrences(of: documensDirectory, with: "")
                    avatarSticker.timelineIn = bgMovieInfo.timelineIn
                    avatarSticker.timelineOut = bgMovieInfo.timelineOut
-               
-                   //头像绘制大小
-                   var avatarSize = Int(360 * (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0) / 1080)
-                   //头像到顶部的高度
-                   var avatarTop =   Int(430 * (self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / 1920)
-                   if((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) <= (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)){//横屏
-                       avatarSize = 300
-                       avatarTop =  130
-                   }
-                   let avatarPostion:PQEditMaterialPositionModel = PQEditMaterialPositionModel.init()
-                   avatarPostion.width = avatarSize
-                   avatarPostion.height = avatarSize
-                   avatarPostion.x = ((self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0) - avatarSize) / 2
-                   avatarPostion.y = avatarTop
+ 
+                //头像绘制大小
+                let avatarSize =  min(360,300 * ((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)))
+                let avatarTop = min(430,130 * ((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)))
+ 
+                let avatarPostion:PQEditMaterialPositionModel = PQEditMaterialPositionModel.init()
+                avatarPostion.width = Int(avatarSize)
+                avatarPostion.height = Int(avatarSize)
+                avatarPostion.x = ((self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0) - Int(avatarSize)) / 2
+                avatarPostion.y = Int(avatarTop)
                    avatarSticker.materialPosition = avatarPostion
                    
                    //3,用户名素材
@@ -1752,13 +1748,11 @@ extension PQStuckPointPublicController {
                    userNameSticker.timelineOut = bgMovieInfo.timelineOut
                    userNameSticker.type = StickerType.SUBTITLE.rawValue
                    
+                
                    //用户名绘制用到的参数
-                   var userNameTop =  Int(870 * (self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / 1920)
-                   var userNameFontSize = Int(100 * (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0) / 1080)
-                   if((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) <= (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)){
-                       userNameTop = 480
-                       userNameFontSize = 70
-                   }
+                   let userNameTop = min(870,480 * ((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)))
+                   let userNameFontSize = min(100,70 * ((self.editProjectModel?.sData?.videoMetaData?.videoHeight ?? 0) / (self.editProjectModel?.sData?.videoMetaData?.videoWidth ?? 0)))
+ 
                    let subtitleInfo:PQEditSubtitleInfoModel = PQEditSubtitleInfoModel.init()
                    subtitleInfo.fontSize = userNameFontSize
                    subtitleInfo.text = BFLoginUserInfo.shared.nickName