Conflicts:
	app/src/main/java/com/mints/street/main/MainActivity.kt
	app/src/main/res/layout/item_grid_map_adapter.xml

 Conflicts:
	app/src/main/java/com/mints/street/main/MainActivity.kt

2.接口加载机制已处理

2.bean的list修改

2.bugly
3.历史影像
4.js交互