Commits · e4e5948d08100cd1311481a19e9ccc84c6208fb5 · android / android_fiveworld

05 Jul, 2021 5 commits
- Merge remote-tracking branch 'origin/master' · e4e5948d
  张释方 authored Jul 05, 2021
```
# Conflicts:
#	app/src/main/res/values/styles.xml
#	library_ad/build.gradle
#	library_base/version.properties
```
  e4e5948d
- 提交平台分红页面 · 0888c86e
  张释方 authored Jul 05, 2021
  
  0888c86e
- 网络请求测试已完成 · 2f63540d
  fengruiyu authored Jul 05, 2021
  
  2f63540d
- Merge branch 'master' of http://gitlab.mints-id.com/android/android_goodnews_best · 47337dfb
  fengruiyu authored Jul 05, 2021
```
 Conflicts:
	library_base/version.properties
```
  47337dfb
- 网络请求测试已完成 · a14cefe5
  fengruiyu authored Jul 05, 2021
  
  a14cefe5
02 Jul, 2021 4 commits
- 添加三方广告lib · bddfcbcd
  mengcuiguang authored Jul 02, 2021
  
  bddfcbcd
- Merge branch 'master' of http://39.97.65.143:81/android/android_goodnews_best · 87d78777
  mengcuiguang authored Jul 02, 2021
  
  87d78777
- add version · 2a784bb5
  mengcuiguang authored Jul 02, 2021
  
  2a784bb5
- 首页搭建已完成 · c60209a8
  fengruiyu authored Jul 02, 2021
  
  c60209a8
01 Jul, 2021 2 commits
- 修改项目 · 522dad58
  fengruiyu authored Jul 01, 2021
  
  522dad58
- 项目正常跑起来 · dc4c934e
  fengruiyu authored Jul 01, 2021
  
  dc4c934e
30 Jun, 2021 11 commits
- 编译时生成的文件，一般用于编译的版本控制 · 7c16a2b2
  fengruiyu authored Jun 30, 2021
  
  7c16a2b2
- Merge branch 'master' of http://gitlab.mints-id.com/android/android_goodnews_best · 51ebdcfb
  fengruiyu authored Jun 30, 2021
```
 Conflicts:
	.idea/vcs.xml
	library_base/version.properties
```
  51ebdcfb
- App主工程加载base · 679fb355
  fengruiyu authored Jun 30, 2021
  
  679fb355
- App主工程加载base · f6b2cb68
  fengruiyu authored Jun 30, 2021
  
  f6b2cb68
- App主工程加载base · 05f610cb
  fengruiyu authored Jun 30, 2021
  
  05f610cb
- 添加拦截器，更新gradle版本 · d224d0b3
  mengcuiguang authored Jun 30, 2021
  
  d224d0b3
- Merge branch 'master' of http://39.97.65.143:81/android/android_goodnews_best · df5b0ceb
  mengcuiguang authored Jun 30, 2021
  
  df5b0ceb
- 添加接口拦截器，更新gradle版本 · b81b4162
  mengcuiguang authored Jun 30, 2021
  
  b81b4162
- 修改网络框架 · 3d12fe52
  fengruiyu authored Jun 30, 2021
  
  3d12fe52
- 修改网络框架 · c18ed429
  fengruiyu authored Jun 30, 2021
  
  c18ed429
- 初始化项目 · 5b42ad52
  fengruiyu authored Jun 30, 2021
  
  5b42ad52