diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index 1376ff67..4507c78e 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -28,16 +28,12 @@ class CourseController extends Controller */ public function listAction() { - $_REQUEST['limit'] = 12; - - $service = new CourseListService(); - - $pager = $service->handle(); - - $pager->items = kg_array_object($pager->items); - $service = new CourseQueryService(); + $params = $service->getQueryParams(); + + $pagerUrl = $this->url->get(['for' => 'web.course.pager'], $params); + $topCategories = $service->handleTopCategories(); $subCategories = $service->handleSubCategories(); @@ -45,11 +41,27 @@ class CourseController extends Controller $levels = $service->handleLevels(); $sorts = $service->handleSorts(); + $this->view->setVar('pager_url', $pagerUrl); $this->view->setVar('top_categories', $topCategories); $this->view->setVar('sub_categories', $subCategories); $this->view->setVar('models', $models); $this->view->setVar('levels', $levels); $this->view->setVar('sorts', $sorts); + } + + /** + * @Get("/pager", name="web.course.pager") + */ + public function pagerAction() + { + $service = new CourseListService(); + + $pager = $service->handle(); + $pager->items = kg_array_object($pager->items); + $pager->target = 'course-list'; + + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/list_pager'); $this->view->setVar('pager', $pager); } diff --git a/app/Http/Web/Controllers/LiveController.php b/app/Http/Web/Controllers/LiveController.php index b4ab59ed..afa219c9 100644 --- a/app/Http/Web/Controllers/LiveController.php +++ b/app/Http/Web/Controllers/LiveController.php @@ -9,19 +9,11 @@ use Phalcon\Mvc\View; /** * @RoutePrefix("/live") */ -class LiveController extends \Phalcon\Mvc\Controller +class LiveController extends Controller { use ResponseTrait; - /** - * @Get("/{id:[0-9]+}/members", name="web.live.members") - */ - public function membersAction($id) - { - return $this->jsonSuccess(); - } - /** * @Get("/{id:[0-9]+}/stats", name="web.live.stats") */ @@ -48,14 +40,6 @@ class LiveController extends \Phalcon\Mvc\Controller return $this->jsonSuccess(); } - /** - * @Post("/{id:[0-9]+}/unbind", name="web.live.unbind") - */ - public function unbindAction($id) - { - - } - /** * @Post("/{id:[0-9]+}/message", name="web.live.message") */ diff --git a/app/Http/Web/Services/CourseQuery.php b/app/Http/Web/Services/CourseQuery.php index 92a65247..b0b4e34f 100644 --- a/app/Http/Web/Services/CourseQuery.php +++ b/app/Http/Web/Services/CourseQuery.php @@ -210,7 +210,7 @@ class CourseQuery extends Service return $result; } - protected function getQueryParams() + public function getQueryParams() { $query = $this->request->getQuery(); diff --git a/app/Http/Web/Services/Im.php b/app/Http/Web/Services/Im.php index d1ab3807..826e5c0c 100644 --- a/app/Http/Web/Services/Im.php +++ b/app/Http/Web/Services/Im.php @@ -15,6 +15,7 @@ use App\Repos\ImGroup as ImGroupRepo; use App\Repos\ImGroupMessage as ImGroupMessageRepo; use App\Repos\ImSystemMessage as ImSystemMessageRepo; use App\Repos\ImUser as ImUserRepo; +use App\Repos\User as UserRepo; use App\Validators\ImFriendUser as ImFriendUserValidator; use App\Validators\ImGroup as ImGroupValidator; use App\Validators\ImGroupUser as ImGroupUserValidator; @@ -24,7 +25,7 @@ use GatewayClient\Gateway; /** * 警告： - * user对象有更新操作会导致afterFetch()中的设置失效， + * 对象有更新操作会导致afterFetch()中的设置失效， * 有相关依赖的要重新调用一次afterFetch() */ class Im extends Service @@ -34,20 +35,20 @@ class Im extends Service public function init() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); - $imUser = $this->getImUser($user->id); + $user = $this->getImUser($loginUser->id); $mine = [ - 'id' => $imUser->id, - 'username' => $imUser->name, - 'avatar' => $imUser->avatar, - 'sign' => $imUser->sign, - 'status' => $imUser->status, + 'id' => $user->id, + 'username' => $user->name, + 'avatar' => $user->avatar, + 'sign' => $user->sign, + 'status' => $user->status, ]; - $friend = $this->handleFriendList($imUser); - $group = $this->handleGroupList($imUser); + $friend = $this->handleFriendList($user); + $group = $this->handleGroupList($user); return [ 'mine' => $mine, @@ -68,7 +69,7 @@ class Im extends Service $page = $pagerQuery->getPage(); $limit = $pagerQuery->getLimit(); - $userRepo = new ImUserRepo(); + $userRepo = new UserRepo(); $pager = $userRepo->paginate($params, $sort, $page, $limit); @@ -293,9 +294,9 @@ class Im extends Service public function bindUser() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); - $imUser = $this->getImUser($user->id); + $user = $this->getImUser($loginUser->id); $clientId = $this->request->getPost('client_id'); @@ -313,7 +314,7 @@ class Im extends Service } } - $this->pushOnlineTips($imUser); + $this->pushOnlineTips($user); } public function sendMessage() @@ -434,9 +435,9 @@ class Im extends Service public function updateStatus() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); - $imUser = $this->getImUser($user->id); + $user = $this->getImUser($loginUser->id); $status = $this->request->getPost('status'); @@ -444,16 +445,16 @@ class Im extends Service $validator->checkSign($status); - $imUser->update(['status' => $status]); + $user->update(['status' => $status]); - $this->pushOnlineTips($imUser); + $this->pushOnlineTips($user); } public function updateSignature() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); - $imUser = $this->getImUser($user->id); + $user = $this->getImUser($loginUser->id); $sign = $this->request->getPost('sign'); @@ -461,16 +462,16 @@ class Im extends Service $sign = $validator->checkSign($sign); - $imUser->update(['sign' => $sign]); + $user->update(['sign' => $sign]); - return $imUser; + return $user; } public function updateSkin() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); - $imUser = $this->getImUser($user->id); + $user = $this->getImUser($loginUser->id); $skin = $this->request->getPost('skin'); @@ -478,9 +479,9 @@ class Im extends Service $skin = $validator->checkSkin($skin); - $imUser->update(['skin' => $skin]); + $user->update(['skin' => $skin]); - return $imUser; + return $user; } protected function pushOnlineTips(ImUserModel $user) @@ -503,9 +504,9 @@ class Im extends Service $this->persistent->online_push_time = time(); - $imUserRepo = new ImUserRepo(); + $userRepo = new ImUserRepo(); - $friendUsers = $imUserRepo->findImFriendUsers($user->id); + $friendUsers = $userRepo->findImFriendUsers($user->id); if ($friendUsers->count() == 0) { return; diff --git a/app/Http/Web/Services/ImFriendTrait.php b/app/Http/Web/Services/ImFriendTrait.php index 6a70533a..3ceb4bc9 100644 --- a/app/Http/Web/Services/ImFriendTrait.php +++ b/app/Http/Web/Services/ImFriendTrait.php @@ -5,10 +5,9 @@ namespace App\Http\Web\Services; use App\Models\ImFriendGroup as ImFriendGroupModel; use App\Models\ImFriendUser as ImFriendUserModel; use App\Models\ImSystemMessage as ImSystemMessageModel; -use App\Models\User as UserModel; +use App\Models\ImUser as ImUserModel; use App\Repos\ImFriendUser as ImFriendUserRepo; -use App\Repos\ImSystemMessage as ImSystemMessageRepo; -use App\Repos\User as UserRepo; +use App\Repos\ImUser as ImUserRepo; use App\Validators\ImFriendUser as ImFriendUserValidator; use App\Validators\ImMessage as ImMessageValidator; use GatewayClient\Gateway; @@ -18,9 +17,11 @@ Trait ImFriendTrait public function applyFriend() { - $post = $this->request->getPost(); + $loginUser = $this->getLoginUser(); - $user = $this->getLoginUser(); + $user = $this->getImUser($loginUser->id); + + $post = $this->request->getPost(); $validator = new ImFriendUserValidator(); @@ -37,7 +38,9 @@ Trait ImFriendTrait public function acceptFriend() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); + + $user = $this->getImUser($loginUser->id); $messageId = $this->request->getPost('message_id'); $groupId = $this->request->getPost('group_id'); @@ -54,9 +57,7 @@ Trait ImFriendTrait return; } - $userRepo = new UserRepo(); - - $sender = $userRepo->findById($message->sender_id); + $sender = $this->getImUser($message->sender_id); $friendUserRepo = new ImFriendUserRepo(); @@ -85,7 +86,9 @@ Trait ImFriendTrait } $itemInfo = $message->item_info; + $itemInfo['status'] = ImSystemMessageModel::REQUEST_ACCEPTED; + $message->update(['item_info' => $itemInfo]); $this->handleAcceptFriendNotice($user, $sender, $message); @@ -93,7 +96,9 @@ Trait ImFriendTrait public function refuseFriend() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); + + $user = $this->getImUser($loginUser->id); $messageId = $this->request->getPost('message_id'); @@ -106,19 +111,19 @@ Trait ImFriendTrait } $itemInfo = $message->item_info; + $itemInfo['status'] = ImSystemMessageModel::REQUEST_REFUSED; + $message->update(['item_info' => $itemInfo]); - $userRepo = new UserRepo(); - - $sender = $userRepo->findById($message->sender_id); + $sender = $this->getImUser($message->sender_id); $this->handleRefuseFriendNotice($user, $sender); } - protected function handleApplyFriendNotice(UserModel $sender, UserModel $receiver, ImFriendGroupModel $group, $remark) + protected function handleApplyFriendNotice(ImUserModel $sender, ImUserModel $receiver, ImFriendGroupModel $group, $remark) { - $userRepo = new UserRepo(); + $userRepo = new ImUserRepo(); $itemType = ImSystemMessageModel::TYPE_FRIEND_REQUEST; @@ -163,7 +168,7 @@ Trait ImFriendTrait } } - protected function handleAcceptFriendNotice(UserModel $sender, UserModel $receiver, ImSystemMessageModel $applyMessage) + protected function handleAcceptFriendNotice(ImUserModel $sender, ImUserModel $receiver, ImSystemMessageModel $applyMessage) { $sysMsgModel = new ImSystemMessageModel(); @@ -189,9 +194,12 @@ Trait ImFriendTrait /** * 上层操作更新了item_info，类型发生了变化，故重新获取 */ - $messageRepo = new ImSystemMessageRepo(); - $message = $messageRepo->findById($applyMessage->id); - $itemInfo = $message->item_info; + $applyMessage->afterFetch(); + + /** + * @var array $itemInfo + */ + $itemInfo = $applyMessage->item_info; $content = kg_json_encode([ 'type' => 'friend_accepted', @@ -210,7 +218,7 @@ Trait ImFriendTrait } } - protected function handleRefuseFriendNotice(UserModel $sender, UserModel $receiver) + protected function handleRefuseFriendNotice(ImUserModel $sender, ImUserModel $receiver) { $sysMsgModel = new ImSystemMessageModel(); diff --git a/app/Http/Web/Services/ImGroupTrait.php b/app/Http/Web/Services/ImGroupTrait.php index a1b3fded..045024db 100644 --- a/app/Http/Web/Services/ImGroupTrait.php +++ b/app/Http/Web/Services/ImGroupTrait.php @@ -5,10 +5,10 @@ namespace App\Http\Web\Services; use App\Models\ImGroup as ImGroupModel; use App\Models\ImGroupUser as ImGroupUserModel; use App\Models\ImSystemMessage as ImSystemMessageModel; -use App\Models\User as UserModel; +use App\Models\ImUser as ImUserModel; use App\Repos\ImGroup as ImGroupRepo; use App\Repos\ImGroupUser as ImGroupUserRepo; -use App\Repos\User as UserRepo; +use App\Repos\ImUser as ImUserRepo; use App\Validators\ImGroup as ImGroupValidator; use App\Validators\ImGroupUser as ImGroupUserValidator; use App\Validators\ImMessage as ImMessageValidator; @@ -19,9 +19,11 @@ Trait ImGroupTrait public function applyGroup() { - $post = $this->request->getPost(); + $loginUser = $this->getLoginUser(); - $user = $this->getLoginUser(); + $user = $this->getImUser($loginUser->id); + + $post = $this->request->getPost(); $validator = new ImGroupUserValidator(); @@ -36,7 +38,9 @@ Trait ImGroupTrait public function acceptGroup() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); + + $user = $this->getImUser($loginUser->id); $messageId = $this->request->getPost('message_id'); @@ -56,9 +60,7 @@ Trait ImGroupTrait $validator->checkOwner($user->id, $group->user_id); - $userRepo = new UserRepo(); - - $applicant = $userRepo->findById($message->sender_id); + $applicant = $this->getImUser($message->sender_id); $groupUserRepo = new ImGroupUserRepo(); @@ -73,7 +75,9 @@ Trait ImGroupTrait } $itemInfo = $message->item_info; + $itemInfo['status'] = ImSystemMessageModel::REQUEST_ACCEPTED; + $message->update(['item_info' => $itemInfo]); $this->handleAcceptGroupNotice($user, $applicant, $group); @@ -83,7 +87,9 @@ Trait ImGroupTrait public function refuseGroup() { - $user = $this->getLoginUser(); + $loginUser = $this->getLoginUser(); + + $user = $this->getImUser($loginUser->id); $messageId = $this->request->getPost('message_id'); @@ -104,19 +110,19 @@ Trait ImGroupTrait $validator->checkOwner($user->id, $group->user_id); $itemInfo = $message->item_info; + $itemInfo['status'] = ImSystemMessageModel::REQUEST_REFUSED; + $message->update(['item_info' => $itemInfo]); - $userRepo = new UserRepo(); - - $sender = $userRepo->findById($message->sender_id); + $sender = $this->getImUser($message->sender_id); $this->handleRefuseGroupNotice($user, $sender); } - protected function handleApplyGroupNotice(UserModel $sender, ImGroupModel $group, $remark) + protected function handleApplyGroupNotice(ImUserModel $sender, ImGroupModel $group, $remark) { - $userRepo = new UserRepo(); + $userRepo = new ImUserRepo(); $receiver = $userRepo->findById($group->user_id); @@ -163,7 +169,7 @@ Trait ImGroupTrait } } - protected function handleAcceptGroupNotice(UserModel $sender, UserModel $receiver, ImGroupModel $group) + protected function handleAcceptGroupNotice(ImUserModel $sender, ImUserModel $receiver, ImGroupModel $group) { $sysMsgModel = new ImSystemMessageModel(); @@ -199,7 +205,7 @@ Trait ImGroupTrait } } - protected function handleRefuseGroupNotice(UserModel $sender, UserModel $receiver) + protected function handleRefuseGroupNotice(ImUserModel $sender, ImUserModel $receiver) { $sysMsgModel = new ImSystemMessageModel(); @@ -224,7 +230,7 @@ Trait ImGroupTrait } } - protected function handleNewGroupUserNotice(UserModel $newUser, ImGroupModel $group) + protected function handleNewGroupUserNotice(ImUserModel $newUser, ImGroupModel $group) { $groupRepo = new ImGroupRepo(); diff --git a/app/Http/Web/Services/Live.php b/app/Http/Web/Services/Live.php index c6b98007..061e9abe 100644 --- a/app/Http/Web/Services/Live.php +++ b/app/Http/Web/Services/Live.php @@ -15,7 +15,7 @@ class Live extends Service { $chapter = $this->checkChapterCache($id); - Gateway::$registerAddress = '127.0.0.1:1238'; + Gateway::$registerAddress = $this->getRegisterAddress(); $groupName = $this->getGroupName($chapter->id); @@ -44,7 +44,7 @@ class Live extends Service $groupName = $this->getGroupName($chapter->id); - Gateway::$registerAddress = '127.0.0.1:1238'; + Gateway::$registerAddress = $this->getRegisterAddress(); if ($user->id > 0) { Gateway::bindUid($clientId, $user->id); @@ -59,36 +59,21 @@ class Live extends Service $user = $this->getLoginUser(); - $from = $this->request->getPost('from'); - $to = $this->request->getPost('to'); - - Gateway::$registerAddress = '127.0.0.1:1238'; + Gateway::$registerAddress = $this->getRegisterAddress(); $groupName = $this->getGroupName($chapter->id); - $excludeClientId = null; - - if ($user->id == $from['id']) { - $excludeClientId = Gateway::getClientIdByUid($user->id); - } - - $content = [ - 'username' => $from['username'], - 'avatar' => $from['avatar'], - 'content' => $from['content'], - 'fromid' => $from['id'], - 'id' => $to['id'], - 'type' => $to['type'], - 'timestamp' => 1000 * time(), - 'mine' => false, - ]; + $excludeClientId = Gateway::getClientIdByUid($user->id); $message = json_encode([ 'type' => 'show_message', - 'content' => $content, + 'user' => [ + 'id' => $user->id, + 'name' => $user->name, + 'avatar' => $user->avatar, + ], ]); - Gateway::sendToGroup($groupName, $message, $excludeClientId); } @@ -105,13 +90,10 @@ class Live extends Service $result = []; foreach ($users->toArray() as $key => $user) { - $user['avatar'] = $baseUrl . $user['avatar']; - $result[] = [ 'id' => $user['id'], 'name' => $user['name'], - 'title' => $user['title'], 'vip' => $user['vip'], 'avatar' => $user['avatar'], ]; @@ -122,7 +104,14 @@ class Live extends Service protected function getGroupName($groupId) { - return "chapter_{$groupId}"; + return "live_{$groupId}"; + } + + protected function getRegisterAddress() + { + $config = $this->getDI()->get('config'); + + return $config->websocket->register_address; } } diff --git a/app/Http/Web/Views/chapter/show_live.volt b/app/Http/Web/Views/chapter/show_live.volt index cc9ab01c..e99b0530 100644 --- a/app/Http/Web/Views/chapter/show_live.volt +++ b/app/Http/Web/Views/chapter/show_live.volt @@ -2,11 +2,14 @@ {% block content %} -
- 首页 - 全部课程 - {{ chapter.course.title }} - {{ chapter.title }} + {% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} + {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} + {% set stats_url = url({'for':'web.live.stats','id':chapter.id}) %} + +
+ + 返回课程主页 +
@@ -16,7 +19,24 @@
- +
+ +
+
+
+
+
+ + +
+
+
+
+
+
@@ -26,11 +46,8 @@ + - - - - {% endblock %} @@ -39,25 +56,7 @@ - {{ js_include('lib/layui/layui.js') }} {{ js_include('web/js/live.player.js') }} {{ js_include('web/js/live.im.js') }} -{% endblock %} - -{% block inline_js %} - - - {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/chapter/show_vod.volt b/app/Http/Web/Views/chapter/show_vod.volt index aea91173..ac19621e 100644 --- a/app/Http/Web/Views/chapter/show_vod.volt +++ b/app/Http/Web/Views/chapter/show_vod.volt @@ -3,6 +3,7 @@ {% block content %} {% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} + {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %}
@@ -20,99 +21,22 @@
+
+ + + + + + + +
+ {% endblock %} {% block include_js %} -{% endblock %} - -{% block inline_js %} - - + {{ js_include('web/js/vod.player.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/list.volt b/app/Http/Web/Views/course/list.volt index 44fc2b88..25ad59e0 100644 --- a/app/Http/Web/Views/course/list.volt +++ b/app/Http/Web/Views/course/list.volt @@ -2,25 +2,14 @@ {% block content %} - {{ partial('partials/macro_course') }} {{ partial('course/list_filter') }} - {% if pager.total_pages > 0 %} -
-
- {% for item in pager.items %} -
- {{ course_card(item) }} -
- {% endfor %} -
-
- {{ partial('partials/pager') }} - {% else %} -
-
-
没有检索到相关课程哦
-
- {% endif %} +
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/course.list.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/list_filter.volt b/app/Http/Web/Views/course/list_filter.volt index 744f72d8..39ce8cbc 100644 --- a/app/Http/Web/Views/course/list_filter.volt +++ b/app/Http/Web/Views/course/list_filter.volt @@ -1,3 +1,7 @@ +
+ +
+
方向
@@ -41,15 +45,12 @@ {% endfor %}
-
-
排序
-
- {% set sort_val = request.get('sort','trim','score') %} - {% for sort in sorts %} - {% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %} - {{ sort.name }} - {% endfor %} -
-
+
+ {% set sort_val = request.get('sort','trim','score') %} + {% for sort in sorts %} + {% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %} + {{ sort.name }} + {% endfor %} +
diff --git a/app/Http/Web/Views/course/list_pager.volt b/app/Http/Web/Views/course/list_pager.volt new file mode 100644 index 00000000..fb22df96 --- /dev/null +++ b/app/Http/Web/Views/course/list_pager.volt @@ -0,0 +1,14 @@ +{{ partial('partials/macro_course') }} + +{% if pager.total_pages > 0 %} +
+
+ {% for item in pager.items %} +
+ {{ course_card(item) }} +
+ {% endfor %} +
+
+ {{ partial('partials/pager_ajax') }} +{% endif %} diff --git a/app/Http/Web/Views/course/recommended.volt b/app/Http/Web/Views/course/recommended.volt index fd2289cb..24379fdb 100644 --- a/app/Http/Web/Views/course/recommended.volt +++ b/app/Http/Web/Views/course/recommended.volt @@ -1,10 +1,12 @@ {{ partial('partials/macro_course') }} -
-
推荐课程
-
- {% for course in courses %} - {{ sidebar_course_card(course) }} - {% endfor %} +{% if courses %} +
+
推荐课程
+
+ {% for course in courses %} + {{ sidebar_course_card(course) }} + {% endfor %} +
-
\ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/related.volt b/app/Http/Web/Views/course/related.volt index 0f671774..bc10fa6f 100644 --- a/app/Http/Web/Views/course/related.volt +++ b/app/Http/Web/Views/course/related.volt @@ -1,10 +1,12 @@ {{ partial('partials/macro_course') }} -
-
相关课程
-
- {% for course in courses %} - {{ sidebar_course_card(course) }} - {% endfor %} +{% if courses %} +
+
相关课程
+
+ {% for course in courses %} + {{ sidebar_course_card(course) }} + {% endfor %} +
-
\ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 4ca62994..69310d2f 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -6,7 +6,6 @@
- 首页 全部课程 {% for path in course.category_paths %} {{ path.name }} diff --git a/app/Http/Web/Views/course/teachers.volt b/app/Http/Web/Views/course/teachers.volt index a3aaa7b7..0b9c417f 100644 --- a/app/Http/Web/Views/course/teachers.volt +++ b/app/Http/Web/Views/course/teachers.volt @@ -1,20 +1,22 @@ -
-
授课教师
-
- {% for teacher in teachers %} - {% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %} -
-
- {{ teacher.name }} -
-
-
- {{ teacher.name }} +{% if teachers %} +
+
授课教师
+
+ {% for teacher in teachers %} + {% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %} +
+
+ {{ teacher.name }} +
+
+
+ {{ teacher.name }} +
+ {% set title = teacher.title ? teacher.title : '小小教书匠' %} +
{{ title }}
- {% set title = teacher.title ? teacher.title : '小小教书匠' %} -
{{ title }}
-
- {% endfor %} + {% endfor %} +
-
\ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/topics.volt b/app/Http/Web/Views/course/topics.volt index 3ceea437..4839d2fc 100644 --- a/app/Http/Web/Views/course/topics.volt +++ b/app/Http/Web/Views/course/topics.volt @@ -1,8 +1,10 @@ -
-
热门专题
-
- {% for topic in topics %} - {{ topic.title }} - {% endfor %} +{% if topics %} +
+
热门专题
+
+ {% for topic in topics %} + {{ topic.title }} + {% endfor %} +
-
\ No newline at end of file +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/templates/layer.volt b/app/Http/Web/Views/templates/layer.volt index 3bb71648..b9b1c962 100644 --- a/app/Http/Web/Views/templates/layer.volt +++ b/app/Http/Web/Views/templates/layer.volt @@ -13,7 +13,6 @@ {% block content %}{% endblock %} -{{ partial('partials/js_global_vars') }} {{ js_include('lib/layui/layui.js') }} {{ js_include('web/js/common.js') }} diff --git a/app/Models/Course.php b/app/Models/Course.php index 194e52d0..ec082c64 100644 --- a/app/Models/Course.php +++ b/app/Models/Course.php @@ -355,7 +355,7 @@ class Course extends Model { return [ 'score' => '综合', - 'rating' => '评价', + 'rating' => '好评', 'latest' => '最新', 'popular' => '最热', 'free' => '免费', diff --git a/app/Validators/ImFriendUser.php b/app/Validators/ImFriendUser.php index 33f32299..80855713 100644 --- a/app/Validators/ImFriendUser.php +++ b/app/Validators/ImFriendUser.php @@ -11,7 +11,7 @@ class ImFriendUser extends Validator public function checkFriend($id) { - $validator = new User(); + $validator = new ImUser(); return $validator->checkUser($id); } diff --git a/public/static/lib/layui/extends/helper.js b/public/static/lib/layui/extends/helper.js index 781720b7..58a18cfe 100644 --- a/public/static/lib/layui/extends/helper.js +++ b/public/static/lib/layui/extends/helper.js @@ -16,5 +16,11 @@ layui.define(['jquery', 'element'], function (exports) { }); }; + helper.getRequestId = function () { + var id = Date.now().toString(36); + id += Math.random().toString(36).substr(3); + return id; + }; + exports(MOD_NAME, helper); }); \ No newline at end of file diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 6d0b6ccc..de2691a7 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -64,6 +64,11 @@ text-align: center; } +.loading { + padding: 30px; + text-align: center; +} + .layout-content { float: left; width: 800px; @@ -330,6 +335,13 @@ color: green; } +.filter-toggle { + text-align: center; + margin-top: -10px; + margin-bottom: 10px; + cursor: pointer; +} + .course-filter { margin-bottom: 20px; } @@ -354,6 +366,15 @@ margin-right: 15px; } +.course-sort { + padding: 10px 20px; + margin-bottom: 20px; +} + +.course-sort a { + margin-right: 20px; +} + .course-list { margin-bottom: 20px; } diff --git a/public/static/web/js/course.list.js b/public/static/web/js/course.list.js new file mode 100644 index 00000000..3ba7118f --- /dev/null +++ b/public/static/web/js/course.list.js @@ -0,0 +1,23 @@ +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; + + var $courseList = $('#course-list'); + + helper.ajaxLoadHtml($courseList.data('url'), $courseList.attr('id')); + + var $filter = $('.course-filter'); + + $('.filter-toggle').on('click', function () { + var $icon = $(this).find('.layui-icon'); + if ($icon.hasClass('layui-icon-up')) { + $icon.removeClass('layui-icon-up').addClass('layui-icon-down'); + $filter.hide(); + } else { + $icon.removeClass('layui-icon-down').addClass('layui-icon-up'); + $filter.show(); + } + }); + +}); \ No newline at end of file diff --git a/public/static/web/js/live.im.js b/public/static/web/js/live.im.js index 19d5e589..04ea2f35 100644 --- a/public/static/web/js/live.im.js +++ b/public/static/web/js/live.im.js @@ -1,51 +1,10 @@ -layui.use(['jquery', 'layim'], function () { +layui.use(['jquery', 'helper'], function () { var $ = layui.jquery; - var layim = layui.layim; - var socket = new WebSocket('ws://127.0.0.1:8282'); + var helper = layui.helper; + var socket = new WebSocket(window.koogua.socketUrl); - var membersUrl = $('input[name="im.members_url"]').val(); - var bindUserUrl = $('input[name="im.bind_user_url"]').val(); - var sendMsgUrl = $('input[name="im.send_msg_url"]').val(); - - var group = { - id: $('input[name="chapter.id"]').val(), - avatar: 'http://tp1.sinaimg.cn/5619439268/180/40030060651/1', - name: '直播讨论' - }; - - var user = { - id: $('input[name="user.id"]').val(), - name: $('input[name="user.name"]').val(), - avatar: $('input[name="user.avatar"]').val(), - status: 'online', - sign: '' - }; - - layim.config({ - brief: true, - init: { - mine: { - 'username': user.name, - 'avatar': user.avatar, - 'id': user.id, - 'status': user.status, - 'sign': user.sign - } - }, - members: {url: membersUrl} - }).chat({ - type: 'group', - name: group.name, - avatar: group.avatar, - id: group.id - }); - - layim.setChatMin(); - - layim.on('sendMessage', function (res) { - sendMessage(res.mine, res.to); - }); + var $chatMsgList = $('#chat-msg-list'); socket.onopen = function () { console.log('socket connect success'); @@ -71,36 +30,44 @@ layui.use(['jquery', 'layim'], function () { } }; - showOrHidePoster(); + form.on('submit(chat)', function (data) { + $.ajax({ + type: 'POST', + url: data.form.action, + data: data.field, + success: function (res) { + showMessage(res); + } + }); + return false; + }); + + refreshLiveStats(); + + setInterval('refreshLiveStats()', 60000); function bindUser(clientId) { $.ajax({ type: 'POST', - url: bindUserUrl, + url: '/live/bind', data: {client_id: clientId} }); } - function sendMessage(from, to) { - $.ajax({ - type: 'POST', - dataType: 'json', - url: sendMsgUrl, - data: {from: from, to: to} - }); + function showMessage(res) { + var html = '
'; + html += '' + res.user.name + ''; + if (res.user.vip === 1) { + html += 'VIP'; + } + html += '' + res.content + ''; + html += '
'; + $chatMsgList.append(html); } - function showMessage(message) { - if (message.fromid !== user.id) { - layim.getMessage(message); - } - } - - function showOrHidePoster() { - if (user.id === '0') { - var html = ''; - $('.layim-chat-footer').hide().after(html); - } + function refreshLiveStats() { + var $liveStats = $('#live-stats'); + helper.ajaxLoadHtml($liveStats.data('url'), $liveStats.attr('id')); } }); \ No newline at end of file diff --git a/public/static/web/js/live.player.js b/public/static/web/js/live.player.js index 1d761435..86166b04 100644 --- a/public/static/web/js/live.player.js +++ b/public/static/web/js/live.player.js @@ -1,4 +1,7 @@ -layui.use(['jquery'], function () { +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; var interval = null; var intervalTime = 5000; @@ -8,7 +11,7 @@ layui.use(['jquery'], function () { var userId = $('input[name="user.id"]').val(); var learningUrl = $('input[name="chapter.learning_url"]').val(); var playUrls = JSON.parse($('input[name="chapter.play_urls"]').val()); - var requestId = getRequestId(); + var requestId = helper.getRequestId(); var options = { live: true, @@ -99,10 +102,4 @@ layui.use(['jquery'], function () { }); } - function getRequestId() { - var id = Date.now().toString(36); - id += Math.random().toString(36).substr(3); - return id; - } - }); \ No newline at end of file diff --git a/public/static/web/js/vod.player.js b/public/static/web/js/vod.player.js new file mode 100644 index 00000000..6f1cf7b1 --- /dev/null +++ b/public/static/web/js/vod.player.js @@ -0,0 +1,79 @@ +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; + + var interval = null; + var intervalTime = 5000; + var position = 0; + var chapterId = $('input[name="chapter.id"]').val(); + var planId = $('input[name="chapter.plan_id"]').val(); + var userId = $('input[name="user.id"]').val(); + var learningUrl = $('input[name="chapter.learning_url"]').val(); + var playUrls = JSON.parse($('input[name="chapter.play_urls"]').val()); + var requestId = helper.getRequestId(); + + var options = { + autoplay: false, + width: 760, + height: 450 + }; + + if (playUrls.od) { + options.m3u8 = playUrls.od.url; + } + + if (playUrls.hd) { + options.m3u8_hd = playUrls.hd.url; + } + + if (playUrls.sd) { + options.m3u8_sd = playUrls.sd.url; + } + + if (userId !== '0' && planId !== '0') { + options.listener = function (msg) { + if (msg.type === 'play') { + start(); + } else if (msg.type === 'pause') { + stop(); + } else if (msg.type === 'end') { + stop(); + } + } + } + + var player = new TcPlayer('player', options); + + if (position > 0) { + player.currentTime(position); + } + + function start() { + if (interval != null) { + clearInterval(interval); + interval = null; + } + interval = setInterval(learning, intervalTime); + } + + function stop() { + clearInterval(interval); + interval = null; + } + + function learning() { + $.ajax({ + type: 'POST', + url: learningUrl, + data: { + request_id: requestId, + chapter_id: chapterId, + plan_id: planId, + interval: intervalTime, + position: player.currentTime(), + } + }); + } + +}); \ No newline at end of file