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

02 Jun, 2022 4 commits
- Merge remote-tracking branch 'origin/release' into d/v_register · de351e65
```
# Conflicts:
#	config.gradle
```
  霍志良 committed Jun 02, 2022
  de351e65 Browse Files
- feat：组件升级 · 53fa6014
  霍志良 committed Jun 02, 2022
  
  53fa6014 Browse Files
- Merge branch 'fix/zl_fixbug' into 'release' · 96033667
```
MeditationWindowService修改、组件升级

See merge request app_android_lib/YDL-Component!130
```
  霍志良 committed Jun 02, 2022
  96033667 Browse Files
- feat：组件升级 · 72c0aa40
  霍志良 committed Jun 02, 2022
  
  72c0aa40 Browse Files
01 Jun, 2022 12 commits

Merge branch 'release' into fix/zl_fixbug · 426d3ddf
```
# Conflicts:
#	config.gradle
```
霍志良 committed Jun 01, 2022
426d3ddf Browse Files
feat：隐藏客服小壹 · 20c1d2ff
霍志良 committed Jun 01, 2022

20c1d2ff Browse Files
Merge branch 'd/lancet/4.3.93_muse' into 'release' · 4981bbee
```
feat：组件升级

See merge request app_android_lib/YDL-Component!129
```
万齐军 committed Jun 01, 2022
4981bbee Browse Files
Merge branch 'd/lancet/4.3.93_muse' into 'release' · 3286a1d8
```
D/lancet/4.3.93 muse

See merge request app_android_lib/YDL-Component!127
```
万齐军 committed Jun 01, 2022
3286a1d8 Browse Files
feat：组件升级 · 464d5e88
霍志良 committed Jun 01, 2022

464d5e88 Browse Files

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

* 'release' of http://gitlab.yidianling.com/app_android_lib/YDL-Component: (98 commits)
  feat: data class 修改
  feat: 去掉倾字
  feat: video点击处理
  feat: 文案
  feat: 支付按钮隐藏
  feat: 优化了喊他xxx文案，产品优化的好啊
  feat: 权限弹窗文案修改、视频播放按钮位置更改
  feat: 语音权限弹窗
  feat: 音频动画修改
  feat: 拨打点击修改
  fix：修复BUG
  feat: 版本打包
  fix bug 通话界面弹框提醒
  feat: 首页营销埋点事件
  feat: 评价跳转url修改
  feat: 播放卡顿处理
  feat: 支付弹窗展示逻辑优化
  feat: 1.UI还原 2.拨打加入绑定手机号逻辑 3. 支付弹窗样式修改
  feat: 一键登录、拨打页优化
  fix bug mr改动
  ...

# Conflicts:
#	app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java
#	app/src/main/java/com/ydl/component/service/web/WebJavascriptHandler.kt
#	app/src/main/java/com/ydl/component/service/web/WebViewClientClickListener.java
#	config.gradle
#	m-home/src/main/java/com/yidianling/home/constants/HomeBIConstants.kt
#	m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

committed Jun 01, 2022

2c856e50 Browse Files

Merge branch 'd/v_confide_2.0' into 'release' · 16bfe177
```
倾诉2.0

See merge request app_android_lib/YDL-Component!125
```
万齐军 committed Jun 01, 2022
16bfe177 Browse Files
feat：user埋点添加 · ad1dd786
霍志良 committed Jun 01, 2022

ad1dd786 Browse Files
Merge branch 'feat/qj/confide_3' into 'd/v_confide_2.0' · 17b50d23
```
feat: data class 修改

See merge request app_android_lib/YDL-Component!124
```
万齐军 committed Jun 01, 2022
17b50d23 Browse Files
feat: data class 修改 · 3038c91f
万齐军 committed Jun 01, 2022

3038c91f Browse Files
fix hw foreground anr · 084a60cb
范玉宾 committed Jun 01, 2022

084a60cb Browse Files
fix play list err · 5ac59c8a
范玉宾 committed Jun 01, 2022

5ac59c8a Browse Files

31 May, 2022 24 commits
- UI complete · 16a79f30
  范玉宾 committed May 31, 2022
  
  16a79f30 Browse Files
- Merge branch 'feat/lp/lp_confide_14' into 'd/v_confide_2.0' · ffc414d4
```
feat: 去掉倾字

See merge request app_android_lib/YDL-Component!117
```
  刘鹏 committed May 31, 2022
  ffc414d4 Browse Files
- feat: 去掉倾字 · 275a02a6
  刘鹏 committed May 31, 2022
  
  275a02a6 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · c2330ebf
```
feat: video点击处理

See merge request app_android_lib/YDL-Component!116
```
  万齐军 committed May 31, 2022
  c2330ebf Browse Files
- feat: video点击处理 · 5bce8a34
  万齐军 committed May 31, 2022
  
  5bce8a34 Browse Files
- feat：当没有返回按钮的时候有跳过 · 137ede2c
  霍志良 committed May 31, 2022
  
  137ede2c Browse Files
- feat：同意拒绝埋点 · 882ea983
  霍志良 committed May 31, 2022
  
  882ea983 Browse Files
- Merge branch 'feat/qj/confide2' into 'd/v_confide_2.0' · d096fbfa
```
feat: 文案

See merge request app_android_lib/YDL-Component!115
```
  万齐军 committed May 31, 2022
  d096fbfa Browse Files
- feat: 文案 · b447fbfa
  万齐军 committed May 31, 2022
  
  b447fbfa Browse Files
- 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
- feat：隐私圆角设置 · 25a2479d
  霍志良 committed May 31, 2022
  
  25a2479d 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
- feat：修改圆角 · 19da3869
  霍志良 committed May 31, 2022
  
  19da3869 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
- fix：跳过按钮展示 · e051f00f
  霍志良 committed May 31, 2022
  
  e051f00f 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 'd/lancet/4.3.93_muse' into d/4.3.93_muse · 4264b44f
```
# Conflicts:
#	config.gradle
#	m-muse/src/main/res/layout/activity_play_meditation.xml
```
  范玉宾 committed May 31, 2022
  4264b44f Browse Files
- Manage floating window state · 37323969
  范玉宾 committed May 31, 2022
  
  37323969 Browse Files