edit

video/database/live.php

@@ -40,7 +40,10 @@ $cate = function()
 
 $stream = function()
 {
-	$array = array();
+	$array = array
+	(
+		-1 => '选择直播流',
+	);
 	$info = Dever::db('live/stream')->state();
 	if($info)
 	{
@@ -183,7 +186,19 @@ return array
 			'match' 	=> 'is_numeric',
 			'update'	=> 'select',
 			'option'	=> $stream,
-			'list'		=> true,
+			//'list'		=> true,
+			'control'	=> 'stream_id',
+		),
+
+		'stream_link'		=> array
+		(
+			'type'      => 'varchar-800',
+            'name'      => '直播地址-输入直播地址后，直播流选择将失效',
+            'default'   => '',
+            'desc'      => '直播地址',
+            'match'     => 'option',
+            'update'	=> 'textarea',
+            'show'		=> 'stream_id=-1'
 		),
 
 		'sdate'     => array
@@ -217,7 +232,7 @@ return array
             'default'   => '',
             'desc'      => '直播回放地址',
             'match'     => 'option',
-            //'update'    => 'text',
+            'update'    => 'textarea',
             //'list'      => true,
         ),
 

video/lib/Live.php

@@ -23,12 +23,22 @@ class Live
         $data['status'] = 1;
         $data['stream'] = '';
         if ($data['sdate'] <= $time && $time <= $data['edate']) {
-            $stream = Dever::db('live/stream')->one($data['stream_id']);
-            $data['stream'] = $stream['live'];
-            $data['stream_rtmp'] = $stream['url_rtmp'];
-            $data['stream_hls'] = $stream['url_hls'];
-            $data['stream_hdl'] = $stream['url_hdl'];
-            $data['stream_pic'] = $stream['url_pic'];
+
+            if ($data['stream_id'] && $data['stream_id'] > 0) {
+                $stream = Dever::db('live/stream')->one($data['stream_id']);
+                $data['stream'] = $stream['live'];
+                $data['stream_rtmp'] = $stream['url_rtmp'];
+                $data['stream_hls'] = $stream['url_hls'];
+                $data['stream_hdl'] = $stream['url_hdl'];
+                $data['stream_pic'] = $stream['url_pic'];
+            } elseif ($data['stream_link']) {
+                $data['stream'] = $data['stream_link'];
+                $data['stream_rtmp'] = $data['stream_link'];
+                $data['stream_hls'] = $data['stream_link'];
+                $data['stream_hdl'] = $data['stream_link'];
+                $data['stream_pic'] = $data['stream_link'];
+            }
+            
             $data['status'] = 2;
         } elseif ($data['sdate'] > $time) {
             $data['status'] = 1;