# Conflicts:
#	PhoneManager/Class/Page/Contact/View/Dup/MergeButtonView.swift
#	PhoneManager/Class/Page/Home/View/TrashSubView.swift
#	PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  隐私空间删除弹窗
  优化
  ui 调整

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

* dev_main:
  【优化】修改广告第二次间隔时间

* dev_main:
  1
  广告收入上报
  ui 调整
  ui 调整

# Conflicts:
#	PhoneManager.xcworkspace/xcshareddata/swiftpm/Package.resolved

* dev_main:
  【新增】广告

* dev_main:
  ui 调整
  fix bugs
  ui 调整
  ui 调整

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bugs

* dev_main:
  【新增】压缩播放视频
  【优化】修复部分bug

* dev_main:
  ui优化
  1
  fix bugs
  优化

* 'dev_main' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  1
  fix bugs

* dev_main:
  【优化】调整压缩动画以及细节
  fix bug
  fix bugs
  【优化】压缩

* dev_main:
  fix bug
  fix bugs
  合并
  修复崩溃
  优化
  fix bugs
  adjust 数据上报
  优化