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

27 May, 2022 7 commits
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · d7102cb8
```
switch float play view

See merge request app_android_lib/YDL-Component!61
```
  范玉宾 committed May 27, 2022
  d7102cb8 Browse Files
- switch float play view · 1669b637
  范玉宾 committed May 27, 2022
  
  1669b637 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 004e2b7f
```
fix play record bug

See merge request app_android_lib/YDL-Component!59
```
  范玉宾 committed May 27, 2022
  004e2b7f Browse Files
- Merge branch 'd/4.3.93_muse' into 'd/lancet/4.3.93_muse' · 7aea9a74
```
# Conflicts:
#   m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
```
  范玉宾 committed May 27, 2022
  7aea9a74 Browse Files
- fix play record bug · 5abdfb2c
  范玉宾 committed May 27, 2022
  
  5abdfb2c Browse Files
- Merge branch 'feat/lp/lp_muse_4' into 'd/4.3.93_muse' · a0f8b9d0
```
feat: 合并和升级组件

See merge request app_android_lib/YDL-Component!58
```
  刘鹏 committed May 27, 2022
  a0f8b9d0 Browse Files
- feat: 合并和升级组件 · 2271092f
  刘鹏 committed May 27, 2022
  
  2271092f Browse Files
26 May, 2022 26 commits
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 20a4ff28
```
add  float view  permission  request

See merge request app_android_lib/YDL-Component!57
```
  刘鹏 committed May 26, 2022
  20a4ff28 Browse Files
- add float view permission request · 0637f105
  范玉宾 committed May 26, 2022
  
  0637f105 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · dcc24a08
```
fix  18162

See merge request app_android_lib/YDL-Component!56
```
  刘鹏 committed May 26, 2022
  dcc24a08 Browse Files
- fix 18162 · 63dbb89e
  范玉宾 committed May 26, 2022
  
  63dbb89e Browse Files
- Merge branch 'feat/lp/lp_muse_3' into 'd/4.3.93_muse' · 5ee5bcec
```
埋点发布后合并

See merge request app_android_lib/YDL-Component!55
```
  刘鹏 committed May 26, 2022
  5ee5bcec Browse Files
- feat: 埋点提交发布后合并 · 8b525788
  刘鹏 committed May 26, 2022
  
  8b525788 Browse Files
- Merge remote-tracking branch 'origin/d/4.3.93_muse' into d/4.3.93_muse · 44f6ddb9
```
# Conflicts:
#	m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt
```
  刘鹏 committed May 26, 2022
  44f6ddb9 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · b83815bc
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!54
```
  刘鹏 committed May 26, 2022
  b83815bc Browse Files
- fix 18162 · bb4e9a54
  范玉宾 committed May 26, 2022
  
  bb4e9a54 Browse Files
- feat: 埋点完成 · 1b4ccdf4
  刘鹏 committed May 26, 2022
  
  1b4ccdf4 Browse Files
- Merge remote-tracking branch 'origin/d/lancet/4.3.93_muse' into d/lancet/4.3.93_muse · 1a10f407
  upwork.021 committed May 26, 2022
  
  1a10f407 Browse Files
- feat: 代码提交 · ab504794
  upwork.021 committed May 26, 2022
  
  ab504794 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · e8c6a1ea
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!52
```
  刘鹏 committed May 26, 2022
  e8c6a1ea Browse Files
- Merge branch 'd/4.3.93_muse' into 'd/lancet/4.3.93_muse' · 674cf978
```
# Conflicts:
#   config.gradle
```
  范玉宾 committed May 26, 2022
  674cf978 Browse Files
- time off single loop playlist · 89f8a399
  范玉宾 committed May 26, 2022
  
  89f8a399 Browse Files
- Merge branch 'feat/lp/lp_muse_2' into 'd/4.3.93_muse' · cf83bbfe
```
feat: 合并重新打包，解决返回无效问题

See merge request app_android_lib/YDL-Component!51
```
  刘鹏 committed May 26, 2022
  cf83bbfe Browse Files
- feat: 合并重新打包，解决返回无效问题 · a19f36a7
  刘鹏 committed May 26, 2022
  
  a19f36a7 Browse Files
- meditation play float view done · 7f7c465b
  范玉宾 committed May 26, 2022
  
  7f7c465b Browse Files
- Merge branch 'feat/lp/lp_muse' into 'd/4.3.93_muse' · 8fc03fa7
```
冥想分支合并release，组件已提交

See merge request app_android_lib/YDL-Component!49
```
  刘鹏 committed May 26, 2022
  8fc03fa7 Browse Files
- feat: 合并release分支 · 4e9933f8
  刘鹏 committed May 26, 2022
  
  4e9933f8 Browse Files
- Merge branch 'd/4.3.93_muse' into feat/lp/lp_muse · 9862f973
```
# Conflicts:
#	config.gradle
#	m-user/src/main/java/com/yidianling/user/mine/MineFragment.java
#	m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt
```
  刘鹏 committed May 26, 2022
  9862f973 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 7838e90a
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!48
```
  刘鹏 committed May 26, 2022
  7838e90a Browse Files
- hide meditation play float when exit app · a3309601
  范玉宾 committed May 26, 2022
  
  a3309601 Browse Files
- Merge branch 'release' into feat/lp/lp_muse · cc9283e1
```
# 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 26, 2022
  cc9283e1 Browse Files
- feat: webview加入页内跳转url方法 · cdd0be70
  刘鹏 committed May 26, 2022
  
  cdd0be70 Browse Files
- meditation play float view · 5305185d
  范玉宾 committed May 26, 2022
  
  5305185d Browse Files
25 May, 2022 4 commits
- fix 18035 · 09ce85ea
  范玉宾 committed May 25, 2022
  
  09ce85ea Browse Files
- fix 17930 17935 · e0715303
  范玉宾 committed May 25, 2022
  
  e0715303 Browse Files
- Merge branch 'feat/lp/lp_jg_text' into 'release' · 5ab37efb
```
feat: 金刚位文案改回抑郁测量

See merge request app_android_lib/YDL-Component!45
```
  刘鹏 committed May 25, 2022
  5ab37efb Browse Files
- feat: 金刚位文案改回抑郁测量 · 6ded4c0d
  刘鹏 committed May 25, 2022
  
  6ded4c0d Browse Files
24 May, 2022 3 commits
- remove uid & glide crossFade · 6a96d7f4
  范玉宾 committed May 24, 2022
  
  6a96d7f4 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · edc7387d
```
fix switch play list

See merge request app_android_lib/YDL-Component!37
```
  刘鹏 committed May 24, 2022
  edc7387d Browse Files
- replace textureView with video view · f54aa0a0
  范玉宾 committed May 24, 2022
  
  f54aa0a0 Browse Files