李帅

1.修复一些bug

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