Commits · 47b29fdcfa5ecbdaebe699cd7adc42d2144c95b5 · 杨凯 / YDL-Component-Medical

31 May, 2022 29 commits
- Merge branch 'feat/lp/lp_confide_13' into 'd/v_confide_2.0' · 47b29fdc
```
feat: 支付按钮隐藏

See merge request app_android_lib/YDL-Component!114
```
  刘鹏 committed May 31, 2022
  47b29fdc Browse Files
- feat: 支付按钮隐藏 · 883c1e68
  刘鹏 committed May 31, 2022
  
  883c1e68 Browse Files
- Merge branch 'feat/lp/lp_confide_12' into 'd/v_confide_2.0' · e29183f6
```
feat: 优化了喊他xxx文案，产品优化的好啊

See merge request app_android_lib/YDL-Component!113
```
  刘鹏 committed May 31, 2022
  e29183f6 Browse Files
- feat: 优化了喊他xxx文案，产品优化的好啊 · 6a0564bc
  刘鹏 committed May 31, 2022
  
  6a0564bc Browse Files
- Merge branch 'feat/lp/lp_confide_11' into 'd/v_confide_2.0' · f50723b2
```
feat: 权限弹窗文案修改、视频播放按钮位置更改

See merge request app_android_lib/YDL-Component!112
```
  刘鹏 committed May 31, 2022
  f50723b2 Browse Files
- feat: 权限弹窗文案修改、视频播放按钮位置更改 · 52938a49
  刘鹏 committed May 31, 2022
  
  52938a49 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 0c8074cd
```
feat: 音频动画修改

See merge request app_android_lib/YDL-Component!111
```
  万齐军 committed May 31, 2022
  0c8074cd Browse Files
- Merge branch 'feat/lp/lp_confide_10' into 'd/v_confide_2.0' · 870db646
```
feat: 语音权限弹窗

See merge request app_android_lib/YDL-Component!110
```
  刘鹏 committed May 31, 2022
  870db646 Browse Files
- feat: 语音权限弹窗 · c32dd051
  刘鹏 committed May 31, 2022
  
  c32dd051 Browse Files
- feat: 音频动画修改 · d33f9b18
  万齐军 committed May 31, 2022
  
  d33f9b18 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 4eb4cf14
```
feat: 拨打点击修改

See merge request app_android_lib/YDL-Component!107
```
  万齐军 committed May 31, 2022
  4eb4cf14 Browse Files
- feat: 拨打点击修改 · 64f00069
  万齐军 committed May 31, 2022
  
  64f00069 Browse Files
- Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0' · 45032738
```
fix：修复BUG

See merge request app_android_lib/YDL-Component!106
```
  霍志良 committed May 31, 2022
  45032738 Browse Files
- fix：修复BUG · 82acf79a
  霍志良 committed May 31, 2022
  
  82acf79a Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 06297235
```
feat: 版本打包

See merge request app_android_lib/YDL-Component!105
```
  万齐军 committed May 31, 2022
  06297235 Browse Files
- feat: 版本打包 · 8dd041de
  万齐军 committed May 31, 2022
  
  8dd041de Browse Files
- Merge branch 'darren_confide_2.0' into 'd/v_confide_2.0' · 11b87929
```
fix bug 通话界面弹框提醒

See merge request app_android_lib/YDL-Component!103
```
  万齐军 committed May 31, 2022
  11b87929 Browse Files
- Merge branch 'd/v_confide_2.0' into darren_confide_2.0 · 4b57a0ea
  fengquan committed May 31, 2022
  
  4b57a0ea Browse Files
- fix bug 通话界面弹框提醒 · 691f4ad3
  fengquan committed May 31, 2022
  
  691f4ad3 Browse Files
- Merge branch 'feat/lp/lp_confide_9' into 'd/v_confide_2.0' · 60a54d1c
```
feat: 首页营销埋点事件

See merge request app_android_lib/YDL-Component!102
```
  刘鹏 committed May 31, 2022
  60a54d1c Browse Files
- feat: 首页营销埋点事件 · 6f4f25c0
  刘鹏 committed May 31, 2022
  
  6f4f25c0 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · a2ecac22
```
feat: 评价跳转url修改

See merge request app_android_lib/YDL-Component!100
```
  万齐军 committed May 31, 2022
  a2ecac22 Browse Files
- feat: 评价跳转url修改 · bd66a82e
  万齐军 committed May 31, 2022
  
  bd66a82e Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · 96a0471c
```
卡顿处理

See merge request app_android_lib/YDL-Component!99
```
  万齐军 committed May 31, 2022
  96a0471c Browse Files
- feat: 播放卡顿处理 · b7e127a6
  万齐军 committed May 31, 2022
  
  b7e127a6 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 11 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