Commits · c946e76a3f995e14f0bac0e85b9a723a1a297852 · 杨凯 / YDL-Component-Medical

20 Dec, 2019 16 commits
- Merge branch 'feature/v3' of… · c946e76a
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  konghaorui committed Dec 20, 2019
  c946e76a Browse Files
- 修复私聊页面未显示在线状态 bug · 7f0d15a1
  konghaorui committed Dec 20, 2019
  
  7f0d15a1 Browse Files
- Merge branch 'feature/v3' of… · b56ae21b
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  徐健 committed Dec 20, 2019
  b56ae21b Browse Files
- backup · c4319528
  徐健 committed Dec 20, 2019
  
  c4319528 Browse Files
- Merge branch 'feature/v3' of… · a28b8a0e
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  konghaorui committed Dec 20, 2019
  a28b8a0e Browse Files
- 修改三方SDK初始化时机 · c7958cce
  konghaorui committed Dec 20, 2019
  
  c7958cce Browse Files
- fragment重复创建问题修复 · 3f7fbd94
  严久程 committed Dec 20, 2019
  
  3f7fbd94 Browse Files
- Merge branch 'feature/v3' of… · 8c95cdc8
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  konghaorui committed Dec 20, 2019
  8c95cdc8 Browse Files
- 升级云信版本号 · c798c1f7
  konghaorui committed Dec 20, 2019
  
  c798c1f7 Browse Files
- x5内核依赖方法修改 · 42e6db02
  严久程 committed Dec 20, 2019
  
  42e6db02 Browse Files
- merge · 58dd9e1f
  徐健 committed Dec 20, 2019
  
  58dd9e1f Browse Files
- 网络库空指针，首页和消息模块的部分bug · 3839b0c4
  徐健 committed Dec 20, 2019
  
  3839b0c4 Browse Files
- 动态bug修复 · 14134f56
```
im模块4.0.20内容增加
basecommand字段修改
```
  严久程 committed Dec 20, 2019
  14134f56 Browse Files
- 动态bug修复 · ca3a5007
```
im模块4.0.20内容增加
basecommand字段修改
```
  严久程 committed Dec 20, 2019
  ca3a5007 Browse Files
- Merge branch 'feature/v3' of… · c0d6d99e
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  徐健 committed Dec 20, 2019
  c0d6d99e Browse Files
- 修复快速切换首页和其他页面导致得首页数据加载异常问题 · 9c71c8be
  徐健 committed Dec 20, 2019
  
  9c71c8be Browse Files
19 Dec, 2019 10 commits

Merge commit '' into feature/v3 · 69418b40

# Conflicts:
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
#	config.gradle
#	m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt
#	m-user/src/main/java/com/yidianling/user/ui/SmsLoginActivity.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt
#	m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt

committed Dec 19, 2019

69418b40 Browse Files

Merge branch 'feature/v3' of… · e9d92d27

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3

committed Dec 19, 2019

e9d92d27 Browse Files

开关 · a9c32924
严久程 committed Dec 19, 2019

a9c32924 Browse Files

Merge branch 'feature/consultant_update' into feature/v3 · 79079b9e

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/ydl/component/MainActivity.kt
#	config.gradle
#	m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt

committed Dec 19, 2019

79079b9e Browse Files

merge · c53b4393
徐健 committed Dec 19, 2019

c53b4393 Browse Files
修改用户版首页缓存时机 · e6494907
徐健 committed Dec 19, 2019

e6494907 Browse Files
更改心理咨询首页模块顺序 · 0a5dc009
徐健 committed Dec 19, 2019

0a5dc009 Browse Files
升级版本号 · b8717329
konghaorui committed Dec 19, 2019

b8717329 Browse Files

Merge branch 'feature/v3' of… · fdf9640a

Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3

committed Dec 19, 2019

fdf9640a Browse Files

删除RouterManager引用 · 4d124e17
konghaorui committed Dec 19, 2019

4d124e17 Browse Files

18 Dec, 2019 14 commits
- 首页数据缓存设置位5秒后缓存，放置数据存取错乱 · 23099a89
  徐健 committed Dec 18, 2019
  
  23099a89 Browse Files
- Merge branch 'feature/v3' of… · 5de1d480
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  严久程 committed Dec 18, 2019
  5de1d480 Browse Files
- Merge branch 'feature/v3' of… · 40cea21d
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  徐健 committed Dec 18, 2019
  40cea21d Browse Files
- 修复登陆页面数组越界问题 · 62f43467
  徐健 committed Dec 18, 2019
  
  62f43467 Browse Files
- Merge branch 'feature/v3' of… · 016d6107
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  严久程 committed Dec 18, 2019
  016d6107 Browse Files
- 极光升级 · d5ff2299
  严久程 committed Dec 18, 2019
  
  d5ff2299 Browse Files
- User模块补充AppService · fd2e5fd8
  konghaorui committed Dec 18, 2019
  
  fd2e5fd8 Browse Files
- Merge branch 'feature/v3' of… · 434613e0
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  konghaorui committed Dec 18, 2019
  434613e0 Browse Files
- 发布动态模块 · dba47e20
  konghaorui committed Dec 18, 2019
  
  dba47e20 Browse Files
- 支付模块升级 · eecf5010
  严久程 committed Dec 18, 2019
  
  eecf5010 Browse Files
- Merge branch 'feature/v3' of… · 4b3c125c
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  konghaorui committed Dec 18, 2019
  4b3c125c Browse Files
- 动态模块UI差异化 · 776bc4d7
  konghaorui committed Dec 18, 2019
  
  776bc4d7 Browse Files
- 修复多出空指针异常 · c87dabe8
  徐健 committed Dec 18, 2019
  
  c87dabe8 Browse Files
- backup · 606a5550
  徐健 committed Dec 18, 2019
  
  606a5550 Browse Files