3 коммитов

Автор SHA1 Сообщение Дата
  谈文友 3c2ab6336d 慧播nosubtitle 2 лет назад
  谈文友 c90f82db49 Merge remote-tracking branch 'origin/photo' into photo 2 лет назад
  谈文友 b2163fb185 慧播资源权限查询修改 2 лет назад
2 измененных файлов: 45 добавлений и 16 удалений
  1. +40
    -11
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  2. +5
    -5
      suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java

+ 40
- 11
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Просмотреть файл

@@ -205,17 +205,6 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
param.setTask_id(photoSpeakVideo.getId());
param.setCallback_url(callbackUrl + "/callback/photo/speak");
param.setImg(Base64Util.imageUrlToBase64(photoSpeakVideo.getPersonPhotoUrl()));
Map<String,Object> subtitleMap = new HashMap<>();
subtitleMap.put("enabled",photoSpeakVideo.getSubtitleEnabled());
if(EnumYesOrNo.YES.getCode().equals(photoSpeakVideo.getSubtitleEnabled())){
Map titleParams = JSON.parseObject(photoSpeakVideo.getSubtitleParams(),Map.class);
if(titleParams == null || titleParams.isEmpty()){
subtitleMap.put("enabled",EnumYesOrNo.NO.getCode());
}else{
subtitleMap.put("params",titleParams);
}
}

String voiceMouldSm = photoSpeakVideo.getVoiceMouldSm();
Integer sex = 1;
Integer speakType = 0;
@@ -263,6 +252,46 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
// param.setSubtitle_params(subtitle);
//
// }
// List<PhotoSpeakVideo> videoMapperList = photoSpeakVideoMapper.findList(speakVideoUpd);
// for (PhotoSpeakVideo speakVideo : videoMapperList) {
// if (speakVideo.getSubtitleEnabled()==1){
//// 开启字幕 查询字幕列表
// String[] getparams = speakVideo.getSubtitleParams().split(",");
// Map subtitle = new HashMap();
// Map params = new HashMap();
// Map map = new HashMap();
// for (String s : getparams) {
// String[] kv = s.split(":");
// map.put(kv[0],kv[1]);
// }
//
// params.put("Fontname",(map.get("Fontname")==null?"宋体":map.get("Fontname")));
// params.put("Fontsize",(map.get("Fontsize")==null? 25:map.get("Fontsize")));
// params.put("PrimaryColour",(map.get("PrimaryColour")==null?"&Hffffff":map.get("PrimaryColour")));
// params.put("SecondaryColour",(map.get("SecondaryColour")==null?"BBGGRR":map.get("SecondaryColour")));
// params.put("OutlineColour",(map.get("OutlineColour")==null?"BBGGRR":map.get("OutlineColour")));
// params.put("BackColour",(map.get("BackColour")==null?"&H0000ff":map.get("BackColour")));
// params.put("Bold",(map.get("Bold")==null? -1:map.get("Bold")));
// params.put("Italic",(map.get("Italic")==null? 0:map.get("Italic")));
// params.put("Underline",(map.get("Underline")==null? 0:map.get("Underline")));
// params.put("Strikeout",(map.get("Strikeout")==null? 0:map.get("Strikeout")));
// params.put("ScaleX",(map.get("ScaleX")==null? 100:map.get("ScaleX")));
// params.put("ScaleY",(map.get("ScaleY")==null? 100:map.get("ScaleY")));
// params.put("Spacing",(map.get("Spacing")==null? 0:map.get("Spacing")));
// params.put("Angle",(map.get("Angle")==null? 15:map.get("Angle")));
// params.put("BorderStyle",(map.get("BorderStyle")==null?"1":map.get("BorderStyle")));
// params.put("Outline",(map.get("Outline")==null? 20:map.get("Outline")));
// params.put("Shadow",(map.get("Shadow")==null? 12:map.get("Shadow")));
// params.put("Alignment",(map.get("Alignment")==null? 1:map.get("Alignment")));
// params.put("MarginL",(map.get("MarginL")==null? 100:map.get("MarginL")));
// params.put("MarginR",(map.get("MarginR")==null? 100:map.get("MarginR")));
// params.put("MarginV",(map.get("MarginV")==null? 100:map.get("MarginV")));
// subtitle.put("enabled",1);
// subtitle.put("text",speakVideo.getPaperwork());
// subtitle.put("params",params);
// param.setSubtitle_params(subtitle);
// }
// }


if (EnumVoiceFrom.FROM_MOULD.getCode().equals(voiceFrom)) {


+ 5
- 5
suimangService/src/main/java/com/iformall/sm/AiPhotoSpeakParam.java Просмотреть файл

@@ -29,7 +29,7 @@ public class AiPhotoSpeakParam {
private String img;
private Long task_id;
private String callback_url;
private Map<String,Object> subtitle_params = new HashMap<>();


public String neglectImgString() {
@@ -40,10 +40,10 @@ public class AiPhotoSpeakParam {
str.append("\"voice_style\":").append("\"").append(voice_style).append("\",");
str.append("\"gender\":").append("\"").append(gender).append("\",");
str.append("\"url\":").append("\"").append(url).append("\",");
str.append("\"img\":").append("\"").append(img).append("\",");
str.append("\"task_id\":").append("\"").append(task_id).append("\",");
str.append("\"callback_url\":").append("\"").append(callback_url).append("\",");
str.append("\"subtitle_params\":").append("\"").append(subtitle_params).append("\"}");
str.append("\"img\":").append("\"").append(img);
str.append("\"task_id\":").append("\"").append(task_id);
str.append("\"callback_url\":").append("\"").append(callback_url).append("\"}");
return str.toString();
}



Загрузка…
Отмена
Сохранить