Commits · 9693cf2e374cf2d930baa0620aab6ac787746194 · 杨凯 / YDL-Component-Medical

20 Jun, 2022 1 commit
- feat: 情绪训练营代码提交 · 9693cf2e
  upwork.021 committed Jun 20, 2022
  
  9693cf2e Browse Files
16 Jun, 2022 2 commits
- Merge branch 'fix/lp/lp_fix_confide' into 'release' · f35d39b7
```
feat: 修复倾诉绑定的手机号问题

See merge request app_android_lib/YDL-Component!167
```
  刘鹏 committed Jun 16, 2022
  f35d39b7 Browse Files
- feat: 修复倾诉绑定的手机号问题 · aad70c51
  刘鹏 committed Jun 16, 2022
  
  aad70c51 Browse Files
15 Jun, 2022 17 commits
- Merge branch 'fix/lp/lp_fix_login' into 'release' · cdd04085
```
feat: 修复一键登录提示问题，修复绑定手机号问题

See merge request app_android_lib/YDL-Component!166
```
  刘鹏 committed Jun 15, 2022
  cdd04085 Browse Files
- feat: 修复一键登录提示问题，修复绑定手机号问题 · dea5ace6
  刘鹏 committed Jun 15, 2022
  
  dea5ace6 Browse Files
- Merge branch 'feat/fp/v4.3.97' into 'release' · a5a9259e
```
Feat/fp/v4.3.97

See merge request app_android_lib/YDL-Component!165
```
  刘鹏 committed Jun 15, 2022
  a5a9259e Browse Files
- v4.3.97 · 2f4043c8
  刘鹏 committed Jun 15, 2022
  
  2f4043c8 Browse Files
- Merge remote-tracking branch 'origin/release' into release · 863a07ce
  刘鹏 committed Jun 15, 2022
  
  863a07ce Browse Files
- Merge branch 'd/v_accountLogOff' into 'release' · ab8e344a
```
注销登录功能合并

See merge request app_android_lib/YDL-Component!163
```
  刘鹏 committed Jun 15, 2022
  ab8e344a Browse Files
- feat: 注销登录toast延长提示 · f54cbd9c
  刘鹏 committed Jun 15, 2022
  
  f54cbd9c Browse Files
- Merge branch 'd/v4.3.97' into d/v_accountLogOff · 234f1074
```
# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
#	config.gradle
```
  刘鹏 committed Jun 15, 2022
  234f1074 Browse Files
- feat: 更换隐私协议地址 · 0096b217
  刘鹏 committed Jun 15, 2022
  
  0096b217 Browse Files
- Merge branch 'd/v4.3.97' into 'release' · ee3dbe51
```
D/v4.3.97

See merge request app_android_lib/YDL-Component!162
```
  刘鹏 committed Jun 15, 2022
  ee3dbe51 Browse Files
- Merge branch 'feat/lp/lp_4.3.97' into 'd/v4.3.97' · 3bad977f
```
feat: 倾诉2.0通话界面功能完成

See merge request app_android_lib/YDL-Component!161
```
  刘鹏 committed Jun 15, 2022
  3bad977f Browse Files
- feat: 倾诉2.0通话界面功能完成 · b5761291
  刘鹏 committed Jun 15, 2022
  
  b5761291 Browse Files
- Merge branch 'feat/lp/lp_4.3.97' into 'd/v4.3.97' · 72c5053c
```
feat: 去掉无用代码

See merge request app_android_lib/YDL-Component!160
```
  刘鹏 committed Jun 15, 2022
  72c5053c Browse Files
- feat: 去掉无用代码 · e7145ce2
  刘鹏 committed Jun 15, 2022
  
  e7145ce2 Browse Files
- Merge branch 'feat/lp/lp_4.3.97' into 'd/v4.3.97' · cc7d274c
```
合规化获取设备信息控制

See merge request app_android_lib/YDL-Component!159
```
  刘鹏 committed Jun 15, 2022
  cc7d274c Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.97' into feat/lp/lp_4.3.97 · 72e6eea2
  刘鹏 committed Jun 15, 2022
  
  72e6eea2 Browse Files
- feat: 1. 合规化整改，获取wifi、mac、imei等加入是否已同意隐私协议判断 · a82fca8b
  刘鹏 committed Jun 15, 2022
  
  a82fca8b Browse Files
