@x-edu/live-player 0.0.21 → 0.0.23

package/src/component/IMChatroom/page/chat/stickedMessage/index.jsx

@@ -1,59 +1,59 @@
-import React, { Component } from 'react'
-import { MessageContent } from '@sdp.nd/im-web-components'
-import { Icon } from 'fish'
-
-import intl from '../../../i18n'
-import { parseMessage } from '../../../sdk/imcore/util/format'
-import { isCurrentAccountId } from '../../../util/account'
-
-import style from './style/index.module.less'
-import { useChatroom } from '../../../context/chatroom'
-
-class StickedMessage extends Component {
-  render() {
-    const { chatroomStickedMessages, chatroomOwner } = this.props
-    if (!chatroomStickedMessages.length) {
-      return null
-    }
-
-    const stickedMessage = parseMessage(chatroomStickedMessages[0])
-    console.log('stickedMessage', stickedMessage)
-
-    return (
-      <div className={style['sticked-message-container']}>
-        {
-          isCurrentAccountId(chatroomOwner.uid) && (
-            <div className={style.close}>
-              <Icon
-                type="close-circle"
-                title={intl.get('message.stick.cancel')}
-                onClick={
-                  () => {
-                    this.props.deleteChatroomStickMessages()
-                  }
-                }
-              />
-            </div>
-          )
-        }
-        <MessageContent message={stickedMessage} />
-      </div>
-    )
-  }
-}
-
-function StickedMessageFn() {
-  const {
-    owner, stickedMessages, deleteChatroomStickMessages
-  } = useChatroom()
-
-  return (
-    <StickedMessage
-      chatroomOwner={owner}
-      chatroomStickedMessages={stickedMessages}
-      deleteChatroomStickMessages={deleteChatroomStickMessages}
-    />
-  )
-}
-
-export default StickedMessageFn
+import React, { Component } from 'react'
+import { MessageContent } from '@sdp.nd/im-web-components'
+import { Icon } from 'fish'
+
+import intl from '../../../i18n'
+import { parseMessage } from '../../../sdk/imcore/util/format'
+import { isCurrentAccountId } from '../../../util/account'
+
+import style from './style/index.module.less'
+import { useChatroom } from '../../../context/chatroom'
+
+class StickedMessage extends Component {
+  render() {
+    const { chatroomStickedMessages, chatroomOwner } = this.props
+    if (!chatroomStickedMessages.length) {
+      return null
+    }
+
+    const stickedMessage = parseMessage(chatroomStickedMessages[0])
+    console.log('stickedMessage', stickedMessage)
+
+    return (
+      <div className={style['sticked-message-container']}>
+        {
+          isCurrentAccountId(chatroomOwner.uid) && (
+            <div className={style.close}>
+              <Icon
+                type="close-circle"
+                title={intl.get('message.stick.cancel')}
+                onClick={
+                  () => {
+                    this.props.deleteChatroomStickMessages()
+                  }
+                }
+              />
+            </div>
+          )
+        }
+        <MessageContent message={stickedMessage} />
+      </div>
+    )
+  }
+}
+
+function StickedMessageFn() {
+  const {
+    owner, stickedMessages, deleteChatroomStickMessages
+  } = useChatroom()
+
+  return (
+    <StickedMessage
+      chatroomOwner={owner}
+      chatroomStickedMessages={stickedMessages}
+      deleteChatroomStickMessages={deleteChatroomStickMessages}
+    />
+  )
+}
+
+export default StickedMessageFn

package/src/component/IMChatroom/page/chat/stickedMessage/style/index.module.less

