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

26 May, 2022 9 commits
- feat: 合并重新打包，解决返回无效问题 · a19f36a7
  刘鹏 committed May 26, 2022
  
  a19f36a7 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 6 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
- fix switch play list · 790e7057
  范玉宾 committed May 24, 2022
  
  790e7057 Browse Files
- Merge branch 'fix/lp/lp_release_share_bug' into 'release' · 45a3c8eb
```
feat: 分享弹窗bug修复

See merge request app_android_lib/YDL-Component!36
```
  刘鹏 committed May 24, 2022
  45a3c8eb Browse Files
- feat: 分享弹窗bug修复 · f2c814d3
  刘鹏 committed May 24, 2022
  
  f2c814d3 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 12 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