Commits · 694c22e1d4150cefc66de58417b0bbbc248fa1e5 · android / android_street

17 Jul, 2021 8 commits
- 1.去除vr页面 · 694c22e1
  fengruiyu authored Jul 17, 2021
  
  694c22e1
- Merge branch 'branche_zsf' of http://39.97.65.143:81/android/android_street into fry_dev · e9635526
  fengruiyu authored Jul 17, 2021
  
  e9635526
- 1.首页的功能已完成 · 9fa3b5fe
  fengruiyu authored Jul 17, 2021
```
2.首页的底部移动布局已完成
3.数据填充已完成
4.搜索页面的数据和页面已完成
```
  9fa3b5fe
- 提交代码 · e4f090c2
  张释方 authored Jul 17, 2021
  
  e4f090c2
- 提交防止重复点击代码 · be03d715
  张释方 authored Jul 17, 2021
  
  be03d715
- 提交VR图标 · 69b06f74
  张释方 authored Jul 17, 2021
  
  69b06f74
- 提交个人中心界面逻辑 · a4949318
  张释方 authored Jul 17, 2021
  
  a4949318
- 提交手机号微信登录代码 · 6ef43e37
  张释方 authored Jul 17, 2021
  
  6ef43e37
16 Jul, 2021 6 commits
- Merge branch 'dev_ad' into branche_zsf · 44a350d4
  mengcuiguang2 authored Jul 16, 2021
  
  44a350d4
- 提交手机号绑定代码 · deaf0bd6
  张释方 authored Jul 16, 2021
  
  deaf0bd6
- 添加微信秘钥，优化微信支付宝支付，优化用户管理类 · 942b75aa
  mengcuiguang2 authored Jul 16, 2021
  
  942b75aa
- 解决冲突 · c70818f0
  mengcuiguang2 authored Jul 16, 2021
  
  c70818f0
- usermanager 优化,地图查询优化 · dcfd97cd
  mengcuiguang2 authored Jul 16, 2021
  
  dcfd97cd
- 提交代码(待解决UserManager) · 51f4a26b
  张释方 authored Jul 16, 2021
  
  51f4a26b
15 Jul, 2021 8 commits
- 解决冲突 · 53cf784a
  mengcuiguang2 authored Jul 15, 2021
  
  53cf784a
- 代码优化 · 48037d39
  mengcuiguang2 authored Jul 15, 2021
  
  48037d39
- 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 13 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