@@ -1,8 +1,8 @@
-.sticked-message-container {
-  padding: 10px 20px;
-  border: 1px #eee solid;
-
-  .close {
-    text-align: right;
-  }
+.sticked-message-container {
+  padding: 10px 20px;
+  border: 1px #eee solid;
+
+  .close {
+    text-align: right;
+  }
 }

package/src/component/IMChatroom/page/chat/style/index.module.less

@@ -1,52 +1,52 @@
-.chat-container {
-  position: relative;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-
-  :global(#chatMessageList .fish-empty-description) {
-    color: #333;
-  }
-
-  :global(.chat-message-list-item-time) {
-    padding-left: 5px;
-  }
-
-  .chat-body {
-    height: 50px; /*设置一个高度，然后通过flex:1撑开*/
-    flex: 1;
-    position: relative;
-
-    :global(.chat-message-list .chat-message-list-inner) {
-      padding: 0 14px;
-    }
-  }
-
-  .banned-overlayer {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background: #fff;
-    z-index: 99;
-  }
-
-  :global(#messageEditorDisabledBox > div) {
-    width: 100%;
-    text-align: center;
-  }
-
-  :global(#messageEditorDisabledBox) {
-    background-color: #eee;
-    color: #999;
-    font-size: 14px;
-  }
-
-  .chat-footer {
-    :global(.message-editor-container.message-editor-container-h5) {
-      margin: 8px 14px;
-    }
-  }
+.chat-container {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+
+  :global(#chatMessageList .fish-empty-description) {
+    color: #333;
+  }
+
+  :global(.chat-message-list-item-time) {
+    padding-left: 5px;
+  }
+
+  .chat-body {
+    height: 50px; /*设置一个高度，然后通过flex:1撑开*/
+    flex: 1;
+    position: relative;
+
+    :global(.chat-message-list .chat-message-list-inner) {
+      padding: 0 14px;
+    }
+  }
+
+  .banned-overlayer {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background: #fff;
+    z-index: 99;
+  }
+
+  :global(#messageEditorDisabledBox > div) {
+    width: 100%;
+    text-align: center;
+  }
+
+  :global(#messageEditorDisabledBox) {
+    background-color: #eee;
+    color: #999;
+    font-size: 14px;
+  }
+
+  .chat-footer {
+    :global(.message-editor-container.message-editor-container-h5) {
+      margin: 8px 14px;
+    }
+  }
 }

package/src/component/IMChatroom/page/home/connect/index.jsx

@@ -1,188 +1,188 @@
-import React, { Component } from 'react'
-import get from 'lodash/get'
-
-import {
-  setChatroom,
-  getChatroom as getChatroomUtil,
-  setChatroomConversationId,
-  setChatroomToken,
-  getChatroomToken
-} from '../../../util/chatroom'
-import { initIMCoreChatroom, getIMCoreChatroom, reconnectIMCoreChatroom } from '../../../sdk/imcore'
-import { CONNECT_STATUS, ERROR_CODE } from '../../../constants'
-import subscription from '../../../subscription'
-
-import ConnectStatus from './status'
-import { useConnect } from '../../../context/connect'
-import { useChatroom } from '../../../context/chatroom'
-
-class Connect extends Component {
-  constructor(props) {
-    super(props)
-    this.retryTimes = 0
-  }
-
-  componentDidMount() {
-    this.loginChatroom()
-    window.addEventListener('online', this.handleOnline)
-  }
-
-  componentDidUpdate(prevProps) {
-    const { status, times } = this.props
-    if (prevProps.status !== status && status === CONNECT_STATUS.LOGIN_SUCCESS && times > 1) {
-      subscription.message.publish(subscription.EVENT.CHAT_MESSAGE_LIST_INIT)
-      const chatroom = getChatroomUtil()
-      if (chatroom) {
-        this.initChatroom(chatroom)
-      }
-    }
-  }
-
-  componentWillUnmount() {
-    window.removeEventListener('online', this.handleOnline)
-  }
-
-  loginChatroom = () => {
-    if (getChatroomToken()) {
-      this.getChatroom()
-    } else {
-      this.props.loginChatroom()
-        .then((token) => {
-          setChatroomToken(token)
-          this.getChatroom()
-          this.retryTimes = 0
-        })
-        .catch((error) => {
-          console.log('login chatroom error:', error)
-
-          if (get(error, 'data.code') === ERROR_CODE.NETWORK_ERROR) {
-            if (this.retryTimes < 5) {
-              setTimeout(() => {
-                this.retryTimes += 1
-                this.onReConnect()
-              }, 2000)
-              return
-            }
-            this.props.setStatus(CONNECT_STATUS.NETWORK_ERROR)
-            return
-          }
-
-          if (get(error, 'data.code') === ERROR_CODE.IMP_TOKEN_EXPIRED) {
-            setChatroomToken()
-            if (this.retryTimes < 5) {
-              setTimeout(() => {
-                this.retryTimes += 1
-                this.onReConnect()
-              }, 500)
-              return
-            }
-          }
-          this.props.setStatus(CONNECT_STATUS.LOGIN_FAIL)
-        })
-    }
-  }
-
-  // 需要重获取聊天室信息时
-  getChatroom = () => {
-    this.props.getChatroom()
-      .then((chatroom) => {
-        setChatroom(chatroom)
-        setChatroomConversationId(chatroom)
-        this.loginCore()
-        this.initChatroom(chatroom)
-        this.retryTimes = 0
-      })
-      .catch((error) => {
-        console.log('get chatroom error:', error)
-
-        if (get(error, 'data.code') === ERROR_CODE.NETWORK_ERROR) {
-          if (this.retryTimes < 5) {
-            setTimeout(() => {
-              this.retryTimes += 1
-              this.onReConnect()
-            }, 2000)
-            return
-          }
-          this.props.setStatus(CONNECT_STATUS.NETWORK_ERROR)
-          return
-        }
-
-        if (get(error, 'data.code') === ERROR_CODE.IMP_AUTH_TOKEN_EXPIRED) {
-          setChatroomToken()
-          if (this.retryTimes < 5) {
-            setTimeout(() => {
-              this.retryTimes += 1
-              this.onReConnect()
-            }, 500)
-            return
-          }
-        }
-        this.props.setStatus(CONNECT_STATUS.GET_CHATROOM_INFO_FAIL)
-      })
-  }
-
-  loginCore = () => {
-    if (getIMCoreChatroom()) {
-      reconnectIMCoreChatroom()
-    } else {
-      initIMCoreChatroom()
-        .catch((error) => {
-          console.log('login core error:', error)
-          this.props.setStatus(CONNECT_STATUS.LOGIN_FAIL)
-        })
-    }
-  }
-
-  initChatroom = (chatroom) => {
-    if (chatroom.user_role === 2) {
-      this.props.getChatroomAdmins()
-    }
-    this.props.getChatroomBan()
-  }
-
-  onReConnect = () => {
-    this.props.setStatus(CONNECT_STATUS.CONNECTING)
-    this.loginChatroom()
-  }
-
-  handleOnline = () => {
-    if ([CONNECT_STATUS.DISCONNECT, CONNECT_STATUS.NETWORK_ERROR].find((item) => item === this.props.status)) {
-      this.onReConnect()
-    }
-  }
-
-  render() {
-    return (
-      <ConnectStatus onRetry={this.onReConnect} />
-    )
-  }
-}
-
-function ConnectFn() {
-  const {
-    status,
-    times,
-    setStatus
-  } = useConnect()
-
-  const {
-    getChatroom,
-    getChatroomAdmins,
-    getChatroomBan,
-    loginChatroom
-  } = useChatroom()
-
-  return (
-    <Connect
-      status={status}
-      times={times}
-      setStatus={setStatus}
-      loginChatroom={loginChatroom}
-      getChatroom={getChatroom}
-      getChatroomAdmins={getChatroomAdmins}
-      getChatroomBan={getChatroomBan}
-    />
-  )
-}
-
-export default ConnectFn
+import React, { Component } from 'react'
+import get from 'lodash/get'
+
+import {
+  setChatroom,
+  getChatroom as getChatroomUtil,
+  setChatroomConversationId,
+  setChatroomToken,
+  getChatroomToken
+} from '../../../util/chatroom'
+import { initIMCoreChatroom, getIMCoreChatroom, reconnectIMCoreChatroom } from '../../../sdk/imcore'
+import { CONNECT_STATUS, ERROR_CODE } from '../../../constants'
+import subscription from '../../../subscription'
+
+import ConnectStatus from './status'
+import { useConnect } from '../../../context/connect'
+import { useChatroom } from '../../../context/chatroom'
+
+class Connect extends Component {
+  constructor(props) {
+    super(props)
+    this.retryTimes = 0
+  }
+
+  componentDidMount() {
+    this.loginChatroom()
+    window.addEventListener('online', this.handleOnline)
+  }
+
+  componentDidUpdate(prevProps) {
+    const { status, times } = this.props
+    if (prevProps.status !== status && status === CONNECT_STATUS.LOGIN_SUCCESS && times > 1) {
+      subscription.message.publish(subscription.EVENT.CHAT_MESSAGE_LIST_INIT)
+      const chatroom = getChatroomUtil()
+      if (chatroom) {
+        this.initChatroom(chatroom)
+      }
+    }
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('online', this.handleOnline)
+  }
+
+  loginChatroom = () => {
+    if (getChatroomToken()) {
+      this.getChatroom()
+    } else {
+      this.props.loginChatroom()
+        .then((token) => {
+          setChatroomToken(token)
+          this.getChatroom()
+          this.retryTimes = 0
+        })
+        .catch((error) => {
+          console.log('login chatroom error:', error)
+
+          if (get(error, 'data.code') === ERROR_CODE.NETWORK_ERROR) {
+            if (this.retryTimes < 5) {
+              setTimeout(() => {
+                this.retryTimes += 1
+                this.onReConnect()
+              }, 2000)
+              return
+            }
+            this.props.setStatus(CONNECT_STATUS.NETWORK_ERROR)
+            return
+          }
+
+          if (get(error, 'data.code') === ERROR_CODE.IMP_TOKEN_EXPIRED) {
+            setChatroomToken()
+            if (this.retryTimes < 5) {
+              setTimeout(() => {
+                this.retryTimes += 1
+                this.onReConnect()
+              }, 500)
+              return
+            }
+          }
+          this.props.setStatus(CONNECT_STATUS.LOGIN_FAIL)
+        })
+    }
+  }
+
+  // 需要重获取聊天室信息时
+  getChatroom = () => {
+    this.props.getChatroom()
+      .then((chatroom) => {
+        setChatroom(chatroom)
+        setChatroomConversationId(chatroom)
+        this.loginCore()
+        this.initChatroom(chatroom)
+        this.retryTimes = 0
+      })
+      .catch((error) => {
+        console.log('get chatroom error:', error)
+
+        if (get(error, 'data.code') === ERROR_CODE.NETWORK_ERROR) {
+          if (this.retryTimes < 5) {
+            setTimeout(() => {
+              this.retryTimes += 1
+              this.onReConnect()
+            }, 2000)
+            return
+          }
+          this.props.setStatus(CONNECT_STATUS.NETWORK_ERROR)
+          return
+        }
+
+        if (get(error, 'data.code') === ERROR_CODE.IMP_AUTH_TOKEN_EXPIRED) {
+          setChatroomToken()
+          if (this.retryTimes < 5) {
+            setTimeout(() => {
+              this.retryTimes += 1
+              this.onReConnect()
+            }, 500)
+            return
+          }
+        }
+        this.props.setStatus(CONNECT_STATUS.GET_CHATROOM_INFO_FAIL)
+      })
+  }
+
+  loginCore = () => {
+    if (getIMCoreChatroom()) {
+      reconnectIMCoreChatroom()
+    } else {
+      initIMCoreChatroom()
+        .catch((error) => {
+          console.log('login core error:', error)
+          this.props.setStatus(CONNECT_STATUS.LOGIN_FAIL)
+        })
+    }
+  }
+
+  initChatroom = (chatroom) => {
+    if (chatroom.user_role === 2) {
+      this.props.getChatroomAdmins()
+    }
+    this.props.getChatroomBan()
+  }
+
+  onReConnect = () => {
+    this.props.setStatus(CONNECT_STATUS.CONNECTING)
+    this.loginChatroom()
+  }
+
+  handleOnline = () => {
+    if ([CONNECT_STATUS.DISCONNECT, CONNECT_STATUS.NETWORK_ERROR].find((item) => item === this.props.status)) {
+      this.onReConnect()
+    }
+  }
+
+  render() {
+    return (
+      <ConnectStatus onRetry={this.onReConnect} />
+    )
+  }
+}
+
+function ConnectFn() {
+  const {
+    status,
+    times,
+    setStatus
+  } = useConnect()
+
+  const {
+    getChatroom,
+    getChatroomAdmins,
+    getChatroomBan,
+    loginChatroom
+  } = useChatroom()
+
+  return (
+    <Connect
+      status={status}
+      times={times}
+      setStatus={setStatus}
+      loginChatroom={loginChatroom}
+      getChatroom={getChatroom}
+      getChatroomAdmins={getChatroomAdmins}
+      getChatroomBan={getChatroomBan}
+    />
+  )
+}
+
+export default ConnectFn