Commits · 98e429ed5c7b705c686cd3cee0c183a433e0e955 · android / android_fiveworld

15 Jul, 2021 6 commits
- Merge branch 'master' of http://gitlab.mints-id.com/android/android_street into branche_zsf · 98e429ed
  张释方 authored Jul 15, 2021
  
  98e429ed
- 对接获取个人信息接口 · ae3ed87f
  张释方 authored Jul 15, 2021
  
  ae3ed87f
- 修改代码冲突 · 60d5b81b
  fengruiyu authored Jul 15, 2021
  
  60d5b81b
- Merge branch 'master' of http://39.97.65.143:81/android/android_street into fry_dev · 283fbbed
  fengruiyu authored Jul 15, 2021
```
 Conflicts:
	app/src/main/AndroidManifest.xml
```
  283fbbed
- 搜索页面的搜索功能已完成（但是回调还没有处理） · cdb591b9
  fengruiyu authored Jul 15, 2021
```
搜索的历史记录的展示和保存到本地已完成（小细节未处理）
```
  cdb591b9
- 解决冲突 · a6fac0d4
  mengcuiguang2 authored Jul 15, 2021
  
  a6fac0d4
14 Jul, 2021 5 commits
- 代码提交 · bd1e5224
  张释方 authored Jul 14, 2021
  
  bd1e5224
- 修改权限弹窗界面 · 99259dea
  mengcuiguang2 authored Jul 14, 2021
  
  99259dea
- 搜索页面已完成 · ae99582d
  fengruiyu authored Jul 14, 2021
```
功能完成百分之80
```
  ae99582d
- 搜索页面已完成 · 81125099
  fengruiyu authored Jul 14, 2021
```
功能完成百分之80
```
  81125099
- 提交支付界面代码 · 5f46575c
  张释方 authored Jul 14, 2021
  
  5f46575c
13 Jul, 2021 19 commits
- 优化response · 09ffc425
  mengcuiguang2 authored Jul 13, 2021
  
  09ffc425
- 添加百度资源 · 1440498b
  fengruiyu authored Jul 13, 2021
  
  1440498b
- 代码优化 · 95295eb1
  mengcuiguang2 authored Jul 13, 2021
  
  95295eb1
- 代码优化 · 2fd69fc0
  mengcuiguang2 authored Jul 13, 2021
  
  2fd69fc0
- 友盟版本问题 · 55ee443d
  fengruiyu authored Jul 13, 2021
  
  55ee443d
- 添加网络优化 · 49d0ee24
  mengcuiguang2 authored Jul 13, 2021
  
  49d0ee24
- 优化代码 · 422093e5
  张释方 authored Jul 13, 2021
  
  422093e5
- 添加登录接口 · b5a3fec2
  mengcuiguang2 authored Jul 13, 2021
  
  b5a3fec2
- 代码优化 · 9ab4bc50
  mengcuiguang authored Jul 13, 2021
  
  9ab4bc50
- Merge branch 'master' of http://gitlab.mints-id.com/android/android_street into branche_zsf · b1c256a2
  张释方 authored Jul 13, 2021
  
  b1c256a2
- 解决冲突 · 15b7a540
  fengruiyu authored Jul 13, 2021
  
  15b7a540
- Merge branch 'master' of http://39.97.65.143:81/android/android_street into fry_dev · bb841b64
  fengruiyu authored Jul 13, 2021
```
 Conflicts:
	app/src/main/java/com/mints/street/login/LoginViewModel.kt
```
  bb841b64
- Merge branch 'branche_zsf' of http://gitlab.mints-id.com/android/android_street into branche_zsf · ddafa25c
  张释方 authored Jul 13, 2021
  
  ddafa25c
- 提交绑定手机号 · 0ae4c650
  张释方 authored Jul 13, 2021
  
  0ae4c650
- 修改activity的启动类 · 3d65501d
  fengruiyu authored Jul 13, 2021
  
  3d65501d
- 登录页面请求接口回调到本地处理 · fbed7c64
  fengruiyu authored Jul 13, 2021
  
  fbed7c64
- 解决冲突 · 5e806fc8
  mengcuiguang2 authored Jul 13, 2021
  
  5e806fc8
- Merge branch 'dev_ad' · e937e0fc
  mengcuiguang2 authored Jul 13, 2021
  
  e937e0fc
- 代码优化 · 174bae57
  mengcuiguang2 authored Jul 13, 2021
  
  174bae57
12 Jul, 2021 10 commits
- 定位功能完成 · 2ebe1a42
  fengruiyu authored Jul 12, 2021
```
vr全景功能已完成80%
```
  2ebe1a42
- 提交会员界面 · 8d8b7ed2
  张释方 authored Jul 12, 2021
  
  8d8b7ed2
- 优化网络层，添加umeng · a5f84795
  mengcuiguang2 authored Jul 12, 2021
  
  a5f84795
- Merge remote-tracking branch 'origin/branche_zsf' into branche_zsf · 552cc250
  张释方 authored Jul 12, 2021
  
  552cc250
- 提交会员界面 · 2207581e
  张释方 authored Jul 12, 2021
  
  2207581e
- 代码优化 · 4c363f84
  mengcuiguang authored Jul 12, 2021
  
  4c363f84
- 添加pay混淆 · bb089c29
  mengcuiguang authored Jul 12, 2021
  
  bb089c29
- 解决冲突 · 20146a75
  mengcuiguang authored Jul 12, 2021
  
  20146a75
- Merge branch 'dev_ad' of http://39.97.65.143:81/android/android_street into dev_ad · d4917671
  mengcuiguang2 authored Jul 12, 2021
  
  d4917671
- 代码优化 · f6088882
  mengcuiguang2 authored Jul 12, 2021
  
  f6088882