Commits · 527ea1bb8748c00282d7c4c1b3cd30f904b291fc · gengmeiios / GMAILab

22 Jun, 2020 7 commits
- Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMAILab into zx/faceTest · 527ea1bb
  朱璇 authored Jun 22, 2020
  
  527ea1bb
- 三体库回退 · 015edf02
  朱璇 authored Jun 22, 2020
  
  015edf02
- Merge branch 'zx/faceTest' into 'master' · 587b3ecd
  朱璇 authored Jun 22, 2020
```
Zx/face test

See merge request !14
```
  587b3ecd
- 数据为空增加判断 · d087ff4b
  朱璇 authored Jun 22, 2020
  
  d087ff4b
- 支付问题fix · a105c7a6
  朱璇 authored Jun 22, 2020
  
  a105c7a6
- Merge branch 'revert-ecfaba77' into 'master' · d6c0a55e
  朱璇 authored Jun 22, 2020
```
Revert "Merge branch 'zx/faceTest' into 'master'"

See merge request !13
```
  d6c0a55e
- Revert "Merge branch 'zx/faceTest' into 'master'" · f0c3b7dd
  朱璇 authored Jun 22, 2020
```
This reverts merge request !12
```
  f0c3b7dd
19 Jun, 2020 4 commits
- Merge branch 'zx/faceTest' into 'master' · ecfaba77
  朱璇 authored Jun 19, 2020
```
修改三体库 依赖方式

See merge request !12
```
  ecfaba77
- 修改三体库依赖方式 · 0ce5c86a
  朱璇 authored Jun 19, 2020
  
  0ce5c86a
- Merge branch 'zx/faceTest' into 'master' · 3ca7995c
  朱璇 authored Jun 19, 2020
```
设置音频编码格式

See merge request !11
```
  3ca7995c
- 设置音频编码格式 · c2d38845
  朱璇 authored Jun 19, 2020
  
  c2d38845
15 Jun, 2020 18 commits
- Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMAILab · 6d2b1ab3
  gm-mini authored Jun 15, 2020
  
  6d2b1ab3
- Merge branch 'master' of git.wanmeizhensuo.com:gengmeiios/GMAILab · d2ba31e4
  jz authored Jun 15, 2020
  
  d2ba31e4
- update · e8150eb7
  jz authored Jun 15, 2020
  
  e8150eb7
- update · 0f5dbc09
  gm-mini authored Jun 15, 2020
  
  0f5dbc09
- Merge branch 'zx/faceTest' into 'master' · 23a99b18
  朱璇 authored Jun 15, 2020
```
Zx/face test

See merge request !10
```
  23a99b18
- conflict fix · ecc21115
  朱璇 authored Jun 15, 2020
  
  ecc21115
- 资源文件 · 0a632578
  朱璇 authored Jun 15, 2020
  
  0a632578
- update · 80ebf99d
  jz authored Jun 15, 2020
  
  80ebf99d
- Merge branch 'zx/faceTest' into 'master' · 88b5522b
  朱璇 authored Jun 15, 2020
```
fix

See merge request !9
```
  88b5522b
- fix · 377798b8
  朱璇 authored Jun 15, 2020
  
  377798b8
- Merge branch 'lym/test' into 'master' · 91120b6a
  卢悦明 authored Jun 15, 2020
```
删除版本号依赖

See merge request !8
```
  91120b6a
- 删除版本号依赖 · d19a5998
  yueming lu authored Jun 15, 2020
  
  d19a5998
- update podfile.lock · 7efc47df
  jz authored Jun 15, 2020
  
  7efc47df
- update · c6f7ff65
  jz authored Jun 15, 2020
  
  c6f7ff65
- update · dc055f88
  jz authored Jun 15, 2020
  
  dc055f88
- Merge branch 'lym/test' into 'master' · 6146c745
  乔金柱 authored Jun 15, 2020
```
Lym/test

See merge request !7
```
  6146c745
- Merge branch 'master' into lym/test · 0e15d112
  yueming lu authored Jun 15, 2020
```
* master:
  delete unused code
  bugfix @莹莹 【组件化IOS】1v1和派单连线接通后，用户侧挂断，先提示‘面诊结束’toast，需要再点击1次，才会出现挂断弹窗
```
  0e15d112
- 将三体库外置 · 086ebf40
  yueming lu authored Jun 15, 2020
  
  086ebf40
12 Jun, 2020 3 commits
- Merge branch 'zx/faceTest' into 'master' · 4ec62e94
  朱璇 authored Jun 12, 2020
```
bugfix @莹莹 【组件化IOS】1v1和派单连线接通后，用户侧挂断，先提示‘面诊结束’toast，需要再点击1次，才会出现挂断弹窗

See merge request !6
```
  4ec62e94
- delete unused code · b539891d
  朱璇 authored Jun 12, 2020
  
  b539891d
- bugfix @莹莹【组件化IOS】1v1和派单连线接通后，用户侧挂断，先提示‘面诊结束’toast，需要再点击1次，才会出现挂断弹窗 · f4bca655
  朱璇 authored Jun 12, 2020
  
  f4bca655
11 Jun, 2020 8 commits
- Merge branch 'zx/faceTest' into 'master' · 4bea1af6
  朱璇 authored Jun 11, 2020
```
Zx/face test

See merge request !5
```
  4bea1af6
- 埋点修改 · 96a10fa7
  朱璇 authored Jun 11, 2020
  
  96a10fa7
- 埋点修改 · fe1d40de
  朱璇 authored Jun 11, 2020
  
  fe1d40de
- bugfix @陈雪 [anroid-用户侧黑屏]android用户给iOS医生发起1V1连线，用户侧看不到用户自己，医生侧可以看到用户 · 1108cb56
  朱璇 authored Jun 11, 2020
  
  1108cb56
- bugfix @莹莹【IOS埋点10-医生侧唤起呼入界面】没有上报 · 425a7c94
  朱璇 authored Jun 11, 2020
  
  425a7c94
- Merge branch 'zx/faceTest' into 'master' · cc58ea4f
  朱璇 authored Jun 11, 2020
```
Zx/face test

See merge request !4
```
  cc58ea4f
- 埋点修改 · 6625c532
  朱璇 authored Jun 11, 2020
  
  6625c532
- bugfix @莹莹【IOS埋点31-医生加入后，调用信令告知用户】问题如下 · 64ea4e8f
  朱璇 authored Jun 11, 2020
  
  64ea4e8f