feat:处理进入直播客户端

051e15b9 · zhangleyuan · ddb42b09 · 051e15b9 · 051e15b9 · 051e15b9
Commit 051e15b9 authored Jan 09, 2021 by zhangleyuan
8 changed files
--- a/src/data-source/base/request-apis.ts
+++ b/src/data-source/base/request-apis.ts
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:21:21
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-22 15:39:00
+ * @LastEditTime: 2021-01-09 11:06:42
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -38,6 +38,9 @@ export function sendNewPhoneAuthCode(params: object) {
 export function editUserPhone(params: object) {
  return Service.Hades("public/hades/editUserPhone", params);
 }
+export function getLastedVersion(params: object) {
+  return Service.Hades("public/hades/getLastedVersion", params);
+}
 export const getOssClient = (
  data: object,
  instId: string,

--- a/src/domains/basic-domain/baseService.ts
+++ b/src/domains/basic-domain/baseService.ts
@@ -2,12 +2,12 @@
 * @Author: wufan
 * @Date: 2020-12-01 17:20:49
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-11 11:36:19
+ * @LastEditTime: 2021-01-09 11:08:02
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
-import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode,sendNewPhoneAuthCode,sendLoginAuthCode,login} from '@/data-source/base/request-apis';
+import { getUserStore, getUserPermission ,logout,getStoreUser,sendBizAuthCode,editUserPhone,checkBizAuthCode,sendNewPhoneAuthCode,sendLoginAuthCode,login,getLastedVersion} from '@/data-source/base/request-apis';
 export default class StoreService {
    // 获取员工列表 
@@ -46,4 +46,7 @@ export default class StoreService {
  static login(params: any){
    return login(params);
  }
+  static getLastedVersion(params: any){
+    return getLastedVersion(params);
+  }
 }
\ No newline at end of file
--- a/src/modules/course-manage/AddLive.jsx
+++ b/src/modules/course-manage/AddLive.jsx
@@ -388,7 +388,7 @@ handleChangeBasicInfo = (field, value) => {
          message.warning('请选择上课日期');
          resolve(false);
          return; 
-        } else if(startTime === endTime) {
+        } else if(startTime === endTime || startTime > endTime) {
          message.warning('结束时间必须晚于开始时间');
          resolve(false);
          return; 

--- a/src/modules/course-manage/components/LiveCourseFilter.jsx
+++ b/src/modules/course-manage/components/LiveCourseFilter.jsx
@@ -98,8 +98,10 @@ class LiveCourseFilter extends React.Component {
      query.endTime = dates[1].valueOf();
    }
    this.setState({
-      query,
+      query:{
+        ...query,
        current: 1,
+      }
    }, () => {
      this.props.onChange(this.state.query);
    })

--- a/src/modules/course-manage/components/LiveCourseList.jsx
+++ b/src/modules/course-manage/components/LiveCourseList.jsx
@@ -383,25 +383,24 @@ class LiveCourseList extends React.Component {
        ),
      });
    } else {
-      // axios
+        CourseService.getLiveCloudCourseDetail({
-      //   .Apollo("public/businessLive/getCourseDetail", {
+          liveCourseId: item.liveCourseId,
-      //     liveCourseId: item.liveCourseId,
+        })
-      //   })
+        .then((res) => {
-      //   .then((res) => {
+          const url = `xmqx://liveCourseId=${item.liveCourseId}`;
-      //     const url = `xiaomai5://instId=${instId}&courseId=${item.liveCourseId}&teacherId=${item.teacherId}&uid=${ teacherId ? User_t.uid() : User.uid()}&aid=${teacherId ? "" : User.aid()}&tid=${teacherId || ""}&identity=${identity}&classType=${item.liveType}&xmVersion=${window.NewVersion ? '5.0' : '4.0'}`;
+          if (res.result.courseState === "FINISH") {
-      //     if (res.result.courseState === "FINISH") {
+            Modal.warning({
-      //       Modal.warning({
+              title: "刷新页面",
-      //         title: "刷新页面",
+              icon: <QuestionCircleOutlined />,
-      //         icon: <QuestionCircleOutlined />,
+              content: "课次已结束，请刷新一下",
-      //         content: "课次已结束，请刷新一下",
+              onOk: () => {
-      //         onOk: () => {
+                this.refreshCourseList();
-      //           this.refreshCourseList();
+              }
-      //         }
+            });
-      //       });
+          } else {
-      //     } else {
+            this.setState({ url, openDownloadModal: true });
-            this.setState({ url:'', openDownloadModal: true });
+          }
-        //   }
+        });
-        // });
    }
  }
  onShowSizeChange = (current, size) => {

--- a/src/modules/course-manage/components/LiveCourseOpt.jsx
+++ b/src/modules/course-manage/components/LiveCourseOpt.jsx
@@ -8,7 +8,9 @@
 import React from 'react';
 import { Button, Modal, message } from 'antd';
+import Service from '@/common/js/service';
 import './liveCourseOpt.less';
+import BaseService from "@/domains/basic-domain/baseService";
 class LiveCourseOpt extends React.Component {
  constructor(props) {
    super(props);
@@ -23,15 +25,15 @@ class LiveCourseOpt extends React.Component {
    const isMac = /macintosh|mac os x/i.test(navigator.userAgent);
    // 判断用户系统
    if(!isMac) {
-      // axios
+      BaseService
-      // .Apollo("anon/version/getLastedVersion", { model: 1, platform: 1 })
+      .getLastedVersion({ model: 1, platform: 1 })
-      // .then((res) => {
+      .then((res) => {
-      //   const a = document.createElement("a");
+        const a = document.createElement("a");
-      //   document.body.appendChild(a);
+        document.body.appendChild(a);
-      //   a.href = res.result.releaseUrl;
+        a.href = res.result.releaseUrl;
-      //   a.click();
+        a.click();
-      //   document.body.removeChild(a);
+        document.body.removeChild(a);
-      // })
+      })
    }else {
      Modal.info({
        title: "抱歉，暂不支持Mac版",

--- a/src/modules/course-manage/modal/PreviewCourseModal.jsx
+++ b/src/modules/course-manage/modal/PreviewCourseModal.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-07-23 14:54:16
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-01-08 17:49:46
+ * @LastEditTime: 2021-01-09 10:55:29
 * @Description: 大班直播课预览弹窗
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */ 
@@ -144,13 +144,11 @@ class PreviewCourseModal extends React.Component {
                  <span className="time__label">上课时间：</span>
                  <span className="time__value">
                    {
                      [
                        <span>{liveDateStr}&nbsp;</span>,
                        <span>{startTimeStr}~{endTimeStr }</span>
                      ]
                    }
                  </span>
                </div>
                <div className="container__body__teacher">

--- a/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
+++ b/src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-05 10:11:57
 * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-31 18:27:26
+ * @LastEditTime: 2021-01-09 11:50:00
 * @Description: 视频课-搜索模块
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -97,8 +97,10 @@ class VideoCourseFilter extends React.Component {
      query.endTime = dates[1].valueOf();
    }
    this.setState({
-      query,
+      query:{
+        ...query,
        current: 1,
+      }
    }, () => {
      this.props.onChange(this.state.query);
    })