- 07 May, 2020 1 commit
-
-
严久程 committed
-
- 06 May, 2020 3 commits
-
-
严久程 committed
-
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化 Conflicts: m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt
严久程 committed -
严久程 committed
-
- 23 Apr, 2020 2 commits
- 22 Apr, 2020 8 commits
-
-
严久程 committed
-
ydl committed
-
Merge branch '声网通话流程优化' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into 声网通话流程优化 Conflicts: config.gradle m-audioim/build.gradle m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchActivity.kt m-im/src/main/java/com/yidianling/im/modular/service/IMServiceImpl.kt m-im/src/main/modular_api/com/yidianling/im/api/service/IImService.kt
严久程 committed -
ydl committed
-
ydl committed
-
konghaorui committed
-
ydl committed
-
严久程 committed
-
- 21 Apr, 2020 1 commit
-
-
konghaorui committed
-
- 20 Apr, 2020 3 commits
-
-
konghaorui committed
-
konghaorui committed
-
# Conflicts: # app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java # config.gradle # m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt # m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt # m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt # m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml # m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLBaseMessageActivity.java # m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java # m-im/src/main/res_uikit/layout/im_nim_chat_confide_order_info_view.xml # m-im/src/main/res_uikit/layout/im_nim_ui_title_bar_bottom.xml # ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
konghaorui committed
-
- 16 Apr, 2020 4 commits
- 15 Apr, 2020 8 commits
- 14 Apr, 2020 5 commits
- 13 Apr, 2020 5 commits