Commits · 691f4ad301a8f9fa338a9ba45df17c09f5a570d5 · 杨凯 / YDL-Component-Medical

31 May, 2022 5 commits
- fix bug 通话界面弹框提醒 · 691f4ad3
  fengquan committed May 31, 2022
  
  691f4ad3 Browse Files
- Merge branch 'feat/lp/lp_confide_8' into 'd/v_confide_2.0' · 143a5d99
```
feat: 支付弹窗展示逻辑优化

See merge request app_android_lib/YDL-Component!97
```
  刘鹏 committed May 31, 2022
  143a5d99 Browse Files
- feat: 支付弹窗展示逻辑优化 · aff1de4f
  刘鹏 committed May 31, 2022
  
  aff1de4f Browse Files
- Merge branch 'feat/lp/lp_confide_8' into 'd/v_confide_2.0' · d283d88d
```
feat: 1.UI还原 2.拨打加入绑定手机号逻辑 3. 支付弹窗样式修改

See merge request app_android_lib/YDL-Component!96
```
  刘鹏 committed May 31, 2022
  d283d88d Browse Files
- feat: 1.UI还原 2.拨打加入绑定手机号逻辑 3. 支付弹窗样式修改 · 31b9573c
  刘鹏 committed May 31, 2022
  
  31b9573c Browse Files
30 May, 2022 21 commits
- Merge branch 'feat/lp/lp_confide_7' into 'd/v_confide_2.0' · 6afdceff
```
feat: 一键登录、拨打页优化

See merge request app_android_lib/YDL-Component!95
```
  刘鹏 committed May 30, 2022
  6afdceff Browse Files
- feat: 一键登录、拨打页优化 · 57c52bca
  刘鹏 committed May 30, 2022
  
  57c52bca Browse Files
- Merge branch 'darren_confide_2.0' into 'd/v_confide_2.0' · b537cadc
```
fix bug mr改动

See merge request app_android_lib/YDL-Component!93
```
  万齐军 committed May 30, 2022
  b537cadc Browse Files
- Merge remote-tracking branch 'origin/d/v_confide_2.0' into darren_confide_2.0 · d7f9853a
```
# Conflicts:
#	m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt
#	m-confide/src/main/java/com/ydl/confide/intro/ItemIntroHolder.kt
```
  fengquan committed May 30, 2022
  d7f9853a Browse Files
- fix bug mr改动 · e4489644
  fengquan committed May 30, 2022
  
  e4489644 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · d4370995
```
feat: ui修改

See merge request app_android_lib/YDL-Component!92
```
  万齐军 committed May 30, 2022
  d4370995 Browse Files
- feat: ui修改 · fe90b127
  万齐军 committed May 30, 2022
  
  fe90b127 Browse Files
- Merge branch 'darren_confide_2.0' into 'd/v_confide_2.0' · 58b9b0fb
```
fix bug 通话界面UI调整&svga

See merge request app_android_lib/YDL-Component!90
```
  刘鹏 committed May 30, 2022
  58b9b0fb Browse Files
- Merge branch 'feat/lp/lp_confide_6' into 'd/v_confide_2.0' · f78b1177
```
收款跳转支付、视频页跳转支付，登录按钮热区

See merge request app_android_lib/YDL-Component!91
```
  刘鹏 committed May 30, 2022
  f78b1177 Browse Files
- feat: 星链消息更改升级组件 · 8cb634ab
  刘鹏 committed May 30, 2022
  
  8cb634ab Browse Files
- Merge branch 'd/v_confide_2.0' into darren_confide_2.0 · 06c65bdd
```
# Conflicts:
#	m-confide/src/main/java/com/ydl/confide/home/ConfideHomeActivity.kt
```
  fengquan committed May 30, 2022
  06c65bdd Browse Files
- fix bug 通话界面UI调整&svga · c6554397
  fengquan committed May 30, 2022
  
  c6554397 Browse Files
- Merge remote-tracking branch 'origin/d/v_confide_2.0' into feat/lp/lp_confide_6 · e7051301
  刘鹏 committed May 30, 2022
  
  e7051301 Browse Files
- feat: 消息ui还原、倾诉支付 · a002933e
  刘鹏 committed May 30, 2022
  
  a002933e Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 6db9f48f
```
feat: bug fix & ui

See merge request app_android_lib/YDL-Component!89
```
  万齐军 committed May 30, 2022
  6db9f48f Browse Files
- feat: bug fix & ui · 382ea25d
  万齐军 committed May 30, 2022
  
  382ea25d Browse Files
- Merge branch 'feat/lp/lp_confide_5' into 'd/v_confide_2.0' · c312118b
```
feat: 一键登录换图

See merge request app_android_lib/YDL-Component!88
```
  刘鹏 committed May 30, 2022
  c312118b Browse Files
- feat: 一键登录换图 · 591d54d0
  刘鹏 committed May 30, 2022
  
  591d54d0 Browse Files
- Merge branch 'feat/lp/lp_confide_4' into 'd/v_confide_2.0' · a4a76a66
```
私聊收款跳转倾诉列表问题

See merge request app_android_lib/YDL-Component!83
```
  刘鹏 committed May 30, 2022
  a4a76a66 Browse Files
- feat: 私聊消息跳转倾诉列表问题修复 · 2a2d953c
  刘鹏 committed May 30, 2022
  
  2a2d953c Browse Files
- Rename .java to .kt · bc030ef6
  刘鹏 committed May 30, 2022
  
  bc030ef6 Browse Files
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 8 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