Commits · 69418b40f0952e650d5beaae94527aaff5077ccc · 杨凯 / YDL-Component-Medical

19 Dec, 2019 8 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/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 15 commits
- 首页数据缓存设置位5秒后缓存，放置数据存取错乱 · 23099a89
  徐健 committed Dec 18, 2019
  
  23099a89 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
- 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
- 修改ydl首页缓存数据和doctorName加载不出来得问题 · ea224558
  徐健 committed Dec 18, 2019
  
  ea224558 Browse Files
- 升级im版本号 · 800eebf3
  konghaorui committed Dec 18, 2019
  
  800eebf3 Browse Files
- Merge branch 'feature/v3' of… · 2f0a352e
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3

# Conflicts:
#	m-home/src/xlzx/java/com/yidianling/home/presenter/HomePresenterImpl.kt
```
  konghaorui committed Dec 18, 2019
  2f0a352e Browse Files
- 修改动态模块样式 · aeff1b11
  konghaorui committed Dec 18, 2019
  
  aeff1b11 Browse Files
17 Dec, 2019 10 commits
- 修复登录埋点数据异常 · f699b29e
  konghaorui committed Dec 17, 2019
  
  f699b29e Browse Files
- 修改警告 · 1002a61b
  徐健 committed Dec 17, 2019
  
  1002a61b Browse Files
- View内部判断上下文不为空，则执行展示逻辑 · 1939d3dd
  徐健 committed Dec 17, 2019
  
  1939d3dd Browse Files
- 用户版首頁mvp绑定view · 3e852281
  徐健 committed Dec 17, 2019
  
  3e852281 Browse Files
- 首頁mvp防止崩潰 · fbb25365
  徐健 committed Dec 17, 2019
  
  fbb25365 Browse Files
- 咨询师首页顶部多种banner布局开发完成 · c2c21df2
  徐健 committed Dec 17, 2019
  
  c2c21df2 Browse Files
- 首页资源重命名 · f1b324e6
  konghaorui committed Dec 17, 2019
  
  f1b324e6 Browse Files
- 补充动态接口 · a0726ba8
  konghaorui committed Dec 17, 2019
  
  a0726ba8 Browse Files
- 动态资源重命名 · 0e15c16c
  konghaorui committed Dec 17, 2019
  
  0e15c16c Browse Files
- 私聊模块补充防止 Rxjava 内存泄露逻辑 · 19b956db
  konghaorui committed Dec 17, 2019
  
  19b956db Browse Files
16 Dec, 2019 4 commits
- 动态支付功能 · aa09a02c
  严久程 committed Dec 16, 2019
  
  aa09a02c Browse Files
- Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev · 5992f71e
  konghaorui committed Dec 16, 2019
  
  5992f71e Browse Files
- 修复线上bug · b12fe3f8
  konghaorui committed Dec 16, 2019
  
  b12fe3f8 Browse Files
- 修复咨询师列表页碎片页面resource获取失败导致的崩溃问题 · 6e7b007c
  徐健 committed Dec 16, 2019
  
  6e7b007c Browse Files
13 Dec, 2019 3 commits
- 升级platform · 76709a76
  徐健 committed Dec 13, 2019
  
  76709a76 Browse Files
- Merge branch 'feature/v3' of… · 5512cdec
```
Merge branch 'feature/v3' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/v3
```
  徐健 committed Dec 13, 2019
  5512cdec Browse Files
- backup · 4d53edd8
  徐健 committed Dec 13, 2019
  
  4d53edd8 Browse Files