|
@@ -305,7 +305,7 @@ class Party extends Common
|
|
|
$this->error('创建房间失败');
|
|
|
}
|
|
|
|
|
|
- //[环信]初始化房间
|
|
|
+ //[环信]初始化房间,初始化自定义属性
|
|
|
$matedata = [
|
|
|
'seatnum'=> $seatnum,//麦位数量
|
|
|
'waitsing_list' => json_encode([]),//已点歌曲列表
|
|
@@ -315,6 +315,7 @@ class Party extends Common
|
|
|
'room_type' => $room_type,//房间类型
|
|
|
'online_user_num' => 0,//当前房间在线的人
|
|
|
'wealth_top3_userlist' => json_encode([]),//财富榜前3个人列表
|
|
|
+ 'background' => '', //房间背景
|
|
|
];
|
|
|
$rs = $easemob->room_setRoomCustomAttributeForced($easemob_room_id,$this->auth->id,$matedata);
|
|
|
|
|
@@ -1151,10 +1152,10 @@ class Party extends Common
|
|
|
$party_pass = input('party_pass'); // 派对密码
|
|
|
//$party_type = input('party_type'); // 使用场景
|
|
|
$is_screen = input('is_screen'); // 是否关闭公屏:1=是,0=否
|
|
|
- $on_model = input('on_model'); // 上麦模式:1=自由模式,2=麦序模式
|
|
|
+ //$on_model = input('on_model'); // 上麦模式:1=自由模式,2=麦序模式
|
|
|
$room_type = input('room_type',1); // 房间类型:1=派对,2=直播
|
|
|
$background = input('background'); // 派对背景
|
|
|
- if (!$party_id || (!$party_name && !$party_logo && !$party_pass && !$party_type && !$is_screen && !$on_model && !$background)) {
|
|
|
+ if (!$party_id || (!$party_name && !$party_logo && !$party_pass && !$is_screen && !$background)) {
|
|
|
$this->error(__('Invalid parameters'));
|
|
|
}
|
|
|
if($party_pass && strlen($party_pass) != 4) {
|
|
@@ -1167,7 +1168,7 @@ class Party extends Common
|
|
|
$data["party_pass"] = $party_pass;
|
|
|
//$party_type && $data["party_type"] = $party_type;
|
|
|
$is_screen && $data["is_screen"] = $is_screen;
|
|
|
- $on_model && $data["on_model"] = $on_model;
|
|
|
+ //$on_model && $data["on_model"] = $on_model;
|
|
|
$background && $data["background"] = $background;
|
|
|
$where = [];
|
|
|
$where["id"] = $party_id;
|
|
@@ -2480,7 +2481,7 @@ class Party extends Common
|
|
|
|
|
|
|
|
|
|
|
|
- //轮询所有房间,挨个赋值新的初始化自定义属性
|
|
|
+ //轮询所有房间,挨个初始化自定义属性
|
|
|
public function room_task(){
|
|
|
exit;
|
|
|
$ids = Db::name('party')->select();
|
|
@@ -2498,6 +2499,7 @@ class Party extends Common
|
|
|
'room_type' => $party['room_type'],//房间类型
|
|
|
'online_user_num' => json_encode($online_user_num),//当前房间在线的人
|
|
|
'wealth_top3_userlist' => json_encode([]),//财富榜前3个人列表
|
|
|
+ 'background' => '',//背景图
|
|
|
];
|
|
|
$rs = $easemob->room_setRoomCustomAttributeForced($party['easemob_room_id'],$party['user_id'],$matedata);
|
|
|
|
|
@@ -2534,7 +2536,7 @@ class Party extends Common
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //显示聊天室所有自定义信息,自用工具
|
|
|
+ //显示聊天室所有自定义属性,自用工具
|
|
|
public function test_party_attr(){
|
|
|
$party_id = input('party_id',0);
|
|
|
$party_info = Db::name('party')->where('id',$party_id)->find();
|
|
@@ -2550,6 +2552,7 @@ class Party extends Common
|
|
|
'room_type',
|
|
|
'online_user_num',
|
|
|
'wealth_top3_userlist',
|
|
|
+ 'background',
|
|
|
];
|
|
|
for($i=1;$i<=$party_info['seatnum'];$i++){
|
|
|
$field[] = 'seat'.$i;
|