修改重启报告的格式以支持最新rboot.txt
Merge branch 'master' of https://github.com/yangfan-njx/hwautotest.git

Conflicts:
	src/com/test/hwautotest/ftp/ActivityUtil.java
	src/com/test/hwautotest/ftp/FtpUtil.java
修正重启报告的刷新公式
Merge branch 'master' of https://github.com/yangfan-njx/hwautotest.git