处理冲突
Merge branch 'master' of https://github.com/minggo620/battery_notification_baiduAd.git
Merge branch 'master' of https://github.com/minggo620/battery_notification_baiduAd.git
①提交处理冲突的scrollview
②添加喝水闹钟列表的适配器