Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Web rtc sharing position #986

Open
wants to merge 44 commits into
base: master
Choose a base branch
from

Commits on Nov 3, 2020

  1. 2020-11-03

    JeongYeonUk committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    558e256 View commit details
    Browse the repository at this point in the history
  2. test

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    668bfca View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b285de1 View commit details
    Browse the repository at this point in the history
  4. first

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    6e06023 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f8833dc View commit details
    Browse the repository at this point in the history
  6. [Add] url /rtc

    Signed-off-by: LimHyoJin <[email protected]>
    hyojin38 committed Nov 3, 2020
    Configuration menu
    Copy the full SHA
    c9d9654 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #3 from JeongYeonUk/webRTC-demo-url

    [Add] url /rtc
    JeongYeonUk authored Nov 3, 2020
    Configuration menu
    Copy the full SHA
    06c324a View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. [Add] record data sharing test

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    9320807 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4 from JeongYeonUk/webRTC-recordtest

    [Add] record data sharing test
    JeongYeonUk authored Nov 5, 2020
    Configuration menu
    Copy the full SHA
    ed9c72b View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2020

  1. Configuration menu
    Copy the full SHA
    6037adb View commit details
    Browse the repository at this point in the history
  2. [Add] media sharing

    file sender를 통해 공유할 media를 objectURL로 보내는 방식
    objectURL이 다른사람 화면에서도 유효한지 확인해볼것
    알될시 다른방법을 찾거나 시간이 부족하면 dataURL방식사용할것
    
    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 8, 2020
    Configuration menu
    Copy the full SHA
    d10e24a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #5 from JeongYeonUk/webRTC-sendObjectURL-fileSend

    Web rtc send object url file send
    JeongYeonUk authored Nov 8, 2020
    Configuration menu
    Copy the full SHA
    6468c59 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Modify config.json

    JeongYeonUk committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8907f67 View commit details
    Browse the repository at this point in the history
  2. [Add] dataURL demo

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    58768f2 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #6 from JeongYeonUk/webRTC-sendDATAURL-demo

    [Add] dataURL demo
    JeongYeonUk authored Nov 9, 2020
    Configuration menu
    Copy the full SHA
    db881e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2020

  1. [Add] sharing media sync demo

    추후 새사용자 들어왔을떄 공유중인 미디어 시간동기까지 맞춰줄 예정
    
    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    c65fc45 View commit details
    Browse the repository at this point in the history
  2. [Add] canvas tools 정리

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 10, 2020
    Configuration menu
    Copy the full SHA
    6dcaf4a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #8 from JeongYeonUk/webRTC-sync-demo

    Web rtc sync demo
    JeongYeonUk authored Nov 10, 2020
    Configuration menu
    Copy the full SHA
    48e59a3 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2020

  1. [Add] communicate to server(record-data)

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    a548b1d View commit details
    Browse the repository at this point in the history
  2. Merge pull request #9 from JeongYeonUk/webRTC-comm-server

    [Add] communicate to server(record-data)
    JeongYeonUk authored Nov 11, 2020
    Configuration menu
    Copy the full SHA
    4c7a1bc View commit details
    Browse the repository at this point in the history
  3. rtc chat

    hyojin38 committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    067bf1c View commit details
    Browse the repository at this point in the history
  4. merging1

    hyojin38 committed Nov 11, 2020
    Configuration menu
    Copy the full SHA
    28dfb49 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    edc8442 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2020

  1. [Add]White board sharing

    공유중지 예외처리
    회의, 칠판 ,동영상칠판 버튼 생성
    
    haveto remove main-video when sharePublicCamera
    
    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    0b6d65b View commit details
    Browse the repository at this point in the history
  2. Merge pull request #13 from JeongYeonUk/webRTC-whiteboard-sharing

    [Add]White board sharing
    JeongYeonUk authored Nov 12, 2020
    Configuration menu
    Copy the full SHA
    a698647 View commit details
    Browse the repository at this point in the history
  3. 1112commit

    hyojin38 committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    e1c10b3 View commit details
    Browse the repository at this point in the history
  4. merging 1112

    hyojin38 committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    ca11d97 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #14 from JeongYeonUk/webRTC-chat

    1112commit
    hyojin38 authored Nov 12, 2020
    Configuration menu
    Copy the full SHA
    7e84af7 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. menu

    hyojin38 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f4c56f5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19cd92c View commit details
    Browse the repository at this point in the history
  3. [Add] particpant

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    89037b1 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #16 from JeongYeonUk/webRTC-participant-list

    [Add] particpant
    MinwooJi authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    823245b View commit details
    Browse the repository at this point in the history
  5. [Add] canvas 위치조정

    hyojin38 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    62df1cd View commit details
    Browse the repository at this point in the history
  6. [Add]Video info label modify share media error

    인터벌 dataurl보낼때만 줄이고 다보낸뒤 초기화 - o
    
    업로드된 영상들 탭에 업로드 날짜 / 스크롤바 달기 - o
    
    미디어나 비디오공유중인데 다른작업요청할때 예외처리 로직 - o
    회의화면으로 바꿀때 누가 화면이 공유중입니다 이런건 처리안함..
    미디어공유-카메라공유-화이트보드 때는 confirm alert 두개 표시
    
    방 새로들어왔을때 동기처리 - (세모)
    회의/메모/실시간 스트림/현재 방상황 정보들은 동기화처리했는데
    미디어같은경우에 값을 다시전달받을라고 하면 속도가 엄청 느려짐... -> 일단 스킵할생각..
    
    메인비디오 숨기기- o
    
    오디오 처음부터 제어가능하게하기 - o
    
    참가자 jqery table - o
     헤더 넣는것 만들어만 놓기
    
    참가자 비디오 라벨 달기 - o
    
    길어지면 서버 오류뜨던것 - o
    
    미디어 업로드하고 보관함 클릭함수 실행시켜서 table 갱신해주기 - o
    
    ERROR
    사람이 많을때
      미디어 제어시 seeked가 이상함 계속 호출됨 두명일땐 갠춘 - o
      alert가 사람수만큼 울림 -o
    
    HAVE TO
    후면카메라 ?
    네이티브앱에서 넘어온 영상공유
    
    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    3861e5d View commit details
    Browse the repository at this point in the history
  7. Merge pull request #17 from JeongYeonUk/webrtc-sharescreen

    [Add] canvas 위치조정
    hyojin38 authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    9988918 View commit details
    Browse the repository at this point in the history
  8. MERGING

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    f2bd8a7 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #18 from JeongYeonUk/WebRTC-labeling

    [Add]Video info label modify share media error
    MinwooJi authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    82749dd View commit details
    Browse the repository at this point in the history
  10. 페이징 붙이기

    Signed-off-by: sinhye <[email protected]>
    yoonsh16 committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    6f02d15 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #21 from JeongYeonUk/RTC-paging

    페이징 붙이기
    s1neng authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    75e7494 View commit details
    Browse the repository at this point in the history
  12. bugfix refresh

    Signed-off-by: JeongYeonuk <[email protected]>
    JeongYeonUk committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    c227df6 View commit details
    Browse the repository at this point in the history
  13. [Add] mobile function

    Signed-off-by: jiminwu <[email protected]>
    MinwooJi committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    36721f5 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #22 from JeongYeonUk/WebRTC-mobile-draw

    [Add] mobile function
    MinwooJi authored Nov 13, 2020
    Configuration menu
    Copy the full SHA
    e018391 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2020

  1. 화면공유 시 화면 올리기

    Signed-off-by: sinhye <[email protected]>
    yoonsh16 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    7286dc3 View commit details
    Browse the repository at this point in the history
  2. merge

    Signed-off-by: sinhye <[email protected]>
    yoonsh16 committed Nov 14, 2020
    Configuration menu
    Copy the full SHA
    2c2ef2d View commit details
    Browse the repository at this point in the history