Commits · 0bc54e8402d1f013bf4ccfd641b63376f7838856 · 杨凯 / YDL-Component-Medical

30 May, 2022 2 commits

Merge branch 'd/lancet/4.3.93_muse' of… · 0bc54e84

Merge branch 'd/lancet/4.3.93_muse' of http://gitlab.yidianling.com/app_android_lib/YDL-Component into dev/4.3.93_muse

* 'd/lancet/4.3.93_muse' of http://gitlab.yidianling.com/app_android_lib/YDL-Component:
  feat: 升级muse

committed May 30, 2022

0bc54e84 Browse Files

UI WalkThrough part2 · 6fac90b6
范玉宾 committed May 30, 2022

6fac90b6 Browse Files

29 May, 2022 4 commits
- Merge branch 'd/4.3.93_muse' into 'd/lancet/4.3.93_muse' · e86b7013
```
# Conflicts:
#   config.gradle
```
  范玉宾 committed May 29, 2022
  e86b7013 Browse Files
- set un full screen activity for switch sound · 2a3883ed
  范玉宾 committed May 29, 2022
  
  2a3883ed Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 44424548
```
UI  WalkThrough

See merge request app_android_lib/YDL-Component!76
```
  范玉宾 committed May 29, 2022
  44424548 Browse Files
- UI WalkThrough · 3a23de50
  范玉宾 committed May 29, 2022
  
  3a23de50 Browse Files
28 May, 2022 17 commits
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 34fae2a2
```
revert   route  method

See merge request app_android_lib/YDL-Component!75
```
  范玉宾 committed May 28, 2022
  34fae2a2 Browse Files
- revert route method · c45b8422
  范玉宾 committed May 28, 2022
  
  c45b8422 Browse Files
- Merge branch 'feat/lp/lp_muse_7' into 'd/4.3.93_muse' · ae380337
```
feat: 升级muse

See merge request app_android_lib/YDL-Component!74
```
  刘鹏 committed May 28, 2022
  ae380337 Browse Files
- feat: 升级muse · ecdf0455
  刘鹏 committed May 28, 2022
  
  ecdf0455 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · c1823cd6
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!73
```
  范玉宾 committed May 28, 2022
  c1823cd6 Browse Files
- Merge branch 'd/4.3.93_muse' into 'd/lancet/4.3.93_muse' · b3b1f248
```
# Conflicts:
#   config.gradle
```
  范玉宾 committed May 28, 2022
  b3b1f248 Browse Files
- fix play bug · 90413816
  范玉宾 committed May 28, 2022
  
  90413816 Browse Files
- Merge branch 'feat/lp/lp_muse_6' into 'd/4.3.93_muse' · 32b354e7
```
feat: 路由问题修复

See merge request app_android_lib/YDL-Component!72
```
  刘鹏 committed May 28, 2022
  32b354e7 Browse Files
- feat: 路由问题修复 · 2b3616b4
  刘鹏 committed May 28, 2022
  
  2b3616b4 Browse Files
- Could not resolve jp.wasabeef:blurry:4.0.1. · c0250f53
  范玉宾 committed May 28, 2022
  
  c0250f53 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · f03c518a
```
fix  meditationId  set value err

See merge request app_android_lib/YDL-Component!69
```
  范玉宾 committed May 28, 2022
  f03c518a Browse Files
- Merge branch 'd/4.3.93_muse' into 'd/lancet/4.3.93_muse' · 11d2889f
```
# Conflicts:
#   config.gradle
```
  范玉宾 committed May 28, 2022
  11d2889f Browse Files
- fix meditationId set value err · c2c63634
  范玉宾 committed May 28, 2022
  
  c2c63634 Browse Files
- Merge branch 'feat/lp/lp_muse_5' into 'd/4.3.93_muse' · d9768508
```
feat: 修复交互方法不生效问题，优化重新加载url方法

See merge request app_android_lib/YDL-Component!68
```
  刘鹏 committed May 28, 2022
  d9768508 Browse Files
- feat: 修复交互方法不生效问题，优化重新加载url方法 · 87a09e34
  刘鹏 committed May 28, 2022
  
  87a09e34 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 5c1be648
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!66
```
  范玉宾 committed May 28, 2022
  5c1be648 Browse Files
- fix bugs · 3c51b5b3
  范玉宾 committed May 28, 2022
  
  3c51b5b3 Browse Files
27 May, 2022 11 commits
- fix 18219 · f870d439
  范玉宾 committed May 27, 2022
  
  f870d439 Browse Files
- Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse' · 4759771f
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!65
```
  范玉宾 committed May 27, 2022
  4759771f Browse Files
- update version code · ddadb6ad
  范玉宾 committed May 27, 2022
  
  ddadb6ad Browse Files
- meditation type error when enter playDetail from floatView · 81b3ba15
  范玉宾 committed May 27, 2022
  
  81b3ba15 Browse Files
- 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 6 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