MainActivity和MoreCityActivity代码merge

andy