14 Jun, 2022 3 commits
- Merge branch 'feat/qj/confide2_record_data' into 'd/v4.3.97' · fe7fc7d7
```
feat: 倾诉新增埋点

See merge request app_android_lib/YDL-Component!158
```
  万齐军 committed Jun 14, 2022
  fe7fc7d7 Browse Files
- feat: 倾诉新增埋点 · 0c5b0668
  万齐军 committed Jun 14, 2022
  
  0c5b0668 Browse Files
- Merge branch 'feat/qj/volcengine' into 'd/v4.3.97' · 1280a706
```
feat: 火山引擎接入，去掉NewH5Activity的错误

See merge request app_android_lib/YDL-Component!153
```
  万齐军 committed Jun 14, 2022
  1280a706 Browse Files
13 Jun, 2022 6 commits
- feat: apm自定义错误 · 0bdb5f19
  万齐军 committed Jun 13, 2022
  
  0bdb5f19 Browse Files
- feat: 1. 倾诉2.0半屏uid刷新问题修复 · 2ad2db39
  刘鹏 committed Jun 13, 2022
  
  2ad2db39 Browse Files
- Merge branch 'feat/zl_4397fixonkeylogin' into 'd/v4.3.97' · 578c64b7
```
feat：一键登录 Token失败情况下增加Toast

See merge request app_android_lib/YDL-Component!157
```
  霍志良 committed Jun 13, 2022
  578c64b7 Browse Files
- feat：一键登录 Token失败情况下增加Toast · 07d050d1
  霍志良 committed Jun 13, 2022
  
  07d050d1 Browse Files
- Merge remote-tracking branch 'origin/d/v4.3.96' into d/v4.3.97 · d78288df
```
# Conflicts:
#	config.gradle
```
  刘鹏 committed Jun 13, 2022
  d78288df Browse Files
- feat: 1. 修复咨询列表点击刷新问题。2.去掉openInstall · 519d6148
  刘鹏 committed Jun 13, 2022
  
  519d6148 Browse Files
10 Jun, 2022 7 commits
- Merge branch 'fix/lp/fix_consultant_refresh' into 'release' · 9014f2e8
```
feat: 咨询列表刷新问题完善

See merge request app_android_lib/YDL-Component!156
```
  刘鹏 committed Jun 10, 2022
  9014f2e8 Browse Files
- feat: 咨询列表刷新问题完善 · 872abb4b
  刘鹏 committed Jun 10, 2022
  
  872abb4b Browse Files
- Merge branch 'd/meditation_bugfix' into 'd/v4.3.96' · e161c2b0
```
Update config.gradle

See merge request app_android_lib/YDL-Component!155
```
  范玉宾 committed Jun 10, 2022
  e161c2b0 Browse Files
- Update config.gradle · 0e101b44
  范玉宾 committed Jun 10, 2022
  
  0e101b44 Browse Files
- Merge branch 'd/meditation_bugfix' into 'd/v4.3.96' · 277aa7e3
```
D/meditation bugfix

See merge request app_android_lib/YDL-Component!154
```
  范玉宾 committed Jun 10, 2022
  277aa7e3 Browse Files
- Merge branch 'd/v4.3.96' into 'd/meditation_bugfix' · 10a80e99
```
# Conflicts:
#   config.gradle
```
  范玉宾 committed Jun 10, 2022
  10a80e99 Browse Files
- add meditation buried · da193851
```
Took 2 hours 24 minutes
```
  范玉宾 committed Jun 10, 2022
  da193851 Browse Files
09 Jun, 2022 4 commits
- feat: 火山引擎接入，去掉NewH5Activity的错误 · 5c537f84
  万齐军 committed Jun 09, 2022
  
  5c537f84 Browse Files
- feat: 更新壹点灵用户版 · 9309e88c
  刘鹏 committed Jun 09, 2022
  
  9309e88c Browse Files
- Merge branch 'feat/qj/fix_login' into 'release' · 26ebd735
```
修复登录不进去首页

See merge request app_android_lib/YDL-Component!152
```
  刘鹏 committed Jun 09, 2022
  26ebd735 Browse Files
- remove confide log & fix meditation switch sound err · 9418c1f4
```
Took 1 hour 34 minutes
```
  范玉宾 committed Jun 09, 2022
  9418c1f4 Browse Files