Merge branch 'develop_0409' into Adv_NewClean

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

PhoneManager.xcodeproj/project.pbxproj

@@ -599,6 +599,7 @@
 				INFOPLIST_FILE = PhoneManager/Info.plist;
 				INFOPLIST_KEY_NSCameraUsageDescription = "We need to obtain your camera permission in order to save the photos you take in the private album feature";
 				INFOPLIST_KEY_NSContactsUsageDescription = "Phone Manager needs access to your contacts to find and merge duplicate contacts";
+				INFOPLIST_KEY_NSFaceIDUsageDescription = "The app needs to use your face ID";
 				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "We need to access the network to load content";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "We need to obtain your microphone permission in order to use it when shooting videos in the private album feature";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "We need to access your album in order to find the photos you want to change and update them";
@@ -647,6 +648,7 @@
 				INFOPLIST_FILE = PhoneManager/Info.plist;
 				INFOPLIST_KEY_NSCameraUsageDescription = "We need to obtain your camera permission in order to save the photos you take in the private album feature";
 				INFOPLIST_KEY_NSContactsUsageDescription = "Phone Manager needs access to your contacts to find and merge duplicate contacts";
+				INFOPLIST_KEY_NSFaceIDUsageDescription = "The app needs to use your face ID";
 				INFOPLIST_KEY_NSLocalNetworkUsageDescription = "We need to access the network to load content";
 				INFOPLIST_KEY_NSMicrophoneUsageDescription = "We need to obtain your microphone permission in order to use it when shooting videos in the private album feature";
 				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "We need to access your album in order to find the photos you want to change and update them";

PhoneManager/AppDelegate.swift

@@ -22,6 +22,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  
         window = UIWindow(frame: UIScreen.main.bounds)
         
+        UserDefaults.standard.set(["en"], forKey: "AppleLanguages")
+        UserDefaults.standard.synchronize()
+        
         window?.backgroundColor = .white
         window?.overrideUserInterfaceStyle = .light
         let Ssoryboard = UIStoryboard(name: "LauchVC", bundle: nil)
@@ -44,6 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // 初始化广告SDK
         AdvManager.shared.initAdertisementSDK()
         PMEmailManager.shareManager.restore()
+        SettingConfiguration.share.initData()
         
         // 相册基本资源加载
         PhotoManager.shared.config()
@@ -76,7 +80,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         for (key,value) in data {
             let uniqueId = UUID().uuidString
             for item in value {
-                let success = GroupDatabase.shared.insert(localIdentifier: item.localIdentifier, assetSize: item.assetSize, createDate: item.createDate, mediaType: key.dbType,groupId: uniqueId)
+                let success = GroupDatabase.shared.insert(localIdentifier: item.localIdentifier, assetSize: item.assetSize, createDate: item.createDate, mediaType: key == TrashTypeEnum.video ? 2 : 1,groupId: uniqueId)
                 if !success {
                     Print("保存保留列表数据失败")
                 }
@@ -91,6 +95,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         postContactNotification()
     }
     
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        
+    }
+    
+    func applicationWillResignActive(_ application: UIApplication) {
+        SettingConfiguration.share.saveData()
+    }
+    
     func postContactNotification(){
         // 通知联系人重复项改变
         let dataUpdated = Notification.Name(ContactDupPreNormalView.CONTACT_MERGED)

PhoneManager/Assets.xcassets/Compress/icon_dingyue.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_dingyue.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_dingyue@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_dingyue@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Compress/playImage.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Email/emailSmall.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "emailSmall.png",
+      "filename" : "image_48.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "image_48@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "image_48@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

PhoneManager/Assets.xcassets/Email/ic_emial_start.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Home/Frame 4.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/Secret/ic_Secret_faceID.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_ChangePin.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_ChangePin.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_ChangePin@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_ChangePin@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Del.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Del.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Del@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Del@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Email_l.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Email_l.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Email_l@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Email_l@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Email_support.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "Frame.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_FAQ.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_FAQ.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_FAQ@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_FAQ@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Face.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Face.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Face@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Face@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Hint.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Hint.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Hint@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Hint@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Info.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Info.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Info@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Info@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Off.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Off.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Off@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Off@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_On.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_On.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_On@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_On@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_Privacy.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_Privacy.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_Privacy@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_Privacy@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret__vibration_setting.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret__vibration_setting.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret__vibration_setting@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret__vibration_setting@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_about_us.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_about_us.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_about_us@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_about_us@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_ins_setting.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_ins_setting.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_ins_setting@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_ins_setting@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_keep.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_keep.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_keep@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_keep@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_lock.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_lock.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_lock@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_lock@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_rate_setting.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_rate_setting.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_rate_setting@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_rate_setting@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Assets.xcassets/SettingQz/icon_set_secret_restore.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "icon_set_secret_restore.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_set_secret_restore@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_set_secret_restore@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}