- 14 Jan, 2020 14 commits
- 
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
# Conflicts: # app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java 严久程 committed
- 
konghaorui committed
- 
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update 徐健 committed
- 
徐健 committed
- 
徐健 committed
- 
konghaorui committed
- 
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update konghaorui committed
- 
konghaorui committed
- 
严久程 committed
- 
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update 徐健 committed
- 
徐健 committed
 
- 
- 13 Jan, 2020 13 commits
- 
- 
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update konghaorui committed
- 
konghaorui committed
- 
徐健 committed
- 
徐健 committed
- 
严久程 committed
- 
Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update 徐健 committed
- 
徐健 committed
- 
# Conflicts: # config.gradle konghaorui committed
- 
徐健 committed
- 
2. 补充 socket ip地址接口 涉及 im、dynamic、platform,未发布 konghaorui committed
- 
徐健 committed
 
- 
- 10 Jan, 2020 4 commits
- 09 Jan, 2020 8 commits
- 
- 
# Conflicts: # config.gradle # m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java # ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt 徐健 committed
- 
徐健 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
严久程 committed
- 
徐健 committed
- 
徐健 committed
 
- 
- 08 Jan, 2020 1 commit
- 
- 
徐健 committed
 
- 
