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

15 Jan, 2020 4 commits
- Merge branch 'feature/im_update' into dev · ef30999e
```
# Conflicts:
#	config.gradle
```
  严久程 committed Jan 15, 2020
  ef30999e Browse Files
- 修改个人动态主页 ui 样式，待发布 · 49a2cf66
  konghaorui committed Jan 15, 2020
  
  49a2cf66 Browse Files
- 本地json缓存问题去掉田大师字段 · 4e797f3e
  严久程 committed Jan 15, 2020
  
  4e797f3e Browse Files
- backup · df2ef859
  徐健 committed Jan 15, 2020
  
  df2ef859 Browse Files
14 Jan, 2020 36 commits
- backup · ecf4b437
  徐健 committed Jan 14, 2020
  
  ecf4b437 Browse Files
- Merge branch 'feature/im_update' of… · fecb048e
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 14, 2020
  fecb048e Browse Files
- backup · 22f5745d
  徐健 committed Jan 14, 2020
  
  22f5745d Browse Files
- Merge branch 'feature/im_update' of… · 3a1afd42
```
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
  3a1afd42 Browse Files
- 升级咨询版本号 · cd67f17b
  konghaorui committed Jan 14, 2020
  
  cd67f17b Browse Files
- backup · 661a8c54
  徐健 committed Jan 14, 2020
  
  661a8c54 Browse Files
- backup · aab91957
  徐健 committed Jan 14, 2020
  
  aab91957 Browse Files
- Merge branch 'feature/im_update' of… · a6070a94
```
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update
```
  徐健 committed Jan 14, 2020
  a6070a94 Browse Files
- backup · fe8ecea6
  徐健 committed Jan 14, 2020
  
  fe8ecea6 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
- 修复webview分享到动态失效问题 · e9b46b68
  konghaorui committed Jan 14, 2020
  
  e9b46b68 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