Commits · 4e762f1435504875285d55f950bb9cc7eac904e0 · 杨凯 / YDL-Component-Medical

21 Apr, 2020 1 commit
- 补充文章模块 · 4e762f14
  konghaorui committed Apr 21, 2020
  
  4e762f14 Browse Files
20 Apr, 2020 3 commits

组件发布、补充 Home 文本自定义逻辑 · 77a715f7
konghaorui committed Apr 20, 2020

77a715f7 Browse Files
修改资源名称 · 62248901
konghaorui committed Apr 20, 2020

62248901 Browse Files

Merge branch 'dev' into feature/组件化_ending · b4bed120

# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java
#	config.gradle
#	m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
#	m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
#	m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLBaseMessageActivity.java
#	m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
#	m-im/src/main/res_uikit/layout/im_nim_chat_confide_order_info_view.xml
#	m-im/src/main/res_uikit/layout/im_nim_ui_title_bar_bottom.xml
#	ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt

committed Apr 20, 2020

b4bed120 Browse Files

16 Apr, 2020 4 commits
- 发版 · 1ed4124c
  严久程 committed Apr 16, 2020
  
  1ed4124c Browse Files
- 声网发版 · 4b50b6e0
  严久程 committed Apr 16, 2020
  
  4b50b6e0 Browse Files
- Merge branch 'dev' into 咨询加声网 · 2176c516
```
# Conflicts:
#	config.gradle
#	m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
```
  严久程 committed Apr 16, 2020
  2176c516 Browse Files
- 声网发版 · 92240540
  严久程 committed Apr 16, 2020
  
  92240540 Browse Files
15 Apr, 2020 8 commits
- 区分心理咨询华为渠道 · 9b4d4af0
  严久程 committed Apr 15, 2020
  
  9b4d4af0 Browse Files
- 区分心理咨询华为渠道 · ed92bebc
  严久程 committed Apr 15, 2020
  
  ed92bebc Browse Files
- 声网 · 86e42944
  严久程 committed Apr 15, 2020
  
  86e42944 Browse Files
- 声网 · 8571b087
  严久程 committed Apr 15, 2020
  
  8571b087 Browse Files
- 华为渠道特殊处理 · 5989f51d
  严久程 committed Apr 15, 2020
  
  5989f51d Browse Files
- 华为渠道特殊处理 · f09b9019
  严久程 committed Apr 15, 2020
  
  f09b9019 Browse Files
- 渠道群分 · d1b6ff4d
  严久程 committed Apr 15, 2020
  
  d1b6ff4d Browse Files
- 日志推送 · 8ad96515
  严久程 committed Apr 15, 2020
  
  8ad96515 Browse Files
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
11 Apr, 2020 1 commit
- 补充flutter获取子频道配置信息方法 · f17008fd
  konghaorui committed Apr 11, 2020
  
  f17008fd Browse Files
10 Apr, 2020 2 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