Commits · 8c9bb5d7242132fa7eef45b9c123b4f0323cc327 · 杨凯 / YDL-Component-Medical

09 Jun, 2020 4 commits
- Merge branch 'feature/改bug_5_26' of… · 8c9bb5d7
```
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26
```
  严久程 committed Jun 09, 2020
  8c9bb5d7 Browse Files
- 发版 · 74af6004
  严久程 committed Jun 09, 2020
  
  74af6004 Browse Files
- Merge branch 'feature/改bug_5_26' of… · bfcb0e38
```
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26
```
  严久程 committed Jun 09, 2020
  bfcb0e38 Browse Files
- 云信音视频增加服务端录制 · 59de1fd2
  严久程 committed Jun 09, 2020
  
  59de1fd2 Browse Files
03 Jun, 2020 2 commits
- Merge branch 'feature/改bug_5_26' of… · 090a0310
```
Merge branch 'feature/改bug_5_26' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/改bug_5_26
```
  ydl committed Jun 03, 2020
  090a0310 Browse Files
- backup · ae56153c
  ydl committed Jun 03, 2020
  
  ae56153c Browse Files
27 May, 2020 1 commit
- 版本升级 · 89b7bbfc
  严久程 committed May 27, 2020
  
  89b7bbfc Browse Files
26 May, 2020 2 commits
- backup · effb01e8
  ydl committed May 26, 2020
  
  effb01e8 Browse Files
- 发版 · eafe40c6
  严久程 committed May 26, 2020
  
  eafe40c6 Browse Files
25 May, 2020 1 commit
- backup · b850da15
  ydl committed May 25, 2020
  
  b850da15 Browse Files
23 May, 2020 1 commit
- Merge branch 'feature/心理咨询首页改版_from咨询加声网分支' into dev · 44eeea65
```
# Conflicts:
#	config.gradle
```
  ydl committed May 23, 2020
  44eeea65 Browse Files
21 May, 2020 3 commits
- 升级首页 · 1d5eb58b
  ydl committed May 21, 2020
  
  1d5eb58b Browse Files
- 升级首页 · c3c082bb
  ydl committed May 21, 2020
  
  c3c082bb Browse Files
- backup · 65b056bc
  ydl committed May 21, 2020
  
  65b056bc Browse Files
20 May, 2020 4 commits
- backup · 042875c0
  ydl committed May 20, 2020
  
  042875c0 Browse Files
- backup · f0c4a7a3
  ydl committed May 20, 2020
  
  f0c4a7a3 Browse Files
- 升级platform-设备id获取失败问题 · 8295a7e3
  ydl committed May 20, 2020
  
  8295a7e3 Browse Files
- backup · cad1c67e
  ydl committed May 20, 2020
  
  cad1c67e Browse Files
19 May, 2020 5 commits

修复devicedId为空的问题 · 0fd403d0
ydl committed May 19, 2020

0fd403d0 Browse Files

Merge branch 'dev' into feature/心理咨询首页改版_from咨询加声网分支 · d56f4077

# Conflicts:
#	config.gradle
#	m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
#	m-home/src/xlzx/res/layout/home_button_banner_view.xml
#	m-home/src/xlzx/res/layout/home_fragment_home_module.xml
#	m-home/src/xlzx/res/layout/home_test_item_view.xml

committed May 19, 2020

d56f4077 Browse Files

即将合并dev，然后发所有组件 · bfb9c7a7
ydl committed May 19, 2020

bfb9c7a7 Browse Files

Merge branch '声网通话流程优化' into dev · ed92e1fd

# Conflicts:
#	config.gradle
#	m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
#	m-audioim/src/main/java/com/ydl/consultantim/ConsultantAudioHomeActivity.kt
#	m-confide/src/main/java/com/ydl/confide/home/bean/ConfideConnectResponse.kt
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt

committed May 19, 2020

ed92e1fd Browse Files

发版 · 5ea2f4f9
严久程 committed May 19, 2020

5ea2f4f9 Browse Files

18 May, 2020 12 commits
- 课程首页 ui · 8120eee6
  严久程 committed May 18, 2020
  
  8120eee6 Browse Files
- 版本 · 76f38c7f
  严久程 committed May 18, 2020
  
  76f38c7f Browse Files
- 版本 · 972911db
  严久程 committed May 18, 2020
  
  972911db Browse Files
- Merge branch '声网通话流程优化' of… · 50f4e3df
```
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化
```
  严久程 committed May 18, 2020
  50f4e3df Browse Files
- 测评路由 · 7468b2bc
  严久程 committed May 18, 2020
  
  7468b2bc Browse Files
- Merge branch '声网通话流程优化' of… · 9b6738d2
```
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化
```
  严久程 committed May 18, 2020
  9b6738d2 Browse Files
- 测评页面埋点事件 · 5a098f99
  严久程 committed May 18, 2020
  
  5a098f99 Browse Files
- 版本 · 7a62b65d
  严久程 committed May 18, 2020
  
  7a62b65d Browse Files
- flutter页面适配 · 9b22465e
  严久程 committed May 18, 2020
  
  9b22465e Browse Files
- 修改默认录音时长 · cc25e78b
  严久程 committed May 18, 2020
  
  cc25e78b Browse Files
- 版本 · 691bbc50
  严久程 committed May 18, 2020
  
  691bbc50 Browse Files
- 测评页面埋点事件 · 0993f164
  严久程 committed May 18, 2020
  
  0993f164 Browse Files
16 May, 2020 1 commit
- 首页改版基本完成，等待接口 · 0504b3e1
  ydl committed May 16, 2020
  
  0504b3e1 Browse Files
15 May, 2020 4 commits
- Merge branch '声网通话流程优化' of… · 50e89e04
```
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化

 Conflicts:
	config.gradle
```
  严久程 committed May 15, 2020
  50e89e04 Browse Files
- 声网通话时不锁屏 · 5e6c2d80
  严久程 committed May 15, 2020
  
  5e6c2d80 Browse Files
- 声网 · 879ed4bb
  严久程 committed May 15, 2020
  
  879ed4bb Browse Files
- 私聊跳转 · 350d18f0
  严久程 committed May 15, 2020
  
  350d18f0 Browse Files