Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift

@@ -274,7 +274,7 @@ private extension YHPreviewFamilyMemberViewController {
                 }
                 self.layouButtons()
                 //延迟刷新
-                DispatchQueue.main.asyncAfter(deadline: .now()) {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
                     self.highlightButton()
                     self.homeTableView.reloadData()
                 }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift

@@ -51,8 +51,8 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
-                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
+                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
                 PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", isShowRedPoint:isShowVersionRedPoint, type:.version), ]
         
@@ -60,16 +60,16 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
-                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
+                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
                 PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
 #else
         return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
                 PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
-                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "用户条款".local, type:.userItems),
+                PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
                 PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
 #endif