OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
c17da486 1 parent 5ac1641a

1.修复一些bug

Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
...@@ -222,11 +222,11 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -222,11 +222,11 @@ class AdminMakeImmerse implements ShouldQueue
222 $default = $this->adminMakeVideo->poem2->title . "\n" . $this->adminMakeVideo->poem2->author; 222 $default = $this->adminMakeVideo->poem2->title . "\n" . $this->adminMakeVideo->poem2->author;
223 $contents[] = $this->autoCenter($default,$font_size, $this->output_width); 223 $contents[] = $this->autoCenter($default,$font_size, $this->output_width);
224 foreach ($this->adminMakeVideo->poem2->verses as $item) { 224 foreach ($this->adminMakeVideo->poem2->verses as $item) {
225 - if ($item->content != '') $contents[] = $this->autoEnter($item->content, $font_size, $this->output_width); 225 + $source = " " . "\n" . $item->source;
226 + if ($item->content != '') $contents[] = $this->autoEnter($item->content, $font_size, $this->output_width) . "\n" . $this->autoCenter($source, $font_size, $this->output_width);
226 if ($item->annotate != '') $contents[] = $this->autoEnter($item->annotate, $font_size, $this->output_width); 227 if ($item->annotate != '') $contents[] = $this->autoEnter($item->annotate, $font_size, $this->output_width);
227 if ($item->spelling != '') $contents[] = $this->autoEnter($item->spelling, $font_size, $this->output_width); 228 if ($item->spelling != '') $contents[] = $this->autoEnter($item->spelling, $font_size, $this->output_width);
228 if ($item->en != '') $contents[] = $this->autoEnter($item->en, $font_size, $this->output_width); 229 if ($item->en != '') $contents[] = $this->autoEnter($item->en, $font_size, $this->output_width);
229 - if ($item->source != '') $contents[] = $this->autoEnter($item->source, $font_size, $this->output_width);
230 } 230 }
231 break; 231 break;
232 case 'weather': 232 case 'weather':
...@@ -330,7 +330,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -330,7 +330,7 @@ class AdminMakeImmerse implements ShouldQueue
330 $video_width = $video_width - 2 * $font_width; // 两侧留出空隙 330 $video_width = $video_width - 2 * $font_width; // 两侧留出空隙
331 $row_count = floor($video_width / $font_width); 331 $row_count = floor($video_width / $font_width);
332 $arr = explode("\n", $string); 332 $arr = explode("\n", $string);
333 - $title = $arr[0]; 333 + $title = $arr[0] ?? " ";
334 $author = $arr[1]; 334 $author = $arr[1];
335 335
336 $title_len = mb_strlen($title); 336 $title_len = mb_strlen($title);
......