CNLive Android Team / newModuleStrike · Commits

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

2 优化基类

# Conflicts:
#	app/strike/src/main/AndroidManifest.xml
#	app/strike/src/main/java/com/cnlive/strike/MainActivity.java
#	app/strike/src/main/res/layout/activity_main.xml