Commits · 611427858846a5683e202547e3dfb30d938aeca3 · 杨凯 / YDL-Component-Medical

28 May, 2022 3 commits
- 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 5 commits
- 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
24 May, 2022 16 commits
- Merge branch 'feat/lp/lp_confide_2.0_2' into 'd/v_confide_2.0' · b3e227f2
```
feat: 倾诉列表加入toast，未升级confide

See merge request app_android_lib/YDL-Component!44
```
  刘鹏 committed May 24, 2022
  b3e227f2 Browse Files
- feat: 倾诉列表加入toast，未升级confide · ee78625b
  刘鹏 committed May 24, 2022
  
  ee78625b Browse Files
- Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0' · 48a08f9d
```
组件升级

See merge request app_android_lib/YDL-Component!43
```
  霍志良 committed May 24, 2022
  48a08f9d Browse Files
- feat：组件升级 · 14d7b0f3
  霍志良 committed May 24, 2022
  
  14d7b0f3 Browse Files
- Merge branch 'feat/lp/lp_confide_2.0' into 'd/v_confide_2.0' · 8e587407
```
feat: 消息类型32兼容新展示界面

See merge request app_android_lib/YDL-Component!42
```
  刘鹏 committed May 24, 2022
  8e587407 Browse Files
- feat: 消息类型32兼容新展示界面 · d1a049fa
  刘鹏 committed May 24, 2022
  
  d1a049fa Browse Files
- feat：一键倾诉 · 8bd160a0
  霍志良 committed May 24, 2022
  
  8bd160a0 Browse Files
- Merge branch 'feat/qj/confide_2.0' into 'd/v_confide_2.0' · 110d9a4e
```
feat: 视频点击事件跳转h5

See merge request app_android_lib/YDL-Component!41
```
  万齐军 committed May 24, 2022
  110d9a4e Browse Files
- feat: 视频点击事件跳转h5 · cdd63b69
  万齐军 committed May 24, 2022
  
  cdd63b69 Browse Files
- Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0' · 9acdb8b5
```
feat：添加通话33埋点，被叫点击了拒绝按钮

See merge request app_android_lib/YDL-Component!40
```
  霍志良 committed May 24, 2022
  9acdb8b5 Browse Files
- feat：添加通话33埋点，被叫点击了拒绝按钮 · 02d15c9b
  霍志良 committed May 24, 2022
  
  02d15c9b Browse Files
- Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0' · 3b7cc2c1
```
通话埋点

See merge request app_android_lib/YDL-Component!39
```
  霍志良 committed May 24, 2022
  3b7cc2c1 Browse Files
- feat：未接通挂断定义为34 · efa009b7
  霍志良 committed May 24, 2022
  
  efa009b7 Browse Files
- feat：32主叫取消呼叫埋点 · f0d933ef
  霍志良 committed May 24, 2022
  
  f0d933ef Browse Files
- feat：私聊未读数JS触发 · f4915912
  霍志良 committed May 24, 2022
  
  f4915912 Browse Files
- Merge branch 'feat/zl/confide2' into 'd/v_confide_2.0' · 7e087ef7
```
再换一位JS参数添加

See merge request app_android_lib/YDL-Component!38
```
  霍志良 committed May 24, 2022
  7e087ef7 Browse Files