CNLive Android Team / newModuleStrike · Commits

# Conflicts:
#	app/strike/src/main/java/com/cnlive/strike/MyActivity.java
#	settings.gradle

修改相关recyclerView

2 基类新增常用工具类

# Conflicts:
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java

# Conflicts:
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java

2 增加百度地图sdk库

# Conflicts:
#	build.gradle

# Conflicts:
#	build.gradle

# Conflicts:
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java