李帅

1.修复一些bug

...@@ -206,6 +206,21 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -206,6 +206,21 @@ class AdminMakeImmerse implements ShouldQueue
206 $components = $this->adminMakeVideo->temp->components; 206 $components = $this->adminMakeVideo->temp->components;
207 207
208 $drawtext = ''; 208 $drawtext = '';
209 +
210 + // 底部加入文字水印
211 + $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
212 + file_put_contents($text_file, 'Parlando.ink');
213 + $font_file = $this->getAbsolutePath("files/d7300fd8be7ff27fb0a11d1afe717374.otf");
214 + $font_size = $this->calcFontSize(22);
215 + $drawtext .= 'drawtext="'.
216 + 'fontfile=' . escapeshellarg($font_file) . ':' .
217 + 'textfile=' . escapeshellarg($text_file) . ':' .
218 + 'fontsize=' . $font_size . ':' .
219 + 'fontcolor=white@0.8:' .
220 + 'x=' . escapeshellarg('w-text_w') . ':' .
221 + 'y=' . escapeshellarg('h-text_h-1') . ':' .
222 + '", ';
223 +
209 foreach ($components as $component) { 224 foreach ($components as $component) {
210 $text_color = $component->text_color ?? 'white'; 225 $text_color = $component->text_color ?? 'white';
211 $text_bg_color = $component->text_bg_color ?? '0xd0cdcc'; 226 $text_bg_color = $component->text_bg_color ?? '0xd0cdcc';
......