李帅

1.修复一些bug

...@@ -238,7 +238,6 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -238,7 +238,6 @@ class AdminMakeImmerse implements ShouldQueue
238 ]; 238 ];
239 } 239 }
240 } 240 }
241 -// if ($item->content != '') $contents[] = $this->autoEnter($item->content, $font_size, $this->output_width) . "\n" . $this->autoCenter($source, $font_size, $this->output_width);
242 if ($item->annotate){ 241 if ($item->annotate){
243 $contents[] = [ 242 $contents[] = [
244 "text" => $this->autoEnter($item->annotate, $font_size, $this->output_width), 243 "text" => $this->autoEnter($item->annotate, $font_size, $this->output_width),
...@@ -283,6 +282,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -283,6 +282,7 @@ class AdminMakeImmerse implements ShouldQueue
283 $round = round($this->media_info['format']['duration'] / count($contents),1); 282 $round = round($this->media_info['format']['duration'] / count($contents),1);
284 if ($round < 1) $round = 1; 283 if ($round < 1) $round = 1;
285 $sub_text = ''; 284 $sub_text = '';
285 + print_r($contents);
286 foreach ($contents as $key => $content){ 286 foreach ($contents as $key => $content){
287 $DS = $key * $round; 287 $DS = $key * $round;
288 $DE = $DS + $round; 288 $DE = $DS + $round;
...@@ -403,7 +403,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -403,7 +403,7 @@ class AdminMakeImmerse implements ShouldQueue
403 { 403 {
404 $video_width = $video_width - 2 * $font_width; // 两侧留出空隙 404 $video_width = $video_width - 2 * $font_width; // 两侧留出空隙
405 $row_count = floor($video_width / $font_width); 405 $row_count = floor($video_width / $font_width);
406 - echo $row_count; 406 + echo $string . "#" . $row_count . PHP_EOL;
407 $str_len = mb_strlen($string); 407 $str_len = mb_strlen($string);
408 if ($str_len > $row_count) { 408 if ($str_len > $row_count) {
409 $tmp = array_chunk( 409 $tmp = array_chunk(
......