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

14 Jan, 2020 27 commits
- 升级咨询版本号 · cd67f17b
  konghaorui committed Jan 14, 2020
  
  cd67f17b Browse Files
- Merge branch 'feature/im_update' of… · 45b9b902
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  konghaorui committed Jan 14, 2020
  45b9b902 Browse Files
- 升级webview版本号 · b87c68c5
  konghaorui committed Jan 14, 2020
  
  b87c68c5 Browse Files
- Merge branch 'feature/im_update' of… · 3c65334b
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  严久程 committed Jan 14, 2020
  3c65334b Browse Files
- 课程播放的问题 · 7108e1f6
  严久程 committed Jan 14, 2020
  
  7108e1f6 Browse Files
- Merge branch 'feature/im_update' of… · 1d28f16f
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update

# Conflicts:
#	app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
```
  konghaorui committed Jan 14, 2020
  1d28f16f Browse Files
- 修改WebView分享到动态按钮失效问题 · 430841c1
  konghaorui committed Jan 14, 2020
  
  430841c1 Browse Files
- Merge branch 'feature/im_update' of… · 0fbc538c
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  严久程 committed Jan 14, 2020
  0fbc538c Browse Files
- 课程播放的问题 · 16ec5d19
  严久程 committed Jan 14, 2020
  
  16ec5d19 Browse Files
- Merge branch 'feature/im_update' of… · 437bc484
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 14, 2020
  437bc484 Browse Files
- webUI修改 · ddfa1944
  徐健 committed Jan 14, 2020
  
  ddfa1944 Browse Files
- Merge branch 'feature/im_update' of… · 7b750acb
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  严久程 committed Jan 14, 2020
  7b750acb Browse Files
- 动态数据展示问题处理 · 04a3c8b8
  严久程 committed Jan 14, 2020
  
  04a3c8b8 Browse Files
- 动态数据展示问题处理 · 551b761e
  严久程 committed Jan 14, 2020
  
  551b761e Browse Files
- 隐私弹框ui修改 · 89e0f996
  徐健 committed Jan 14, 2020
  
  89e0f996 Browse Files
- 发版 · e1618ae2
  严久程 committed Jan 14, 2020
  
  e1618ae2 Browse Files
- Merge branch 'dev' into feature/im_update · b144c34c
```
# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java
```
  严久程 committed Jan 14, 2020
  b144c34c Browse Files
- 输入密码页面请求输入焦点 · 0bffdca5
  konghaorui committed Jan 14, 2020
  
  0bffdca5 Browse Files
- Merge branch 'feature/im_update' of… · 83a1b997
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 14, 2020
  83a1b997 Browse Files
- backup 更新ydlcommondialog样式 · e8af2e71
  徐健 committed Jan 14, 2020
  
  e8af2e71 Browse Files
- 修改h5页面的标题栏图标 · 08da99e9
  徐健 committed Jan 14, 2020
  
  08da99e9 Browse Files
- 升级umeng版本 · aeafabb8
  konghaorui committed Jan 14, 2020
  
  aeafabb8 Browse Files
- Merge branch 'feature/im_update' of… · 5e72522b
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  konghaorui committed Jan 14, 2020
  5e72522b Browse Files
- 升级umeng版本 · e6d3f330
  konghaorui committed Jan 14, 2020
  
  e6d3f330 Browse Files
- Merge branch 'dev' into feature/im_update · b67f55da
  严久程 committed Jan 14, 2020
  
  b67f55da Browse Files
- Merge branch 'feature/im_update' of… · 1d5c3217
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 14, 2020
  1d5c3217 Browse Files
- backup · a61df9ec
  徐健 committed Jan 14, 2020
  
  a61df9ec Browse Files
13 Jan, 2020 13 commits
- Merge branch 'feature/im_update' of… · 96c33044
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  konghaorui committed Jan 13, 2020
  96c33044 Browse Files
- 新增长连接重连umeng埋点 · a66f2b5b
  konghaorui committed Jan 13, 2020
  
  a66f2b5b Browse Files
- backup · 3b4c669b
  徐健 committed Jan 13, 2020
  
  3b4c669b Browse Files
- backup · 74557a7c
  徐健 committed Jan 13, 2020
  
  74557a7c Browse Files
- Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev · de4763ac
  严久程 committed Jan 13, 2020
  
  de4763ac Browse Files
- 动态主页、三个分类切换时不在顶部的问题 · 3b4df2ad
  严久程 committed Jan 13, 2020
  
  3b4df2ad Browse Files
- Merge branch 'feature/im_update' of… · 9de0287e
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 13, 2020
  9de0287e Browse Files
- backup · 90a7b17a
  徐健 committed Jan 13, 2020
  
  90a7b17a Browse Files
- Merge branch 'dev' into feature/im_update · cfa15a4c
```
# Conflicts:
#	config.gradle
```
  konghaorui committed Jan 13, 2020
  cfa15a4c Browse Files
- backup · 0d8e4013
  徐健 committed Jan 13, 2020
  
  0d8e4013 Browse Files
- Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev · 8e3569af
  konghaorui committed Jan 13, 2020
  
  8e3569af Browse Files
- 1. 修改图片选择库 · 7f031eb3
```
2. 补充 socket ip地址接口
涉及 im、dynamic、platform，未发布
```
  konghaorui committed Jan 13, 2020
  7f031eb3 Browse Files
- backup · 9f397a9e
  徐健 committed Jan 13, 2020
  
  9f397a9e Browse Files