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

08 Jun, 2022 16 commits
- feat: 去掉视频封面,音频封面要 · c0740b83
  万齐军 committed Jun 08, 2022
  
  c0740b83 Browse Files
- Merge branch 'feature/yk_release' into 'release' · 4a4b4648
```
feat: 组件升级提交

See merge request app_android_lib/YDL-Component!145
```
  刘鹏 committed Jun 08, 2022
  4a4b4648 Browse Files
- feat: 组件升级提交 · f7b8b9cf
  upwork.021 committed Jun 08, 2022
  
  f7b8b9cf Browse Files
- Merge branch 'feature/yk_release' into 'release' · 2de12e06
```
feat: 组件升级提交

See merge request app_android_lib/YDL-Component!144
```
  刘鹏 committed Jun 08, 2022
  2de12e06 Browse Files
- feat: 组件升级提交 · b342e73d
  upwork.021 committed Jun 08, 2022
  
  b342e73d Browse Files
- Merge branch 'd/v4.3.95' into 'release' · 7cf1e0bd
```
v.4.3.95

See merge request app_android_lib/YDL-Component!142
```
  刘鹏 committed Jun 08, 2022
  7cf1e0bd Browse Files
- Merge branch 'd/v_full_text' into 'd/v4.3.95' · d3c043fe
```
富文本合并发布版本

See merge request app_android_lib/YDL-Component!141
```
  刘鹏 committed Jun 08, 2022
  d3c043fe Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.95' into d/v_full_text · 035144ff
  刘鹏 committed Jun 08, 2022
  
  035144ff Browse Files
- Merge branch 'feat/lp/lp_v4.3.95' into 'd/v4.3.95' · c7f17394
```
声网优化代码合并

See merge request app_android_lib/YDL-Component!140
```
  刘鹏 committed Jun 08, 2022
  c7f17394 Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.95' into feat/lp/lp_v4.3.95 · 15ce4787
  刘鹏 committed Jun 08, 2022
  
  15ce4787 Browse Files
- Merge branch 'd/v_sort' into 'd/v4.3.95' · 366e99b6
```
D/v sort

See merge request app_android_lib/YDL-Component!139
```
  刘鹏 committed Jun 08, 2022
  366e99b6 Browse Files
- feat: 合并代码提交 · 54c2a611
  upwork.021 committed Jun 08, 2022
  
  54c2a611 Browse Files
- feat: 倒计时时间同步ios · 02eeeae8
  刘鹏 committed Jun 08, 2022
  
  02eeeae8 Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.95' into d/v_sort · 3c4c54c3
```
# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
#	config.gradle
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
#	m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt
```
  upwork.021 committed Jun 08, 2022
  3c4c54c3 Browse Files
- Merge branch 'feature/yk_sort' into 'd/v_sort' · a58adebe
```
Feature/yk sort

See merge request app_android_lib/YDL-Component!138
```
  刘鹏 committed Jun 08, 2022
  a58adebe Browse Files
- feat: 代码提交 · 342290e2
  upwork.021 committed Jun 08, 2022
  
  342290e2 Browse Files
07 Jun, 2022 13 commits
- Merge branch 'd/meditation_bugfix' into 'd/v4.3.95' · f93dc397
```
D/meditation bugfix

See merge request app_android_lib/YDL-Component!136
```
  范玉宾 committed Jun 07, 2022
  f93dc397 Browse Files
- Merge branch 'feat/lp/lp_v4.3.95' into 'd/v4.3.95' · b29b9ac6
```
feat: 1. opensl去掉，采用系统音频采集。2.倒计时增加1分钟，保证通话不被提前终止。3.登录页授权按钮加入动效

See merge request app_android_lib/YDL-Component!135
```
  刘鹏 committed Jun 07, 2022
  b29b9ac6 Browse Files
- feat: 1. opensl去掉，采用系统音频采集。2.倒计时增加1分钟，保证通话不被提前终止。3.登录页授权按钮加入动效 · ffa3295a
  刘鹏 committed Jun 07, 2022
  
  ffa3295a Browse Files
- Merge remote-tracking branch 'origin/release' into d/v_full_text · c3dc3fc5
```
# Conflicts:
#	app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
#	config.gradle
```
  霍志良 committed Jun 07, 2022
  c3dc3fc5 Browse Files
- feat: 主题弹窗优化，ui验收优化，bug修复 · cc3b6d32
  upwork.021 committed Jun 07, 2022
  
  cc3b6d32 Browse Files
- Merge branch 'd/v_register' into 'd/v4.3.95' · 43649f62
```
新用户注册登录

See merge request app_android_lib/YDL-Component!134
```
  霍志良 committed Jun 07, 2022
  43649f62 Browse Files
- Merge remote-tracking branch 'origin/release' into d/v_register · 94c2a178
```
# Conflicts:
#	app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
#	config.gradle
```
  霍志良 committed Jun 07, 2022
  94c2a178 Browse Files
- fix total duration err · d6e9d2a8
```
Took 47 minutes
```
  范玉宾 committed Jun 07, 2022
  d6e9d2a8 Browse Files
- Merge branch 'd/v4.0.51_xlzx' into 'release' · 50cd0d65
```
D/v4.0.51 xlzx

See merge request app_android_lib/YDL-Component!133
```
  刘鹏 committed Jun 07, 2022
  50cd0d65 Browse Files
- feat: 线上问题修复 · a04040ed
  刘鹏 committed Jun 07, 2022
  
  a04040ed Browse Files
- feat：二次拒绝埋点 · 7b9dc605
  霍志良 committed Jun 07, 2022
  
  7b9dc605 Browse Files
- Merge branch 'feat/qj/fix_confide2' into 'd/v4.3.95' · 418eee77
```
feat: 去掉视频封面

See merge request app_android_lib/YDL-Component!132
```
  万齐军 committed Jun 07, 2022
  418eee77 Browse Files
- feat: 去掉视频封面 · 1dab8da3
  万齐军 committed Jun 07, 2022
  
  1dab8da3 Browse Files
06 Jun, 2022 2 commits
- add buried for home video entrance to meditation & fix sleep collected status err · 560c631e
```
Took 34 minutes
```
  范玉宾 committed Jun 06, 2022
  560c631e Browse Files
- feat：心理咨询隐私政策页修改 · ed6ccd25
  霍志良 committed Jun 06, 2022
  
  ed6ccd25 Browse Files
05 Jun, 2022 2 commits
- feat: 心理咨询包4.9.51 · 97efed67
  刘鹏 committed Jun 05, 2022
  
  97efed67 Browse Files
- Merge branch 'release' into d/v4.0.51_xlzx · 97c2aedc
  刘鹏 committed Jun 05, 2022
  
  97c2aedc Browse Files
03 Jun, 2022 3 commits
- Merge branch 'fix/lp/lp_fix_flow_play' into 'release' · 400d2004
```
feat: 修复倾诉视频列表流量播放开关问题

See merge request app_android_lib/YDL-Component!131
```
  刘鹏 committed Jun 03, 2022
  400d2004 Browse Files
- feat: 修复倾诉视频列表流量播放开关问题 · ff8ccb04
  刘鹏 committed Jun 03, 2022
  
  ff8ccb04 Browse Files
- feat: 冥想service删除注释代码，home组件ydl包内容迁移位置 · 50f3dd7e
  刘鹏 committed Jun 03, 2022
  
  50f3dd7e Browse Files
02 Jun, 2022 4 commits
- feat: 小众病症联想词代码提交 · 2e5b358b
  upwork.021 committed Jun 02, 2022
  
  2e5b358b Browse Files
- feat：分支合并、user组件升级 · 5a7a0355
  霍志良 committed Jun 02, 2022
  
  5a7a0355 Browse Files
- Merge remote-tracking branch 'origin/release' into d/v_register · de351e65
```
# Conflicts:
#	config.gradle
```
  霍志良 committed Jun 02, 2022
  de351e65 Browse Files
- feat：IM组件升级 · 222e0f8a
  霍志良 committed Jun 02, 2022
  
  222e0f8a Browse Files