date to string
date to string
Merge branch 'master' of https://github.com/ericwangtengyu/DataCollectionAndroid
tryin to fix git
fix null pointers and some error handleing