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

29 May, 2022 6 commits
- Merge branch 'feat/lp/lp_confide_3' into 'd/v_confide_2.0' · cdd11a9a
```
feat: 麦克风权限文案修改

See merge request app_android_lib/YDL-Component!80
```
  刘鹏 committed May 29, 2022
  cdd11a9a Browse Files
- feat: 麦克风权限文案修改 · 6ec77330
  刘鹏 committed May 29, 2022
  
  6ec77330 Browse Files
- Merge branch 'feat/lp/lp_confide_3' into 'd/v_confide_2.0' · da2c1021
```
feat: home组件升级

See merge request app_android_lib/YDL-Component!78
```
  刘鹏 committed May 29, 2022
  da2c1021 Browse Files
- feat: home组件升级 · 0af142ed
  刘鹏 committed May 29, 2022
  
  0af142ed Browse Files
- Merge branch 'feat/lp/lp_confide_2' into 'd/v_confide_2.0' · 1fb7673c
```
feat: 通话时长问题修复

See merge request app_android_lib/YDL-Component!77
```
  刘鹏 committed May 29, 2022
  1fb7673c Browse Files
- feat: 通话时长问题修复 · 36c0ed2a
  刘鹏 committed May 29, 2022
  
  36c0ed2a Browse Files
28 May, 2022 11 commits
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · af04c26c
```
Feat/qj/confide2

See merge request app_android_lib/YDL-Component!71
```
  万齐军 committed May 28, 2022
  af04c26c Browse Files
- feat: bug fix · cd1b3800
  万齐军 committed May 28, 2022
  
  cd1b3800 Browse Files
- feat: bug fix · 4fabe375
  万齐军 committed May 28, 2022
  
  4fabe375 Browse Files
- feat: bug fix · 0faf5ec0
  万齐军 committed May 28, 2022
  
  0faf5ec0 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 5c68892b
```
Feat/qj/confide2

See merge request app_android_lib/YDL-Component!70
```
  万齐军 committed May 28, 2022
  5c68892b Browse Files
- feat: bug fix · 7f36c40d
  万齐军 committed May 28, 2022
  
  7f36c40d Browse Files
- feat: 版本 · 3e3e3d33
  万齐军 committed May 28, 2022
  
  3e3e3d33 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · b310c420
```
Feat/qj/confide2

See merge request app_android_lib/YDL-Component!67
```
  万齐军 committed May 28, 2022
  b310c420 Browse Files
- feat: 添加uid · 61142785
  万齐军 committed May 28, 2022
  
  61142785 Browse Files
- feat: 添加js方法 · b72f91de
  万齐军 committed May 28, 2022
  
  b72f91de Browse Files
- feat: ui细节 · 2d9f6402
  万齐军 committed May 28, 2022
  
  2d9f6402 Browse Files
27 May, 2022 7 commits
- Merge branch 'feat/lp/lp_confide_2.0' into 'd/v_confide_2.0' · 963b1c63
```
feat: 合并release 提交

See merge request app_android_lib/YDL-Component!64
```
  刘鹏 committed May 27, 2022
  963b1c63 Browse Files
- feat: 合并release 提交 · 0e2fa5d8
  刘鹏 committed May 27, 2022
  
  0e2fa5d8 Browse Files
- Merge branch 'feat/lp/lp_confide_2.0' into 'd/v_confide_2.0' · 9d9a5c10
```
合并release

See merge request app_android_lib/YDL-Component!62
```
  刘鹏 committed May 27, 2022
  9d9a5c10 Browse Files
- Merge remote-tracking branch 'origin/d/v_confide_2.0' into feat/lp/lp_confide_2.0 · 6202a283
```
# Conflicts:
#	config.gradle
```
  刘鹏 committed May 27, 2022
  6202a283 Browse Files
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · a65cdba3
```
Feat/qj/confide 2.0

See merge request app_android_lib/YDL-Component!60
```
  刘鹏 committed May 27, 2022
  a65cdba3 Browse Files
- Merge remote-tracking branch 'origin/d/v_confide_2.0' into feat/qj/confide_2.0 · 4aa17fb4
  万齐军 committed May 27, 2022
  
  4aa17fb4 Browse Files
- feat: bug修改 · fda5f9f1
  万齐军 committed May 27, 2022
  
  fda5f9f1 Browse Files
26 May, 2022 7 commits
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · e17532d2
```
Feat/qj/confide 2.0

See merge request app_android_lib/YDL-Component!53
```
  万齐军 committed May 26, 2022
  e17532d2 Browse Files
- feat: bug修改 · 5713bcfa
  万齐军 committed May 26, 2022
  
  5713bcfa Browse Files
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · d1384bdb
```
Feat/qj/confide 2.0

See merge request app_android_lib/YDL-Component!50
```
  万齐军 committed May 26, 2022
  d1384bdb Browse Files
- feat: ui修改 · baaabd67
  万齐军 committed May 26, 2022
  
  baaabd67 Browse Files
- feat: 埋点与bugfix · 8d85c7d1
  万齐军 committed May 26, 2022
  
  8d85c7d1 Browse Files
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · fd17312f
```
module 版本

See merge request app_android_lib/YDL-Component!47
```
  万齐军 committed May 26, 2022
  fd17312f Browse Files
- module 版本 · 02672b14
  万齐军 committed May 26, 2022
  
  02672b14 Browse Files
25 May, 2022 9 commits
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · 4f823ebc
```
Feat/qj/confide 2.0

See merge request app_android_lib/YDL-Component!46
```
  万齐军 committed May 25, 2022
  4f823ebc Browse Files
- feat: bugFix · 31897a3d
  万齐军 committed May 25, 2022
  
  31897a3d Browse Files
- feat: 再换一位处理 · 213c6ba2
  万齐军 committed May 25, 2022
  
  213c6ba2 Browse Files
- feat: confideId url处理 · 432a724d
  万齐军 committed May 25, 2022
  
  432a724d Browse Files
- feat: 埋点 · 4d5a4d57
  万齐军 committed May 25, 2022
  
  4d5a4d57 Browse Files
- feat: webview支付修改 · f5b13dca
  万齐军 committed May 25, 2022
  
  f5b13dca Browse Files
- Merge branch 'd/v_confide_2.0' into feat/lp/lp_confide_2.0 · 29693366
```
# Conflicts:
#	app/build.gradle
#	config.gradle
#	ydl-platform/src/main/java/com/ydl/ydlcommon/view/dialog/YDLShareDialog.kt
```
  刘鹏 committed May 25, 2022
  29693366 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