* yQz0507:
  设置及二级界面
  设置及二级界面

* dev_main:
  优化保留 和首页
  【优化】垃圾桶逻辑优化
  app内资源删除

# Conflicts:
#	PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift

* dev_zhaoqian:
  【修改】优化

* dev_main:
  app内资源删除

# Conflicts:
#	PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift
#	PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift
#	PhoneManager/Class/Page/Home/Controller/HomeViewController.swift

# Conflicts:
#	PhoneManager/Class/Page/Settings/Model/SettingModel.swift
#	PhoneManager/Class/Page/Settings/ViewController/SettingViewController.swift
#	Podfile

* develop_0409:
  【优化】部分功能新增优化
  【新增】垃圾桶详情以及部分优化
  【新增】添加视频、截图、其他选择按钮
  【新增】撤回功能，照片详情页面
  【优化】处理部分逻辑
  【新增】左滑垃圾桶功能
  【新增】垃圾桶功能
  【新增】内部勾选框

# Conflicts:
#	PhoneManager/Class/Database/TrashDatabase.swift

* develop_0409:
  11212

* develop_0409:
  【新增】充电修改，相似详情新增下一行

* develop_0409:
  【新增】首页筛选
  引入新相册资源管理类
  垃圾桶数据库
  引导页动画
  垃圾桶页面
  【新增】左右滑动UI
  【优化】设置弹窗

# Conflicts:
#	PhoneManager/Class/Tool/Extension.swift/ UIView+Extension.swift

谷歌邮件登录
锁屏小组件

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  引入新相册资源管理类
  垃圾桶数据库
  引导页动画
  垃圾桶页面

# Conflicts:
#	PhoneManager/Class/Page/Home/View/DateSelectButtonView.swift
#	PhoneManager/Class/Page/Home/View/ResourceFilterBoxView.swift
#	PhoneManager/Class/Page/Home/View/YearMonthPickerView.swift
#	PhoneManager/Class/Page/Home/View/cell/ResourceFilterBoxTableViewCell.swift