用户列表

web/PhalApi/Appapi/Api/Live.php

@@ -784,7 +784,7 @@ class Api_Live extends PhalApi_Api {
         }
 		
         /* 用户列表 */
-        $userlists=$this->getUserList($liveuid,$stream);
+        $userlists=$this->getUserList($liveuid,$liveuid);
 		$configpri=getConfigPri();
         
 
@@ -886,7 +886,7 @@ class Api_Live extends PhalApi_Api {
 		$list=array();
 
 		$uidlist=DI()->redis -> zRevRange('user_'.$stream,$start,$pnum,true);
-		
+
 		foreach($uidlist as $k=>$v){
 			$userinfo=getUserInfo($k);
 			$info=explode(".",$v);
@@ -896,19 +896,17 @@ class Api_Live extends PhalApi_Api {
 			
 			$list[]=$userinfo;
 		}
-            
 
-        
-        if(!$list){
-            $list=array();
-        }
+//        if(!$list){
+//            $list=array();
+//        }
         
 		$nums=DI()->redis->zCard('user_'.$stream);
         if(!$nums){
             $nums=0;
         }
 
-		$rs['userlist']=$list;
+//		$rs['userlist']=$list;
 		$rs['nums']=(string)$nums;
 
 		/* 主播信息 */

web/app/admin/controller/LiveingController.php

@@ -214,7 +214,7 @@ class LiveingController extends AdminbaseController {
                 $data['push'] = 'rtmp://push.umotool.com/live/'. $uid . '?' .$params['PushArgs'];
 
                 $pull_urls = $this->getPullUrl( 'live', $uid, $end_timestamp );
-                $data['pull'] = $pull_urls;
+                $data['pull'] = $pull_urls[1];
                 $data['TaskId'] = $resp->TaskId;
 
                 echo json_encode( $data , JSON_UNESCAPED_UNICODE );