Skip to content

quxiu
quxiu
Commit d6c3f25a by 冷斌
Options

踢人

parent 3581eae3
Showing with 54 additions and 17 deletions
api/Appapi/Model/Home.php
...@@ -228,9 +228,18 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -228,9 +228,18 @@ class Model_Home extends PhalApi_Model_NotORM {
$nums=DI()->redis->zSize('user_'.$v['stream']); $nums=DI()->redis->zSize('user_'.$v['stream']);
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$image = DI()->notorm->users_live_image
->where('uid=?',$v['uid'])
->fetchOne();
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
...@@ -296,10 +305,17 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -296,10 +305,17 @@ class Model_Home extends PhalApi_Model_NotORM {
foreach($result as $k=>$v){ foreach($result as $k=>$v){
$nums=DI()->redis->zSize('user_'.$v['stream']); $nums=DI()->redis->zSize('user_'.$v['stream']);
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$image = DI()->notorm->users_live_image
->where('uid=?',$v['uid'])
->fetchOne();
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
...@@ -359,9 +375,14 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -359,9 +375,14 @@ class Model_Home extends PhalApi_Model_NotORM {
$nums=DI()->redis->zSize('user_'.$v['stream']); $nums=DI()->redis->zSize('user_'.$v['stream']);
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
...@@ -532,6 +553,7 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -532,6 +553,7 @@ class Model_Home extends PhalApi_Model_NotORM {
if (!empty($image) && $image['status'] == 1) { if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb']; $avatar = $image['thumb'];
} }
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$avatar; $v['avatar']=$avatar;
$v['avatar_thumb']=$avatar; $v['avatar_thumb']=$avatar;
...@@ -587,7 +609,7 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -587,7 +609,7 @@ class Model_Home extends PhalApi_Model_NotORM {
if (!empty($image) && $image['status'] == 1) { if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb']; $avatar = $image['thumb'];
} }
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$avatar; $v['avatar']=$avatar;
$v['avatar_thumb']=$avatar; $v['avatar_thumb']=$avatar;
...@@ -1124,7 +1146,7 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -1124,7 +1146,7 @@ class Model_Home extends PhalApi_Model_NotORM {
$configpri=getConfigPri(); $configpri=getConfigPri();
$result=DI()->notorm->users_live $result=DI()->notorm->users_live
->select("uid,title,city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway,starttime") ->select("uid,title,thumb,city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway,starttime")
->where($where) ->where($where)
->order('isrecommend desc,hotvotes desc,starttime desc') ->order('isrecommend desc,hotvotes desc,starttime desc')
->limit($start,$pnum) ->limit($start,$pnum)
...@@ -1135,9 +1157,14 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -1135,9 +1157,14 @@ class Model_Home extends PhalApi_Model_NotORM {
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
...@@ -1182,7 +1209,7 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -1182,7 +1209,7 @@ class Model_Home extends PhalApi_Model_NotORM {
} }
$last_starttime=0; $last_starttime=0;
$result=DI()->notorm->users_live $result=DI()->notorm->users_live
->select("uid,title,city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway,starttime") ->select("uid,title,thumb, city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway,starttime")
->where($where) ->where($where)
->order("starttime desc") ->order("starttime desc")
->limit($start,$pnum) ->limit($start,$pnum)
...@@ -1191,9 +1218,14 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -1191,9 +1218,14 @@ class Model_Home extends PhalApi_Model_NotORM {
$nums=DI()->redis->zSize('user_'.$v['stream']); $nums=DI()->redis->zSize('user_'.$v['stream']);
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
...@@ -1311,16 +1343,21 @@ class Model_Home extends PhalApi_Model_NotORM { ...@@ -1311,16 +1343,21 @@ class Model_Home extends PhalApi_Model_NotORM {
$where=" islive= '1' and uid={$touid} "; $where=" islive= '1' and uid={$touid} ";
$configpri=getConfigPri(); $configpri=getConfigPri();
$result=DI()->notorm->users_live $result=DI()->notorm->users_live
->select("uid,title,city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway") ->select("uid,title,thumb,city,stream,pull,thumb,isvideo,type,type_val,game_action,goodnum,anyway")
->where($where) ->where($where)
->order('isrecommend desc,hotvotes desc,starttime desc') ->order('isrecommend desc,hotvotes desc,starttime desc')
->fetchAll(); ->fetchAll();
foreach($result as $k=>$v){ foreach($result as $k=>$v){
$nums=DI()->redis->zSize('user_'.$v['stream']); $nums=DI()->redis->zSize('user_'.$v['stream']);
$v['nums']=(string)$nums; $v['nums']=(string)$nums;
$avatar = $v['thumb'];
if (!empty($image) && $image['status'] == 1) {
$avatar = $image['thumb'];
}
$avatar = get_upload_path($avatar);
$userinfo=getUserInfo($v['uid']); $userinfo=getUserInfo($v['uid']);
$v['avatar']=$userinfo['avatar']; $v['avatar']=$avatar;
$v['avatar_thumb']=$userinfo['avatar_thumb']; $v['avatar_thumb']=$avatar;
$v['user_nicename']=$userinfo['user_nicename']; $v['user_nicename']=$userinfo['user_nicename'];
$v['sex']=$userinfo['sex']; $v['sex']=$userinfo['sex'];
$v['level']=$userinfo['level']; $v['level']=$userinfo['level'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment