Commits · 7f7c465be28242dd062964fecf02260055ce3f12 · 杨凯 / YDL-Component-Medical

26 May, 2022 3 commits
- meditation play float view done · 7f7c465b
  范玉宾 committed May 26, 2022
  
  7f7c465b Browse Files
- hide meditation play float when exit app · a3309601
  范玉宾 committed May 26, 2022
  
  a3309601 Browse Files
- meditation play float view · 5305185d
  范玉宾 committed May 26, 2022
  
  5305185d Browse Files
25 May, 2022 2 commits
- fix 18035 · 09ce85ea
  范玉宾 committed May 25, 2022
  
  09ce85ea Browse Files
- fix 17930 17935 · e0715303
  范玉宾 committed May 25, 2022
  
  e0715303 Browse Files
24 May, 2022 3 commits
- remove uid & glide crossFade · 6a96d7f4
  范玉宾 committed May 24, 2022
  
  6a96d7f4 Browse Files
- replace textureView with video view · f54aa0a0
  范玉宾 committed May 24, 2022
  
  f54aa0a0 Browse Files
- fix switch play list · 790e7057
  范玉宾 committed May 24, 2022
  
  790e7057 Browse Files
23 May, 2022 5 commits
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 1ae1e421
```
fix  17946  17947

See merge request app_android_lib/YDL-Component!34
```
  刘鹏 committed May 23, 2022
  1ae1e421 Browse Files
- fix 17946 17947 · 4a3ac3bc
  范玉宾 committed May 23, 2022
  
  4a3ac3bc Browse Files
- feat: 合并release 发布组件 · db37a4cd
  刘鹏 committed May 23, 2022
  
  db37a4cd Browse Files
- Merge remote-tracking branch 'origin/dev_muse' into d/4.3.93_muse · 64dff320
```
# Conflicts:
#	config.gradle
#	m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
#	m-user/src/main/res/layout/user_mine_fragment_mine.xml
```
  刘鹏 committed May 23, 2022
  64dff320 Browse Files
- to be test · c6b43e16
  范玉宾 committed May 23, 2022
  
  c6b43e16 Browse Files
22 May, 2022 4 commits
- H5 debug done · deddb032
  范玉宾 committed May 22, 2022
  
  deddb032 Browse Files
- Merge branch 'fix/lp_4.3.92' into 'release' · a9549fa8
```
Fix/lp 4.3.92

See merge request app_android_lib/YDL-Component!28
```
  刘鹏 committed May 22, 2022
  a9549fa8 Browse Files
- feat: 修复我的界面快速点击问题 · f527082a
  刘鹏 committed May 22, 2022
  
  f527082a Browse Files
- Rename .java to .kt · 263d4903
  刘鹏 committed May 22, 2022
  
  263d4903 Browse Files
20 May, 2022 19 commits
- Merge branch 'feat/lp_4.3.92' into 'release' · 4040f11d
```
feat: 倾诉列表登录状态点击导医跳转活动页

See merge request app_android_lib/YDL-Component!27
```
  刘鹏 committed May 20, 2022
  4040f11d Browse Files
- feat: 倾诉列表登录状态点击导医跳转活动页 · 149b0d87
  刘鹏 committed May 20, 2022
  
  149b0d87 Browse Files
- Merge branch 'feat/lp/lp_4.3.92_4' into 'release' · 4526187f
```
feat: 4.3.92版本最最终合并版

See merge request app_android_lib/YDL-Component!26
```
  刘鹏 committed May 20, 2022
  4526187f Browse Files
- feat: 4.3.92版本最最终合并版 · edf6342d
  刘鹏 committed May 20, 2022
  
  edf6342d Browse Files
- Merge branch 'feat/lp/lp_4.3.92_3' into 'release' · 378e3f9e
```
Feat/lp/lp 4.3.92 3

See merge request app_android_lib/YDL-Component!25
```
  刘鹏 committed May 20, 2022
  378e3f9e Browse Files
- feat:4.3.92版本最终合并版 · 877d3169
  刘鹏 committed May 20, 2022
  
  877d3169 Browse Files
- Merge remote-tracking branch 'origin/release' into d/v4.3.92 · 928a7d43
```
# Conflicts:
#	config.gradle
```
  刘鹏 committed May 20, 2022
  928a7d43 Browse Files
- Merge branch 'feat/lp_4.3.92_2' into 'd/v4.3.92' · 9a236f85
```
feat:组件升级

See merge request app_android_lib/YDL-Component!23
```
  刘鹏 committed May 20, 2022
  9a236f85 Browse Files
- feat:组件升级 · 2d6bf8b9
  刘鹏 committed May 20, 2022
  
  2d6bf8b9 Browse Files
- Merge branch 'feat/lp_4.3.92' into 'd/v4.3.92' · d488850b
```
Feat/lp 4.3.92

See merge request app_android_lib/YDL-Component!22
```
  刘鹏 committed May 20, 2022
  d488850b Browse Files
- feat:我的页面UI还原，倾诉列表加入跳转99元3小时活动逻辑 · ef482ca4
  刘鹏 committed May 20, 2022
  
  ef482ca4 Browse Files
- Merge branch '心事动态发布优化' into 'd/v4.3.92' · 714cc3de
```
心事动态发布优化

See merge request app_android_lib/YDL-Component!21
```
  霍志良 committed May 20, 2022
  714cc3de Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.92' into 心事动态发布优化 · 684fc0ff
```
# Conflicts:
#	m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java
```
  霍志良 committed May 20, 2022
  684fc0ff Browse Files
- feat：dynamicUI修改 · 0396bfba
  霍志良 committed May 20, 2022
  
  0396bfba Browse Files
- Merge branch 'd/v4.3.92' into feat/lp_4.3.92 · 84e7b60f
```
# Conflicts:
#	config.gradle
```
  刘鹏 committed May 20, 2022
  84e7b60f Browse Files
- feat:我的页面优化 · cbc1683a
  刘鹏 committed May 20, 2022
  
  cbc1683a Browse Files
- feat：dynamic升级 · 7653275e
  霍志良 committed May 20, 2022
  
  7653275e Browse Files
- Merge branch 'fix/lp_v4.0.50' into 'release' · 568bed43
```
fix : 修复云信消息不更新bug

See merge request app_android_lib/YDL-Component!18
```
  刘鹏 committed May 20, 2022
  568bed43 Browse Files
- fix : 修复云信消息不更新bug · d0a6dbe6
  刘鹏 committed May 20, 2022
  
  d0a6dbe6 Browse Files
19 May, 2022 3 commits
- feat：ui修改 · b0e55560
  霍志良 committed May 19, 2022
  
  b0e55560 Browse Files
- Merge branch 'fix/v4.0.50_fixhome' into 'release' · 4c642e23
```
fix : home埋点

See merge request app_android_lib/YDL-Component!16
```
  刘鹏 committed May 19, 2022
  4c642e23 Browse Files
- fix : home埋点 · 48d0bf17
  刘鹏 committed May 19, 2022
  
  48d0bf17 Browse Files
18 May, 2022 1 commit
- Merge branch 'd/v_xlzx_4.0.50' into 'release' · 3fefa00f
```
心理咨询4.0.50

See merge request app_android_lib/YDL-Component!10
```
  刘鹏 committed May 18, 2022
  3fefa00f Browse Files