diff --git a/app/Http/Desktop/Services/Im.php b/app/Http/Desktop/Services/Im.php
index 3e848b1d..c5ebbe32 100644
--- a/app/Http/Desktop/Services/Im.php
+++ b/app/Http/Desktop/Services/Im.php
@@ -51,14 +51,18 @@ class Im extends Service
$group = $validator->checkGroup($id);
- $groupRepo = new ImGroupRepo();
+ Gateway::$registerAddress = $this->getRegisterAddress();
- $users = $groupRepo->findUsers($group->id);
+ $userIds = Gateway::getUidListByGroup($this->getGroupName($group->id));
- if ($users->count() == 0) {
+ if (count($userIds) == 0) {
return [];
}
+ $userRepo = new ImUserRepo();
+
+ $users = $userRepo->findByIds($userIds);
+
$baseUrl = kg_cos_url();
$result = [];
@@ -211,7 +215,6 @@ class Im extends Service
'name' => $user->name,
'avatar' => $user->avatar,
],
- 'status' => $user->status == 'online' ? 'online' : 'offline',
]);
Gateway::sendToUid($friendUser->friend_id, $content);
}
diff --git a/app/Http/Desktop/Views/chapter/live.volt b/app/Http/Desktop/Views/chapter/live.volt
index 30403179..05831875 100644
--- a/app/Http/Desktop/Views/chapter/live.volt
+++ b/app/Http/Desktop/Views/chapter/live.volt
@@ -71,10 +71,9 @@
{% block include_js %}
-
-
+ {{ js_include('https://imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.3.js', false) }}
{{ js_include('desktop/js/chapter.live.player.js') }}
- {{ js_include('desktop/js/chapter.live.im.js') }}
+ {{ js_include('desktop/js/chapter.live.chat.js') }}
{{ js_include('desktop/js/chapter.action.js') }}
{{ js_include('desktop/js/course.share.js') }}
diff --git a/app/Http/Desktop/Views/chapter/vod.volt b/app/Http/Desktop/Views/chapter/vod.volt
index d837c02f..706ef1a8 100644
--- a/app/Http/Desktop/Views/chapter/vod.volt
+++ b/app/Http/Desktop/Views/chapter/vod.volt
@@ -56,8 +56,7 @@
{% block include_js %}
-
-
+ {{ js_include('https://imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.3.js', false) }}
{{ js_include('desktop/js/course.share.js') }}
{{ js_include('desktop/js/chapter.action.js') }}
{{ js_include('desktop/js/chapter.vod.player.js') }}
diff --git a/app/Http/Desktop/Views/search/user.volt b/app/Http/Desktop/Views/search/user.volt
index 6de1ec3e..14b269de 100644
--- a/app/Http/Desktop/Views/search/user.volt
+++ b/app/Http/Desktop/Views/search/user.volt
@@ -4,7 +4,7 @@
{% elseif gender == 2 %}
女
{% else %}
- 保密
+ 密
{% endif %}
{%- endmacro %}
diff --git a/public/static/desktop/js/chapter.live.im.js b/public/static/desktop/js/chapter.live.chat.js
similarity index 95%
rename from public/static/desktop/js/chapter.live.im.js
rename to public/static/desktop/js/chapter.live.chat.js
index 834975cc..625dfc52 100644
--- a/public/static/desktop/js/chapter.live.im.js
+++ b/public/static/desktop/js/chapter.live.chat.js
@@ -11,6 +11,9 @@ layui.use(['jquery', 'form', 'helper'], function () {
socket.onopen = function () {
console.log('socket connect success');
+ setInterval(function () {
+ socket.send('ping');
+ }, 30000);
};
socket.onclose = function () {
@@ -24,9 +27,7 @@ layui.use(['jquery', 'form', 'helper'], function () {
socket.onmessage = function (e) {
var data = JSON.parse(e.data);
console.log(data);
- if (data.type === 'ping') {
- socket.send('pong...');
- } else if (data.type === 'bind_user') {
+ if (data.type === 'bind_user') {
bindUser(data.client_id);
} else if (data.type === 'new_message') {
showNewMessage(data);
diff --git a/public/static/desktop/js/im.js b/public/static/desktop/js/im.js
index 16cf1f06..dfafbd71 100644
--- a/public/static/desktop/js/im.js
+++ b/public/static/desktop/js/im.js
@@ -6,6 +6,9 @@ layui.use(['jquery', 'layim'], function () {
socket.onopen = function () {
console.log('socket connect success');
+ setInterval(function () {
+ socket.send('ping');
+ }, 30000);
};
socket.onclose = function () {
@@ -19,9 +22,7 @@ layui.use(['jquery', 'layim'], function () {
socket.onmessage = function (e) {
var data = JSON.parse(e.data);
console.log(data);
- if (data.type === 'ping') {
- socket.send('pong...');
- } else if (data.type === 'bind_user') {
+ if (data.type === 'bind_user') {
bindUser(data);
refreshMessageBox();
} else if (data.type === 'new_group_user') {