Commits · aa31f9289ac1eff29d78def2e3ca937524ab75e4 · 杨凯 / YDL-Component-Medical · GitLab

14 Apr, 2020 5 commits
- merge · aa31f928
  ydl committed Apr 14, 2020
  
  aa31f928 Browse Files
- backup · e34eff7a
  ydl committed Apr 14, 2020
  
  e34eff7a Browse Files
- Merge branch '咨询加声网' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 咨询加声网 · cd3bc428
```
 Conflicts:
	config.gradle
```
  严久程 committed Apr 14, 2020
  cd3bc428 Browse Files
- 日志推送 · 76ea785b
  严久程 committed Apr 14, 2020
  
  76ea785b Browse Files
- 手动切换axb之前，如果声网是连接成功状态，调用上传异常接口108，成功之后，才能调用dial接口切换axb，如果未连接成功，则走原逻辑 · b58105fb
  ydl committed Apr 14, 2020
  
  b58105fb Browse Files
13 Apr, 2020 16 commits
- 修复导医和增加心理咨询华为渠道的判断 · 44c7d0a2
  ydl committed Apr 13, 2020
  
  44c7d0a2 Browse Files
- 升级backup · 868c667b
  ydl committed Apr 13, 2020
  
  868c667b Browse Files
- Merge branch '咨询加声网' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 咨询加声网 · 19e7bb83
  ydl committed Apr 13, 2020
  
  19e7bb83 Browse Files
- 修复导医展示问题 · 4d4a53f1
  ydl committed Apr 13, 2020
  
  4d4a53f1 Browse Files
- Merge branch '咨询加声网' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 咨询加声网 · 6c72f6e9
  严久程 committed Apr 13, 2020
  
  6c72f6e9 Browse Files
- 去掉问答模块的背景颜色 · 205843ba
  严久程 committed Apr 13, 2020
  
  205843ba Browse Files
- merge · d2e3abca
  ydl committed Apr 13, 2020
  
  d2e3abca Browse Files
- 导医弹窗测试 · 249f2afc
  ydl committed Apr 13, 2020
  
  249f2afc Browse Files
- 版本升级 · 2beef95f
  严久程 committed Apr 13, 2020
  
  2beef95f Browse Files
- 声网日志 · 7967b66f
  严久程 committed Apr 13, 2020
  
  7967b66f Browse Files
- Merge branch 'dev' into 咨询加声网 · 83ff181a
```
# Conflicts:
#	config.gradle
#	m-audioim/build.gradle
#	m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
```
  严久程 committed Apr 13, 2020
  83ff181a Browse Files
- Merge branch '心理咨询紧急改版' into dev · e428403e
  严久程 committed Apr 13, 2020
  
  e428403e Browse Files
- 声网日志 · 5b638bfd
  严久程 committed Apr 13, 2020
  
  5b638bfd Browse Files
- 修复H5图片无法上传问题 · 300c1693
  konghaorui committed Apr 13, 2020
  
  300c1693 Browse Files
- Merge branch '心理咨询紧急改版' of… · bb4a972a
```
Merge branch '心理咨询紧急改版' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 心理咨询紧急改版
```
  严久程 committed Apr 13, 2020
  bb4a972a Browse Files
- 首页图标区分 · 09309b3c
  严久程 committed Apr 13, 2020
  
  09309b3c Browse Files
10 Apr, 2020 11 commits
- 升级ydl-flutter-base · 2415d343
  ydl committed Apr 10, 2020
  
  2415d343 Browse Files
- 升级ydl-flutter-base · b1ce13b5
  ydl committed Apr 10, 2020
  
  b1ce13b5 Browse Files
- Merge branch '心理咨询紧急改版' of… · c46b997a
```
Merge branch '心理咨询紧急改版' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 心理咨询紧急改版
```
  ydl committed Apr 10, 2020
  c46b997a Browse Files
- 增加获取包名和渠道名的交互方法 · bc610bd3
  ydl committed Apr 10, 2020
  
  bc610bd3 Browse Files
- 首页图标区分 · 6f1c8680
  严久程 committed Apr 10, 2020
  
  6f1c8680 Browse Files
- 首页图标区分 · 5cd15980
  严久程 committed Apr 10, 2020
  
  5cd15980 Browse Files
- 华为渠道区分 · 02dbf89f
  严久程 committed Apr 10, 2020
  
  02dbf89f Browse Files
- Merge branch '心理咨询紧急改版' of… · 40bf9ef2
```
Merge branch '心理咨询紧急改版' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 心理咨询紧急改版
```
  严久程 committed Apr 10, 2020
  40bf9ef2 Browse Files
- 华为渠道区分 · 2a816887
  严久程 committed Apr 10, 2020
  
  2a816887 Browse Files
- 心理咨询首页组件发布 · 4b633fd6
  ydl committed Apr 10, 2020
  
  4b633fd6 Browse Files
- 心理咨询首页布局调整 · 89632734
  ydl committed Apr 10, 2020
  
  89632734 Browse Files
09 Apr, 2020 4 commits
- 页面销毁增加108异常上传，删除其余108上传逻辑 · a97bba19
  ydl committed Apr 09, 2020
  
  a97bba19 Browse Files
- 补充手动切换异常上传108 · 296fdeb8
  ydl committed Apr 09, 2020
  
  296fdeb8 Browse Files
- 补充手动切换异常上传108 · af87b6f9
  ydl committed Apr 09, 2020
  
  af87b6f9 Browse Files
- 升级组件版本 · 91dec545
  ydl committed Apr 09, 2020
  
  91dec545 Browse Files
08 Apr, 2020 4 commits
- Merge branch 'feature/daoyi_kuoliu' into 咨询加声网 · a3541e56
```
# Conflicts:
#	config.gradle
```
  ydl committed Apr 08, 2020
  a3541e56 Browse Files
- 修复推广来源无法展示的问题 · b1ede74c
  徐健 committed Apr 08, 2020
  
  b1ede74c Browse Files
- Merge remote-tracking branch 'origin/feature/daoyi_kuoliu' into 咨询加声网 · 36040170
```
# Conflicts:
#	config.gradle
```
  ydl committed Apr 08, 2020
  36040170 Browse Files
- 倾述和咨询声网页面去重 · 823d66fb
  严久程 committed Apr 08, 2020
  
  823d66fb Browse Files