Commit 52ac3f69 authored by pete谢兆麟's avatar pete谢兆麟

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

parents 9106d777 51050d74
...@@ -51,8 +51,8 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -51,8 +51,8 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs), PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement), PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo), PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", isShowRedPoint:isShowVersionRedPoint, type:.version), ] PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", isShowRedPoint:isShowVersionRedPoint, type:.version), ]
...@@ -60,16 +60,16 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -60,16 +60,16 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs), PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement), PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo), PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)] PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
#else #else
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs), PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement), PersonalModuleItem(title: "隐私协议".local, type:.privaceAgreement),
PersonalModuleItem(title: "用户条款".local, type:.userItems),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)] PersonalModuleItem(title: "版本 \(UIDevice.appVersion())",isShowRedPoint:isShowVersionRedPoint, type:.version)]
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment