OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
8ef270d4 1 parent 6e958748

1.调整一些字号大小

Inline Side-by-side
Showing 3 changed files with 10 additions and 10 deletions
...@@ -33,7 +33,7 @@ class ImmerseController extends AdminController ...@@ -33,7 +33,7 @@ class ImmerseController extends AdminController
33 $grid->column('content','有感'); 33 $grid->column('content','有感');
34 $grid->column('weather','天气'); 34 $grid->column('weather','天气');
35 $grid->column('huangli','黄历'); 35 $grid->column('huangli','黄历');
36 - $grid->column('location','此地'); 36 + $grid->column('location','此地')->width('14%');
37 $grid->column('url')->display(function ($url){ 37 $grid->column('url')->display(function ($url){
38 if (Str::of($url)->contains('.mp4')) 38 if (Str::of($url)->contains('.mp4'))
39 return "<a target='_blank' href='". $url ."'>查看</a>"; 39 return "<a target='_blank' href='". $url ."'>查看</a>";
......
...@@ -211,14 +211,14 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -211,14 +211,14 @@ class AdminMakeImmerse implements ShouldQueue
211 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 211 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
212 file_put_contents($text_file, 'Parlando.ink'); 212 file_put_contents($text_file, 'Parlando.ink');
213 $font_file = $this->getAbsolutePath("files/d7300fd8be7ff27fb0a11d1afe717374.otf"); 213 $font_file = $this->getAbsolutePath("files/d7300fd8be7ff27fb0a11d1afe717374.otf");
214 - $font_size = $this->calcFontSize(22); 214 + $font_size = $this->calcFontSize(12);
215 $drawtext .= 'drawtext="'. 215 $drawtext .= 'drawtext="'.
216 'fontfile=' . escapeshellarg($font_file) . ':' . 216 'fontfile=' . escapeshellarg($font_file) . ':' .
217 'textfile=' . escapeshellarg($text_file) . ':' . 217 'textfile=' . escapeshellarg($text_file) . ':' .
218 'fontsize=' . $font_size . ':' . 218 'fontsize=' . $font_size . ':' .
219 'fontcolor=white@0.8:' . 219 'fontcolor=white@0.8:' .
220 - 'x=' . escapeshellarg('w-text_w') . ':' . 220 + 'x=' . escapeshellarg('w-text_w-20') . ':' .
221 - 'y=' . escapeshellarg('h-text_h-1') . ':' . 221 + 'y=' . escapeshellarg('h-text_h-20') . ':' .
222 '", '; 222 '", ';
223 223
224 foreach ($components as $component) { 224 foreach ($components as $component) {
...@@ -309,7 +309,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -309,7 +309,7 @@ class AdminMakeImmerse implements ShouldQueue
309 $sub_text .= 'drawtext="'. 309 $sub_text .= 'drawtext="'.
310 'fontfile=' . escapeshellarg($font_file) . ':' . 310 'fontfile=' . escapeshellarg($font_file) . ':' .
311 'textfile=' . escapeshellarg($text_file) . ':' . 311 'textfile=' . escapeshellarg($text_file) . ':' .
312 - 'fontsize=' . $font_size . ':' . 312 + 'fontsize=' . $font_size * 1.5 . ':' .
313 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 313 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
314 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 314 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
315 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1]) . ':' . 315 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1]) . ':' .
...@@ -320,7 +320,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -320,7 +320,7 @@ class AdminMakeImmerse implements ShouldQueue
320 $sub_text .= 'drawtext="'. 320 $sub_text .= 'drawtext="'.
321 'fontfile=' . escapeshellarg($font_file) . ':' . 321 'fontfile=' . escapeshellarg($font_file) . ':' .
322 'textfile=' . escapeshellarg($text_file) . ':' . 322 'textfile=' . escapeshellarg($text_file) . ':' .
323 - 'fontsize=' . $font_size / 2 . ':' . 323 + 'fontsize=' . $font_size . ':' .
324 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 324 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
325 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 325 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
326 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' . 326 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' .
...@@ -346,7 +346,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -346,7 +346,7 @@ class AdminMakeImmerse implements ShouldQueue
346 $sub_text .= 'drawtext="'. 346 $sub_text .= 'drawtext="'.
347 'fontfile=' . escapeshellarg($font_file) . ':' . 347 'fontfile=' . escapeshellarg($font_file) . ':' .
348 'textfile=' . escapeshellarg($text_file) . ':' . 348 'textfile=' . escapeshellarg($text_file) . ':' .
349 - 'fontsize=' . $font_size / 2 . ':' . 349 + 'fontsize=' . $font_size . ':' .
350 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 350 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
351 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 351 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
352 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] . '+' . $font_size) . ':' . 352 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] . '+' . $font_size) . ':' .
......
...@@ -589,7 +589,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -589,7 +589,7 @@ class UserMakeImmerse implements ShouldQueue
589 $sub_text .= 'drawtext="'. 589 $sub_text .= 'drawtext="'.
590 'fontfile=' . escapeshellarg($font_file) . ':' . 590 'fontfile=' . escapeshellarg($font_file) . ':' .
591 'textfile=' . escapeshellarg($text_file) . ':' . 591 'textfile=' . escapeshellarg($text_file) . ':' .
592 - 'fontsize=' . $font_size . ':' . 592 + 'fontsize=' . $font_size * 1.5 . ':' .
593 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 593 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
594 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 594 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
595 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1]) . ':' . 595 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1]) . ':' .
...@@ -600,7 +600,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -600,7 +600,7 @@ class UserMakeImmerse implements ShouldQueue
600 $sub_text .= 'drawtext="'. 600 $sub_text .= 'drawtext="'.
601 'fontfile=' . escapeshellarg($font_file) . ':' . 601 'fontfile=' . escapeshellarg($font_file) . ':' .
602 'textfile=' . escapeshellarg($text_file) . ':' . 602 'textfile=' . escapeshellarg($text_file) . ':' .
603 - 'fontsize=' . $font_size / 2 . ':' . 603 + 'fontsize=' . $font_size . ':' .
604 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 604 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
605 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 605 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
606 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' . 606 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' .
...@@ -626,7 +626,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -626,7 +626,7 @@ class UserMakeImmerse implements ShouldQueue
626 $sub_text .= 'drawtext="'. 626 $sub_text .= 'drawtext="'.
627 'fontfile=' . escapeshellarg($font_file) . ':' . 627 'fontfile=' . escapeshellarg($font_file) . ':' .
628 'textfile=' . escapeshellarg($text_file) . ':' . 628 'textfile=' . escapeshellarg($text_file) . ':' .
629 - 'fontsize=' . $font_size / 2 . ':' . 629 + 'fontsize=' . $font_size . ':' .
630 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 630 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
631 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' . 631 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][0]) . ':' .
632 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] . '+' . $font_size) . ':' . 632 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG[$component->position][1] . '+' . $font_size) . ':' .
......